From 2d359c80f1961cd1da912685b2a2c3f2ba57b7ea Mon Sep 17 00:00:00 2001
From: Cricial <2911646453@qq.com>
Date: Wed, 11 Dec 2024 15:58:06 +0800
Subject: [PATCH] no message

---
 __pycache__/firm.cpython-38.pyc     | Bin 11523 -> 11499 bytes
 __pycache__/my_model.cpython-38.pyc | Bin 16398 -> 16494 bytes
 firm.py                             |   4 +--
 my_model.py                         |  40 +++++++++++++++-------------
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/__pycache__/firm.cpython-38.pyc b/__pycache__/firm.cpython-38.pyc
index 29fcd9a30442a5d205c4a48b5a3aa5ef02503afb..d5d075f5b34b67739097f4209f1ca27b68d1ee35 100644
GIT binary patch
delta 1878
zcmZ{kO>7%Q6vubA$$IUL?Sv+^^U>H&QYTJKS|mz72nc8ZQI#NC5=5Z5iFf1J`EWA3
zPD!<n6;j%i(kd_%1QaPgAq1*aEf-FeI7Gbx;)I2Ygt(yIk+>k{KW-Z*DVFx<dH*-_
z_RV|GUK_vrhIiEK^+^2l#}A{aw{LnINs|Wi-p9|s75?nwj~Qgokf)DUuS*HHt#W#F
zVykJwSDNkNtl_pt*j{1#Y&Tc^Ty-;t94jc?I$*mv13IDvbtsKGl%}-A*(}&1cyL|H
z$eC8Iwpt;v4zJ-|5vxsD?ZWD?4hbtNtj>E@m#|{oqilBDRXUlHi)5HccJ;7yI-1vX
zHAQr{?l~{n+GbBt8kW|Gu3eY;0hg@}NgHIbU+le+ui;vUUNfU?5Yx8e?3Ub6=xmnq
zUZMMD<PAc9;%hnc=w`3&)%`&U3`j*e@3RiuJ|3CO@Q8FvC-X{K$@}J?5a(<8d71Ju
zi1SDI$+|t~{;fP``_?5-Mzw21lDczx->))xjP)s7j_S%2;%67s2>VvOLMGXuJ4&jZ
zq`OWgr&vyVOM97jkyZh(JHKgv6Eenr@t#v&g>sTbTAyTBeb13;_OoxLsSn~XM~PT5
zjbad}I6uYG{*zh~wg_c7TmIX!n&Co>&=K~@BbT%kylEiA{Ph9$?EVB<V#WQ*U7j<_
zIc&07uD+l2u^aWFLO+D3fOd|OIz3?~3_WE~6&ezvSzr)&furO~PG{3e!=x6ZW#D;W
zfFq`qGaupWQthm1C8pAJE|JX6&l^dL&OlZnFVO5{sm?UmiH3moE{-n&BhGxoqP#2X
z03*S(@p9(av<iq?)M8b~ahpFTBt?=XTHv)E+7m=>d`YVa!p0ig3dp%sowkfQlXmg7
zxNFHbkxUv3R)QLfIm5KJ%R|p&&vs=V6otMAhbRaNT2iPnmt8Vq>UKHC#l2AudI6hJ
z3z=SI|1=&Vt4^rt8&a6%67Q*)j~47X05k&)aMg((RU~l?F8p6m6TtgR>V&SBJ18!M
z8`2MePT&+Ex|+jEOdT?gRa5^FC|3ZqZ(QR&(i7!Ult)q2TtF25va{Us72)&yuxb}t
z^A*)zVXjb^?Cnc7bf#k0Dl3KJy&^j?a}UO{;>x>A&K?iH7%k70nVU?^rg^_E;tuNo
zlKony<pFbw;XD7A?wz)kibPges{LW<{@A`V-NBA9*<f#W9B)Df^h03h%jrkXt&W?7
zTw{yT?*gNIL#&F%u&)~sz00wo&fI-p59Ig`UxfYD`PzMdFI<Or`Ey;zRS}!e0Uj*q
z{N7cCoBkOK9~CVYZ5KavF$Lw<B8Vt<kgqTR5X67ZSvJtkLWoGm03RS4FCe<V!0vWm
z<L_AQ2}BS+CRYU5wRf3)-;+8qi74*?mw>ClWq<)61D^t)0iOe30M~&pfg-Q~EVJ48
LLGlWFKfe4QrqrcK

delta 1937
zcmZ`(T}&KR6rMXQ!z{Bu(1N=_W%*|ZRw`-@v<)$qwxK4aQrcP~nb4U5_J;-T3}A7V
zHQ*1JR?*uM9~uL`G{)H2j4$e&G1Z607ZV@$!Nf=P!8d*NoIB8Ei=AY?x#v6Qo_qf0
z{&jV2EO;pxtQ6q6LoZED-w)Q2`T&Z%PZfM6c+23m8re%^;Fz>7Xnw~JSZNT)pCqtS
z90f1{vclycmqSh^uwh^;nM+RP%Rzd|sQ`>PGGNp|rp`c*^#<|{NdfQ($EP_qt_vwK
z6$3VAH}Q4z8lKo<w{oeCOYL?CmpZu=-<4D@b%93O?sj~6gG`D$gb0o_D2#XH0){+A
z48KwNw%`P|6Fb77utp5!jtCnnoWMz8lgtlr+k3enaP3AQEo~BO)qchZu8~y;BPAK6
zPQVw|@dhCm;&!35xJl@*uohE2+ee*{5snH@9zGFaN6dxoXPqz{MbdBteQ1!Z<T1H$
z_C@ZX3LJ<uu<M`~98^EHPo%#6`<yV?%1)36oic=rf_msYCD1h;fj?{|Siu&3{qC1#
zYa)4$^-2$vf<LR7^9#v2O?Us5a)eZ|1-ZGLJ`X$CmVA>Ktj*t1Rwjw=EB<PcjIwd%
zb>%#0sSn{b_Xp)4Lawmyg3HnfG8b7@>;zj3y-bqqo6t&qACjj53dB|w8b*=tpJK0u
zM-&5P?rPG#7ye0<(?F<%4zra*8_G0lQwV8xp)tbL!x~v)8;A7+no!M<^d=hS*mzAJ
z>0?_pv3x%g0|>1E1$lbH(oAE@q%v|C6rDpjfp8X}P@zxHCUw)I3rH;^oIyAaph{l!
z!>}$?Wh`5pOwt)mpUq}X-KH6&Wu)im?6pF*WwIA)Bgz_XUqTpmFW1hC2O|F?vZQ#C
zqtPl$N1Mo7P{fl5EdPuSl~@kcwd66dLV40QXDk{=2bfSHG@<L}oUKvlt!dfC8qjyp
zrkMVt%;~$R;8|nU3KBJEW*1FWF6KPOlf#_pduWUai*%j+Ue``m-HQ4zh&%%nG;f4`
z+Yrkaj~YaCyhf;vfTtAX3B&N3!NbNp=uL!9gi!?EphaBqA;P%Saxb0_ki|xfDNt=g
z^YZlui%*kJ@Ph?jU-X7MapW$6aXeVlTl?ynXMZ<7sq)!aY309<C3=eE^Jv2MRrm42
zvLj7rJG>FG7OrWTBy?pRquW5hkUtlxH!JQ&({KMDZiGE(St$v5xb;aP|J*v1*f&;t
zr+6i)1~Cp7gM|l6f+*0B*r~R2^%x-i7@;&a%G|qc_X*izS3ACrTm}QxM^&`zLg1}k
zWM6eQv(ufUd-`rvB}()Qd%7N^kCy0~*?9b%%zYDj9GpenALBkO#6z{|7@q(>75t~>
zL*gBaPIxb(u-cmse#5-Mn!A{U9_bbE7ZK?^`=#r4e-atI7HKWO=owWk4jrtESJdt#
zfgvBHWwz5j)u!Xd>j>{7e28!Z;TFPegily+BHHsQE<Zz<N5IRZ5Y#k1Ghtb}naOCH
Nck%I4E-;$7{vT*txVHcR

diff --git a/__pycache__/my_model.cpython-38.pyc b/__pycache__/my_model.cpython-38.pyc
index 54c89ce7e5810f8c457380fb59f885960718beb3..2ce3b7ae942d2d4d292ffb2833ca84caac61511b 100644
GIT binary patch
delta 3144
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

delta 3174
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
JZQ$q%{~xeE3n2gi

diff --git a/firm.py b/firm.py
index d3ab4fe..81f48cf 100644
--- a/firm.py
+++ b/firm.py
@@ -2,7 +2,7 @@ from mesa import Agent
 
 
 class FirmAgent(Agent):
-    def __init__(self, unique_id, model, type_region, revenue_log, n_equip_c, a_lst_product,
+    def __init__(self, unique_id, model, type_region, revenue_log, a_lst_product,
                  production_output, demand_quantity, R, P, C):
         # 调用超类的 __init__ 方法
         super().__init__(unique_id, model)
@@ -38,7 +38,7 @@ class FirmAgent(Agent):
         self.downer_i = [agent for u, v in self.firm_network.out_edges(self.unique_id)
                          for agent in self.model.company_agents if agent.unique_id == u]
         # 设备c的数量 （总量） 使用这个来判断设备数量
-        self.n_equip_c = n_equip_c
+        #self.n_equip_c = n_equip_c
         # 设备c产量 根据设备量进行估算
         self.c_yield = production_output
         # 消耗材料量 根据设备量进行估算   {           }
diff --git a/my_model.py b/my_model.py
index e7634b5..c78cfc1 100644
--- a/my_model.py
+++ b/my_model.py
@@ -68,13 +68,14 @@ class MyModel(Model):
 
         # 方法执行
         self.initialize_product_network(params)
+        self.resource_integration()
+        self.j_comp_consumed_produced()
+        self.initialize_agents()
+
         self.initialize_firm_network()
         self.initialize_firm_product_network()
         self.add_edges_to_firm_network()
         self.connect_unconnected_nodes()
-        self.resource_integration()
-        self.j_comp_consumed_produced()
-        self.initialize_agents()
         self.initialize_disruptions()
 
     def initialize_product_network(self, params):
@@ -94,7 +95,7 @@ class MyModel(Model):
     def initialize_firm_network(self):
         # Read the firm data
 
-        firm = pd.read_csv("input_data/input_firm_data/Firm_amended.csv")
+        firm = pd.read_csv("input_data/input_firm_data/firm_amended.csv")
 
         firm['Code'] = firm['Code'].astype(str)
 
@@ -316,18 +317,16 @@ class MyModel(Model):
         for ag_node, attr in self.product_network.nodes(data=True):
             # 产业种类
 
-            type2 = self.type2[self.type2["Index"] == ag_node]["产业种类"]
+            # type2 = self.type2[self.type2["Index"] == ag_node]["产业种类"]
             # depreciation ratio 折旧比值
             # product_id = product_id.iloc[0]
-            product = ProductAgent(ag_node, self, name=attr['Name'], type2=type2)
+            product = ProductAgent(ag_node, self, name=attr['Name'], type2=0)
             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']]
-            firm_id = self.Firm['Code'] == ag_node
-            n_equip_c = self.Firm.loc[firm_id, '设备数量'].values[0]
 
             demand_quantity = self.data_consumed[self.data_consumed['Firm_Code'] == ag_node]
 
@@ -335,17 +334,16 @@ class MyModel(Model):
 
             # c购买价格？ 数据预处理
             # c_price = self.Firm.loc[self.Firm['Code'] == ag_node, 'c_price'].values[0]
-
             # 资源 资源库存信息 利用 firm_resource
-            R = self.firm_resource_R.loc[firm_id].to_list()[0]
-            P = self.firm_resource_P.loc[firm_id].to_list()[0]
-            C = self.firm_resource_C.loc[firm_id].to_list()[0]
+
+            R = self.firm_resource_R.loc[int(ag_node)]
+            P = self.firm_resource_P.loc[int(ag_node)]
+            C = self.firm_resource_C.loc[int(ag_node)]
 
             firm_agent = FirmAgent(
                 ag_node, self,
                 type_region=attr['Type_Region'],
                 revenue_log=attr['Revenue_Log'],
-                n_equip_c=n_equip_c,
                 a_lst_product=a_lst_product,
                 demand_quantity=demand_quantity,
                 production_output=production_output,
@@ -396,6 +394,7 @@ class MyModel(Model):
             self.product_agents.append(agent)
 
     def resource_integration(self):
+
         data_R = pd.read_csv("input_data/input_firm_data/firms_materials.csv")
         data_C = pd.read_csv("input_data/input_firm_data/firms_devices.csv")
         data_P = pd.read_csv("input_data/input_firm_data/firms_products.csv")
@@ -422,18 +421,21 @@ class MyModel(Model):
         data_consumed = pd.read_csv('input_data/input_firm_data/firms_materials.csv')
         data_produced = pd.read_csv('input_data/input_firm_data/firms_products.csv')
 
-        data_not_consumed = data_consumed.groupby('Firm_Code')[['消耗材料id', '材料数量']] \
-            .apply(lambda x: dict(zip(x['消耗材料id'], x['材料数量']))) \
+        data_not_consumed = data_consumed.groupby('Firm_Code')[['材料id', '材料数量']] \
+            .apply(lambda x: dict(zip(x['材料id'], x['材料数量']))) \
             .reset_index(name='Material_not_Consumed')
 
         # 这里简单设置为折半 考虑 企业的设备量
         # 可以引入 换算率 也就是 材料——计算产品比例 通过上游产业 现在假设为 2:1 的比例
-        data_consumed = data_consumed.groupby('Firm_Code')[['消耗材料id', '材料数量']] \
-            .apply(lambda x: dict(zip(x['消耗材料id'], x['材料数量'] / 2))) \
+        data_consumed0 = data_consumed.groupby('Firm_Code')[['材料id', '材料数量']] \
+            .apply(lambda x: dict(zip(x['材料id'], x['材料数量'] / 2))) \
+            .reset_index(name='Material_not_Consumed')
+        data_produced = data_consumed.groupby('Firm_Code')[['材料id', '材料数量']] \
+            .apply(lambda x: dict(zip(x['材料id'], x['材料数量'] / 4))) \
             .reset_index(name='Material_not_Consumed')
 
-        self.data_consumed = data_consumed
-        self.data_produced = data_consumed / 2
+        self.data_consumed = data_consumed0
+        self.data_produced = data_produced
 
     def step(self):
         # 1. Remove edge to customer and disrupt customer up product