Bugfix: Meters record all energy types for each component instead of only one (#90) (#91)

* Bugfix meters

Energy types now considered in the file creation already

* String fix

keys to key again

* Quickfix

Author: TUM-Doepfert

hamlet/creator/agents/agents.py

@@ -483,10 +483,13 @@ def _create_plants_for_agent(self, account: dict, agent_type: str) -> Tuple:
                 plants_ids += [plant_id]
 
                 # Add meter data
-                meters[plant_id] = self.__init_vals(df=meters)  # TODO: Ponder if rows need to be added here
+                energy_types = c.COMP_MAP[plant].keys()
+                for key in energy_types:
+                    col_id = f'{plant_id}_{plant}_{key}'
+                    meters[col_id] = self.__init_vals(df=meters)
 
                 # Add setpoints
-                setpoints[plant_id] = self.__init_vals(df=setpoints)  # TODO: Ponder if rows need to be added here
+                setpoints[plant_id] = self.__init_vals(df=setpoints)
 
                 # Add and process additional plant information
                 plant_dict.update(info)

hamlet/executor/utilities/controller/rtc/rtc.py

@@ -476,12 +476,13 @@ def update_meters(self, solution: dict) -> pl.DataFrame:
             row_now = self.meters.filter(self.meters[c.TC_TIMESTAMP] == self.timestamp)
             row_new = self.meters.filter(self.meters[c.TC_TIMESTAMP] == self.timestamp + self.dt)
 
+            # Create strings for energy types
+            energy_endings = tuple(f'_{et}' for et in self.energy_types)
+
             # Update meters
             for col in self.meters.columns[1:]:
                 # Extract power from variable values
-                key = next((key for key in solution
-                            if key.startswith(col) and (key.endswith('_power') or key.endswith('_heat'))),
-                           None)
+                key = next((key for key in solution if key.startswith(col) and key.endswith(energy_endings)), None)
 
                 if key:  # Check for matching key
                     # Calculate energy from power