epyt-flow 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

epyt_flow/simulation/sensor_config.py

@@ -11,17 +11,19 @@ from epyt.epanet import ToolkitConstants
 from ..serialization import SENSOR_CONFIG_ID, JsonSerializable, serializable
 
 
-SENSOR_TYPE_NODE_PRESSURE     = 1
-SENSOR_TYPE_NODE_QUALITY      = 2
-SENSOR_TYPE_NODE_DEMAND       = 3
-SENSOR_TYPE_LINK_FLOW         = 4
-SENSOR_TYPE_LINK_QUALITY      = 5
-SENSOR_TYPE_VALVE_STATE       = 6
-SENSOR_TYPE_PUMP_STATE        = 7
-SENSOR_TYPE_TANK_VOLUME       = 8
-SENSOR_TYPE_NODE_BULK_SPECIES = 9
-SENSOR_TYPE_LINK_BULK_SPECIES = 10
-SENSOR_TYPE_SURFACE_SPECIES   = 11
+SENSOR_TYPE_NODE_PRESSURE          = 1
+SENSOR_TYPE_NODE_QUALITY           = 2
+SENSOR_TYPE_NODE_DEMAND            = 3
+SENSOR_TYPE_LINK_FLOW              = 4
+SENSOR_TYPE_LINK_QUALITY           = 5
+SENSOR_TYPE_VALVE_STATE            = 6
+SENSOR_TYPE_PUMP_STATE             = 7
+SENSOR_TYPE_TANK_VOLUME            = 8
+SENSOR_TYPE_NODE_BULK_SPECIES      = 9
+SENSOR_TYPE_LINK_BULK_SPECIES      = 10
+SENSOR_TYPE_SURFACE_SPECIES        = 11
+SENSOR_TYPE_PUMP_EFFICIENCY        = 12
+SENSOR_TYPE_PUMP_ENERGYCONSUMPTION = 13
 
 AREA_UNIT_FT2 = 1
 AREA_UNIT_M2 = 2
@@ -462,6 +464,8 @@ class SensorConfig(JsonSerializable):
                  quality_link_sensors: list[str] = [],
                  valve_state_sensors: list[str] = [],
                  pump_state_sensors: list[str] = [],
+                 pump_efficiency_sensors: list[str] = [],
+                 pump_energyconsumption_sensors: list[str] = [],
                  tank_volume_sensors: list[str] = [],
                  bulk_species_node_sensors: dict = {},
                  bulk_species_link_sensors: dict = {},
@@ -572,6 +576,20 @@ class SensorConfig(JsonSerializable):
             raise ValueError("Each item in 'pump_state_sensors' must be in 'pumps' -- cannot " +
                              "place a sensor at a non-existing pump.")
 
+        if not isinstance(pump_efficiency_sensors, list):
+            raise TypeError("'pump_efficiency_sensors' must be an instance of 'list[str]' " +
+                            f"but not of '{type(pump_efficiency_sensors)}'")
+        if any(link not in pumps for link in pump_efficiency_sensors):
+            raise ValueError("Each item in 'pump_efficiency_sensors' must be in 'pumps' -- cannot " +
+                             "place a sensor at a non-existing pump.")
+
+        if not isinstance(pump_energyconsumption_sensors, list):
+            raise TypeError("'pump_energyconsumption_sensors' must be an instance of 'list[str]' " +
+                            f"but not of '{type(pump_energyconsumption_sensors)}'")
+        if any(link not in pumps for link in pump_energyconsumption_sensors):
+            raise ValueError("Each item in 'pump_energyconsumption_sensors' must be in 'pumps' -- cannot " +
+                             "place a sensor at a non-existing pump.")
+
         if not isinstance(tank_volume_sensors, list):
             raise TypeError("'tank_volume_sensors' must be an instance of 'list[str]' " +
                             f"but not of '{type(tank_volume_sensors)}'")
@@ -714,6 +732,8 @@ class SensorConfig(JsonSerializable):
         self.__quality_link_sensors = quality_link_sensors
         self.__valve_state_sensors = valve_state_sensors
         self.__pump_state_sensors = pump_state_sensors
+        self.__pump_energyconsumption_sensors = pump_energyconsumption_sensors
+        self.__pump_efficiency_sensors = pump_efficiency_sensors
         self.__tank_volume_sensors = tank_volume_sensors
         self.__bulk_species_node_sensors = bulk_species_node_sensors
         self.__bulk_species_link_sensors = bulk_species_link_sensors
