rename variable

This commit is contained in:
2023-06-10 19:51:50 +08:00
parent a8259fdc7d
commit 313870bcc3
10 changed files with 23 additions and 53 deletions

View File

@@ -19,8 +19,8 @@ class Model(ap.Model):
self.dct_lst_remove_firm_prod = self.p.dct_lst_init_remove_firm_prod
self.int_n_max_trial = int(self.p.n_max_trial)
self.flt_netw_pref_supp_n = float(self.p.netw_pref_supp_n)
self.flt_netw_pref_supp_size = float(self.p.netw_pref_supp_size)
self.flt_netw_sply_prf_n = float(self.p.netw_sply_prf_n)
self.flt_netw_sply_prf_size = float(self.p.netw_sply_prf_size)
self.flt_cap_limit = int(self.p.cap_limit)
self.flt_diff_remove = float(self.p.diff_remove)
self.proactive_ratio = float(self.p.proactive_ratio)
@@ -76,7 +76,7 @@ class Model(ap.Model):
1].to_list()
lst_pred_firm_size_damp = \
[G_Firm.nodes[pred_firm]['Revenue_Log'] **
self.flt_netw_pref_supp_size
self.flt_netw_sply_prf_size
for pred_firm in lst_pred_firm
]
lst_prob = \
@@ -94,7 +94,7 @@ class Model(ap.Model):
share = G_Firm.nodes[node]['Revenue_Log'] / sum(
lst_same_prod_firm_size)
# damp share
share = share ** self.flt_netw_pref_supp_n
share = share ** self.flt_netw_sply_prf_n
n_pred_firm = round(share * len(lst_pred_firm)) if round(
share * len(lst_pred_firm)) > 0 else 1 # at least one
lst_choose_firm = self.nprandom.choice(lst_pred_firm,