Further optimize _match_and_rank_thermostats()

Author: bouwew

plugwise/helper.py

@@ -776,8 +776,8 @@ def _scan_thermostats(self) -> None:
         Update locations with thermostat ranking results and use
         the result to update the device_class of secondary thermostats.
         """
-        self._thermo_locs = self._match_and_rank_thermostats()
-        for loc_id, loc_data in self._thermo_locs.items():
+        self._match_and_rank_thermostats()
+        for loc_id, loc_data in self._loc_data.items():
             if loc_data["primary_prio"] != 0:
                 self._zones[loc_id] = {
                     "dev_class": "climate",
@@ -796,65 +796,49 @@ def _match_and_rank_thermostats(self) -> dict[str, ThermoLoc]:
 
         Match thermostat-appliances with locations, rank them for locations with multiple thermostats.
         """
-        matched_locations: dict[str, ThermoLoc] = {}
         thermo_matching: dict[str, int] = {
             "thermostat": 2,
             "zone_thermometer": 2,
             "zone_thermostat": 2,
             "thermostatic_radiator_valve": 1,
         }
-        LOGGER.debug("HOI _loc_data: %s", self._loc_data)
-        for location_id, location_details in self._loc_data.items():
-            for entity in self.gw_entities.values():
-                if entity["location"] == location_id:
-                    location_details.update(
-                        {"primary": [], "primary_prio": 0, "secondary": []}
-                    )
-                    matched_locations[location_id] = location_details
-
-        LOGGER.debug("HOI matched_locations before: %s", matched_locations)
-        for loc_id in matched_locations:
+        for location_id, location in self._loc_data.items():
+            location.update(
+                {"primary": [], "primary_prio": 0, "secondary": []}
+            )
             for entity_id, entity in self.gw_entities.items():
                 self._rank_thermostat(
-                    entity_id, entity, loc_id, matched_locations, thermo_matching
+                    entity_id, entity, location_id, location, thermo_matching
                 )
 
-        LOGGER.debug("HOI matched_locations after: %s", matched_locations)
-        return matched_locations
-
     def _rank_thermostat(
         self,
         entity_id: str,
         entity: GwEntityData,
-        loc_id: str,
-        matched_locations: dict[str, ThermoLoc],
+        location_id: str,
+        location: dict[str, ThermoLoc],
         thermo_matching: dict[str, int],
     ) -> None:
         """Helper-function for _scan_thermostats().
 
         Rank the thermostat based on entity-thermostat-type: primary or secondary.
-        There can be one primary and several secondary thermostats per location.
+        There can be several primary and secondary thermostats per location.
         """
         appl_class = entity["dev_class"]
-        appl_d_loc = entity["location"]
-        thermo_loc = matched_locations[loc_id]
-        if loc_id == appl_d_loc and appl_class in thermo_matching:
-            if thermo_matching[appl_class] == thermo_loc["primary_prio"]:
-                thermo_loc["primary"].append(entity_id)
+        if location_id == entity["location"] and appl_class in thermo_matching:
             # Pre-elect new primary
-            elif (thermo_rank := thermo_matching[appl_class]) > thermo_loc[
-                "primary_prio"
-            ]:
-                thermo_loc["primary_prio"] = thermo_rank
+            if thermo_matching[appl_class] == location["primary_prio"]:
+                location["primary"].append(entity_id)
+            elif (thermo_rank := thermo_matching[appl_class]) > location["primary_prio"]:
+                location["primary_prio"] = thermo_rank
                 # Demote former primary
-                if tl_primary := thermo_loc["primary"]:
-                    thermo_loc["secondary"] += tl_primary
-                    thermo_loc["primary"] = []
-
+                if tl_primary := location["primary"]:
+                    location["secondary"] += tl_primary
+                    location["primary"] = []
                 # Crown primary
-                thermo_loc["primary"].append(entity_id)
+                location["primary"].append(entity_id)
             else:
-                thermo_loc["secondary"].append(entity_id)
+                location["secondary"].append(entity_id)
 
     def _control_state(self, data: GwEntityData) -> str | bool:
         """Helper-function for _get_location_data().