@@ -771,6 +791,51 @@ class SensorConfig(JsonSerializable):
                             bulkspecies_id_to_idx=sensor_config.bulkspecies_id_to_idx,
                             surfacespecies_id_to_idx=sensor_config.surfacespecies_id_to_idx)
 
+    def is_empty(self) -> bool:
+        """
+        Checks if the sensor configuration is empty -- i.e. no sensors are placed.
+
+        Returns
+        -------
+        `bool`
+            True if no sensors are placed, False otherwise.
+        """
+        if self.__pressure_sensors == [] and self.__flow_sensors == [] \
+                and self.__demand_sensors == [] and self.__quality_node_sensors == [] \
+                and self.__quality_link_sensors == [] and self.__valve_state_sensors == [] \
+                and self.__pump_state_sensors == [] \
+                and self.__pump_energyconsumption_sensors == [] \
+                and self.__pump_efficiency_sensors == [] and self.__tank_volume_sensors == [] \
+                and self.__bulk_species_node_sensors == [] \
+                and self.__bulk_species_link_sensors == [] \
+                and self.__surface_species_sensors == []:
+            return True
+        else:
+            return False
+
+    def place_sensors_everywhere(self) -> None:
+        """
+        Places sensors everywhere -- i.e. every possible quantity is monitored
+        at every position in the network.
+        """
+        self.__pressure_sensors = self.__nodes[:]
+        self.__demand_sensors = self.__nodes[:]
+        self.__flow_sensors = self.__links[:]
+        self.__quality_node_sensors = self.__nodes[:]
+        self.__quality_link_sensors = self.__links[:]
+        self.__pump_state_sensors = self.__pumps[:]
+        self.__pump_energyconsumption_sensors = self.__pumps[:]
+        self.__pump_efficiency_sensors = self.__pumps[:]
+        self.__tank_volume_sensors = self.__tanks[:]
+        self.__bulk_species_node_sensors = {species_id: self.__nodes[:]
+                                            for species_id in self.__bulk_species}
+        self.__bulk_species_link_sensors = {species_id: self.__links[:]
+                                            for species_id in self.__bulk_species}
+        self.__surface_species_sensors = {species_id: self.__links[:]
+                                          for species_id in self.__surface_species}
+
+        self.__compute_indices()
+
     @property
     def node_id_to_idx(self) -> dict:
         """
@@ -1032,6 +1097,12 @@ class SensorConfig(JsonSerializable):
                                            for v in self.__valve_state_sensors], dtype=np.int32)
         self.__pump_state_idx = np.array([self.map_pump_id_to_idx(p)
                                           for p in self.__pump_state_sensors], dtype=np.int32)
+        self.__pump_efficiency_idx = np.array([self.map_pump_id_to_idx(p)
+                                               for p in self.__pump_efficiency_sensors],
+                                               dtype=np.int32)
+        self.__pump_energyconsumption_idx = np.array([self.map_pump_id_to_idx(p)
+                                                      for p in self.__pump_energyconsumption_sensors],
+                                                      dtype=np.int32)
         self.__tank_volume_idx = np.array([self.map_tank_id_to_idx(t)
                                            for t in self.__tank_volume_sensors], dtype=np.int32)
         self.__bulk_species_node_idx = np.array([(self.map_bulkspecies_id_to_idx(s),
@@ -1057,6 +1128,8 @@ class SensorConfig(JsonSerializable):
         n_link_quality_sensors = len(self.__quality_link_sensors)
         n_valve_state_sensors = len(self.__valve_state_sensors)
         n_pump_state_sensors = len(self.__pump_state_sensors)
+        n_pump_efficiency_sensors = len(self.__pump_efficiency_sensors)
+        n_pump_energyconsumption_sensors = len(self.__pump_energyconsumption_sensors)
         n_tank_volume_sensors = len(self.__tank_volume_sensors)
         n_bulk_species_node_sensors = len(list(itertools.chain(
             *self.__bulk_species_node_sensors.values())))
@@ -1070,7 +1143,9 @@ class SensorConfig(JsonSerializable):
         link_quality_idx_shift = node_quality_idx_shift + n_node_quality_sensors
         valve_state_idx_shift = link_quality_idx_shift + n_link_quality_sensors
         pump_state_idx_shift = valve_state_idx_shift + n_valve_state_sensors
-        tank_volume_idx_shift = pump_state_idx_shift + n_pump_state_sensors
+        pump_efficiency_idx_shift = pump_state_idx_shift + n_pump_state_sensors
+        pump_energyconsumption_idx_shift = pump_efficiency_idx_shift + n_pump_efficiency_sensors
+        tank_volume_idx_shift = pump_energyconsumption_idx_shift + n_pump_energyconsumption_sensors
         bulk_species_node_idx_shift = tank_volume_idx_shift + n_tank_volume_sensors
         bulk_species_link_idx_shift = bulk_species_node_idx_shift + n_bulk_species_node_sensors
         surface_species_idx_shift = bulk_species_link_idx_shift + n_bulk_species_link_sensors
@@ -1103,6 +1178,11 @@ class SensorConfig(JsonSerializable):
                                                             valve_state_idx_shift),
                    "pump_state": __build_sensors_id_to_idx(self.__pump_state_sensors,
                                                            pump_state_idx_shift),
+                   "pump_efficiency": __build_sensors_id_to_idx(self.__pump_efficiency_sensors,
+                                                                pump_efficiency_idx_shift),
+                   "pump_energyconsumption":
+                   __build_sensors_id_to_idx(self.__pump_energyconsumption_sensors,
+                                             pump_energyconsumption_idx_shift),
                    "tank_volume": __build_sensors_id_to_idx(self.__tank_volume_sensors,
                                                             tank_volume_idx_shift),
                    "bulk_species_node":
@@ -1526,6 +1606,58 @@ class SensorConfig(JsonSerializable):
 
         self.__compute_indices()
 
+    @property
+    def pump_energyconsumption_sensors(self) -> list[str]:
+        """
+        Gets all pump energy consumption sensors
+        (i.e. IDs of pumps at which the energy consumption is monitored).
+
+        Returns
+        -------
+        `list[str]`
+            All pump IDs with an energy consumption sensor.
+        """
+        return self.__pump_energyconsumption_sensors.copy()
+
+    @pump_energyconsumption_sensors.setter
+    def pump_energyconsumption_sensors(self, pump_energyconsumption_sensors: list[str]) -> None:
+        if not isinstance(pump_energyconsumption_sensors, list):
+            raise TypeError("'pump_energyconsumption_sensors' must be an instance of 'list[str]' " +
+                            f"but not of '{type(pump_energyconsumption_sensors)}'")
+        if any(link not in self.__pumps for link in pump_energyconsumption_sensors):
+            raise ValueError("Each item in 'pump_energyconsumption_sensors' must be in 'pumps' " +
+                             "-- cannot place a sensor at a non-existing pump.")
+
+        self.__pump_energyconsumption_sensors = pump_energyconsumption_sensors
+
+        self.__compute_indices()
+
+    @property
+    def pump_efficiency_sensors(self) -> list[str]:
+        """
+        Gets all pump efficiency sensors
+        (i.e. IDs of pumps at which the efficiency is monitored).
+
+        Returns
+        -------
+        `list[str]`
+            All pump IDs with an efficiency sensor.
+        """
+        return self.__pump_efficiency_sensors.copy()
+
+    @pump_efficiency_sensors.setter
+    def pump_efficiency_sensors(self, pump_efficiency_sensors: list[str]) -> None:
+        if not isinstance(pump_efficiency_sensors, list):
+            raise TypeError("'pump_efficiency_sensors' must be an instance of 'list[str]' " +
+                            f"but not of '{type(pump_efficiency_sensors)}'")
+        if any(link not in self.__pumps for link in pump_efficiency_sensors):
+            raise ValueError("Each item in 'pump_efficiency_sensors' must be in 'pumps' " +
+                             "-- cannot place a sensor at a non-existing pump.")
+
+        self.__pump_efficiency_sensors = pump_efficiency_sensors
+
+        self.__compute_indices()
+
     @property
     def tank_volume_sensors(self) -> list[str]:
         """
@@ -1670,6 +1802,10 @@ class SensorConfig(JsonSerializable):
             r["valve_state"] = self.__valve_state_sensors
         if self.__pump_state_sensors != []:
             r["pump_state"] = self.__pump_state_sensors
+        if self.__pump_efficiency_sensors != []:
+            r["pump_efficiency"] = self.__pump_efficiency_sensors
+        if self.__pump_energyconsumption_sensors != []:
+            r["pump_energyconsumption"] = self.__pump_energyconsumption_sensors
         if self.__quality_node_sensors != []:
             r["node_quality"] = self.__quality_node_sensors
         if self.__quality_link_sensors != []:
@@ -1695,6 +1831,8 @@ class SensorConfig(JsonSerializable):
                 "quality_link_sensors": self.__quality_link_sensors,
                 "valve_state_sensors": self.__valve_state_sensors,
                 "pump_state_sensors": self.__pump_state_sensors,
+                "pump_efficiency_sensors": self.__pump_efficiency_sensors,
+                "pump_energyconsumption_sensors": self.__pump_energyconsumption_sensors,
                 "tank_volume_sensors": self.__tank_volume_sensors,
                 "bulk_species_node_sensors": self.__bulk_species_node_sensors,
                 "bulk_species_link_sensors": self.__bulk_species_link_sensors,
