update variable name
This commit is contained in:
		| @@ -24,7 +24,7 @@ class EnergySystem: | |||||||
|             if generated_pv_energy >= factory_demand * time_interval: |             if generated_pv_energy >= factory_demand * time_interval: | ||||||
|                 surplus_energy = generated_pv_energy - factory_demand * time_interval |                 surplus_energy = generated_pv_energy - factory_demand * time_interval | ||||||
|                 charge_to_ess = min(surplus_energy, self.ess.charge_power * time_interval, self.ess.capacity - self.ess.storage) |                 charge_to_ess = min(surplus_energy, self.ess.charge_power * time_interval, self.ess.capacity - self.ess.storage) | ||||||
|                 self.ess_storage += charge_to_ess |                 self.ess.storage += charge_to_ess | ||||||
|                 surplus_after_ess = surplus_energy - charge_to_ess |                 surplus_after_ess = surplus_energy - charge_to_ess | ||||||
|                 if surplus_after_ess > 0 and generated_pv_power > self.ess.charge_power + factory_demand: |                 if surplus_after_ess > 0 and generated_pv_power > self.ess.charge_power + factory_demand: | ||||||
|                     sold_to_grid = surplus_after_ess |                     sold_to_grid = surplus_after_ess | ||||||
| @@ -41,9 +41,9 @@ class EnergySystem: | |||||||
|                     total_energy = generated_pv_energy + self.ess.storage |                     total_energy = generated_pv_energy + self.ess.storage | ||||||
|                     self.ess.storage = 0 |                     self.ess.storage = 0 | ||||||
|                     needed_from_grid = factory_demand * time_interval - total_energy |                     needed_from_grid = factory_demand * time_interval - total_energy | ||||||
|                     net_grid = min(self.grid.capacity * time_interval, needed_from_grid) * (1 - self.grid_loss) |                     net_grid = min(self.grid.capacity * time_interval, needed_from_grid) * (1 - self.grid.loss) | ||||||
|                     total_energy += net_grid |                     total_energy += net_grid | ||||||
|  |             print(total_energy) | ||||||
|             unmet_demand = max(0, factory_demand * time_interval - total_energy) |             unmet_demand = max(0, factory_demand * time_interval - total_energy) | ||||||
|             benefit = (total_energy - unmet_demand) * electricity_price |             benefit = (total_energy - unmet_demand) * electricity_price | ||||||
|             total_benefit += benefit |             total_benefit += benefit | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ class ess_config: | |||||||
| class grid_config: | class grid_config: | ||||||
|     def __init__(self, capacity, price_schedule, grid_loss, sell_price): |     def __init__(self, capacity, price_schedule, grid_loss, sell_price): | ||||||
|         self.price_schedule = price_schedule |         self.price_schedule = price_schedule | ||||||
|         self.grid_loss = grid_loss |         self.loss = grid_loss | ||||||
|         self.sell_price = sell_price |         self.sell_price = sell_price | ||||||
|         self.capacity = capacity |         self.capacity = capacity | ||||||
|      |      | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user