epyt-flow 0.7.3__py3-none-any.whl → 0.8.0__py3-none-any.whl

epyt_flow/simulation/scada/scada_data_export.py

@@ -58,7 +58,8 @@ class ScadaDataExport():
         """
         return self.__export_raw_data
 
-    def create_global_sensor_config(self, scada_data: ScadaData) -> SensorConfig:
+    @staticmethod
+    def create_global_sensor_config(scada_data: ScadaData) -> SensorConfig:
         """
         Creates a global sensor configuration with sensors placed everywhere.
 
@@ -89,7 +90,8 @@ class ScadaDataExport():
 
         return sensor_config
 
-    def create_column_desc(self, scada_data: ScadaData) -> np.ndarray:
+    @staticmethod
+    def create_column_desc(scada_data: ScadaData) -> np.ndarray:
         """
         Creates column descriptions -- i.e. sensor type and location for each column
 
@@ -101,9 +103,9 @@ class ScadaDataExport():
         Returns
         -------
         `numpy.ndarray`
-            2-dimensional array describing all columns of the sensor readings:
-            The first dimension describes the sensor type, and the second dimension
-            describes the sensor location.
+            3-dimensional array describing all columns of the sensor readings:
+            The first dimension describes the sensor type, the second dimension
+            describes the sensor location, and the third one describes the measurement units.
         """
         sensor_readings = scada_data.get_data()
 

epyt_flow/simulation/scenario_config.py

@@ -6,6 +6,7 @@ from copy import deepcopy
 import os
 import json
 import numpy as np
+from pathlib import Path
 
 from ..uncertainty import AbsoluteGaussianUncertainty, RelativeGaussianUncertainty, \
     AbsoluteUniformUncertainty, RelativeUniformUncertainty, ModelUncertainty, \
@@ -220,7 +221,12 @@ class ScenarioConfig(Serializable):
         `str`
             Path to the .inp file.
         """
-        return os.path.join(self._parent_path, self.__f_inp_in)
+        if Path(self.__f_inp_in).is_absolute():
+            return self.__f_inp_in
+        elif Path(self.__f_inp_in).name == self.__f_inp_in:
+            return os.path.join(self._parent_path, self.__f_inp_in)
+        else:
+            return self.__f_inp_in
 
     @property
     def f_msx_in(self) -> str:
@@ -235,7 +241,12 @@ class ScenarioConfig(Serializable):
         if self.__f_msx_in is None:
             return None
         else:
-            return os.path.join(self._parent_path, self.__f_msx_in)
+            if Path(self.__f_msx_in).is_absolute():
+                return self.__f_msx_in
+            elif Path(self.__f_msx_in).name == self.__f_msx_in:
+                return os.path.join(self._parent_path, self.__f_msx_in)
+            else:
+                return self.__f_msx_in
 
     @property
     def general_params(self) -> dict: