Merge remote-tracking branch 'origin/retrofit_project' into retrofit_project

hub/city_model_structure/building.py

@@ -302,7 +302,7 @@ class Building(CityObject):
     Set heating demand in Wh
     :param value: dict{DataFrame(float)}
     """
-    self._heating = value
+    self._heating_demand = value
 
   @property
   def cooling_demand(self) -> dict:
@@ -318,7 +318,7 @@ class Building(CityObject):
     Set cooling demand in Wh
     :param value: dict{DataFrame(float)}
     """
-    self._cooling = value
+    self._cooling_demand = value
 
   @property
   def lighting_electrical_demand(self) -> dict:

hub/city_model_structure/city.py

@@ -472,11 +472,16 @@ class City:
         for surface in building.surfaces:
           if surface.global_irradiance:
             parameter_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
+
         merged_city_building_total_radiation = 0
         for surface in merged_city.city_object(building.name).surfaces:
           if surface.global_irradiance:
             merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
-        if merged_city_building_total_radiation < parameter_city_building_total_radiation:
+
+        if merged_city_building_total_radiation == 0:
+          merged_city.remove_city_object(merged_city.city_object(building.name))
+          merged_city.add_city_object(building)
+        elif merged_city_building_total_radiation > parameter_city_building_total_radiation > 0:
           merged_city.remove_city_object(merged_city.city_object(building.name))
           merged_city.add_city_object(building)
 

tests/test_city_merge.py

@@ -10,6 +10,8 @@ import subprocess
 from pathlib import Path
 from unittest import TestCase
 
+import pandas as pd
+
 from hub.city_model_structure.city import City
 from hub.imports.geometry_factory import GeometryFactory
 from hub.imports.results_factory import ResultFactory
@@ -65,23 +67,36 @@ class TestCityMerge(TestCase):
     ResultFactory('sra', full_city, output_path).enrich()
     self.assertEqual(17, len(full_city.buildings), 'Wrong number of buildings')
     merged_city = full_city.merge(par_city)
-    buildings_with_radiation = 0
+    merged_city_building_total_radiation = 0
     for building in merged_city.buildings:
-      radiation = True
       for surface in building.surfaces:
-        if not surface.global_irradiance:
-          radiation = False
-      if radiation:
-        buildings_with_radiation += 1
-    self.assertEqual(17, buildings_with_radiation, 'Some buildings have radiation')
+        if surface.global_irradiance:
+          merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
+    self.assertEqual(447383461, merged_city_building_total_radiation)
     merged_city = par_city.merge(full_city)
-    buildings_with_radiation = 0
+    merged_city_building_total_radiation = 0
     for building in merged_city.buildings:
-      radiation = True
       for surface in building.surfaces:
-        if not surface.global_irradiance:
-          radiation = False
-      if radiation:
-        buildings_with_radiation += 1
-    self.assertEqual(17, buildings_with_radiation, 'Some buildings have radiation')
+        if surface.global_irradiance:
+          merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
+    self.assertEqual(447383461, merged_city_building_total_radiation)
+
+    for building in par_city.buildings:
+      for surface in building.surfaces:
+        surface.global_irradiance[cte.YEAR] = pd.DataFrame([3], columns=['sra_mockup_value'])
+
+    merged_city = full_city.merge(par_city)
+    merged_city_building_total_radiation = 0
+    for building in merged_city.buildings:
+      for surface in building.surfaces:
+        if surface.global_irradiance:
+          merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
+    self.assertEqual(202699159, merged_city_building_total_radiation)
+    merged_city = par_city.merge(full_city)
+    merged_city_building_total_radiation = 0
+    for building in merged_city.buildings:
+      for surface in building.surfaces:
+        if surface.global_irradiance:
+          merged_city_building_total_radiation += surface.global_irradiance[cte.YEAR].iloc[0, 0]
+    self.assertEqual(202699159, merged_city_building_total_radiation)
 

tests/test_construction_factory.py

@@ -104,7 +104,6 @@ class TestConstructionFactory(TestCase):
       self.assertIsNone(building.households, 'building households is not none')
       self.assertFalse(building.is_conditioned, 'building is conditioned')
       self.assertIsNotNone(building.shell, 'building shell is none')
-      self.assertIsNone(building.aliases, 'building alias is not none')
 
   def _check_thermal_zones(self, internal_zone):
     for thermal_zone in internal_zone.thermal_zones:

tests/test_db_factory.py

@@ -80,7 +80,7 @@ class Control:
     ConstructionFactory('nrcan', self._city).enrich()
     UsageFactory('nrcan', self._city).enrich()
     WeatherFactory('epw', self._city).enrich()
-    ExportsFactory('sra', self._city, output_path, weather_file=weather_file, weather_format='epw').export()
+    ExportsFactory('sra', self._city, output_path).export()
     sra_file = str((output_path / f'{self._city.name}_sra.xml').resolve())
     subprocess.run([self.sra, sra_file], stdout=subprocess.DEVNULL)
     ResultFactory('sra', self._city, output_path).enrich()

tests/test_results_import.py

@@ -49,7 +49,7 @@ class TestResultsImport(TestCase):
         self.assertIsNotNone(surface.global_irradiance)
 
   def test_meb_import(self):
-    ExportsFactory('sra', self._city, self._output_path, weather_file='CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw', weather_format='epw').export()
+    ExportsFactory('sra', self._city, self._output_path).export()
     sra_path = (self._output_path / f'{self._city.name}_sra.xml').resolve()
     subprocess.run(['sra', str(sra_path)])
     ResultFactory('sra', self._city, self._output_path).enrich()
@@ -67,7 +67,7 @@ class TestResultsImport(TestCase):
 
   def test_peak_loads(self):
     # todo: this is not technically a import
-    ExportsFactory('sra', self._city, self._output_path, weather_file='CAN_PQ_Montreal.Intl.AP.716270_CWEC.epw', weather_format='epw').export()
+    ExportsFactory('sra', self._city, self._output_path).export()
     sra_path = (self._output_path / f'{self._city.name}_sra.xml').resolve()
     subprocess.run(['sra', str(sra_path)])
     ResultFactory('sra', self._city, self._output_path).enrich()

tests/test_systems_catalog.py

@@ -15,11 +15,11 @@ class TestSystemsCatalog(TestCase):
     catalog = EnergySystemsCatalogFactory('montreal_custom').catalog
     catalog_categories = catalog.names()
     archetypes = catalog.names('archetypes')
-    self.assertEqual(18, len(archetypes['archetypes']))
+    self.assertEqual(19, len(archetypes['archetypes']))
     systems = catalog.names('systems')
-    self.assertEqual(16, len(systems['systems']))
+    self.assertEqual(18, len(systems['systems']))
     generation_equipments = catalog.names('generation_equipments')
-    self.assertEqual(6, len(generation_equipments['generation_equipments']))
+    self.assertEqual(7, len(generation_equipments['generation_equipments']))
     distribution_equipments = catalog.names('distribution_equipments')
     self.assertEqual(8, len(distribution_equipments['distribution_equipments']))
     emission_equipments = catalog.names('emission_equipments')