@@ -1730,6 +1868,8 @@ class SensorConfig(JsonSerializable):
             and self.__quality_link_sensors == other.quality_link_sensors \
             and self.__valve_state_sensors == other.valve_state_sensors \
             and self.__pump_state_sensors == other.pump_state_sensors \
+            and self.__pump_efficiency_sensors == other.pump_efficiency_sensors \
+            and self.__pump_energyconsumption_sensors == other.pump_energyconsumption_sensors \
             and self.__tank_volume_sensors == other.tank_volume_sensors \
             and self.__bulk_species_node_sensors == other.bulk_species_node_sensors \
             and self.__bulk_species_link_sensors == other.bulk_species_link_sensors \
@@ -1762,6 +1902,8 @@ class SensorConfig(JsonSerializable):
             f"quality_link_sensors: {self.__quality_link_sensors} " +\
             f"valve_state_sensors: {self.__valve_state_sensors} " +\
             f"pump_state_sensors: {self.__pump_state_sensors} " +\
+            f"pump_efficiency_sensors: {self.__pump_efficiency_sensors} " +\
+            f"pump_energyconsumption_sensors: {self.__pump_energyconsumption_sensors} " +\
             f"tank_volume_sensors: {self.__tank_volume_sensors} " +\
             f"bulk_species_node_sensors: {self.__bulk_species_node_sensors} " +\
             f"bulk_species_link_sensors: {self.__bulk_species_link_sensors} " +\
@@ -1776,7 +1918,8 @@ class SensorConfig(JsonSerializable):
 
     def compute_readings(self, pressures: np.ndarray, flows: np.ndarray, demands: np.ndarray,
                          nodes_quality: np.ndarray, links_quality: np.ndarray,
-                         pumps_state: np.ndarray, valves_state: np.ndarray,
+                         pumps_state: np.ndarray, pumps_efficiency: np.ndarray,
+                         pumps_energyconsumption: np.ndarray, valves_state: np.ndarray,
                          tanks_volume: np.ndarray, bulk_species_node_concentrations: np.ndarray,
                          bulk_species_link_concentrations: np.ndarray,
                          surface_species_concentrations: np.ndarray) -> np.ndarray:
@@ -1798,6 +1941,10 @@ class SensorConfig(JsonSerializable):
             Quality values at all links/pipes.
         pumps_state : `numpy.ndarray`
             States of all pumps.
+        pumps_efficiency : `numpy.ndarray`
+            Efficiency of all pumps.
+        pumps_energyconsumption : `numpy.ndarray`
+            Energy consumption of all pumps.
         valves_state : `numpy.ndarray`
             States of all valves.
         tanks_volume : `numpy.ndarray`
@@ -1874,6 +2021,20 @@ class SensorConfig(JsonSerializable):
                 raise ValueError("Pump states readings requested " +
                                  "but no pump state data is given")
 
+        if pumps_efficiency is not None:
+            data.append(pumps_efficiency[:, self.__pump_efficiency_idx])
+        else:
+            if len(self.__pump_efficiency_sensors) != 0:
+                raise ValueError("Pump efficiency readings requested " +
+                                 "but no pump efficiency data is given")
+
+        if pumps_energyconsumption is not None:
+            data.append(pumps_energyconsumption[:, self.__pump_energyconsumption_idx])
+        else:
+            if len(self.__pump_energyconsumption_sensors) != 0:
+                raise ValueError("Pump energy consumption readings requested " +
+                                 "but no pump energy consumption data is given")
+
         if tanks_volume is not None:
             data.append(tanks_volume[:, self.__tank_volume_idx])
         else:
@@ -1913,7 +2074,9 @@ class SensorConfig(JsonSerializable):
     def get_index_of_reading(self, pressure_sensor: str = None, flow_sensor: str = None,
                              demand_sensor: str = None, node_quality_sensor: str = None,
                              link_quality_sensor: str = None, valve_state_sensor: str = None,
-                             pump_state_sensor: str = None, tank_volume_sensor: str = None,
+                             pump_state_sensor: str = None, pump_efficiency_sensor: str = None,
+                             pump_energyconsumption_sensor: str = None,
+                             tank_volume_sensor: str = None,
                              bulk_species_node_sensor: tuple[str, str] = None,
                              bulk_species_link_sensor: tuple[str, str] = None,
                              surface_species_sensor: tuple[str, str] = None) -> int:
