From 60b402c04348a63ab3ddbdf91646a02dbb38f22a Mon Sep 17 00:00:00 2001
From: Cricial <2911646453@qq.com>
Date: Fri, 13 Sep 2024 16:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=9F=BA?=
 =?UTF-8?q?=E6=9C=AC=E7=BB=93=E6=9D=9F=EF=BC=8C=E5=88=B0=E8=BE=BE=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=BC=80=E5=A7=8B=E6=89=A7=E8=A1=8C=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=A4=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/csv-editor.xml                   |  21 ++++++++
 __pycache__/computation.cpython-38.pyc | Bin 1420 -> 1425 bytes
 __pycache__/firm.cpython-38.pyc        | Bin 7235 -> 7276 bytes
 __pycache__/model.cpython-38.pyc       | Bin 9561 -> 0 bytes
 __pycache__/my_model.cpython-38.pyc    | Bin 0 -> 10456 bytes
 __pycache__/product.cpython-38.pyc     | Bin 1432 -> 1446 bytes
 computation.py                         |   2 +-
 firm.py                                |  13 ++---
 input_data/oa_without_exp.csv          |   3 +-
 input_data/xv_without_exp.csv          |   3 +-
 model.py => my_model.py                |  65 +++++++++++++++++++------
 product.py                             |  19 +++++---
 12 files changed, 92 insertions(+), 34 deletions(-)
 delete mode 100644 __pycache__/model.cpython-38.pyc
 create mode 100644 __pycache__/my_model.cpython-38.pyc
 rename model.py => my_model.py (81%)

diff --git a/.idea/csv-editor.xml b/.idea/csv-editor.xml
index 5d9af44..ec19d70 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\BomNodes.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="\input_data\Firm_amended.csv">
           <value>
             <Attribute>
@@ -10,6 +17,20 @@
             </Attribute>
           </value>
         </entry>
+        <entry key="\input_data\oa_with_exp.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
+        <entry key="\input_data\oa_without_exp.csv">
+          <value>
+            <Attribute>
+              <option name="separator" value="," />
+            </Attribute>
+          </value>
+        </entry>
         <entry key="\input_data\xv_with_exp.csv">
           <value>
             <Attribute>
