From 0965a5daa43b1035297e6aacd36c934df31a655e Mon Sep 17 00:00:00 2001
From: HaoYizhi <haoyizhi@agentlab.cn>
Date: Sun, 2 Jul 2023 15:51:01 +0800
Subject: [PATCH] set to removed only for disrupted firm

---
 __pycache__/controller_db.cpython-38.pyc | Bin 7905 -> 7908 bytes
 __pycache__/firm.cpython-38.pyc          | Bin 8626 -> 8626 bytes
 __pycache__/model.cpython-38.pyc         | Bin 12035 -> 12254 bytes
 controller_db.py                         |   4 ++--
 model.py                                 |  18 ++++++++++++++----
 xv_without_exp.csv                       |   2 +-
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/__pycache__/controller_db.cpython-38.pyc b/__pycache__/controller_db.cpython-38.pyc
index 9a63791e09a21cf9473085097e1957a9ae90c559..7c1cb9727e6b758edf78cb826d2686189b6b25e2 100644
GIT binary patch
delta 725
zcmZ{h%WD%+6vn-iN9&M>(>95=X|yWVx(LyVMIlhJAXGP13wAIa^0?CJOgrV=sR>FE
zQK2ZJ_AadAEB*(Ph2YY?xNsqaZWINV{t4c1MyeZU@#CEDoO{kU_kJyZFYB|(q`pIa
zmk+<y=k%nhO`N>mbF6r@I9@#7S<*jhkys)o%gJAZrs|?AKn0iwjsSD=Z0ddHZ#fiE
zv80hM4Rjf&VWa^Hh-Nxwy2aQf`FU53Rpbd{k=e3s42}k)dsItTvm108fl*s^9ZOWN
zam%YM^13g`k>8BT)GDe>gkx7arM?f^K2K@pPT`Z~S8Fb(11kS#FUh{lId(_RXV#dI
zTbUBOE0fuayKkbcg?aJ%f@jw`MWNi5t?X3)4TOQG_*L8WIZ;!7%1))$g8l|~xzZdt
zlDoieb^P3bmWS`L7!9EzLR^G5Hj6py(#ZGAcYC%>fpi?53EJLI_n<xiG+=u-Jw%F?
zWCKm0q%amSdtKpM!crHu4)r-!Yz%!l_20udM=yaiCPV|Le-1<4R1+#}Q+oNyL$A;g
zr^nDYfMD|@M1eyGQ9JmnpZRC!VXhl>ZS@3uQ8@^V05iaT;3@Dzp_>qX)wk<Q++Xk-
wp`+I*;<o9HY!`C!$MF5p@MTu2%Z;j_3DjVx+q=yDrbkYT&On=%PYTn&0cK6ELjV8(

delta 685
zcmZ{hOK1~O6o$PsNm_<HH4jshh*B!;qNHY{LLro_T33+@M$#}QS2}fU(lb|^`l5&m
zMG*C@TJTjDu3SiVF5S55LKh;l5kWU@?8>$C&lJ0I79aop?|<$&_s);$@6*P7EM^?=
zzK_Ls#s$N0#mO7tsmZCy%AjZLXu2L9;%aPn<f0d$Ca?gsfC-?%v+?)I{p~$7pD5?a
z@&c}qR7B86393G5Ci+6m^Oxi$vB0NOOA|}*HN?X!*Cee`1X?$3JLorrrDk<#hIdjq
zVe`*aHGUnYaDtOp29<*!G|}Tf>5_0blbI9u+05J)ioa#b;sGbK=MJxX6|{!3NPDqs
zwIzk%+~b?s+M!#Jext}`%T|)8&!4lk_#Hprk+$?an@4kXad)tqOKXK0Z)ZGAM-b3S
zI>D^xan1(6$^ULB$O=+XT8Bn&dI&rMaAW${mmXt@cI3ZDAFAwOTyG59j%qnA?*%sC
zKI7eyUuXVXi6VLdBv2mmN8GD~yUFQ7Q*1I7s$(yah|p8`4ESxIK>6d@P}}^q@b)aG
zaznP|C^`yv6gURdf#bjy@Z5tNb(E>B_Eo7CyPaT~SJ=c8(`)`z+&&Tfik`XLF&#Pu
WA7i+~%Tld&=}Mn!@aA}{H2W6__NC?k

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index 046379154c324a6a17c03a9acc713e51f49d698a..b90941022575c608169dade22bc0e4c60ead138c 100644
GIT binary patch
delta 19
Zcmdnwyvdm>l$V!_0SJ;5H*&2|1OPBJ1a$xa

delta 19
Zcmdnwyvdm>l$V!_0SKljY~)&@2mmo#1f~E0

diff --git a/__pycache__/model.cpython-38.pyc b/__pycache__/model.cpython-38.pyc
index 63a8eab1d3966360267348376da348c5520c1929..c6eb21f76734d74f28393a00e298003139915a7f 100644
GIT binary patch
delta 3556
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
F{{U2+o^JpE

delta 3275
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

diff --git a/controller_db.py b/controller_db.py
index 550a28c..9aba433 100644
--- a/controller_db.py
+++ b/controller_db.py
@@ -81,9 +81,9 @@ class ControllerDB:
                     list_dct.append(dct)
         # list_dct = [{'140': ['1.4.5.1']}]
         # list_dct = [{'133': ['1.4.4.1']}]
-        list_dct = [{'2': ['1.1.3']}]
+        # list_dct = [{'2': ['1.1.3']}]
         # list_dct = [{'135': ['1.3.2.1']}]
-        # list_dct = [{'79': ['2.1.3.4']}]
+        list_dct = [{'79': ['2.1.3.4']}]
         # list_dct = [{'99': ['1.3.3']}]
         # list_dct = [{'41': ['1.4.5']}]
 
diff --git a/model.py b/model.py
index 1ffbb89..352e8d2 100644
--- a/model.py
+++ b/model.py
@@ -349,10 +349,10 @@ class Model(ap.Model):
                     firm.size_stat.append((size, self.t))
                     print(f'in ts {self.t}, reduce {firm.name} size '
                           f'to {firm.size_stat[-1][0]} due to {prod.code}')
-                if self.t - ts + 1 == self.remove_t:
-                    # turn disrupted firm into removed firm
-                    firm.dct_prod_up_prod_stat[
-                        prod]['status'].append(('R', self.t))
+                    if self.t - ts + 1 == self.remove_t:
+                        # turn disrupted firm into removed firm
+                        firm.dct_prod_up_prod_stat[
+                            prod]['status'].append(('R', self.t))
 
         # stop simulation if any firm still in disrupted except inital removal
         if self.t > 0:
@@ -422,6 +422,16 @@ class Model(ap.Model):
     def end(self):
         print('/' * 20, 'output', '/' * 20)
 
+        for firm in self.a_lst_total_firms:
+            is_size = False
+            for prod, dct_status_supply in firm.dct_prod_up_prod_stat.items():
+                if len(dct_status_supply['status']) > 1:
+                    is_size = True
+                    print(f"{firm.name} {prod.code}:")
+                    print(dct_status_supply['status'])
+            if is_size:
+                print(firm.size_stat)
+
         # qry_result = db_session.query(Result).filter_by(s_id=self.sample.id)
         # if qry_result.count() == 0:
         #     lst_result_info = []
diff --git a/xv_without_exp.csv b/xv_without_exp.csv
index 2f2b311..c53192d 100644
--- a/xv_without_exp.csv
+++ b/xv_without_exp.csv
@@ -1,2 +1,2 @@
 n_max_trial,prf_size,prf_conn,cap_limit_prob_type,cap_limit_level,diff_new_conn,crit_supplier,proactive_ratio,remove_t,netw_prf_n
-10,TRUE,TRUE,uniform,10,0.1,0.1,1,5,2
+10,TRUE,TRUE,uniform,10,0.5,0.1,1,5,2