@@ -1943,6 +2106,10 @@ class SensorConfig(JsonSerializable):
             ID of the state sensor (at a valve).
         pump_state_sensor : `str`
             ID of the state sensor (at a pump).
+        pump_efficiency_sensor : `str`
+            ID of the efficiency sensor (at a pump).
+        pump_energyconsumption_sensor : `str`
+            ID of the energy consumption sensor (at a pump).
         tank_volume_sensor : `str`
             ID of the water volume sensor (at a tank)
         bulk_species_node_sensor : `tuple[str, str]`
@@ -1966,6 +2133,10 @@ class SensorConfig(JsonSerializable):
             return self.__sensors_id_to_idx["valve_state"][valve_state_sensor]
         elif pump_state_sensor is not None:
             return self.__sensors_id_to_idx["pump_state"][pump_state_sensor]
+        elif pump_efficiency_sensor is not None:
+            return self.__sensors_id_to_idx["pump_efficiency"][pump_efficiency_sensor]
+        elif pump_energyconsumption_sensor is not None:
+            return self.__sensors_id_to_idx["pump_energyconsumption"][pump_energyconsumption_sensor]
         elif tank_volume_sensor is not None:
             return self.__sensors_id_to_idx["tank_volume"][tank_volume_sensor]
         elif surface_species_sensor is not None:

epyt_flow/topology.py

@@ -188,6 +188,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
         """
         return [node_id for node_id, _ in self.__nodes]
 
+    def get_number_of_nodes(self) -> int:
+        """
+        Returns the number of nodes.
+
+        Returns
+        -------
+        `int`
+            Number of nodes.
+        """
+        return len(self.get_all_nodes())
+
     def get_all_links(self) -> list[tuple[str, tuple[str, str]]]:
         """
         Gets a list of all links/pipes (incl. their end points).
@@ -199,6 +210,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
         """
         return [(link_id, end_points) for link_id, end_points, _ in self.__links]
 
+    def get_number_of_links(self) -> int:
+        """
+        Returns the number of links.
+
+        Returns
+        -------
+        `int`
+            Number of links.
+        """
+        return len(self.get_all_links())
+
     def get_all_junctions(self) -> list[str]:
         """
         Gets all junctions -- i.e. nodes that are not tanks or reservoirs.
@@ -216,6 +238,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
 
         return r
 
+    def get_number_of_junctions(self) -> int:
+        """
+        Returns the number of junctions.
+
+        Returns
+        -------
+        `int`
+            Number of junctions.
+        """
+        return len(self.get_all_junctions())
+
     def get_all_tanks(self) -> list[str]:
         """
         Gets all tanks -- i.e. nodes that are not junctions or reservoirs.
@@ -233,6 +266,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
 
         return r
 
+    def get_number_of_tanks(self) -> int:
+        """
+        Returns the number of tanks.
+
+        Returns
+        -------
+        `int`
+            Number of tanks.
+        """
+        return len(self.get_all_tanks())
+
     def get_all_reservoirs(self) -> list[str]:
         """
         Gets all reservoirs -- i.e. nodes that are not junctions or tanks.
@@ -250,6 +294,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
 
         return r
 
+    def get_number_of_reservoirs(self) -> int:
+        """
+        Returns the number of reservoirs.
+
+        Returns
+        -------
+        `int`
+            Number of reservoirs.
+        """
+        return len(self.get_all_reservoirs())
+
     def get_all_pipes(self) -> list[tuple[str, tuple[str, str]]]:
         """
         Gets all pipes -- i.e. links that not valves or pumps.
@@ -269,6 +324,17 @@ class NetworkTopology(nx.Graph, JsonSerializable):
 
         return r
 
+    def get_number_of_pipes(self) -> int:
+        """
+        Returns the number of pipes.
+
+        Returns
+        -------
+        `int`
+            Number of pipes.
+        """
+        return len(self.get_all_pipes())
+
     def get_all_pumps(self) -> list[str]:
         """
         Gets the IDs of all pumps.
@@ -278,7 +344,18 @@ class NetworkTopology(nx.Graph, JsonSerializable):
         `list[str]`
             Pump IDs.
         """
-        return self.__pumps.keys()
+        return list(self.__pumps.keys())
+
+    def get_number_of_pumps(self) -> int:
+        """
+        Returns the number of pumps.
+
+        Returns
+        -------
+        `int`
+            Number of pumps.
+        """
+        return len(self.get_all_pumps())
 
     def get_all_valves(self) -> list[str]:
         """
