From ede00b04037f262d5cfe7699c9fa802c1cad4a11 Mon Sep 17 00:00:00 2001
From: Cricial <2911646453@qq.com>
Date: Tue, 17 Sep 2024 14:17:58 +0800
Subject: [PATCH] =?UTF-8?q?without=E6=A8=A1=E5=9E=8B=E8=BD=AC=E5=9E=8B?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=EF=BC=81=E4=BD=86=E6=98=AFwithout=E8=BF=98?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=8F=92=E5=85=A5=E8=A1=A8=20o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/csv-editor.xml                     |   7 +
 __pycache__/controller_db.cpython-38.pyc | Bin 8257 -> 8257 bytes
 __pycache__/firm.cpython-38.pyc          | Bin 7276 -> 7799 bytes
 __pycache__/my_model.cpython-38.pyc      | Bin 10456 -> 10329 bytes
 firm.py                                  | 121 ++++++++++-------
 my_model.py                              | 157 +++++++++++++----------
 6 files changed, 176 insertions(+), 109 deletions(-)

diff --git a/.idea/csv-editor.xml b/.idea/csv-editor.xml
index ec19d70..c775f95 100644
--- a/.idea/csv-editor.xml
+++ b/.idea/csv-editor.xml
@@ -3,6 +3,13 @@
   <component name="CsvFileAttributes">
     <option name="attributeMap">
       <map>
+        <entry key="\input_data\BomCateNet.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="\input_data\BomNodes.csv">
           <value>
             <Attribute>
