From ae5bebb1f39b80ce93c5aee341efd2d66c5a1957 Mon Sep 17 00:00:00 2001
From: HaoYizhi <haoyizhi@agentlab.cn>
Date: Sun, 18 Jun 2023 22:41:26 +0800
Subject: [PATCH] drop firm attr a_lst_product/_disrupted

---
 __pycache__/controller_db.cpython-38.pyc | Bin 7931 -> 7932 bytes
 __pycache__/firm.cpython-38.pyc          | Bin 8364 -> 8364 bytes
 __pycache__/model.cpython-38.pyc         | Bin 12801 -> 12917 bytes
 controller_db.py                         |   4 ++--
 model.py                                 |  17 ++++++++++-------
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/__pycache__/controller_db.cpython-38.pyc b/__pycache__/controller_db.cpython-38.pyc
index f446f0c5237a79bbabcf52831f172fb73ea965d6..d282dbe8092e0c336186aee67169a85c25ca0d7e 100644
GIT binary patch
delta 666
zcmZ{h%WD%+6vn-in3N$;HEGi(S-3DnB{U5MQ3^q_YF$W51taZ{$Cc*Q)H4&?28xJi
zv52KTt|~rS-MT1Q3NBo^@gK-vPz$Bdg&Vu@ev?vH&f>?p-~G<{E@%EsoJ{C5Uax*m
zefxnu{l4z&IntT&jys*oq{dR|?xOxvb2vRN&U%lBA1E8m0&{=?Tm=ez$M+-f@A_0s
z`o|+wQ-+?96ob)5996zc{*Dkcd>AN+IlddLi8_A`4kzr<ZZv7t3f)E#EVUbT!z@0Q
zMyphlWy_={p9HhMCEN<LKbE?a7rtxa5qm>%Ve$3Qlz73*p;gi5-=R^l#)<Is&{Jf0
z(B>-7x2k1HPAJcLE1bKyiqejDJ*+k?NwmVh!a3g)+h36lskA2F8qAAl-PePcv?!jJ
zJWnGqI7piP#oWW3b^aDPDzs5%;PTK}Hobzn0cgNkE^Xq7II06Hz^FpfQ5a~LmSGxd
zC+kq(vwP&==6^fUL>~daLegnJ@w5}_HeZX*ifw)w&0g7o!$l1J4PeJ^p|YRXMD>Y}
zqF>Z6dKZg~<sn=K-U1&KdLGj%TGet>TJx<+KY16ISSNkv{n&1zzxKuALZxWZ4d{sM
T4J=4&sYUf=%0Zjrz4+u`OW381

delta 681
zcmZ{h%TH556vmxf+LD_-tZ<9a$HD{=6B`~HqLB!ZRf&tLENH}=KE}{;p>XDkg{UD$
zP0+;GSwSKy{sr2t8(q0!<Hn@%AJByhH!jq~`^`1Fau&aw`Of1znfW>XW89pHM$LWR
zF~hISSu<KR#!jw>M{>it(cJOYin(V5f{`FkM!)qHy(+o{%mJ5yqrfbmi@mr0rF{_@
zoBQJ@y4ylh23L(NqC!i>*M+#qU-y^A92XLGQRg>_z5zWt?3J{QT9qadB+6Hv1zVL?
zrQImkWyMwG@UO%~Y!z9d{IM&o=>zW!vCJ_mD-<8Iro|mzvu+5Nzgt7%E+0u=IJn_;
z&>Gr8mH9@kBB=w)ZRX@u*L8&2I&`JxxRR*JUy@U?o4UR#9qDNfpYAy?ZnYlvbQ@``
zHyET83IZgR|1dL{v&nC>UHqZ<Q_;nB6qOO$Kn#Dn4?F-2;IB75!WEWO2b#c;hrvLx
z(^0OiZ0}t*p+40Xsno|)|LsO2Jp<wx(V<uU(+zb?k2sUgi!HvFo;ds*RUvwU90S_^
zF(SRDgJ@Sb1v1;-m+fSFM+y)R0o%Zihjv7{CAU^tl<s_^>TmD@NjxvT<j<Mi0skA8
dOH0*~qA}>OZFeq7_gaG%nsgRgo?mD4zX6%SsM7!d

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index da4039eea97b8a364d7ded136608863536798863..7e83b77c7342343627af0addbfaa2fc0ec22d32f 100644
GIT binary patch
delta 18
YcmZ4ExW<t)l$V!_0SFFk<Xo%(04;3<ng9R*

delta 18
YcmZ4ExW<t)l$V!_0SLl2axPW?04rMrFaQ7m

diff --git a/__pycache__/model.cpython-38.pyc b/__pycache__/model.cpython-38.pyc
index f1db79e11d636caa587f2acc8589d3c01a432d1f..91c1e07bf149bda0189f169117001d68f500106f 100644
GIT binary patch
delta 1315
zcmY*Z|8G-O6u<Yq*Dveq7hv7`U~_EQq-)F8Rg}TRK*BIl6kR3}inA-ducckrcDJwW
zi?1410^^HVxQ4`Eq+5)J#9yQ_{saD?(S*drm^6kMe>34n@fXeToVPil&HeP8&$;LG
z&OPV8USN-y=cLEuBJerd`4Ri^E6*sU1I=S}zr*+N9qEd#y4&16PU_NBOI&sSBGajV
z1Z#VbelC7%o9H^;c;&K^rfeT;zvwhc?)W&V(N$XAYn&2qx`G|2{iKUjhs|L#ydoVU
zb?4k|BQCDHCWp@CFjt0bi5=X`25u{V)ZAO6%r>Lc+xWC_tCMuPIjt%xz1!3~ZBpO_
z6wIGPco`rh@z>CPqj^F5Sq|`Sbb0_<3d^R9mTk7k^n7!+yDF&@7~9<asAox%w@FHq
z_dTGrA}0E~UtPrb(tiSRXOU+U<?NEq3&_2TFpsc+un)m1Lr3crKuakb#Zt(|m&G^z
zx4b@}9I#|q<vq=}2X4^qx2x2oIk};%5@;=*S{8pjTd~s&t*WM&+tdERD5<K<&vslS
zriv}8x?z8(5is2~suAW05JN-zNd_A2VGa|QOCx@wk*e49!cca$qeXJN8eOKBb!Y@J
zKvpG;GY7O-;tl2~NT%0f)R_p(o8M#VCIzXvZsua%3~T{;uSPNw>-<ov%bbXwU>^;L
zBf*%ao!|%Ilza@~MTA2Lm&KLf{vF$s>9n3Qbk<wqMOH}}W8$aanz--xjyK2(S*2Vt
z=}l=)nIv4pwAT@ExOXW(g0{u(L~9qoJqrD_gJCC<<XQ)@!Lb~9LLfw~8(>Ln<UTF%
zH3}#j0z}*&40ilK)(Spl<01$(6zP8-{WAb9NBLYOozCmrn)eLyd4z&E9l92sLbGV?
zs}!>7BA?|Y@IpSmjFH0#R}rknTodi#2)!W=hr>!b%V$L@Jm|lPVe6FG!8t7QJ8>tx
z;FIlCqAsdDhOgqKqBpYEixtB;Eph8~TSsikdV&4W{5|q5r6<J~L(kJc#jis(*Cb^8
z4Wj%lksZGDLJgl*MtC}%-vMrYtHsp)*bXn*A8y>aCI+I%;13`dJrGO)5pOFjB$64P
zES-z{te^AQr9?itSgaU4ju~8h9}TP4J7sn3W3e9Xq36XjBL`l>+T(I5Z?xo6vCKb1
z*QK+J4hm=W{6<}$q6#*p<z_rNpD5_Ye38#Q6t_lJIxb=GI)ZiQK0)hC5si(+;?6#f
xS0uD8?nq|zf>B!JXTfjTOUVLDmU#-CxN}o&fhR;g7PC(S$?YHz5D#Mg{{k)qLz@5q

delta 1161
zcmYjQO>7%Q6rPz~|76`wA&$Ln6XmA?96OO?Csim=D2KKZG=YMFQj;`tGHYWe{>gYv
z(y$8(fi!JZaQmR@1r#^xp>P5D%ms1il>@3|iHIvF(n?53NWi=;Rk1Xm-uvEryKla4
z{Rdy?`kT705&65n|1&=Qo&GeX!>to^(zkzahF$bH{dWIx(qOZ@aLIpHVY38y$NTha
z__gD;{<n*#wqLrS<|v=w!H@kmDN5!z*`Q78j9O=5N{fav-K2*&2|HoOx7bnA@GoDt
z-hnMG9eOaW$a%(}c{mSynn5}E18K@zGXXU~W36o1!;ERUq8LXwDIvzh6vnT#oXF3L
z(e{)o+*}g9$n{BRtGuvawF<os3!FyszwUc|YfR~4-d1^Vmr@I+hk9RL#rpY&lNo<S
z6y|D$HB*$3n?-mJVFh6V!Cix6bVfp3tyz_7%p=yJHFT}BQ&K*86nSdlR{Dug>EoLY
zwP{h=R+~hMNoNJzf3p4|DY9bN30xpjz##8(1!O3n6Oi3u%di6*G(xz~AXWt9|1(n5
zecWf`(ITXqM2Mr?y0qXx5F=7NxZPvxygNb=4bo&-=e|X?!9;`m%IvVMyHsFN`YUeo
zK$*FW94+>8jd$i{E+4N)NS^V~6(+m(ARZm0VVH`hr~w~D!*mnAh)xE(vbmhOV3~ZN
zDk{9bU_CnkKMfCqXLt?ng!jE_(`~XvnpCLrX7nmsR?|d8q(ah2*I6{pb@nzDFJg>E
zaRA|<gm0-7(<=inVNClQCSuXhBU3DFdtf6}Vk1Ki<{1fXU+vv`F1KU~*R3M*iwGt7
zK6ZI*2E(%3S1%WG6;TounZ-KAI#!M$TtqmEa0yo8BlHUF#N%)`eyF>Fq`TpBGFrwB
ze*k@CwS)PoM%9133Vc3t(~oP$sQfry7&Yjf)?1@LQu+q;Bo5Pia5}M}y)Ns2%3+a)
zUlN;rAK_C4f~&wI8NQO-U$8zFrcJmpc7oo5-LWI|92m&~?^*0$hUb&<xcecy7X?YS
zl~T5v3Fb{}&g6M>E^Aq$FkiRKnyACo<dLWFq8X*SWVMxQr6zVT)!f#l?7aL(x$plH
zeouz!Z{SUBg+9SoT}HrLiyH{vz)mWeI^!P{Xi@C3j4zuv%U1Qg$jZF!t!B$STNCp#
Y$@t5rwNep_tKuA}<0(1^ljFz!1qLD}LjV8(

diff --git a/controller_db.py b/controller_db.py
index f7a1c01..9512bf1 100644
--- a/controller_db.py
+++ b/controller_db.py
@@ -82,8 +82,8 @@ class ControllerDB:
         # list_dct = [{'140': ['1.4.5.1']}]
         # list_dct = [{'133': ['1.4.4.1']}]
         # list_dct = [{'2': ['1.1.3']}]
-        # list_dct = [{'135': ['1.3.2.1']}]
-        list_dct = [{'79': ['2.1.3.4']}]
+        list_dct = [{'135': ['1.3.2.1']}]
+        # 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 49f551f..132ca26 100644
--- a/model.py
+++ b/model.py
@@ -287,9 +287,9 @@ class Model(ap.Model):
                             self.a_lst_total_firms.select(
                                 [firm.code == di_supp_node['Firm_Code']
                                  for firm in self.a_lst_total_firms])[0]
-                        lst_cand = self.model.a_lst_total_firms.select([
+                        lst_cand = self.a_lst_total_firms.select([
                             firm.is_prod_in_current_normal(di_supp_prod)
-                            for firm in self.model.a_lst_total_firms
+                            for firm in self.a_lst_total_firms
                         ])
                         n2n_betweenness = \
                             sum([True if di_supp_code in path else False
@@ -418,7 +418,7 @@ class Model(ap.Model):
             for product in firm.dct_prod_up_prod_stat.keys():
                 status = firm.dct_prod_up_prod_stat[product]['status'][-1][0]
                 if status == 'A':
-                    print(firm.name, 'affected product: ', product.code)
+                    print(firm.name, 'affected product:', product.code)
                     n_up_product_lost = \
                         sum([not stat for stat in
                              firm.dct_prod_up_prod_stat[
@@ -428,10 +428,13 @@ class Model(ap.Model):
                     else:
                         lost_percent = n_up_product_lost / len(
                             product.a_predecessors())
-                        lst_size = self.a_lst_total_firms.size
-                        lst_size = [firm.size for firm
-                                    in self.a_lst_total_firms
-                                    if firm.is_prod_in_current_normal(product)]
+                        # firm (affected) + other firm (same product, normal)
+                        lst_firm = [firm]
+                        lst_firm += \
+                            [firm for firm
+                             in self.a_lst_total_firms
+                             if firm.is_prod_in_current_normal(product)]
+                        lst_size = [firm.size for firm in lst_firm]
                         std_size = (firm.size - min(lst_size) +
                                     1) / (max(lst_size) - min(lst_size) + 1)
                         prob_disrupt = 1 - std_size * (1 - lost_percent)