GSYE-660: Fix home count

gridsingularity · Nov 23, 2023 · 6733037 · 6733037
1 parent 2ba193e
commit 6733037
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/gsy_framework/utils.py b/gsy_framework/utils.py
@@ -507,7 +507,8 @@ class HomeRepresentationUtils:
 
     @staticmethod
     def _is_home(representation):
-        home_devices = ["PV", "Storage", "Load", "MarketMaker"]
+        home_devices = ["PV", "Storage", "Load", "MarketMaker", "HeatPump", "WindTurbine",
+                        "SmartMeter"]
         return all("type" in c and c["type"] in home_devices
                    for c in representation["children"])
 

diff --git a/tests/test_assets_info.py b/tests/test_assets_info.py
@@ -83,6 +83,24 @@ def test_update_from_repr(self):
                         "type": "Storage",
                         "battery_capacity_kWh": 20
                     },
+                    {
+                        "type": "Area",
+                        "children":
+                            [
+                                {
+                                    "type": "HeatPump"
+                                },
+                            ]
+                    },
+                    {
+                        "type": "Area",
+                        "children":
+                            [
+                                {
+                                    "type": "SmartMeter"
+                                },
+                            ]
+                    },
                     {
                         "type": "Area",
                         "children":
@@ -121,8 +139,8 @@ def test_update_from_repr(self):
             "total_energy_capacity_kwh": 45,
             "number_of_power_plant_type": 2,
             "max_power_plant_power_kw": 45,
-            "number_of_house_type": 2,
-            "avg_assets_per_house": 3
+            "number_of_house_type": 4,
+            "avg_assets_per_house": 2
         }
         actual_res = {key: self.assets_info.raw_results[key] for key in expected_res}
         assert expected_res == actual_res