epyt-flow 0.11.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

epyt_flow/visualization/visualization_utils.py

@@ -7,6 +7,7 @@ from dataclasses import dataclass
 from typing import Optional, Union, List, Tuple
 
 import matplotlib as mpl
+import matplotlib.pyplot as plt
 import networkx.drawing.nx_pylab as nxp
 import numpy as np
 from scipy.interpolate import CubicSpline
@@ -114,7 +115,7 @@ class JunctionObject:
 
         self.node_color.append(sorted_values)
         self.vmin = min(*sorted_values, self.vmin)
-        self.vmax = max(*sorted_values, self.vmin)
+        self.vmax = max(*sorted_values, self.vmax)
 
     def get_frame(self, frame_number: int = 0):
         """
@@ -156,6 +157,42 @@ class JunctionObject:
 
         return valid_params
 
+    def get_frame_mask(self, mask, color):
+        """
+        Returns all attributes necessary for networkx to draw the specified
+        frame mask. Meaning covering all masked junction objects with the
+        default value.
+
+        Parameters
+        ----------
+        mask: `np.ndarray`
+            An array consisting of 0 and 1, where 0 means no sensor. Nodes
+            without sensor are to be masked.
+        color:
+            The default color of masked nodes.
+
+        Returns
+        -------
+        valid_params : `dict`
+            A dictionary containing all attributes that function as parameters
+            for `networkx.drawing.nx_pylab.draw_networkx_nodes() <https://networkx.org/documentation/stable/reference/generated/networkx.drawing.nx_pylab.draw_networkx_nodes.html#draw-networkx-nodes>`_.
+        """
+
+        attributes = vars(self).copy()
+
+        attributes['nodelist'] = [node for node, flag in
+                                  zip(self.nodelist, mask) if not flag]
+        attributes['node_color'] = color
+
+        sig = inspect.signature(nxp.draw_networkx_nodes)
+
+        valid_params = {
+            key: value for key, value in attributes.items()
+            if key in sig.parameters and value is not None
+        }
+
+        return valid_params
+
     def interpolate(self, num_inter_frames: int):
         """
         Interpolates node_color values for smoother animations.
@@ -220,7 +257,7 @@ class EdgeObject:
     edge_color: Union[str, list] = 'k'
     interpolated = {}
 
-    def rescale_widths(self, line_widths: Tuple[int] = (1, 2)):
+    def rescale_widths(self, line_widths: Tuple[int, int] = (1, 2)):
         """
         Rescales all edge widths to the given interval.
 
@@ -253,7 +290,9 @@ class EdgeObject:
             scada_data: Optional[ScadaData],
             parameter: str = 'flow_rate', statistic: str = 'mean',
             pit: Optional[Union[int, Tuple[int]]] = None,
-            intervals: Optional[Union[int, List[Union[int, float]]]] = None):
+            species: str = None,
+            intervals: Optional[Union[int, List[Union[int, float]]]] = None,
+            use_sensor_data: bool = None):
         """
         Adds a new frame of edge_color or edge width based on the given data
         and statistic.
@@ -277,10 +316,18 @@ class EdgeObject:
              'max' or 'time_step'.
         pit : `int`
             The point in time for the 'time_step' statistic.
+        species: `str`, optional
+            Key of the species. Necessary only for parameter
+            'bulk_species_concentration'.
         intervals : `int`, `list[int]` or `list[float]`
             If provided, the data will be grouped into intervals. It can be an
             integer specifying the number of groups or a list of boundary
             points.
+        use_sensor_data : `bool`, optional
+            If `True`, instead of using raw simulation data, the data recorded
+            by the corresponding sensors in the system is used for the
+            visualization. Note: Not all components may have a sensor attached
+            and sensors may be subject to sensor faults or noise.
 
         Raises
         ------
@@ -296,11 +343,36 @@ class EdgeObject:
                 self.edge_vmax = float('-inf')
 
         if parameter == 'flow_rate':
