From ee6dc92b40ee4a0b6efdc5d1be4e37e8c52d36dc Mon Sep 17 00:00:00 2001
From: s_ranjbar <saeed.ranjbar@mail.concordia.ca>
Date: Mon, 24 Jun 2024 19:21:28 -0400
Subject: [PATCH] fix: new archetype to model a system with central heating and
 decenral cooling and dhw created

---
 .../montreal_future_systems.xml               | 31 +++++++++++++++++++
 scripts/random_assignation.py                 |  1 +
 tests/test_systems_catalog.py                 |  6 ++--
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/hub/data/energy_systems/montreal_future_systems.xml b/hub/data/energy_systems/montreal_future_systems.xml
index 455235ae..f9d43be4 100644
--- a/hub/data/energy_systems/montreal_future_systems.xml
+++ b/hub/data/energy_systems/montreal_future_systems.xml
@@ -1438,6 +1438,29 @@
 			<generation_id>27</generation_id>
 		</components>
 	</system>
+    <system>
+		<id>11</id>
+		<name>Central Heating System َASHP Gas-Boiler TES</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>heating</demand>
+		</demands>
+		<components>
+			<generation_id>23</generation_id>
+			<generation_id>16</generation_id>
+		</components>
+	</system>
+    <system>
+		<id>12</id>
+		<name>Unitary ASHP Cooling System</name>
+		<schema>schemas/ASHP+TES+GasBoiler.jpg</schema>
+		<demands>
+			<demand>cooling</demand>
+		</demands>
+		<components>
+			<generation_id>23</generation_id>
+		</components>
+	</system>
   </systems>
 
   <system_archetypes>
@@ -1528,6 +1551,14 @@
             <system_id>10</system_id>
 		</systems>
 	</system_archetype>
+	<system_archetype id="14">
+		<name>Central Heating+Unitary Cooling+Unitary DHW</name>
+		<systems>
+			<system_id>10</system_id>
+			<system_id>11</system_id>
+            <system_id>12</system_id>
+		</systems>
+	</system_archetype>
   </system_archetypes>
 </EnergySystemCatalog>
 
diff --git a/scripts/random_assignation.py b/scripts/random_assignation.py
index f82ab89f..44be581c 100644
--- a/scripts/random_assignation.py
+++ b/scripts/random_assignation.py
@@ -30,6 +30,7 @@ residential_systems_percentage = {'system 1 gas': 100,
 
 residential_new_systems_percentage = {'PV+ASHP+GasBoiler+TES': 0,
                                       'PV+4Pipe+DHW': 100,
+                                      'Central Heating+Unitary Cooling+Unitary DHW': 0,
                                       'PV+ASHP+ElectricBoiler+TES': 0,
                                       'PV+GSHP+GasBoiler+TES': 0,
                                       'PV+GSHP+ElectricBoiler+TES': 0,
diff --git a/tests/test_systems_catalog.py b/tests/test_systems_catalog.py
index 839107c2..234f54d6 100644
--- a/tests/test_systems_catalog.py
+++ b/tests/test_systems_catalog.py
@@ -38,10 +38,10 @@ class TestSystemsCatalog(TestCase):
     catalog = EnergySystemsCatalogFactory('montreal_future').catalog
 
     catalog_categories = catalog.names()
-    archetypes = catalog.names('archetypes')
-    self.assertEqual(13, len(archetypes['archetypes']))
+    archetypes = catalog.names()
+    self.assertEqual(14, len(archetypes['archetypes']))
     systems = catalog.names('systems')
-    self.assertEqual(10, len(systems['systems']))
+    self.assertEqual(12, len(systems['systems']))
     generation_equipments = catalog.names('generation_equipments')
     self.assertEqual(27, len(generation_equipments['generation_equipments']))
     with self.assertRaises(ValueError):