epyt-flow 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

epyt_flow/EPANET/compile_macos.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+mkdir -p "../customlibs/"
+gcc-12 -w -O3 -march=native -dynamiclib -fPIC -install_name libepanet2_2.dylib -o "../customlibs/libepanet2_2.dylib" EPANET/SRC_engines/*.c -IEPANET/SRC_engines/include -lc -lm -pthread
+gcc-12 -w -O3 -march=native -dynamiclib -fPIC -install_name libepanetmsx2_2_0.dylib -o "../customlibs/libepanetmsx2_2_0.dylib" -fopenmp -Depanetmsx_EXPORTS -IEPANET-MSX/Src/include -IEPANET/SRC_engines/include EPANET-MSX/Src/*.c -L'../customlibs' -lepanet2_2 -lm -lgomp -lpthread

epyt_flow/VERSION

@@ -1 +1 @@
-0.2.0
+0.4.0

epyt_flow/__init__.py

@@ -8,7 +8,8 @@ with open(os.path.join(os.path.dirname(__file__), 'VERSION'), encoding="utf-8")
     VERSION = f.read().strip()
 
 
-def compile_libraries_unix(lib_epanet_name, compile_script_name):
+def compile_libraries_unix(lib_epanet_name: str, compile_script_name: str,
+                           gcc_name: str = "gcc") -> None:
     """Compile EPANET and EPANET-MSX libraries if needed."""
     path_to_custom_libs = os.path.join(os.path.dirname(__file__), "customlibs")
     path_to_lib_epanet = os.path.join(path_to_custom_libs, lib_epanet_name)
@@ -20,7 +21,7 @@ def compile_libraries_unix(lib_epanet_name, compile_script_name):
             update = True
 
     if not os.path.isfile(path_to_lib_epanet) or update:
-        if shutil.which("gcc") is not None:
+        if shutil.which(gcc_name) is not None:
             print("Compiling EPANET and EPANET-MSX...")
             try:
                 subprocess.check_call(f"cd \"{path_to_epanet}\"; bash {compile_script_name}",
@@ -28,6 +29,7 @@ def compile_libraries_unix(lib_epanet_name, compile_script_name):
                 print("Done")
             except subprocess.CalledProcessError as ex:
                 print(f"Compilation failed\n{ex}")
+                warnings.warn("Falling back to pre-compiled library shipped by EPyT.")
         else:
             warnings.warn("GCC is not available to compile the required libraries.\n" +
                           "Falling back to pre-compiled library shipped by EPyT.")
@@ -35,3 +37,5 @@ def compile_libraries_unix(lib_epanet_name, compile_script_name):
 
 if sys.platform.startswith("linux"):
     compile_libraries_unix("libepanet2_2.so", "compile_linux.sh")
+elif sys.platform.startswith("darwin"):
+    compile_libraries_unix("libepanet2_2.dylib", "compile_macos.sh", gcc_name="gcc-12")

epyt_flow/data/benchmarks/leakdb.py

@@ -475,12 +475,10 @@ def load_scenarios(scenarios_id: list[int], use_net1: bool = True,
                                   (int(week_year_pat.shape[0]), int(week_year_pat.shape[1])))
 
         # Create demand
-        if use_net1 is True:
-            base = 1
-        else:
-            base = 0.3  # Avoid negative pressure in Hanoi
+        base = 1
         variation = 0.75 + np.random.normal(0, 0.07)  # from 0 to 1
         dem = base * (year_offset+1) * (week_year_pat*variation+1) * (random+1)
+
         dem = dem.tolist()
         dem_final = []
         for d in dem:
@@ -508,6 +506,7 @@ def load_scenarios(scenarios_id: list[int], use_net1: bool = True,
                 wdn.epanet_api.setTimeHydraulicStep(general_params["hydraulic_time_step"])
                 wdn.epanet_api.setTimeSimulationDuration(general_params["simulation_duration"])
                 wdn.epanet_api.setTimePatternStep(general_params["hydraulic_time_step"])
+                wdn.epanet_api.setFlowUnitsCMH()
 
                 wdn.epanet_api.deletePatternsAll()
 
@@ -542,14 +541,10 @@ def load_scenarios(scenarios_id: list[int], use_net1: bool = True,
             upper = data + z
             return lower + np.random.uniform() * (upper - lower)
 
-    model_uncertainty = ModelUncertainty(pipe_length_uncertainty=MyUniformUncertainty(low=0,
-                                                                                      high=0.25),
-                                         pipe_diameter_uncertainty=MyUniformUncertainty(low=0,
-                                                                                        high=0.25),
-                                         pipe_roughness_uncertainty=MyUniformUncertainty(low=0,
-                                                                                         high=0.25),
-                                         demand_base_uncertainty=MyUniformUncertainty(low=0,
-                                                                                      high=0.25))
+    my_uncertainties = {"pipe_length_uncertainty": MyUniformUncertainty(low=0, high=0.25),
+                        "pipe_roughness_uncertainty": MyUniformUncertainty(low=0, high=0.25),
+                        "base_demand_uncertainty": MyUniformUncertainty(low=0, high=0.25)}
+    model_uncertainty = ModelUncertainty(**my_uncertainties)
 
     # Create sensor config (place pressure and flow sensors everywhere)
     sensor_config = network_config.sensor_config