diff --git a/__pycache__/computation.cpython-38.pyc b/__pycache__/computation.cpython-38.pyc
index edfb8012a9649fe4963ae8160cf60f030f7ed41f..7c87c9dd0d1100a22787bca18bec1f402e9dd429 100644
GIT binary patch
delta 103
zcmeC-p2*D`%FD~e00gsUJW8wE$ScLn7&Tdgc_Y6lQ0x{*N@7WBNoH<p)Z`b;a*X1W
z*;(8KqgZqEQ&MwoF=iI=02LJpPmW`0W>lE`h{cRiYO*A&G*=WyZe=`J(PT^3U;v+&
B9C-i$

delta 98
zcmbQp-NVfr%FD~e00eS#PNr3F<dtG(yfs;ac_Y6VQ0x{*N@7WBNoH>9t;sK#<rpO<
yv$MDf-eS$oPf5+W#h6*d15{KbGC7W=nNfN2BNj78>B*9;(yT>_K=H|Ttib>?5E@4S

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index b98ae6a0d2555fd898d73d39a3171646a1e5a258..c831dbfbd8f58727c65e531825da7b7602d5b908 100644
GIT binary patch
delta 1712
zcma)6U1%It6rMAGJG--!Y}#bAKS>rE60%wn$<`Q6;t$3owlzkZTDzLA>&)zC|7JIL
zHffbvLaF#5D5jT)f?!s}hrULzPl5=F4}y;}uRbY#@S%txMen(*N#lbgkdJ%Lx%d2h
z-<kbp`p&d*(J(>+``f+ubK%z=V{mSa8J1u{Rj5H00MBAo%u0)bC0X)Yf+gE<L(0mQ
zctJ=jzu?<6_{vj7+i5QET=@vRoj-nrTl9O#z!bd)v6bea7rX%$RD}0|oVLJGJDyh1
znev442`f|)S)|I&VmY}t<Y|`P7F)q1@2taj^a=3?7^8-C3sUs9bZ5}l8l;dj>yG2=
zB{z3qNN$t(^lSMH`1E&qgyDelLXvc|mVJfPHyz72oI0uHt6O<e$~SGgqim}x3%m0)
zs?G&tFaTkQK!Rq~3HX%0qb9cBZb__BD9a2bPb!FUp(T6ro?<~8JSeLbkwjT6P}cT>
zp45hx;wk0Op57Mbg|(@c>H*rG8fV1D1@u=`vU<PI0~V85EbIwwCc(xkR@^hNA{_|~
z4|Mr*wZw*t;v_-GE)~~buM?L{Fq>8a=V6@Q4$QzLy&D+qeH7;zVjzGB;lE^2gA@DX
z+INteV!pK6$pVW6FY*-RF+9!CXlOV&jz`=OqBHPAvsl=y*BXy6(bdrBC!b~B^X%W1
z8K{CNkaN_~Gm&X#c9QksX_l_&eGmCkEq{$X$Q-_EuGdSZO$IQUMvvSq)$FuRc*RL{
zFVS5+3ybtOJpl{*dblDcpJV<skPL<ox+2&_mhN<I4WGpT_CxSy=gQH01qywObfde!
z_vM2dI2un<q#t*$93zRtk}Rof_$)`)A}IwssMG6_iS1c*UO*T`IE8>Zk!KkA+Irs2
z*;di+aD#)B7ZFkjoS8s}8JE0-u2&HrKtKtZTAUu7-;Y$?X0A{oHNN_`*(A$M{)wJZ
z-NO5PybOJ<Ck~hP-|R8PW6bsL&EBokov|>5iExy@_n7NY>pX3roIOU~UF2)%e-nSO
zU+i0e<>#^FJVF<Of?y!vex-X4sU!vT;>HvF$>Q8`%6u(vSsjjN=%3N#(j104)16gB
z^AZBzJya>Ja9aJKRln+RO8JIm^#-Y1xx8uGjV76-SNc!EC-izh+2)ctnB%Cv_cg@}
z9;ix+c$q7T1xXdF1`ox|YX6E!)-leM6iA6dw%fI<Oxv8f={D;%n~<6y7y{wNxilu-
zj>VuwKaB0N?|wW!3SZER@w;%2o=uEA%!lVC6PWTp4DcocEbtElgnxIJ>1T-yd`W*w
ztmzy0iq|3Z$z%+^rI(Wnsi)EV3PKs7f#4!sMYu-4N)FDS!6W~&Bz8g}-3S8>!Wqrb
qdbCmP5lzy%2}aY3FV}20Pef+;inCd3yy1&ZgZ2%KX{dY{H0f`1oNNdH

delta 1744
zcma)6&2Jk;6rZ<iuh$<NCo~`ah?ABiPF)2xZ9*H;fJ8&%hNP%fn*bKUHM<+fU+Z*s
z6Hr(y63GD-2~kFXkgCcNhyw>C2nca2>H%>;ir|2>`~e852QHjp-nb-$1Ju&~H1m6J
z-n{pFZ+w5^-h{TGX(7UYKYjH5vVBWSjUVM3gBVaHHOK*wEHNZQ-X?}@!j_zq4Bu6f
z@&ATrGT`~2E}E8etN0--GJrkUW<SE%bgxUwQaRb|byXu6BZxg@M`{Euv^-*jD$+YZ
zCmwjExIK(kr_TVV-wkfTmc%US2S~Fi`BON`ewFX1a_TBw&g*r{^1>xMzrT@fhvwMt
zzH!L0A^#A^IscVGFF*^HQL-FQv+A@~sIC`iso<ENTr0fh`DuO4GT7JtO~uFSu+Ot8
z<;g$-BG3+P><#7Q=Et0N2u~225=VIlwxA)o(lcb~&4!G8*;n?X#g&((IBED?UsEw)
z2V5uzDiZDHHnkjVhFpHO;dlMza5J()`1vyp#Rc5EN}OvOC&*V6y7&(+PF&zdnHx2i
z?C>_+Sj0=4Z7drY9*BCrYKhm~&9n5hqUq!<vs7GprA}@77;=zhHv{u9!hQ~%gHd)w
zO?RHbLi;!nkRbA>Pg0?C_mcV@92@6cMiIg2S-z$d2pESxfiTI&LIcSWT;izEFb6L*
zg&FAe+Uipm*p1L9N3xuq<)4j;Dnuf5mYoQXE#SSaU|qO6$H7wyI5jqn<3_HPEP4WM
z!@{Po)JwWadyyGJ#^;o3W+qHU2BS#NurI<nxWKeX0;YG5M=DZsj`JCyr_j8gCB>wk
zXP>pL4_rjUvk2(fayjg$v%an@dpp|Gxv=knrHUX1`zCt%A%awRkc&zVkG;e;+WY;O
zL6zNUKe>sO(<=xmgkuQUK%u#(t`zLNX%x+tR#-T_jL?rDlnJzyvFTN$UPMSEU{iVj
zggjWk*Iu=q{Bnub#B(uqht3ni<~!2i0{V;cPO(Nu9Iowt(4k8YQP)kD>Rcab)rB#x
zBOKQ6ElwRY|7CVJ*vamOh6m~YOaCsa*7u*$+3t4N3@DfI-f6bi-M=YDRmZ&;)j?dL
zPC_0}Ef_{i&q?Hx2q=`NP_tHFH)#TyDFmVQ{&3Q3$cgF0K4ttuSTAVQU$um&V#ab|
zZI#xId_mXERfmqU*Lxm?+w4vc-4tD`V35NtrU$u-8}}Pa4RjVw6_ZiIYl8><%&C9(
zlbYzsn@Q+0hg{S)tGvB=ea&|2HIvdZAsV6La?zaY>~<^$8|<std;HH}E}qst=jUvR
z1A&cR7EQ+3`|&-PWyQqM<3bIQf)M9ll8B@O{NMvgsCbHt?Ayc`e98VuEQKv@Yz;-7
zEhS@ckF6(X`p+Z#0zwg?hOmm@Agr-plBvnlxD<~~<}3W{b`B~;POF;Qp{CWds;ovS
XTAs_up08%w1&U>`sovuXE+W!j&qQ(H

diff --git a/__pycache__/model.cpython-38.pyc b/__pycache__/model.cpython-38.pyc
deleted file mode 100644
index 573f0983f78acb72f156f441b4d2dec335148f3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9561
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
IWebn}zp1?|!vFvP

diff --git a/__pycache__/my_model.cpython-38.pyc b/__pycache__/my_model.cpython-38.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..6df0db6a37c4e1577115af672610c109a81b2631
GIT binary patch
literal 10456
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
R6Qaw<!P;~Eiv}L^{{Wkz3t|8O

literal 0
HcmV?d00001

diff --git a/__pycache__/product.cpython-38.pyc b/__pycache__/product.cpython-38.pyc
index 0e920d394430b98a50dd7904ec93cb691f1455f7..d61ad035400f7c49e265a908bb88804e8c4b1988 100644
GIT binary patch
delta 511
zcmbQiy^NbLl$V!_0SGd_JWgw2*~qtp(UcL$WdUMlATHJd5+w{Z3|Wj>ObeKSG|NK9
zX2wp2c7`;@6vh;$77nl+>*NGx{n#4DEQSt-Y_=kn8perCg)G4gMSMX0D;bNpK@`(1
zCOv~&tcmHVc_k|uZ*diuCMTyB7v~ohgOwHW0~OukvdPITE=kVMEwB>=@{8Gk1RDbr
z1J~ppCPPcMTPz^yA`YNv5hsWc1rZ?QZ}Alr<)@S;m&AiDC<fXJ@)^Wvk;yNZ6j?-=
zt0X7)Gf6rngZu~sWc$|-hkuI%fJPUATo3dmPeD;?N-Bmwi^PD^5<raP!TZd{+H6JQ
zAk7H>$$+>Z{}q8$7fFH$P@on`Pqt%`;1vcki$Sr)z$C&vIhn<aQF3x2t1uf&aY<@{
d)a2tVp4?I()v_Q$Zn8A1B{Mq*`{Zy|M*w&gW`6(x

delta 498
zcmZ3+J%gJsl$V!_0SNxhKbf|Tc_ZHrMqMT#mj#HKfw))+NR%*iFk~?<VCrC4$k@zS
z%h=A4#+bsG!qmc1!#KH+S-&1A4OEcDRKqCAFp;T{C77Xz52$Y?a}fuSy2VkPoROMR
znv;5qEipYcucTO$=@yfo!7a|>(&XgS;^O?Gm5fCoSAcaD@q_em+2mvvmn7%s7TAIK
z#UKZ<F)%Sy=>`<#r<5j_ID$;lON<AaF?kM?j5hNv7Lbl2POxsc$w0dxMoR$2A?Axt
z{>Y@rB)~XXgjs`h&j#S|Y>@!a0-$BWAp5xsic(WjA$}_oh1(4BNs$<k5CLMCmnOes
zHr8P-5(mkF9nXWL8SZ>(kTfVzi$o{;ut@L<!c1TQ`J|A=i&1p)9u^58d6mVJTN0#D
U21LkC)?~G0X60a+oXYA508yN5+yDRo

diff --git a/computation.py b/computation.py
index a8a58ee..dba191f 100644
--- a/computation.py
+++ b/computation.py
@@ -5,7 +5,7 @@ from mesa import Model
 
 from typing import TYPE_CHECKING
 
-from model import MyModel
+from my_model import MyModel
 
 if TYPE_CHECKING:
     from controller_db import ControllerDB
diff --git a/firm.py b/firm.py
index eed6ecf..823e19d 100644
--- a/firm.py
+++ b/firm.py
@@ -1,5 +1,5 @@
 from mesa import Agent
-from model import MyModel
+import numpy as np
 
 
 class FirmAgent(Agent):
@@ -47,17 +47,18 @@ class FirmAgent(Agent):
                 "cap_limit_prob_type must be either 'uniform' or 'normal'"
             extra_cap_mean = self.size_stat[0][0] / self.flt_cap_limit_level
             if self.str_cap_limit_prob_type == 'uniform':
-                extra_cap = self.model.random.randint(extra_cap_mean - 2, extra_cap_mean + 2)
+                extra_cap = self.model.random.uniform(extra_cap_mean - 2, extra_cap_mean + 2)
+                extra_cap = 0 if round(extra_cap) < 0 else round(extra_cap)
             elif self.str_cap_limit_prob_type == 'normal':
                 extra_cap = self.model.random.normalvariate(extra_cap_mean, 1)
-            extra_cap = max(0, round(extra_cap))
+                extra_cap = 0 if round(extra_cap) < 0 else round(extra_cap)
             self.dct_prod_capacity[product] = extra_cap
 
     def remove_edge_to_cus(self, disrupted_prod):
         lst_out_edge = list(
-            self.firm_network.get_neighbors(self.unique_id))
+            self.firm_network.neighbors(self.unique_id))
         for n2 in lst_out_edge:
-            edge_data = self.firm_network.G.edges[self.unique_id, n2]
+            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)
                 for prod in customer.dct_prod_up_prod_stat.keys():
@@ -69,7 +70,7 @@ class FirmAgent(Agent):
     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.get_neighbors(self.unique_id)
+            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])
         lost_percent = num_lost / (num_lost + num_remain)
         lst_size = [firm.size_stat[-1][0] for firm in self.model.schedule.agents]