-            values = scada_data.flow_data_raw
+            if use_sensor_data:
+                values, self.mask = scada_data.get_data_flows_as_edge_features()
+                values = values[:, ::2]
+                self.mask = self.mask[::2]
+            else:
+                values = scada_data.flow_data_raw
         elif parameter == 'link_quality':
-            values = scada_data.link_quality_data_raw
+            if use_sensor_data:
+                values, self.mask = scada_data.get_data_links_quality_as_edge_features()
+                values = values[:, ::2]
+                self.mask = self.mask[::2]
+            else:
+                values = scada_data.link_quality_data_raw
         elif parameter == 'custom_data':
             values = scada_data
+        elif parameter == 'bulk_species_concentration':
+            if not species:
+                raise ValueError('Species must be given when using '
+                                 'bulk_species_concentration')
+            if use_sensor_data:
+                values, self.mask = scada_data.get_data_bulk_species_concentrations_as_edge_features()
+                self.mask = self.mask[::2,
+                            scada_data.sensor_config.bulk_species.index(
+                                species)]
+                values = values[:, ::2,
+                         scada_data.sensor_config.bulk_species.index(species)]
+            else:
+                values = scada_data.bulk_species_link_concentration_raw[:,
+                         scada_data.sensor_config.bulk_species.index(species),
+                         :]
         elif parameter == 'diameter':
             value_dict = {
                 link[0]: topology.get_link_info(link[0])['diameter'] for
@@ -314,7 +386,6 @@ class EdgeObject:
                 self.edge_color.append(sorted_values)
                 self.edge_vmin = min(*sorted_values, self.edge_vmin)
                 self.edge_vmax = max(*sorted_values, self.edge_vmax)
-
             return
         else:
             raise ValueError('Parameter must be flow_rate, link_quality, '
@@ -404,6 +475,54 @@ class EdgeObject:
 
         return valid_params
 
+    def get_frame_mask(self, frame_number: int = 0, color='k'):
+        """
+        Returns all attributes necessary for networkx to draw the specified
+        frame mask.
+
+        Parameters
+        ----------
+        frame_number : `int`, default = 0
+            The frame whose parameters should be returned. Default is 0, this
+            is also used if only 1 frame exists (e.g. for plots, not
+            animations).
+        color:
+            The default color of masked nodes.
+
+        Returns
+        -------
+        valid_params : `dict`
+            A dictionary containing all attributes that function as parameters
+            for `networkx.drawing.nx_pylab.draw_networkx_edges() <https://networkx.org/documentation/stable/reference/generated/networkx.drawing.nx_pylab.draw_networkx_edges.html#draw-networkx-edges>`_.
+        """
+        attributes = vars(self).copy()
+
+        attributes['edgelist'] = [edge for edge, flag in
+                                  zip(self.edgelist, self.mask) if not flag]
+        attributes['edge_color'] = color
+
+        if hasattr(self, 'width'):
+            if 'width' in self.interpolated.keys():
+                if frame_number > len(self.interpolated['width']):
+                    frame_number = -1
+                attributes['width'] = self.interpolated['width'][frame_number]
+            else:
+                if frame_number > len(self.width):
+                    frame_number = -1
+                attributes['width'] = self.width[frame_number]
+            attributes['width'] = [edge for edge, flag in
+                                   zip(attributes['width'].copy(), self.mask)
+                                   if not flag]
+
+        sig = inspect.signature(nxp.draw_networkx_edges)
+
+        valid_params = {
+            key: value for key, value in attributes.items()
+            if key in sig.parameters and value is not None
+        }
+
+        return valid_params
+
     def interpolate(self, num_inter_frames: int):
         """
         Interpolates edge_color and width values for smoother animations.
@@ -447,10 +566,10 @@ class EdgeObject:
         for key, value in attributes.items():
             setattr(self, key, value)
 
-    @staticmethod
-    def __rescale(values: Union[np.ndarray, list],
+    def __rescale(self, values: Union[np.ndarray, list],
                   scale_min_max: Union[List, Tuple[int]],
-                  values_min_max: Union[List, Tuple[int, int]] = None) -> List:
+                  values_min_max: Union[
+                      List, Tuple[int, int]] = None) -> np.ndarray:
         """
         Rescales the given values to a new range.
 
@@ -487,7 +606,13 @@ class EdgeObject:
             return scale_min_max[0] + (x - min_val) / (
                     max_val - min_val) * scale
 
-        return [range_map(x) for x in values]
+        vectorized_range_map = np.vectorize(range_map)
+        rescaled_widths = vectorized_range_map(np.array(values))
+
+        if hasattr(self, 'mask'):
+            rescaled_widths = np.where(self.mask == 1, rescaled_widths, 1.0)
+
+        return rescaled_widths
 
 
 @serializable(COLOR_SCHEMES_ID, ".epyt_flow_color_scheme")
@@ -496,6 +621,7 @@ class ColorScheme(JsonSerializable):
     A class containing the color scheme for the
     :class:`~epyt_flow.visualization.ScenarioVisualizer`.
     """
+
     def __init__(self, pipe_color: str, node_color: str, pump_color: str,
                  tank_color: str, reservoir_color: str,
                  valve_color: str) -> None:
@@ -537,7 +663,8 @@ class ColorScheme(JsonSerializable):
         """
         attr = {
             k: v for k, v in self.__dict__.items()
-            if not (k.startswith("__") or k.startswith("_")) and not callable(v)
+            if
+            not (k.startswith("__") or k.startswith("_")) and not callable(v)
         }
         return super().get_attributes() | attr
 
@@ -558,12 +685,12 @@ class ColorScheme(JsonSerializable):
         if not isinstance(other, ColorScheme):
             return False
         return (
-            self.pipe_color == other.pipe_color and
-            self.node_color == other.node_color and
-            self.pump_color == other.pump_color and
-            self.tank_color == other.tank_color and
-            self.reservoir_color == other.reservoir_color and
-            self.valve_color == other.valve_color
+                self.pipe_color == other.pipe_color and
+                self.node_color == other.node_color and
+                self.pump_color == other.pump_color and
+                self.tank_color == other.tank_color and
+                self.reservoir_color == other.reservoir_color and
+                self.valve_color == other.valve_color
         )
 
     def __str__(self) -> str:

{epyt_flow-0.11.0.dist-info → epyt_flow-0.13.0.dist-info}/METADATA

@@ -1,9 +1,9 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: epyt-flow
-Version: 0.11.0
+Version: 0.13.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
+License-Expression: MIT
 Project-URL: Homepage, https://github.com/WaterFutures/EPyT-Flow
 Project-URL: Documentation, https://epyt-flow.readthedocs.io/en/stable/
 Project-URL: Repository, https://github.com/WaterFutures/EPyT-Flow.git
@@ -11,7 +11,6 @@ Project-URL: Issues, https://github.com/WaterFutures/EPyT-Flow/issues
 Keywords: epanet,water,networks,hydraulics,quality,simulations
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Science/Research
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -35,6 +34,7 @@ Requires-Dist: geopandas>=0.14.4
 Requires-Dist: svgpath2mpl>=1.0.0
 Requires-Dist: Deprecated>=1.2.14
 Requires-Dist: psutil
+Dynamic: license-file
 
 [![pypi](https://img.shields.io/pypi/v/epyt-flow.svg)](https://pypi.org/project/epyt-flow/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)

{epyt_flow-0.11.0.dist-info → epyt_flow-0.13.0.dist-info}/RECORD

@@ -1,9 +1,8 @@
-epyt_flow/VERSION,sha256=eV1rx5V00q7AOtnP7EBLuVCDyd0hDmUh4NQZl3LSjUQ,7
+epyt_flow/VERSION,sha256=2EyeWWx9apTl90V5742JEqgHsNKFgkdJAK0137Pt_PQ,7
 epyt_flow/__init__.py,sha256=n-zI5G3DUofs_pNC5YNWopNPCPUtpL-jYi8RPH6eakw,1768
-epyt_flow/metrics.py,sha256=vGUOWJ7hHkTtLKXsUTpT4LUHulumQ6WcmWc3yeJ8Fbo,16402
 epyt_flow/serialization.py,sha256=uGGN1iZ21ek1u6Xzs4z2xum5Qt8554Wem-wEMGEaa7I,14574
-epyt_flow/topology.py,sha256=w5V9OK6ZtO7hpCb5LYMyAYY80gd3lDPPZk3qhXP5Qdo,25858
-epyt_flow/utils.py,sha256=jQslCH4YMvTp5AtqRMbNIW2B9G3E-TQoGaox7yQ3UtE,16489
+epyt_flow/topology.py,sha256=Ih6m_tMT1JlPOJv8rHDVBtNayFOarPyAmCbMyojJtQg,26037
+epyt_flow/utils.py,sha256=R_IE6uuTF2MRjUkgWDEa3xOYk8iorieHCqqQ0tDUZ40,17476
 epyt_flow/EPANET/compile_linux.sh,sha256=wcrDyiB8NkivmaC-X9FI2WxhY3IJqDLiyIbVTv2XEPY,489
 epyt_flow/EPANET/compile_macos.sh,sha256=1K33-bPdgr01EIf87YUvmOFHXyOkBWI6mKXQ8x1Hzmo,504
 epyt_flow/EPANET/EPANET/SRC_engines/AUTHORS,sha256=yie5yAsEEPY0984PmkSRUdqEU9rVvRSGGWmjxdwCYMU,925
@@ -65,7 +64,7 @@ epyt_flow/EPANET/EPANET-MSX/Src/msxproj.c,sha256=Of2YTh98MXMUv2ZiwNyUcKf7gh2QsYV
 epyt_flow/EPANET/EPANET-MSX/Src/msxqual.c,sha256=jv7s35zMh88k9uQ9NJoN7I3NzpTiUlttdj0cV-h770Y,57734
 epyt_flow/EPANET/EPANET-MSX/Src/msxrpt.c,sha256=RW-sD7Q1LaxKLNSBXrxSkEKerGNCMMdA9BkSkJm3Pis,11505
 epyt_flow/EPANET/EPANET-MSX/Src/msxtank.c,sha256=UNeZg9pcBjx8kHiVgDWWAPrfOrUDr3gpEwDO66_bh20,12126
-epyt_flow/EPANET/EPANET-MSX/Src/msxtoolkit.c,sha256=TX7bXomDuIHAC1WzI9vR_xDPnHCwpn4ICkjJtAlM6vE,33854
+epyt_flow/EPANET/EPANET-MSX/Src/msxtoolkit.c,sha256=0KgIpPP28-sOCCExBaq1Hh8ib2J-W65kNf0-fR5D5OE,33863
 epyt_flow/EPANET/EPANET-MSX/Src/msxtypes.h,sha256=0LSgX4yiCxWBuFm0Dt1lD0lryRob5T8x38ukXWg9rSc,24060
 epyt_flow/EPANET/EPANET-MSX/Src/msxutils.c,sha256=HLPavITgmlX9-s6mOUkQPt3noQUiv0I1gT_59Q33dfs,12104
 epyt_flow/EPANET/EPANET-MSX/Src/msxutils.h,sha256=R1qNWqw74TcaAErzzeBjXnH6cwDX2NYvQYX-pc4mfMA,1811
@@ -86,60 +85,58 @@ epyt_flow/data/benchmarks/batadal.py,sha256=E9kl0gI5HyL6LZ9ZoLZwdQBNHXKblWW1QV4E
 epyt_flow/data/benchmarks/batadal_data.py,sha256=oIzcysGivMPAgrfzrk5l8i-j6Ii96DPcFa6sL4TSaw8,880
 epyt_flow/data/benchmarks/battledim.py,sha256=JS8nYZVTAhNhhUber_m3_rK-_J94Jqx9B-0DHBc_NfA,20756
 epyt_flow/data/benchmarks/battledim_data.py,sha256=0vHm-2eAiLv6U-n5dqUUWS1o_szFRy9mVJ3eqDRp4PE,3373
-epyt_flow/data/benchmarks/gecco_water_quality.py,sha256=Aes0Cua8w7Lz6CBD8JeK4etTvHY-oDX3GSq0JbseY2c,11409
-epyt_flow/data/benchmarks/leakdb.py,sha256=IwOl0vLL5Fn5sJjWrB4eIq52nMx7kmdUpiB2HDGl_rs,25483
+epyt_flow/data/benchmarks/gecco_water_quality.py,sha256=xYN-xrcx409IhTJjvaMbZABORru3XQNnble76aAOKQ8,11414
+epyt_flow/data/benchmarks/leakdb.py,sha256=IEP6-bx9il65kX5mlGK1M9cevQPvAwLaDxg9YaX9qVg,26690
 epyt_flow/data/benchmarks/leakdb_data.py,sha256=FNssgMkC1wqWVlaOrrihr4Od9trEZY7KeK5KuBeRMvM,507058
-epyt_flow/data/benchmarks/water_usage.py,sha256=COgsLRSzcG0JT5xh2qdDm7IjuMCx6n_zrdxOPupHiJY,4920
-epyt_flow/gym/__init__.py,sha256=KNTDtPTEtHwZ4ehHfj9qGw81Z9acFqPIgMzYUzH5_uM,115
-epyt_flow/gym/control_gyms.py,sha256=7GVIdBKd4vppLke59pqi-OKl8m-BkPyvLwUhg9xRah4,1632
-epyt_flow/gym/scenario_control_env.py,sha256=7OZuhrEW6bzKwYfL-lMgvNBERX9WG9Npkle3pfLEgq0,12845
-epyt_flow/models/__init__.py,sha256=be5s08y1Tg66SuNYKGz5GnNMHThnQJo8SWJdT9493Kc,75
-epyt_flow/models/event_detector.py,sha256=jLCkd0ocJXpYB2t_nlj7GjYIqBfch6hY4eA41KejX4w,941
-epyt_flow/models/sensor_interpolation_detector.py,sha256=H5pPbwa18FmE2L8khSkcYEunPjN6fuh2vXb9BZSX_5o,4011
+epyt_flow/data/benchmarks/water_usage.py,sha256=RiLGLof1HT0luwn7_dG11_nP5U5r9B3L8vDLuwsIKTM,4962
+epyt_flow/gym/__init__.py,sha256=gDIP9VGjKraajsJo6MnPN-TaEUTLnnJNj2c_7jrb8Bg,36
+epyt_flow/gym/scenario_control_env.py,sha256=0ZaZr-fApW_0z9NdgggB2ejUJfPPXb08CljgBnqiOqQ,12635
 epyt_flow/rest_api/__init__.py,sha256=4HilmXhdh6H56UHJBB2WUSULlEBUDnI1FPTP11ft3HE,126
 epyt_flow/rest_api/base_handler.py,sha256=HDLXrMXqgWvxWAsB-3G4plyTyCv27_eBbq4eRl_FeBo,2609
 epyt_flow/rest_api/res_manager.py,sha256=j6-3FUBZNLKM9bCsIDZzSytfDYJbDLRwjn1mIPstTqI,2342
-epyt_flow/rest_api/server.py,sha256=kZlprvRw7op39s7KhtEt1TgAsqs94KTQEdzIW9NMMJc,7778
+epyt_flow/rest_api/server.py,sha256=cPQM17rdbXLFlPRePb0Y7OcCyfJUN9SX7cv0etHtfvo,8727
 epyt_flow/rest_api/scada_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 epyt_flow/rest_api/scada_data/data_handlers.py,sha256=VGw3uakxhFgqLMYRC5OaAuCbp0SnGxdPXWruUVEBiJc,11895
 epyt_flow/rest_api/scada_data/export_handlers.py,sha256=W-T2WgPuG8cNVzA8h3e0lwi-nSKFi11PPyuNQWTMwzg,4624
 epyt_flow/rest_api/scada_data/handlers.py,sha256=jcGw91TjjhRQm_hJvjbWvSTBLpvMJDOA4bQw5iOpSUw,7673
 epyt_flow/rest_api/scenario/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-epyt_flow/rest_api/scenario/event_handlers.py,sha256=rld6gbneARp079ege4IU5J5jefkZtOvgNnlFMi-fm18,4362
-epyt_flow/rest_api/scenario/handlers.py,sha256=r355-4wjQGOH0vpDTOOIP9qC8bo_Sm7znir2BgNuweg,13656
+epyt_flow/rest_api/scenario/control_handlers.py,sha256=ouxc54V_yJyoO2yPJEJqcPbZs7CXgM_CWKGj5RvkABQ,4585
+epyt_flow/rest_api/scenario/event_handlers.py,sha256=wgKWFHJPwF4celetSb-_jTlrcicoxDbC7GpZ9uw-BJY,8969
+epyt_flow/rest_api/scenario/handlers.py,sha256=v1V6gsBh2HLtPTnl9_53W13Awo5YjG681Urp24yXelY,14993
 epyt_flow/rest_api/scenario/simulation_handlers.py,sha256=A59Iv-6k7SlGF_RDQgoFlvHWM1mScvfCobXBW4Rhh6E,6511
 epyt_flow/rest_api/scenario/uncertainty_handlers.py,sha256=Pdo2YmiawOqKXWcLs2P-lv5qN-OKHS3sDgkAFQeRzK8,4568
 epyt_flow/simulation/__init__.py,sha256=nihvZ8O2rJjYQkv7JhtVMqNacO5bA38VtS8Y_0BWrVQ,129
 epyt_flow/simulation/parallel_simulation.py,sha256=ph4KXw9jCt-hiJFJbmC6fNvEsrbQoWV-tFKE5-qSfoQ,6523
 epyt_flow/simulation/scenario_config.py,sha256=uHHwwzCRwooVdODxDNoCOUgfrlol1K-TS8P8_Ja9Coc,30435
-epyt_flow/simulation/scenario_simulator.py,sha256=Byk1X6sVdJRLahjpebxfSdSosmXIOYt8hn2rDQTqUoY,156653
+epyt_flow/simulation/scenario_simulator.py,sha256=AhsMh3KcVRmhqqRgwH3WU26YqUvJuTZbNKxsRYwDukA,161461
 epyt_flow/simulation/sensor_config.py,sha256=AGAIC5vqcu2UZsglSCwv2pvZ3E0kbTtdaqtFPEMBwSw,94262
+epyt_flow/simulation/backend/__init__.py,sha256=tkJb2NB_hruTv39sYHAq9ffazyA-UzZzFmiy2nYVTqA,23
+epyt_flow/simulation/backend/my_epyt.py,sha256=edkhDDOZBtYSpaQmnui_opdetebaS9ZzBwngnIpkc3s,32040
 epyt_flow/simulation/events/__init__.py,sha256=gv8ZcvwjJN0Z5MwRXEOVFRNq4X5NPyyqXIQnhBxszQ0,215
 epyt_flow/simulation/events/actuator_events.py,sha256=gNOIZL9WNiIhEANi8yEyGxKx4vSMBZiRpiSJ4BbDL60,8171
 epyt_flow/simulation/events/event.py,sha256=kARPV20XCAl6zxnJwI9U7ICtZUPACO_rgAmtHm1mGCs,2603
 epyt_flow/simulation/events/leakages.py,sha256=pFSbOiKeGeHPZhLAgo2DFFI1QYImd7m167lMW6B-n-U,17838
-epyt_flow/simulation/events/quality_events.py,sha256=y9i1U4xjwsoDZ55vtjl4KeJt5AbYJsfVt7X0Xw0Mq6Y,7965
+epyt_flow/simulation/events/quality_events.py,sha256=b0tClag6ln0eJtEfJ-HTvkD5nn7bjmyS-x_b1bfeqGQ,8053
 epyt_flow/simulation/events/sensor_faults.py,sha256=XX6k-GJh9RWZ4x54eGj9um-Ir9Eq41tY_9pRSCeYeqc,8447
 epyt_flow/simulation/events/sensor_reading_attack.py,sha256=2E8q6yWnLxeLgYxW0MHw0GSjlUDjIIZ2GybVRLA7FJQ,7967
 epyt_flow/simulation/events/sensor_reading_event.py,sha256=OWMRWPsvgMgaynMayJ-hQotP9zV5sDIYrOfY0fOCuvc,7586
 epyt_flow/simulation/events/system_event.py,sha256=IGypfTL-miosmwKd4DGTYvByyBcl8__0Asiifw-SzUQ,2606
 epyt_flow/simulation/scada/__init__.py,sha256=pfJhg-tM5DaiZTXs0_1qJsY2R6Py_LwSz6BUFJexfQM,150
-epyt_flow/simulation/scada/advanced_control.py,sha256=t0dlEHsnUE0T-du2_5YBYUzMW4a3-Qxw0tT_e9Z9g8Y,4883
 epyt_flow/simulation/scada/complex_control.py,sha256=p2ehLyScJbj2jbyevXf7T3Ot8jnBYWgRR3Cz-m3boB0,22107
 epyt_flow/simulation/scada/custom_control.py,sha256=QzkKcn7t53GcTaRofRDbY-HErcDReMF4utWkck6bN60,4681
-epyt_flow/simulation/scada/scada_data.py,sha256=jH5jrlbDb_gwSndcLNfjLZj3Kt2YAZVY56klWf5yRp8,194085
+epyt_flow/simulation/scada/scada_data.py,sha256=vzhTUoUIdmqTj9rP2w00q1dAaT90rY5vY2S6Sgo04jg,203434
 epyt_flow/simulation/scada/scada_data_export.py,sha256=WNAFn_WNfzYAEFbl2Al-cOIx-A0ozY4AI60-i_qEHdc,11643
 epyt_flow/simulation/scada/simple_control.py,sha256=wUsxsrgqmYxXR93_atcKbV9E-t3hgqj60ZeTvoBBnoQ,12215
 epyt_flow/uncertainty/__init__.py,sha256=ZRjuJL9rDpWVSdPwObPxFpEmMTcgAl3VmPOsS6cIyGg,89
 epyt_flow/uncertainty/model_uncertainty.py,sha256=Bfc9OgecJbX2qOiANhTSKdK_m95aRuXkIGyc22b8d30,41183
-epyt_flow/uncertainty/sensor_noise.py,sha256=AYtc6YOfzIfBq3zTBWT5s_A4EFthqfLcpXwJZZO0wIY,6789
+epyt_flow/uncertainty/sensor_noise.py,sha256=-AnBfuW1VAx7Ya-q_gJ9bAr7Kx6pzP_y0PvNeuRjXIg,6477
 epyt_flow/uncertainty/uncertainties.py,sha256=5bZu1Zx8RZ6ESzJSvjtPogNkft3eemTojRsYdi_i1Qo,20495
 epyt_flow/uncertainty/utils.py,sha256=K-ZhyO6Bg7UmNPgpfND0JLa_wRwyrtUUgGTWyWwy-fo,8029
 epyt_flow/visualization/__init__.py,sha256=uQ7lO6AsgLc88X48Te3QhBQY-iDKGvdPtxKCl4b-Mfw,70
-epyt_flow/visualization/scenario_visualizer.py,sha256=LyruyMIXmQwwdkIZSJ2Q4FO0Z0pLexBaPDRT6ufOuoo,52428
-epyt_flow/visualization/visualization_utils.py,sha256=IxzoHkddChuAPAQkLDUJdHY_ntqz7k8ui0qvyPEXKVs,22181
-epyt_flow-0.11.0.dist-info/LICENSE,sha256=YRJC2kcAhMlpEeHwUF0lzE-GRXLFyAjXNErI8L5UwYk,1071
-epyt_flow-0.11.0.dist-info/METADATA,sha256=J5USrYOxWHhykGuW1EHD8UWKB4j_-ZwY2ZclEMqeLeA,9739
-epyt_flow-0.11.0.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-epyt_flow-0.11.0.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
-epyt_flow-0.11.0.dist-info/RECORD,,
+epyt_flow/visualization/scenario_visualizer.py,sha256=vkP0J_OfjvePUz_HehXJkH4CGKR3chAHe_UTx4hQ6XI,57860
+epyt_flow/visualization/visualization_utils.py,sha256=l-EQ9UlY9MDBcOhK-uUZ9c-tX9emVqlo4xSqR-Sg17M,27525
+epyt_flow-0.13.0.dist-info/licenses/LICENSE,sha256=YRJC2kcAhMlpEeHwUF0lzE-GRXLFyAjXNErI8L5UwYk,1071
+epyt_flow-0.13.0.dist-info/METADATA,sha256=M-XauQzx0P0u0_vvNEMgsXybG5V64q2pLZTOkhfnzYU,9713
+epyt_flow-0.13.0.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+epyt_flow-0.13.0.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
+epyt_flow-0.13.0.dist-info/RECORD,,

{epyt_flow-0.11.0.dist-info → epyt_flow-0.13.0.dist-info}/WHEEL

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

epyt_flow/gym/control_gyms.py

@@ -1,55 +0,0 @@
-"""
-Module provides functions for registering and creating control environments.
-"""
-import warnings
-
-from .scenario_control_env import ScenarioControlEnv
-
-
-environments = {}
-
-
-def register(env_name: str, env: ScenarioControlEnv) -> None:
-    """
-    Registers a new environment under a given name.
-
-    Parameters
-    ----------
-    env_name : `str`
-        Name of the environment -- must be unique among all environments.
-    env : :class:`~epyt_flow.gym.scenario_control_env.ScenarioControlEnv`
-        Environment.
-    """
-    warnings.warn("'register()' is deprecated and will be removed in future releases -- " +
-                  "please consider switching to the EPyT-Control package")
-
-    if env_name in environments:
-        raise ValueError(f"Environment '{env_name}' already exists.")
-    if not issubclass(env, ScenarioControlEnv):
-        raise TypeError("'env' must be a subclass of " +
-                        "'epyt_flow.gym.ScenarioControlEnv'")
-
-    environments[env_name] = env
-
-
-def make(env_name: str, **kwds) -> ScenarioControlEnv:
-    """
-    Creates an instance of a registered environment.
-
-    Parameters
-    ----------
-    env_name : `str`
-        Name of the environment.
-
-    Returns
-    -------
-    :class:`~epyt_flow.gym.scenario_control_env.ScenarioControlEnv`
-        Environment.
-    """
-    warnings.warn("'make()' is deprecated and will be removed in future releases -- " +
-                  "please consider switching to the EPyT-Control package")
-
-    if env_name not in environments:
-        raise ValueError(f"Unknown environment '{env_name}'.")
-
-    return environments[env_name](**kwds)