diff --git a/__pycache__/controller_db.cpython-38.pyc b/__pycache__/controller_db.cpython-38.pyc
index a3bf1d70abddf08b331563b5c433f810c2b6d1f6..38608ab2537369902aa40c548d483a8f0b941349 100644
GIT binary patch
delta 860
zcmZ{iO=}ZD7{{G9#+Wyg);2LOo1#*!pddsjMKBfZskf3tgLd6)re@o1HqK5>pp__*
zYAY&qs8xi5Z`FeqWj{gjA_$&kKY*YYkAfGS|E8!H_weJH|MR-@%ywbB5GqC@!Cms(
z%zk|rst1VcECzmc5mzjRPRhep=nF}y($6jd8c+s~15;uv(jXIJFnVzKZ&1etzYbIY
z3QPl+fhu4CGva!*pA?<-C?{l6gkxpD*Ca1^jLOn(EOo>a0y5g|GAisWjCgt8oK<b@
zDpjrW4Ar^KOp%TkqVw<)o8?gaietoUgw)079);NAN6$yn67PG*NZSeSpCtZU2)ZeZ
zzGK-I%nZ<!aQ%AKGIYv(P}<^c->7m|nx#FO%C)jdJN3OL0|;4m_Vtewk{1^e3gKcQ
zG19vL-J9A!ZJ3-g)({^OW6^6;cl{M=QmL6DlT4Bu;#4w6R-9t;6UpHJhIX?o!nzr?
zJC|NUwKZ`j^}WPl<`ETU-q@I!-3L~IF5pjh_5epTWfMRHcq}p0T?&{sS8Y{Z>KfE1
z;&%Gm$bU1D#GV0hr2D)PcQT=Fh}W5mWJ3hAg~8{D@Uw@|9|2z5by(hbCag_S&%Tj6
zR+Iy$ix3V2_kd+!1$ZjqhHb8KL!YC(YE?Qjynqwe%U%jwSt3i~r*c#-;81R=)mdR(
zt5r0c4I>7FxPcnw4U5e-**R$AzzHA>yaLh^ZbY|goLQz^vsx*$HXL{0*n7UI(>gb-
U8k@t}N1F!!=PB&Ght+}6-wOoP4FCWD

delta 839
zcmZ{iOKTHR6vw@3jj?&yG}gvECPk$h(S-yNieQ4+jjl?IHMSim$(2r<X3{&iHfYdF
zB`qolIaY;&Z+BWM`2@v{BDj|M0506P6a>-xpA>cDEPkB(KhL@6Ze};L{?TBtYn%Fh
zu6}syuliWNRrme!usqfM$JAln|AocIm0wH%lYkB!0WQ*daDffeKxkj;Z&2F>|0Tcx
z3N#i<&{8PEMp_R;lCkp?=q`BOdKr@4Tvc(pV+UQqr!pLmSrR!I;lg}*Mz@VCT(=6-
zyeMs9Qaqdu33!<;QfN?Vnc)g!v-G(~V^#Xz^O4o*U1W$Ywz_s-VBT8@x=Cj5;ba|V
z0+?5Dyu~TYEOOBaWsx>|bJ}fX=64vnGzw+juJ1PKM@XZ!YtK2xGBn<&u{pZdHyEiw
zcc=DVHp`L=A?bbJQ0S`C9dC)3xzbEZM5F9F9gn8ia%(jDi6!uV>FpwkunxiP_Wh2b
zT9Z!2zUAj&W)Kw+?%0@E+y(9d9^g-RK{%qR7zQNpNFm*k_myp_+q$~cCe+8Y68}2*
z-%KQlr$AUC-RX|Fl?io?UMD8l8g(VJ1J4lQ6|2x60B+m+u-x%XSTCrWe4}=(X?stO
zKsW&00UE$E@I=80*wT<@ahA&|tJI$1Ih?p&@sez<!ItQUc1SH?e`@kZdxce_QZj6D
z0x=lG@m087u*6JFoQ8H5I0^)SS3q3B2^Ou26joWSSuYjDA{;Al>^xH|@~SkgikQZ^
Qlh;i7&r{fX56%AEZz>4R^#A|>

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index c831dbfbd8f58727c65e531825da7b7602d5b908..17f3ddfa615f11df024858be9b0459cbfdcfea33 100644
GIT binary patch
literal 7799
zcmcIp>u(&_b-(w{V`m>+E-8s3X;~3sA?~KGlFEf+q>P#%u2Qsx>c+CrZY57vdxz96
zcW0M(W-W^trh)0k3=jdX+fRWJEQ7RwiuP;&i4^?<E>NIofdcwc<a1Dj{hc%WB&9+P
zS`u^TKIfc!?>WEo*mswfN&<gB+kCox`O8B5J2mG2Tr|FpC%J+`3oW~%CmT|VZwalm
z^O4X_BoCd2((XH=?mfjUQJ2>H#!eKcEo#mGIpapsMI{mqsYOG5EViYVT748W9PMcL
zBhhfRr+vIVUC;sEzAow#-UVIO6}$tzq^o!r^|G$vUD7Lh74Nb>r_bYE(HHa@-b)_~
zS2U{N?4m8+Y@1%rmOsZ6ZJ*l2T9Qd2QgJ9oGLxA)R#If5qdHC|LOiIssJR)ny&a5&
zew)eymjRbWE=ydNc})c~D(Mo}tA`S;<+R4F6>hDj=eTvATNlQyHEvzRh(B7-TrIcN
zF^)a+-V*n&9{5`A$o#M}f3$Hd-V%pWd!H%HFJ%6f*!v03{JVn!dRDc+>nHz~ZtB9J
z{16;;d@VO{nH#jf3onU-fM*4}>Jw?+KwWiS8ePf)U0fGbUKGdbpqRd#6+uPr3e0*<
z%h=C*4vI0YS=A+8-yN^NjFsgx>-7A(tcbZmRsg^Mqy?_2a?9WfL|s{#*ILw^{3%rE
zuHM0uY@(o3zPEaS+tPe*T7IVfO6`#-s@wR8o21Ru){-a<bvrS`K^ksD3Lu~k`Y=IV
z`?4(z2jRf<^%G%87=BUz=2!2&n?xqL`|#nzyKg^gJ!qQV+os=%T4{2(7bVTR^pR_W
zN4B)3+pV<K?+tFeN<0yBzEmel?0;b@Zr8%F9k<gkytdWtx0>DL#<kfp@Zb+ZX46mj
zjh@0VZg2NZ&-yXSW_SP1R&x+`+dX^*oZb)9M}z1}Z<wT4?nhUmcKRSPS6&@2di6>l
zjeOy&W*HnkrE@bis`24|&U(pk5E&axII~`_ucNN5(8j_zN+0&ku3e^68Me}CN15n`
zCfaHDV_Qtx`%%vM1&v8GIUFBl-n}yI2K&ucJAGtdrmi?lO}p8hP99%Pr0pv-+-k-;
zY<ANSOb(tgX_F?IXm1!LW2)Px-{Xt5<#qx_wnO60y7&A2t_`T&>c{bPkQ+{t8hh>;
z=i0c45ioJ)z^%94?L(ZFXJg&y{ixeGw+&`bb=oD}-rmN^J<MsZ(456Czd0C0v2IkG
zU^&uJD@u~SNo@5S38XK@8UL;^ePext1L^npDy?Vw!&uv;{C?kW;vmzgUV@}Y-ECWh
z4B%YCwl){&&eu`cvH_Pddb|A{yVMN3<730kT9<Ck7RDFds74>8rpbHhMa{TToVK4x
zTMWZix0xhi$a-SRMBzLN4^Q$I3Zbe_NtPU6`4az5UY2Av|95Impj;X`aerAY1hN8E
zan*Ue*X1RYHMuGGSI;U=iv)P`7oai)?4P2M5{StTL7zi*L_3e2LwTSw1*rV+u6yA8
zKpeOSUgl-8<LoMPDRtTAz{-3?z~^;*f={gRGrv<91q7$}-T-t;YG(yNrN1Glf7ds6
z=KC^&QH+lOWCYK9cZio!DRYiQ<{mrfxx~O0+`4TGZ|C~-1i-W#JxZ*rn`!e5!jUC<
z9Zzxz1@P@W;af)>39zm*c}L)*iaz>8-g+X<moTfY3>}O0nq+oyS1P_fyChrOLU;7R
zz})ycW-&^+LWz>t|I+NRP1NhZABB<LiNdrWwuZ?ZUQO1UDn4N7`0HiscH2;uH8gCo
zKTLUP!u(hl<WiPFTP1jG#*aegEir`K=1p4UG_@w_oYJia<{AbX)hQw{sx&GjvJ(o}
z+izM2=VvQpv4w`|$Ohmz?e`*Mt`h}<a`QDRNKWnQ9GUU<h==4V3ZWE)l1>ETc;Y%W
zSyG#-D%T*8=)vQA`<MQwlWI*I8~Pg2E8t;|;xc;_Bor(v5SJqXkx?5ExC18@EQsXv
zkRY<BF>;Ruxj(w_*cpo@c^ppWUKFs@o({-Gnu#rh7B*iO@zv6XNQ2Bjl<Pv5FN(BC
z_4yvGhYOX_<E@MHVm-I~UZ>P4gJxw%k<HG6b+M!L(qr-lHgyT#uN;Xjq2bA#+DCPZ
zm5=wf3=Y7>U3dxyrL3rHyAG|NuEF?dNt5T}b*i~H!>X}zYbI3-%0Rv+iP||l$>&j!
z%XM!P8V&8nKMv(cbVx1SO#UUC{ruX08*}S!t`c%+WoV^_Qmo9xYHX+GbfmOJ(#)ou
z-3vD5qU4tTYyaBp>L*?VWQ|30PDQ56Z<{wj-+Tqd!gdJ6XiHP?g}1}rO9!qsP7l(N
zZ{vx2dV)Xpg`naaSoLJA;_fy~bj~-6IHT~}n9#tJ<VU82`8Ha-+^nK@6T6oKLqKho
zP+0j^ec3wQD9+W9bvS6pxeD9O9XL!xXJYxoQ+DN>^daKPI=yy`qWOUh;z4extlxUj
zZ?_^t_+{!$F0GeYwR7G4BlI<bc-VtUO43G&YS7PSJBF&GCxmm-0+88&6rXH)BS=!6
z*GTK{Puw}{lj}50%pVdhK9E~fW1X*^zO6sNP_m6ecvbS!NV`vzTOmUv)i2!>|3vu}
zRXb5?U9O(EZViSD*l?mw0;i;METC1>2j*<n3RFo>+O8~}>~B6_a28A&$r{}aBgRjF
z7|;=M1dJfv>8M=^J^Jya5B|3@H$GMfnkWDx+<;jlq(IF*Qmm19Z;+S%;~fD*2#qtJ
z=A#>A+O9)&D6XK`Ajq6faIBK=k9*Lf-eYCn%M{F-!)EQhw3I3K{gwFz#>?hEv`gV1
z>P(C1|3H2$!Iei`9ZBjrK)lqcbSU=WS%_o&$BN|qz>8ODY*d|$9ZU56$&`)@?!S$(
zGTt{41`;h8bWq7LGhiwl_e`m%h3^wu(f1KIk?|ibAEEY%Ozx+(59N`{yw1w5kFS4^
zYII%`BOYVrj?8=cG;tRm>1XjPxFX;nMJlD|#3yu*3|M66W*R;M?jOrjKvkD^gB@0Q
z&QQMA&=^R4nEQ6-Ha<|7=5@SgIAuuH_wY<&4U)6pn8{fZMY~hyx%=o@`1GrSlKEre
zgwTswdlm*A5MvVzIzwlAG~|}@(bUMbNpUoX@})8K@n->7PBQFGF^?bsN6{qOi>UYA
zd5Tz8co?;J9;C?`;xCB2FR;nKm?wFL&Wmr-M6{h96ySS_kd7gj_IhfQ-=C+*fL>qC
z(UrV>yWA$B2?4@+U}YGdU#72<)yzG#;6XECcxMNVVcGmCjed@bUq@jJIc_H=q%KXx
z7pb_6qVDJTP10y<Q)VfYLRf6xrEW%RLg&T`q7ih@2_o;P?ifn^<oC#O%{aY$N@!!u
zNp7GJ@;m^z1OTo$6+o+x)~Y0UCdl?Nx~kUUu+gl5$JP|!8>6du?{7R;Ef#KVA)xql
zjJ_jDLBJ>S-uK|oP%r`SEcf7c37H0|GsVL<_DY|~y&sNy6wnz#z{t%Q=Q2rIq=j)>
z|3lz1VX$ZZmcx|mjA0W*b{Ua>gmLOY3pGMylR3aBml4^39>N^52KXNNXeIOWaYkq!
zCq42lk8+&!Fst0DWWc^D4*P_5o$_djaT2~HIQMg|V?Cw8JQEGjx&t&O50q`r6phbP
zah^#9_Jlmv8I?U)7TBaUgj<D9mCksyoCi}lwREq<Xj{zDmSun8^8Oc2)eEThPf7A7
z__hDqOnx391n*MngR>4VgsQ&^5SU#sa7y|AW}YY0M(h9a0RDcS*cm$iS6ljrc`Ef9
z1B~_BY1B*1OBiEdvejm*6(M6cKJ*!u83Kqo7@H!P>C*tC7oi_ACmdUj!%DWK4F)L!
zS~H-@1YCyfX#*(4m^BF_ZBh3h#*E4Njqu$tU{x2z;jghg*+M~hRbynTFme%M1yjVT
zj`0f^1+1DwELl~7++Tm5v@HaebOrPf#3w)&b`_DXW_ao#Wu06_ofFuc5kZgnqDH70
zQ<&&5=(v>eAm<U`9zxH|;c(A;tjvGXT4X%NU&~ZS0Vo_!g9lme1i5dr6NEX%jGU$t
zz=9If5+G9H%*pQo%m9|1a^}KmLUsgMlTY<R53SSzoU6$!1da#}3C7$>aJcs=Mwc`7
zHJVkUcU;SBOqKI33=ZX6WJK}z^WV9BlOe*~K?@E82Vzy!XQ7WF^{%h5QJfQ`U!zH!
zGkcF}Bttepej+!SER<vh&5(*|3L`h8-=RJZc1Y^#UT!Jhr(QC0jWXpa!d#l?k`psW
zCdI6O#FJ+u#sWi0w9810!Qdemv5IU2OyP+SQ7Nf;VOi9Y1)YU>AgM7H79z*LO0fTG
zzKSMJh&J^^<{UFaQ?Bf4tBV|9ct1ia8Yv-4+5QZ(6Z)c%^9hl&6BpQ6klD|$I3@Xn
zjEx+mI$$92lZay0C|vNU7Y4z=H$;n#E=h~SsRfSu(T}{`u4A_6XN(}B`N;UElF4dF
z;rN@E4&1bONIH{$7b7gA9)5uMVDBnRlRq{!6es6lGz$>LXq0EAgue|a<4h^M{Msp#
zWZ2(g$zU=14)sy+YbX~q5eiOC-A9L2X<~{reCpKK77w%Cqa1rQ_-9N_D1|SOFZCTt
zPF3V3XHD*3nc>E>moD4|i3B~2AG9Z&1;QB?2Sa%i^N5N?rp%wA?_cmt?*8hG=JQhp
z3n4BE4TZN%mt+sQRmLgKsa~gg?q1=h$G5FrxKgia?;T`c-w`oFN7N|vD%|2E#$1kr
zbo%y9WI?BziTX8kK2zN^2L2UKLc0`Dt4--DU+up#+tqWUvgaQr@j&e5N682HjH9HV
zq@ux7qRx7x_Nz0hG=#hiewK-wxcAVO!Vo{q4B>f%wi1SW!)7-h;k>)~eSF5Ws4!GK
zq=K-->{IbwD(L2NSN_jYvrFR~ek<yBCwY8k^|xpq88<_>M0-irP#{PDdT=gyCHO+{
q`QSp}1j~4eJm*&3u`c}@W@sbaH77RwQ8t#rR=$NBBzC;%iu2!qh2<>(

delta 3474
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
TZpNauqE3&FJ5;UZxMTbmVbbV=

diff --git a/__pycache__/my_model.cpython-38.pyc b/__pycache__/my_model.cpython-38.pyc
index 6df0db6a37c4e1577115af672610c109a81b2631..033717c9183a842a9253409fb5b2ce9b85b115de 100644
GIT binary patch
literal 10329
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

literal 10456
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
R6Qaw<!P;~Eiv}L^{{Wkz3t|8O

diff --git a/firm.py b/firm.py
index 823e19d..561ea80 100644
--- a/firm.py
+++ b/firm.py
@@ -1,5 +1,4 @@
 from mesa import Agent
-import numpy as np
 
 
 class FirmAgent(Agent):
@@ -55,47 +54,71 @@ class FirmAgent(Agent):
             self.dct_prod_capacity[product] = extra_cap
 
     def remove_edge_to_cus(self, disrupted_prod):
+        # parameter disrupted_prod is the product that self got disrupted
         lst_out_edge = list(
-            self.firm_network.neighbors(self.unique_id))
-        for n2 in lst_out_edge:
-            edge_data = self.firm_network.edges[self.unique_id, n2]
-            if edge_data.get('Product') == disrupted_prod.code:
-                customer = self.model.schedule.get_agent(n2)
+            self.firm_network.out_edges(
+                self.unique_id, keys=True, data='Product'))
+        for n1, n2, key, product_code in lst_out_edge:
+            if product_code == disrupted_prod.unique_id:
+                # update customer up product supplier status
+                customer = next(agent for agent in self.model.company_agents if agent.unique_id == n2)
+
                 for prod in customer.dct_prod_up_prod_stat.keys():
                     if disrupted_prod in customer.dct_prod_up_prod_stat[prod]['s_stat'].keys():
                         customer.dct_prod_up_prod_stat[prod]['s_stat'][disrupted_prod][
                             'set_disrupt_firm'].add(self)
-                self.firm_network.remove_edge(self.unique_id, n2)
+                        # print(f"{self.name} disrupt {customer.name}'s "
+                        #       f"{prod.code} due to {disrupted_prod.code}")
+                # remove edge to customer
+                self.firm_network.remove_edge(n1, n2, key)
 
     def disrupt_cus_prod(self, prod, disrupted_up_prod):
-        num_lost = len(self.dct_prod_up_prod_stat[prod]['s_stat'][disrupted_up_prod]['set_disrupt_firm'])
-        num_remain = len([
-            u for u in self.firm_network.neighbors(self.unique_id)
-            if self.firm_network.G.edges[u, self.unique_id].get('Product') == disrupted_up_prod.code])
+        # parameter prod is the product that has disrupted_up_prod
+        # parameter disrupted_up_prod is the product that
+        # self's component exists disrupted supplier
+        num_lost = \
+            len(self.dct_prod_up_prod_stat[prod]['s_stat']
+                [disrupted_up_prod]['set_disrupt_firm'])
+        num_remain = \
+            len([u for u, _, _, d in
+                 self.firm_network.in_edges(self.get_firm_network_unique_id(),
+                                            keys=True,
+                                            data='Product')
+                 if d == disrupted_up_prod.unique_id])
         lost_percent = num_lost / (num_lost + num_remain)
-        lst_size = [firm.size_stat[-1][0] for firm in self.model.schedule.agents]
-        std_size = (self.size_stat[-1][0] - min(lst_size) + 1) / (max(lst_size) - min(lst_size) + 1)
+        lst_size = \
+            [firm.size_stat[-1][0] for firm in self.model.company_agents]
+        std_size = (self.size_stat[-1][0] - min(lst_size) + 1) \
+                   / (max(lst_size) - min(lst_size) + 1)
 
+        # calculate probability of disruption
         prob_disrupt = 1 - std_size * (1 - lost_percent)
-        if self.random.choice([True, False], p=[prob_disrupt, 1 - prob_disrupt]):
+        if self.model.nprandom.choice([True, False],
+                                      p=[prob_disrupt,
+                                         1 - prob_disrupt]):
             self.dct_n_trial_up_prod_disrupted[disrupted_up_prod] = 0
-            self.dct_prod_up_prod_stat[prod]['s_stat'][disrupted_up_prod]['stat'] = False
-            status, _ = self.dct_prod_up_prod_stat[prod]['p_stat'][-1]
+            self.dct_prod_up_prod_stat[
+                prod]['s_stat'][disrupted_up_prod]['stat'] = False
+            status, _ = self.dct_prod_up_prod_stat[
+                prod]['p_stat'][-1]
             if status != 'D':
-                self.dct_prod_up_prod_stat[prod]['p_stat'].append(('D', self.model.schedule.time))
+                self.dct_prod_up_prod_stat[
+                    prod]['p_stat'].append(('D', self.model.t))
+                # print(f"{self.name}'s {prod.code} turn to D status due to "
+                #       f"disrupted supplier of {disrupted_up_prod.code}")
 
     def seek_alt_supply(self, product):
         if self.dct_n_trial_up_prod_disrupted[product] <= self.model.int_n_max_trial:
             if self.dct_n_trial_up_prod_disrupted[product] == 0:
                 self.dct_cand_alt_supp_up_prod_disrupted[product] = [
-                    firm for firm in self.model.schedule.agents
+                    firm for firm in self.model.company_agents
                     if firm.is_prod_in_current_normal(product)]
             if self.dct_cand_alt_supp_up_prod_disrupted[product]:
                 lst_firm_connect = []
                 if self.is_prf_conn:
                     for firm in self.dct_cand_alt_supp_up_prod_disrupted[product]:
-                        if self.firm_network.G.has_edge(self.unique_id, firm.unique_id) or \
-                                self.firm_network.G.has_edge(firm.unique_id, self.unique_id):
+                        if self.firm_network.has_edge(self.unique_id, firm.unique_id) or \
+                                self.firm_network.has_edge(firm.unique_id, self.unique_id):
                             lst_firm_connect.append(firm)
                 if len(lst_firm_connect) == 0:
                     if self.is_prf_size:
@@ -133,8 +156,8 @@ class FirmAgent(Agent):
                     lst_firm_connect = []
                     if self.is_prf_conn:
                         for firm in lst_firm:
-                            if self.firm_network.G.has_edge(self.unique_id, firm.unique_id) or \
-                                    self.firm_network.G.has_edge(firm.unique_id, self.unique_id):
+                            if self.firm_network.has_edge(self.unique_id, firm.unique_id) or \
+                                    self.firm_network.has_edge(firm.unique_id, self.unique_id):
                                 lst_firm_connect.append(firm)
                     if len(lst_firm_connect) == 0:
                         if self.is_prf_size:
@@ -156,26 +179,26 @@ class FirmAgent(Agent):
                 for down_firm in lst_firm:
                     down_firm.dct_cand_alt_supp_up_prod_disrupted[product].remove(self)
 
-                    def accept_request(self, down_firm, product):
-                        if self.firm_network.G.has_edge(self.unique_id, down_firm.unique_id) or \
-                                self.firm_network.G.has_edge(down_firm.unique_id, self.unique_id):
-                            prod_accept = 1.0
-                        else:
-                            prod_accept = self.flt_diff_new_conn
-                        if self.random.choice([True, False], p=[prod_accept, 1 - prod_accept]):
-                            self.firm_network.G.add_edge(self.unique_id, down_firm.unique_id, Product=product.code)
-                            self.dct_prod_capacity[product] -= 1
-                            self.dct_request_prod_from_firm[product].remove(down_firm)
+    def accept_request(self, down_firm, product):
+        if self.firm_network.has_edge(self.unique_id, down_firm.unique_id) or \
+                self.firm_network.has_edge(down_firm.unique_id, self.unique_id):
+            prod_accept = 1.0
+        else:
+            prod_accept = self.flt_diff_new_conn
+        if self.model.nprandom.choice([True, False], p=[prod_accept, 1 - prod_accept]):
+            self.firm_network.add_edge(self.unique_id, down_firm.unique_id, Product=product.unique_id)
+            self.dct_prod_capacity[product] -= 1
+            self.dct_request_prod_from_firm[product].remove(down_firm)
 
-                            for prod in down_firm.dct_prod_up_prod_stat.keys():
-                                if product in down_firm.dct_prod_up_prod_stat[prod]['s_stat']:
-                                    down_firm.dct_prod_up_prod_stat[prod]['s_stat'][product]['stat'] = True
-                                    down_firm.dct_prod_up_prod_stat[prod]['p_stat'].append(
-                                        ('N', self.model.schedule.time))
-                            del down_firm.dct_n_trial_up_prod_disrupted[product]
-                            del down_firm.dct_cand_alt_supp_up_prod_disrupted[product]
-                        else:
-                            down_firm.dct_cand_alt_supp_up_prod_disrupted[product].remove(self)
+            for prod in down_firm.dct_prod_up_prod_stat.keys():
+                if product in down_firm.dct_prod_up_prod_stat[prod]['s_stat']:
+                    down_firm.dct_prod_up_prod_stat[prod]['s_stat'][product]['stat'] = True
+                    down_firm.dct_prod_up_prod_stat[prod]['p_stat'].append(
+                        ('N', self.model.t))
+            del down_firm.dct_n_trial_up_prod_disrupted[product]
+            del down_firm.dct_cand_alt_supp_up_prod_disrupted[product]
+        else:
+            down_firm.dct_cand_alt_supp_up_prod_disrupted[product].remove(self)
 
     def clean_before_trial(self):
         self.dct_request_prod_from_firm = {}
@@ -188,13 +211,25 @@ class FirmAgent(Agent):
         # Update the status of products and refresh disruption sets
         for prod in self.dct_prod_up_prod_stat.keys():
             status, ts = self.dct_prod_up_prod_stat[prod]['p_stat'][-1]
-            if ts != self.model.schedule.time:
-                self.dct_prod_up_prod_stat[prod]['p_stat'].append((status, self.model.schedule.time))
+            if ts != self.model.t:
+                self.dct_prod_up_prod_stat[prod]['p_stat'].append((status, self.model.t))
 
             # Refresh the set of disrupted firms
             for up_prod in self.dct_prod_up_prod_stat[prod]['s_stat'].keys():
                 self.dct_prod_up_prod_stat[prod]['s_stat'][up_prod]['set_disrupt_firm'] = set()
 
+    def get_firm_network_unique_id(self):
+        return self.unique_id
+
+    def is_prod_in_current_normal(self, prod):
+        if prod in self.dct_prod_up_prod_stat.keys():
+            if self.dct_prod_up_prod_stat[prod]['p_stat'][-1][0] == 'N':
+                return True
+            else:
+                return False
+        else:
+            return False
+
     def step(self):
         # 在每个时间步进行的操作
         pass
diff --git a/my_model.py b/my_model.py
index d87d93f..cf868b2 100644
--- a/my_model.py
+++ b/my_model.py
@@ -6,8 +6,8 @@ import pandas as pd
 from mesa import Model
 from mesa.space import MultiGrid, NetworkGrid
 from mesa.datacollection import DataCollector
-from mesa.time import RandomActivation
 
+import numpy as np
 from firm import FirmAgent
 from product import ProductAgent
 
@@ -35,10 +35,20 @@ class MyModel(Model):
         self.data_collector = DataCollector(
             agent_reporters={"Product": "name"}
         )
+        # initialize graph bom
+        self.G_bom = nx.adjacency_graph(json.loads(params['g_bom']))
+
+
+        # Create the firm-product network graph
+        self.G_FirmProd = nx.MultiDiGraph()
+        # Create the firm network graph
+        self.G_Firm = nx.MultiDiGraph()
 
         self.company_agents = []
         self.product_agents = []
 
+        self.nprandom = np.random.default_rng(params['seed'])
+
         # Initialize parameters from `params`
         self.sample = params['sample']
         self.int_stop_ts = 0
@@ -62,121 +72,136 @@ class MyModel(Model):
     def initialize_product_network(self, params):
         try:
             self.product_network = nx.adjacency_graph(json.loads(params['g_bom']))
-            print(
-                f"Product network initialized with {self.product_network.number_of_nodes()} nodes and {self.product_network.number_of_edges()} edges.")
         except Exception as e:
             print(f"Failed to initialize product network: {e}")
 
     def initialize_firm_network(self):
-        """ Initialize the firm network and add it to the model. """
+        """ Initialize the firm network by reading firm data from a CSV file """
+        # Read the firm data
         Firm = pd.read_csv("input_data/Firm_amended.csv")
         Firm['Code'] = Firm['Code'].astype('string')
         Firm.fillna(0, inplace=True)
         Firm_attr = Firm.loc[:, ["Code", "Type_Region", "Revenue_Log"]]
-        firm_product = [row[row == 1].index.to_list() for _, row in Firm.loc[:, '1':].iterrows()]
+
+        firm_product = []
+        for _, row in Firm.loc[:, '1':].iterrows():
+            firm_product.append(row[row == 1].index.to_list())
         Firm_attr.loc[:, 'Product_Code'] = firm_product
         Firm_attr.set_index('Code', inplace=True)
 
-        self.firm_network = nx.MultiDiGraph()
-        self.firm_network.add_nodes_from(Firm["Code"])
 
-        firm_labels_dict = {code: Firm_attr.loc[code].to_dict() for code in self.firm_network.nodes}
-        nx.set_node_attributes(self.firm_network, firm_labels_dict)
+        self.G_Firm.add_nodes_from(Firm["Code"])
+
+        # Assign attributes to the firm nodes
+        firm_labels_dict = {code: Firm_attr.loc[code].to_dict() for code in self.G_Firm.nodes}
+        nx.set_node_attributes(self.G_Firm, firm_labels_dict)
+
+        self.Firm = Firm
 
     def initialize_firm_product_network(self):
-        """ Initialize the firm-product network and add it to the model. """
+        """ Initialize the firm-product network """
+        # Read the firm-product data
         Firm_Prod = pd.read_csv("input_data/Firm_amended.csv")
         Firm_Prod.fillna(0, inplace=True)
+
+        # Stack the firm-product relationships into a DataFrame
         firm_prod = pd.DataFrame({'bool': Firm_Prod.loc[:, '1':].stack()})
         firm_prod = firm_prod[firm_prod['bool'] == 1].reset_index()
         firm_prod.drop('bool', axis=1, inplace=True)
         firm_prod.rename({'level_0': 'Firm_Code', 'level_1': 'Product_Code'}, axis=1, inplace=True)
         firm_prod['Firm_Code'] = firm_prod['Firm_Code'].astype('string')
 
-        self.firm_prod_network = nx.MultiDiGraph()
-        self.firm_prod_network.add_nodes_from(firm_prod.index)
-
+        self.G_FirmProd.add_nodes_from(firm_prod.index)
+        # Assign attributes to the firm-product nodes
         firm_prod_labels_dict = {code: firm_prod.loc[code].to_dict() for code in firm_prod.index}
-        nx.set_node_attributes(self.firm_prod_network, firm_prod_labels_dict)
-
-        self.add_edges_to_firm_network()
-        self.connect_unconnected_nodes()
-
-        print(
-            f"Firm network has {self.firm_network.number_of_nodes()} nodes and {self.firm_network.number_of_edges()} edges.")
-        print(
-            f"Product network has {self.product_network.number_of_nodes()} nodes and {self.product_network.number_of_edges()} edges.")
+        nx.set_node_attributes(self.G_FirmProd, firm_prod_labels_dict)
 
     def add_edges_to_firm_network(self):
-        """ Add edges to the firm network based on product BOM. """
-        Firm = pd.read_csv("input_data/Firm_amended.csv")
-        Firm['Code'] = Firm['Code'].astype('string')
-        Firm.fillna(0, inplace=True)
-        for node in nx.nodes(self.firm_network):
+        """ Add edges between firms based on the product BOM relationships """
+        # Add edges to G_Firm according to G_bom
+        for node in nx.nodes(self.G_Firm):
             lst_pred_product_code = []
-            for product_code in self.firm_network.nodes[node]['Product_Code']:
-                lst_pred_product_code += list(self.product_network.predecessors(product_code))
+            for product_code in self.G_Firm.nodes[node]['Product_Code']:
+                lst_pred_product_code += list(self.G_bom.predecessors(product_code))
             lst_pred_product_code = list(set(lst_pred_product_code))
-            lst_pred_product_code = list(sorted(lst_pred_product_code))
+            lst_pred_product_code = list(sorted(lst_pred_product_code))  # Ensure consistency
 
             for pred_product_code in lst_pred_product_code:
-                lst_pred_firm = Firm['Code'][Firm[pred_product_code] == 1].to_list()
+                # Get a list of firms producing the component (pred_product_code)
+                lst_pred_firm = self.Firm['Code'][self.Firm[pred_product_code] == 1].to_list()
+
+                # Select multiple suppliers (multi-sourcing)
                 n_pred_firm = self.int_netw_prf_n
                 if n_pred_firm > len(lst_pred_firm):
                     n_pred_firm = len(lst_pred_firm)
+
                 if self.is_prf_size:
-                    lst_pred_firm_size = [self.firm_network.nodes[pred_firm]['Revenue_Log'] for pred_firm in
+                    lst_pred_firm_size = [self.G_Firm.nodes[pred_firm]['Revenue_Log'] for pred_firm in
                                           lst_pred_firm]
                     lst_prob = [size / sum(lst_pred_firm_size) for size in lst_pred_firm_size]
-                    lst_choose_firm = self.random.choices(lst_pred_firm, k=n_pred_firm, weights=lst_prob)
+                    lst_choose_firm = self.nprandom.choice(lst_pred_firm, n_pred_firm, replace=False, p=lst_prob)
                 else:
-                    lst_choose_firm = self.random.choices(lst_pred_firm, k=n_pred_firm)
+                    lst_choose_firm = self.nprandom.choice(lst_pred_firm, n_pred_firm, replace=False)
+
+                # Add edges from predecessor firms to current node (firm)
                 lst_add_edge = [(pred_firm, node, {'Product': pred_product_code}) for pred_firm in lst_choose_firm]
-                self.firm_network.add_edges_from(lst_add_edge)
+                self.G_Firm.add_edges_from(lst_add_edge)
 
-                # Add edges to firm-prod network
-                set_node_prod_code = set(self.firm_network.nodes[node]['Product_Code'])
-                set_pred_succ_code = set(self.product_network.successors(pred_product_code))
-                lst_use_pred_prod_code = list(set_node_prod_code & set_pred_succ_code)
+                # Add edges to firm-product network
+                self.add_edges_to_firm_product_network(node, pred_product_code, lst_choose_firm)
 
-                for pred_firm in lst_choose_firm:
-                    pred_node = [n for n, v in self.firm_prod_network.nodes(data=True) if
-                                 v['Firm_Code'] == pred_firm and v['Product_Code'] == pred_product_code][0]
-                    for use_pred_prod_code in lst_use_pred_prod_code:
-                        current_node = [n for n, v in self.firm_prod_network.nodes(data=True) if
-                                        v['Firm_Code'] == node and v['Product_Code'] == use_pred_prod_code][0]
-                        self.firm_prod_network.add_edge(pred_node, current_node)
+    def add_edges_to_firm_product_network(self, node, pred_product_code, lst_choose_firm):
+        """ Helper function to add edges to the firm-product network """
+        set_node_prod_code = set(self.G_Firm.nodes[node]['Product_Code'])
+        set_pred_succ_code = set(self.G_bom.successors(pred_product_code))
+        lst_use_pred_prod_code = list(set_node_prod_code & set_pred_succ_code)
+
+        for pred_firm in lst_choose_firm:
+            pred_node = [n for n, v in self.G_FirmProd.nodes(data=True) if
+                         v['Firm_Code'] == pred_firm and v['Product_Code'] == pred_product_code][0]
+            for use_pred_prod_code in lst_use_pred_prod_code:
+                current_node = [n for n, v in self.G_FirmProd.nodes(data=True) if
+                                v['Firm_Code'] == node and v['Product_Code'] == use_pred_prod_code][0]
+                self.G_FirmProd.add_edge(pred_node, current_node)
 
     def connect_unconnected_nodes(self):
-        """ Connect unconnected nodes in the firm network. """
-        Firm = pd.read_csv("input_data/Firm_amended.csv")
-        Firm['Code'] = Firm['Code'].astype('string')
-        Firm.fillna(0, inplace=True)
-        for node in nx.nodes(self.firm_network):
-            if self.firm_network.degree(node) == 0:
-                for product_code in self.firm_network.nodes[node]['Product_Code']:
-                    current_node = [n for n, v in self.firm_prod_network.nodes(data=True) if
+        """ Connect unconnected nodes in the firm network """
+        for node in nx.nodes(self.G_Firm):
+            if self.G_Firm.degree(node) == 0:
+                for product_code in self.G_Firm.nodes[node]['Product_Code']:
+                    current_node = [n for n, v in self.G_FirmProd.nodes(data=True) if
                                     v['Firm_Code'] == node and v['Product_Code'] == product_code][0]
-                    lst_succ_product_code = list(self.product_network.successors(product_code))
+                    lst_succ_product_code = list(self.G_bom.successors(product_code))
+
                     for succ_product_code in lst_succ_product_code:
-                        lst_succ_firm = Firm['Code'][Firm[succ_product_code] == 1].to_list()
+                        lst_succ_firm = self.Firm['Code'][self.Firm[succ_product_code] == 1].to_list()
+
                         n_succ_firm = self.int_netw_prf_n
                         if n_succ_firm > len(lst_succ_firm):
                             n_succ_firm = len(lst_succ_firm)
+
                         if self.is_prf_size:
-                            lst_succ_firm_size = [self.firm_network.nodes[succ_firm]['Revenue_Log'] for succ_firm in
+                            lst_succ_firm_size = [self.G_Firm.nodes[succ_firm]['Revenue_Log'] for succ_firm in
                                                   lst_succ_firm]
                             lst_prob = [size / sum(lst_succ_firm_size) for size in lst_succ_firm_size]
-                            lst_choose_firm = self.random.choices(lst_succ_firm, k=n_succ_firm, weights=lst_prob)
+                            lst_choose_firm = self.nprandom.choice(lst_succ_firm, n_succ_firm, replace=False,
+                                                                   p=lst_prob)
                         else:
-                            lst_choose_firm = self.random.choices(lst_succ_firm, k=n_succ_firm)
-                        lst_add_edge = [(node, succ_firm, {'Product': product_code}) for succ_firm in lst_choose_firm]
-                        self.firm_network.add_edges_from(lst_add_edge)
+                            lst_choose_firm = self.nprandom.choice(lst_succ_firm, n_succ_firm, replace=False)
 
+                        lst_add_edge = [(node, succ_firm, {'Product': product_code}) for succ_firm in
+                                        lst_choose_firm]
+                        self.G_Firm.add_edges_from(lst_add_edge)
+
+                        # Add edges to firm-product network
                         for succ_firm in lst_choose_firm:
-                            succ_node = [n for n, v in self.firm_prod_network.nodes(data=True) if
+                            succ_node = [n for n, v in self.G_FirmProd.nodes(data=True) if
                                          v['Firm_Code'] == succ_firm and v['Product_Code'] == succ_product_code][0]
-                            self.firm_prod_network.add_edge(current_node, succ_node)
+                            self.G_FirmProd.add_edge(current_node, succ_node)
+
+        self.sample.g_firm = json.dumps(nx.adjacency_data(self.G_Firm))
+        self.firm_network = self.G_Firm  # 直接使用 networkx 图对象
+        self.firm_prod_network = self.G_FirmProd  # 直接使用 networkx 图对象
 
     def initialize_agents(self):
         """ Initialize agents and add them to the model. """
@@ -189,7 +214,6 @@ class MyModel(Model):
 
         for ag_node, attr in self.firm_network.nodes(data=True):
             a_lst_product = [agent for agent in self.product_agents if agent.unique_id in attr['Product_Code']]
-            print(a_lst_product)
             firm_agent = FirmAgent(
                 ag_node, self,
                 type_region=attr['Type_Region'],
@@ -208,7 +232,8 @@ class MyModel(Model):
         # 遍历初始公司-产品干扰数据，将其转化为基于公司和产品的映射
         for firm_code, lst_product in self.dct_lst_init_disrupt_firm_prod.items():
             # 从 company_agents 列表中选择指定公司
-            firm = next(firm for firm in self.company_agents if firm.unique_id == firm_code)
+            firms = [firm for firm in self.company_agents if firm.unique_id == firm_code]
+            firm = firms[0] if firms else None
 
             # 从总产品列表中选择该公司受干扰的产品
             disrupted_products = [product for product in self.product_agents if product.unique_id in lst_product]
@@ -219,6 +244,7 @@ class MyModel(Model):
         # 更新 self.dct_lst_init_disrupt_firm_prod 字典，存储公司及其受干扰的产品
         self.dct_lst_init_disrupt_firm_prod = t_dct
 
+
         # 设置初始受干扰的公司产品状态
         for firm, a_lst_product in self.dct_lst_init_disrupt_firm_prod.items():
             for product in a_lst_product:
@@ -236,7 +262,6 @@ class MyModel(Model):
             self.product_agents.append(agent)
 
     def step(self):
-        print(f"Running step {self.t}")
         # 1. Remove edge to customer and disrupt customer up product
         for firm in self.company_agents:
             for prod in firm.dct_prod_up_prod_stat.keys():