diff --git a/input_data/oa_without_exp.csv b/input_data/oa_without_exp.csv
index dec6a32..ef2e559 100644
--- a/input_data/oa_without_exp.csv
+++ b/input_data/oa_without_exp.csv
@@ -1,3 +1,2 @@
 X1,X2,X3,X4,X5,X6,X7,X8
-0,0,0,0,0,0,0,0
-,,,,,,,
\ No newline at end of file
+0,0,0,0,0,0,0,0
\ No newline at end of file
diff --git a/input_data/xv_without_exp.csv b/input_data/xv_without_exp.csv
index b497255..8a9c6c3 100644
--- a/input_data/xv_without_exp.csv
+++ b/input_data/xv_without_exp.csv
@@ -1,3 +1,2 @@
 n_max_trial,prf_size,prf_conn,cap_limit_prob_type,cap_limit_level,diff_new_conn,remove_t,netw_prf_n
-5,TRUE,TRUE,uniform,10,0.5,5,2
-,,,,,,,
\ No newline at end of file
+5,TRUE,TRUE,uniform,10,0.5,5,2
\ No newline at end of file
diff --git a/model.py b/my_model.py
similarity index 81%
rename from model.py
rename to my_model.py
index d654a30..d87d93f 100644
--- a/model.py
+++ b/my_model.py
@@ -16,17 +16,20 @@ class MyModel(Model):
     def __init__(self, params):
 
         # self.num_agents = N
