v0.0.5 code

EnergySystem.py

@@ -35,6 +35,8 @@ class EnergySystem:
     # 如果ESS也不足以满足需求，再从电网获取 - 当ESS中的存储电量也不足以补充时，再从电网购买剩余所需电量。
     def simulate(self, data, time_interval):
         total_benefit = 0
+        total_netto_benefit = 0
+        total_gen = 0
         for index, row in data.iterrows():
             time = row['time']
             sunlight_intensity = row['sunlight']
@@ -109,9 +111,11 @@ class EnergySystem:
             # 工厂需求量-总能量
             # unmet_demand = max(0, factory_demand * time_interval - total_energy)
             # benefit = (total_energy - unmet_demand) * electricity_price
+            total_gen += saved_energy
             benefit = (saved_energy) * electricity_price
             cost = net_grid * electricity_price
             # print(f"time:{time} benefit: {benefit}, cost: {cost}")
+            total_netto_benefit += benefit
             total_benefit += benefit - cost
             # # spring
             week_start = self.season_start
@@ -137,4 +141,4 @@ class EnergySystem:
             #     self.winter_week_gen.append(generated_pv_power)
             #     self.winter_week_soc.append(self.ess.storage / self.ess.capacity)
 
-        return total_benefit
+        return (total_benefit, total_netto_benefit, total_gen)