co2_emission/co2_emission.py

@@ -40,27 +40,25 @@ class Co2Emission:
     """
     results = {}
     for energy_system in self._building.energy_systems:
-      for generation_system in energy_system.generation_systems:
-        fuel_type = generation_system.fuel_type
-        emissions_factor = self._emissions_factor[fuel_type]
-        for demand_type in energy_system.demand_types:
-          if demand_type == cte.ELECTRICITY:
-            continue
-          results_by_time_period = {}
-          if demand_type == cte.HEATING:
-            for time_period in self._building.heating_consumption:
-              values = [v * emissions_factor for v in self._building.heating_consumption[time_period]]
-              results_by_time_period[time_period] = values
-          if demand_type == cte.COOLING:
-            for time_period in self._building.cooling_consumption:
-              values = [v * emissions_factor for v in self._building.cooling_consumption[time_period]]
-              results_by_time_period[time_period] = values
-          if demand_type == cte.DOMESTIC_HOT_WATER:
-            for time_period in self._building.domestic_hot_water_consumption:
-              values = [v * emissions_factor for v in self._building.domestic_hot_water_consumption[time_period]]
-              results_by_time_period[time_period] = values
-          results[demand_type] = results_by_time_period
-
+      fuel_type = energy_system.generation_system.generic_generation_system.fuel_type
+      emissions_factor = self._emissions_factor[fuel_type]
+      for demand_type in energy_system.demand_types:
+        if demand_type == cte.ELECTRICITY:
+          continue
+        results_by_time_period = {}
+        if demand_type == cte.HEATING:
+          for time_period in self._building.heating_consumption:
+            values = [v * emissions_factor for v in self._building.heating_consumption[time_period]]
+            results_by_time_period[time_period] = values
+        if demand_type == cte.COOLING:
+          for time_period in self._building.cooling_consumption:
+            values = [v * emissions_factor for v in self._building.cooling_consumption[time_period]]
+            results_by_time_period[time_period] = values
+        if demand_type == cte.DOMESTIC_HOT_WATER:
+          for time_period in self._building.domestic_hot_water_consumption:
+            values = [v * emissions_factor for v in self._building.domestic_hot_water_consumption[time_period]]
+            results_by_time_period[time_period] = values
+        results[demand_type] = results_by_time_period
     emission_factor = self._emissions_factor[cte.ELECTRICITY]
     results_by_time_period = {}
     for time_period in self._building.lighting_electrical_demand:

co2_emission/version.py

@@ -5,4 +5,4 @@ Copyright © 2023 Project Coder Guille Gutierrez guillermo.gutierrezmorote@conco
 Code contributor Pilar Monsalvete Alvarez de Uribarri pilar.monsalvete@concordia.ca
 Code contributor Oriol Gavalda Torrellas oriol.gavalda@concordia.ca
 """
-__version__ = '0.1.0.5'
+__version__ = '0.1.0.4'