-        self.is_prf_size = params['is_prf_size']
+        self.is_prf_size = params['prf_size']
         self.prf_conn = params['prf_conn']
         self.cap_limit_prob_type = params['cap_limit_prob_type']
         self.cap_limit_level = params['cap_limit_level']
         self.diff_new_conn = params['diff_new_conn']
 
+        self.firm_network = nx.MultiDiGraph()  # 有向多重图
+        self.firm_prod_network = nx.MultiDiGraph()
+        self.product_network = nx.MultiDiGraph()  # 有向多重图
+
+        # NetworkGrid 用于管理网格
         # NetworkX 图对象
         self.t = 0
         self.network_graph = nx.MultiDiGraph()
-
-        # NetworkGrid 用于管理网格
         self.grid = NetworkGrid(self.network_graph)
 
         self.data_collector = DataCollector(
@@ -48,20 +51,21 @@ class MyModel(Model):
         self.remove_t = int(params['remove_t'])
         self.int_netw_prf_n = int(params['netw_prf_n'])
 
-        self.product_network = None
-        self.firm_network = None
-        self.firm_prod_network = None
-
         self.initialize_product_network(params)
         self.initialize_firm_network()
         self.initialize_firm_product_network()
+        self.add_edges_to_firm_network()
+        self.connect_unconnected_nodes()
         self.initialize_agents()
         self.initialize_disruptions()
 
     def initialize_product_network(self, params):
-        """ Initialize the product network and add it to the model. """
-        self.product_network = nx.adjacency_graph(json.loads(params['g_bom']))
-        self.network_graph.add_edges_from(self.product_network.edges)
+        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. """
@@ -98,6 +102,11 @@ class MyModel(Model):
         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.")
+
     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")
@@ -176,8 +185,11 @@ class MyModel(Model):
             self.add_agent(product)
             # self.grid.place_agent(product, ag_node)
 
+            ##print(f"Product agent created: {product.name}, ID: {product.unique_id}")
+
         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'],
@@ -185,16 +197,37 @@ class MyModel(Model):
                 a_lst_product=a_lst_product,
             )
             self.add_agent(firm_agent)
+
+            ##print(f"Firm agent created: {firm_agent.unique_id}, Products: {[p.name for p in a_lst_product]}")
             # self.grid.place_agent(firm_agent, ag_node)
 
     def initialize_disruptions(self):
-        """ Initialize disruptions in the network. """
-        for firm_code, lst_product in self.dct_lst_init_disrupt_firm_prod.items():
-            for product_code in lst_product:
-                self.firm_network.nodes[firm_code]['Product_Code'].remove(product_code)
+        # 初始化一部字典，用于存储每个公司及其对应的受干扰产品列表
+        t_dct = {}
 
-                # Log disruptions for visualization
-                self.dct_lst_init_disrupt_firm_prod[firm_code].append(product_code)
+        # 遍历初始公司-产品干扰数据，将其转化为基于公司和产品的映射
+        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)
+
+            # 从总产品列表中选择该公司受干扰的产品
+            disrupted_products = [product for product in self.product_agents if product.unique_id in lst_product]
+
+            # 将公司与其受干扰的产品映射到字典中
+            t_dct[firm] = disrupted_products
+
+        # 更新 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:
+                # 确保产品存在于公司的生产状态字典中
+                assert product in firm.dct_prod_up_prod_stat.keys(), \
+                    f"Product {product.code} not in firm {firm.code}"
+
+                # 将产品状态更新为干扰状态，并记录干扰时间
+                firm.dct_prod_up_prod_stat[product]['p_stat'].append(('D', self.t))
 
     def add_agent(self, agent):
         if isinstance(agent, FirmAgent):
diff --git a/product.py b/product.py
index 87c90cc..3eaabd6 100644
--- a/product.py
+++ b/product.py
@@ -10,14 +10,19 @@ class ProductAgent(Agent):
         self.product_network = self.model.product_network
 
     def a_successors(self):
-        # Find successors of the current product and return them as a list of ProductAgent
-        successors = list(self.product_network.successors(self))
-        return [self.model.schedule.agents[successor] for successor in successors]
+        # 从 product_network 中找到当前代理的后继节点
+        successors = list(self.model.product_network.successors(self.unique_id))
+
+        # 通过 unique_id 查找后继节点对应的代理对象，从 self.product_agents 中获取
+        return [agent for agent in self.model.product_agents if agent.unique_id in successors]
 
     def a_predecessors(self):
-        # Find predecessors of the current product and return them as a list of ProductAgent
-        predecessors = list(self.product_network.predecessors(self))
-        return [self.model.schedule.agents[predecessor] for predecessor in predecessors]
+        # 找到当前代理的前驱节点
+        predecessors = list(self.model.product_network.predecessors(self.unique_id))
+
+        # 通过 unique_id 查找前驱节点对应的代理对象，直接从 self.product_agents 列表中获取
+        return [agent for agent in self.model.product_agents if agent.unique_id in predecessors]
+
     def step(self):
-        # 在每个时间步进行的操作
+        # 在每个时间步 进行的操作
         pass