epyt-flow 0.14.0__py3-none-any.whl → 0.14.1__py3-none-any.whl

epyt_flow/simulation/events/system_event.py

@@ -13,7 +13,7 @@ class SystemEvent(Event):
     """
     def __init__(self, **kwds):
         self._epanet_api = None
-        self.__exit_called = False
+        self._exit_called = False
 
         super().__init__(**kwds)
 
@@ -52,9 +52,9 @@ class SystemEvent(Event):
         if self.start_time <= cur_time < self.end_time:
             self.apply(cur_time)
         elif cur_time > self.end_time:
-            if self.__exit_called is False:
+            if self._exit_called is False:
                 self.exit(cur_time)
-                self.__exit_called = True
+                self._exit_called = True
 
     def reset(self) -> None:
         """

epyt_flow/simulation/scada/scada_data.py

@@ -1713,7 +1713,7 @@ class ScadaData(Serializable):
         self.__sensor_reading_events = sensor_reading_events
         self.__init()
 
-    def extract_time_window(self, start_time: int, end_time: int):
+    def extract_time_window(self, start_time: int, end_time: int = None):
         """
         Extracts a time window of SCADA data from this SCADA data instance --
         i.e. creating a new SCADA data instance containing data from the requested

epyt_flow/simulation/scenario_simulator.py

@@ -1966,9 +1966,12 @@ class ScenarioSimulator():
         self._adapt_to_network_changes()
 
         if self._model_uncertainty is not None:
-            if self.__uncertainties_applied is True and reapply_uncertainties is True:
+            if self.__uncertainties_applied is False:
                 self._model_uncertainty.apply(self.epanet_api)
                 self.__uncertainties_applied = True
+            elif self.__uncertainties_applied is True and reapply_uncertainties is True:
+                self._model_uncertainty.undo(self.epanet_api)
+                self._model_uncertainty.apply(self.epanet_api)
 
         for event in self._system_events:
             event.reset()
@@ -2006,8 +2009,8 @@ class ScenarioSimulator():
             with the hydraulic simulation.
 
             The default is False.
-        reapply_uncertainties: bool = False : `bool`, optional
-            If True, the uncertainties are re-applied.
+        reapply_uncertainties: `bool`, optional
+            If True, the uncertainties are re-applied on the original properties.
 
             The default is False.
 
@@ -2089,8 +2092,8 @@ class ScenarioSimulator():
             with the hydraulic simulation.
 
             The default is False.
-        reapply_uncertainties: bool = False : `bool`, optional
-            If True, the uncertainties are re-applied.
+        reapply_uncertainties : `bool`, optional
+            If True, the uncertainties are re-applied on the original properties.
 
             The default is False.
 
@@ -2511,8 +2514,8 @@ class ScenarioSimulator():
             will be stored -- this usually leads to a significant reduction in memory consumption.
 
             The default is False.
-        reapply_uncertainties: bool = False : `bool`, optional
-            If True, the uncertainties are re-applied.
+        reapply_uncertainties : `bool`, optional
+            If True, the uncertainties are re-applied on the original properties.
 
             The default is False.
 
@@ -2596,8 +2599,8 @@ class ScenarioSimulator():
             will be stored -- this usually leads to a significant reduction in memory consumption.
 
             The default is False.
-        reapply_uncertainties: bool = False : `bool`, optional
-            If True, the uncertainties are re-applied.
+        reapply_uncertainties : `bool`, optional
+            If True, the uncertainties are re-applied on the original properties.
 
             The default is False.
 
@@ -2778,8 +2781,8 @@ class ScenarioSimulator():
             will be stored -- this usually leads to a significant reduction in memory consumption.
 
             The default is False.
-        reapply_uncertainties: bool = False : `bool`, optional
-            If True, the uncertainties are re-applied.
+        reapply_uncertainties: `bool`, optional
+            If True, the uncertainties are re-applied on the original properties.
 
             The default is False.
 

epyt_flow/topology.py

@@ -500,8 +500,15 @@ class NetworkTopology(nx.Graph, JsonSerializable):
             raise TypeError("Can not compare 'NetworkTopology' instance to " +
                             f"'{type(other)}' instance")
 
+        adj_matrix = self.get_adj_matrix()
+        other_adj_matrix = other.get_adj_matrix()
+
         return super().__eq__(other) and \
-            self.get_all_nodes() == other.get_all_nodes() \
+            self.name == other.name \
+            and not np.any(adj_matrix.data != other_adj_matrix.data) \
+            and not np.any(adj_matrix.indices != other_adj_matrix.indices) \
+            and not np.any(adj_matrix.indptr != other_adj_matrix.indptr) \
+            and self.get_all_nodes() == other.get_all_nodes() \
             and all(link_a[0] == link_b[0] and link_a[1] == link_b[1]
                     for link_a, link_b in zip(self.get_all_links(), other.get_all_links())) \
             and self.__units == other.units \