small bug solved
This commit is contained in:
parent
ff6ed6a311
commit
6ee71cbc14
|
@ -40,6 +40,8 @@ class Co2Emission:
|
||||||
for energy_system in self._building.energy_systems:
|
for energy_system in self._building.energy_systems:
|
||||||
fuel_type = energy_system.generation_system.generic_generation_system.fuel_type
|
fuel_type = energy_system.generation_system.generic_generation_system.fuel_type
|
||||||
for demand_type in energy_system.demand_types:
|
for demand_type in energy_system.demand_types:
|
||||||
|
if demand_type == cte.ELECTRICITY:
|
||||||
|
continue
|
||||||
results_by_time_period = {}
|
results_by_time_period = {}
|
||||||
if demand_type == cte.HEATING:
|
if demand_type == cte.HEATING:
|
||||||
for time_period in self._building.heating_consumption:
|
for time_period in self._building.heating_consumption:
|
||||||
|
@ -64,7 +66,7 @@ class Co2Emission:
|
||||||
results_by_time_period = {}
|
results_by_time_period = {}
|
||||||
for time_period in self._building.lighting_electrical_demand:
|
for time_period in self._building.lighting_electrical_demand:
|
||||||
values = []
|
values = []
|
||||||
for value in self._building.lighting_electrical_demand[time_period]:
|
for value in self._building.lighting_electrical_demand[time_period]['insel meb']:
|
||||||
values.append(value * self._emissions_factor[cte.ELECTRICITY])
|
values.append(value * self._emissions_factor[cte.ELECTRICITY])
|
||||||
results_by_time_period[time_period] = values
|
results_by_time_period[time_period] = values
|
||||||
results[cte.LIGHTING] = results_by_time_period
|
results[cte.LIGHTING] = results_by_time_period
|
||||||
|
@ -72,7 +74,7 @@ class Co2Emission:
|
||||||
results_by_time_period = {}
|
results_by_time_period = {}
|
||||||
for time_period in self._building.appliances_electrical_demand:
|
for time_period in self._building.appliances_electrical_demand:
|
||||||
values = []
|
values = []
|
||||||
for value in self._building.appliances_electrical_demand[time_period]:
|
for value in self._building.appliances_electrical_demand[time_period]['insel meb']:
|
||||||
values.append(value * self._emissions_factor[cte.ELECTRICITY])
|
values.append(value * self._emissions_factor[cte.ELECTRICITY])
|
||||||
results_by_time_period[time_period] = values
|
results_by_time_period[time_period] = values
|
||||||
results[cte.APPLIANCES] = results_by_time_period
|
results[cte.APPLIANCES] = results_by_time_period
|
||||||
|
|
Loading…
Reference in New Issue
Block a user