@@ -289,7 +366,18 @@ class NetworkTopology(nx.Graph, JsonSerializable):
         `list[str]`
             Valve IDs.
         """
-        return self.__valves.keys()
+        return list(self.__valves.keys())
+
+    def get_number_of_valves(self) -> int:
+        """
+        Returns the number of valves.
+
+        Returns
+        -------
+        `int`
+            Number of valves.
+        """
+        return len(self.get_all_valves())
 
     def get_node_info(self, node_id: str) -> dict:
         """

{epyt_flow-0.5.0.dist-info → epyt_flow-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: epyt-flow
-Version: 0.5.0
+Version: 0.6.0
 Summary: EPyT-Flow -- EPANET Python Toolkit - Flow
 Author-email: André Artelt <aartelt@techfak.uni-bielefeld.de>, "Marios S. Kyriakou" <kiriakou.marios@ucy.ac.cy>, "Stelios G. Vrachimis" <vrachimis.stelios@ucy.ac.cy>
 License: MIT License
@@ -20,7 +20,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: epyt >=1.1.6
+Requires-Dist: epyt >=1.1.9
 Requires-Dist: requests >=2.31.0
 Requires-Dist: scipy >=1.11.4
 Requires-Dist: u-msgpack-python >=2.8.0

{epyt_flow-0.5.0.dist-info → epyt_flow-0.6.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-epyt_flow/VERSION,sha256=oK1QZAE5pST4ZZEVcUW_HUZ06pwGW_6iFVjw97BEMMg,6
+epyt_flow/VERSION,sha256=l6XW5UCmEg0Jw53bZn4Ojiusf8wv_vgTuC4I_WA2W84,6
 epyt_flow/__init__.py,sha256=KNDiPWiHdB9a5ZF1ipjA1uoq61TwU2ThjaStpvSLBtY,1742
 epyt_flow/metrics.py,sha256=kvt42pzZrUR9PSlCyK4uq5kj6UlYHkt7OcCjLnI1RQE,12883
-epyt_flow/serialization.py,sha256=nBcwc3aMUbHF0zW8Nvpc49kKeLPh75blc3gzjKDR1ok,12893
-epyt_flow/topology.py,sha256=yKIspoX4uoo9rAeVR5eWJ6D91QNozHzvzjiry9bFkNI,23424
+epyt_flow/serialization.py,sha256=YhqDFZ7FLLcYOPnhOQdS0K8uyqM6bIXOkKDzGJQ-d3o,13075
+epyt_flow/topology.py,sha256=pWG3Cq48Kq-mql-Lg3HUwvj5BGN0SrySa_OfDYNcGxg,25244
 epyt_flow/utils.py,sha256=AB2MuknQ_16UE-URQe1WShIS7dmSyFwZYVHxMVT539k,12379
 epyt_flow/EPANET/compile_linux.sh,sha256=wcrDyiB8NkivmaC-X9FI2WxhY3IJqDLiyIbVTv2XEPY,489
 epyt_flow/EPANET/compile_macos.sh,sha256=1K33-bPdgr01EIf87YUvmOFHXyOkBWI6mKXQ8x1Hzmo,504
@@ -80,19 +80,19 @@ epyt_flow/EPANET/EPANET-MSX/Src/smatrix.h,sha256=heHTNgQNNDTs_Jx0YBts7_B7dPg8VUF
 epyt_flow/EPANET/EPANET-MSX/Src/include/epanetmsx.h,sha256=L9y0VKHk5Fg1JZxID9uBzcvLZWOb1xuQP-MkmHH_LD4,3429
 epyt_flow/EPANET/EPANET-MSX/Src/include/epanetmsx_export.h,sha256=h5UMaf6pH_0asRJOmhWUGAZhyA180ui2Cz8_y5h1FKw,1054
 epyt_flow/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-epyt_flow/data/networks.py,sha256=Ct-3tNEJPq6EooGWHr_Hz4vkkNYjv-QgiSwNKOTZ-oM,38526
+epyt_flow/data/networks.py,sha256=ieL_rIQ21Wqm4_Ois2IyI54Qkv0R2FbbQfqA4MtsmQA,38393
 epyt_flow/data/benchmarks/__init__.py,sha256=nJ6hqPaPNp8YMizniev3fwOWpzvvNUBMoRF16wACUkE,754
 epyt_flow/data/benchmarks/batadal.py,sha256=sa_OZwO5XIbJONgGMwgok-KCGyHq07WpIQagVq-a-gw,11175
 epyt_flow/data/benchmarks/batadal_data.py,sha256=oIzcysGivMPAgrfzrk5l8i-j6Ii96DPcFa6sL4TSaw8,880
-epyt_flow/data/benchmarks/battledim.py,sha256=K0j9tbfxuXJmqBQY_e5XBJZGDYavaOZ7efkCT96Fb8A,20167
+epyt_flow/data/benchmarks/battledim.py,sha256=yLwiQB0x7yq197XSM77tjHm7E7ucTbrybFaNxZx2TtM,20448
 epyt_flow/data/benchmarks/battledim_data.py,sha256=0vHm-2eAiLv6U-n5dqUUWS1o_szFRy9mVJ3eqDRp4PE,3373
 epyt_flow/data/benchmarks/gecco_water_quality.py,sha256=1buZRJiNf4jsqWYg4Ud90GhqaiLVo4yij3RAZJkzsqE,10985
-epyt_flow/data/benchmarks/leakdb.py,sha256=Z_ah6FXAyN4M7dn4jH0qYFmKTtViNHd6Jn2L9I6nMYg,24952
+epyt_flow/data/benchmarks/leakdb.py,sha256=iNgGVTQT7Sl8xXC1iCyTZTJ0OHXW_n5uqsM7NBTIBHU,25046
 epyt_flow/data/benchmarks/leakdb_data.py,sha256=FNssgMkC1wqWVlaOrrihr4Od9trEZY7KeK5KuBeRMvM,507058
 epyt_flow/data/benchmarks/water_usage.py,sha256=FLqjff3pha33oEU9ZM3UGPXn9eJJumsJH8Gdj7YFX3A,4778
 epyt_flow/gym/__init__.py,sha256=KNTDtPTEtHwZ4ehHfj9qGw81Z9acFqPIgMzYUzH5_uM,115
 epyt_flow/gym/control_gyms.py,sha256=xbq1gjUC2i-TR_0jXBxXFM24lo_ykHLqMEEpmXPaGq0,1281
-epyt_flow/gym/scenario_control_env.py,sha256=YAej2YJzZD5bnQSkPNZRcHWdQzLLieGktKBHmdGBb9s,2950
+epyt_flow/gym/scenario_control_env.py,sha256=vOadWpjpdcdwcypu0vy0DBkJZODsXnT1tArGQsmsgoM,6789
 epyt_flow/models/__init__.py,sha256=be5s08y1Tg66SuNYKGz5GnNMHThnQJo8SWJdT9493Kc,75
 epyt_flow/models/event_detector.py,sha256=idR7byBgloo07XEJEyMIwi49VW4wxJErLQtI-tJXWPs,789
 epyt_flow/models/sensor_interpolation_detector.py,sha256=5MBK9WlliGPonrNApf0j9lp-NjwF0iTwPDXx4yv7Fa0,3624
@@ -111,10 +111,10 @@ epyt_flow/rest_api/scenario/simulation_handlers.py,sha256=oY1Ch6ZQgYT_5WeE1I7tvG
 epyt_flow/rest_api/scenario/uncertainty_handlers.py,sha256=uuu6AP11ZZUp2P3Dnukjg5ZTjyYKljlubg1xLN1GnXY,4048
 epyt_flow/simulation/__init__.py,sha256=VGGJqJRUoXZjKJ0-m6KPp3JQqD_1TFW0pofLgkwZJ8M,164
 epyt_flow/simulation/parallel_simulation.py,sha256=VmC7xemjxRB_N0fx1AAQ7ux82tnyTi7jk7jfFpeg7gM,6523
-epyt_flow/simulation/scenario_config.py,sha256=_Zs0EPyfet0mTLpAt-oMN3k7jCW3x7_VbOQHpHVntrA,26597
-epyt_flow/simulation/scenario_simulator.py,sha256=1amMxO-PVHBU_AN6K9Ga6xzFmpaX2ZZnhwkirtj6IgY,93036
+epyt_flow/simulation/scenario_config.py,sha256=NyadeCihpR4bpsWVPj7J-1DU2w1CEN0pAo2yh0t8Xkg,26751
+epyt_flow/simulation/scenario_simulator.py,sha256=_DINJgPVBdKds6hq0w4zJuCIoQVBnkqBwU04KIi5egY,101950
 epyt_flow/simulation/scenario_visualizer.py,sha256=fpj67zl69q-byg7Oxocqhmu1S3P7B3ROCkSYzWyM--0,2187
-epyt_flow/simulation/sensor_config.py,sha256=MGeerEnLhyFLE6XA2p-X9Swd4k0o0T7QboeGuTUFq7I,81584
+epyt_flow/simulation/sensor_config.py,sha256=HSNT8BAfWo0G4k5PXI8BhWDl8YzpS8CYJqlv0pmbPZc,90921
 epyt_flow/simulation/events/__init__.py,sha256=tIdqzs7_Cus4X2kbZG4Jl2zs-zsk_4rnajFOCvL0zlI,185
 epyt_flow/simulation/events/actuator_events.py,sha256=2_MPYbYO9As6fMkm5Oy9pjSB9kCvFuKpGu8ykYDAydg,7903
 epyt_flow/simulation/events/event.py,sha256=kARPV20XCAl6zxnJwI9U7ICtZUPACO_rgAmtHm1mGCs,2603
@@ -124,16 +124,16 @@ epyt_flow/simulation/events/sensor_reading_attack.py,sha256=bo5VavArN0wD5AHbIXJC
 epyt_flow/simulation/events/sensor_reading_event.py,sha256=rQ-CmdpSUyZzDFYwNUGH2jGoj0oyU-aAb-7E8Oshhqw,6785
 epyt_flow/simulation/events/system_event.py,sha256=0KI2iaAaOyC9Y-FIfFVazeKT_4ORQRp26gWyMBUu_3c,2396
 epyt_flow/simulation/scada/__init__.py,sha256=ZFAxJVqwEVsgiyFilFetnb13gPhZg1JEOPWYvKIJT4c,90
-epyt_flow/simulation/scada/advanced_control.py,sha256=Enox02ggt36HdFLX7ZNxgxuqsTEeu9AACHrzU8CXGrg,4489
-epyt_flow/simulation/scada/scada_data.py,sha256=WaFSppBHvJOwSyLYNs9Pu2GngSzWsfkpqPfBQoeiEcU,105101
+epyt_flow/simulation/scada/advanced_control.py,sha256=5h7dmSMcNlTE7TMZa8gQVnOCGMf7uZy60r9aOfKDxMc,4487
+epyt_flow/simulation/scada/scada_data.py,sha256=YBgVfs2L85XQxHRcC4-X-yTudB2E8p2oYCxqazPrI9k,110586
 epyt_flow/simulation/scada/scada_data_export.py,sha256=0BwDgV-5qZx17wIyWQ8Nl2TPgho3mBI49027RDq8sDA,11217
 epyt_flow/uncertainty/__init__.py,sha256=ZRjuJL9rDpWVSdPwObPxFpEmMTcgAl3VmPOsS6cIyGg,89
 epyt_flow/uncertainty/model_uncertainty.py,sha256=-2QT2AffZerKZyZ_w_mmeqYpfBALyPDvV61sCrvcK1o,13966
 epyt_flow/uncertainty/sensor_noise.py,sha256=zJVULxnxVPSSqc6UW0iwZ9O-HGf9dn4CwScPqf4yCY0,2324
 epyt_flow/uncertainty/uncertainties.py,sha256=X-o7GZUC0HELtzpoXIAJaAeYOw35N05TuRoSmStcCpI,17669
 epyt_flow/uncertainty/utils.py,sha256=gq66c9-QMOxOqI6wgWLyFxjVV0fbG0_8Yzd6mQjNYNo,5315
-epyt_flow-0.5.0.dist-info/LICENSE,sha256=-4hYIY2BLmCkdOv2_PehEwlnMKTCes8_oyIUXjKtkug,1076
-epyt_flow-0.5.0.dist-info/METADATA,sha256=a7kEbUctgxuMBJ06GNrwJnAlr_arMtcxHg-TZzSiD8M,7087
-epyt_flow-0.5.0.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
-epyt_flow-0.5.0.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
-epyt_flow-0.5.0.dist-info/RECORD,,
+epyt_flow-0.6.0.dist-info/LICENSE,sha256=-4hYIY2BLmCkdOv2_PehEwlnMKTCes8_oyIUXjKtkug,1076
+epyt_flow-0.6.0.dist-info/METADATA,sha256=8dlCwOkZghE4xDbbWWQ2dOjMBRGo8m48cZuzhmJ0_ds,7087
+epyt_flow-0.6.0.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+epyt_flow-0.6.0.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
+epyt_flow-0.6.0.dist-info/RECORD,,

{epyt_flow-0.5.0.dist-info → epyt_flow-0.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.1)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any