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

epyt_flow/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.3

epyt_flow/simulation/sensor_config.py

@@ -33,6 +33,7 @@ MASS_UNIT_UG = 5
 MASS_UNIT_MOL = 6
 MASS_UNIT_MMOL = 7
 TIME_UNIT_HRS = 8
+MASS_UNIT_CUSTOM = 9
 
 
 def areaunit_to_id(unit_desc: str) -> int:
@@ -68,10 +69,15 @@ def massunit_to_id(unit_desc: str) -> int:
     `int`
         Corresponding mass unit ID.
     """
-    return {"MG": MASS_UNIT_MG,
-            "UG": MASS_UNIT_UG,
-            "MOL": MASS_UNIT_MOL,
-            "MMOL": MASS_UNIT_MMOL}[unit_desc]
+    mass_unit_dict = {"MG": MASS_UNIT_MG,
+                      "UG": MASS_UNIT_UG,
+                      "MOL": MASS_UNIT_MOL,
+                      "MMOL": MASS_UNIT_MMOL}
+
+    if unit_desc in mass_unit_dict:
+        return mass_unit_dict[unit_desc]
+    else:
+        return MASS_UNIT_CUSTOM
 
 
 def qualityunit_to_id(unit_desc: str) -> int:
@@ -116,10 +122,11 @@ def massunit_to_str(unit_id: int) -> str:
 
         Must be one of the following constant:
 
-            - MASS_UNIT_MG   = 4
-            - MASS_UNIT_UG   = 5
-            - MASS_UNIT_MOL  = 6
-            - MASS_UNIT_MMOL = 7
+            - MASS_UNIT_MG     = 4
+            - MASS_UNIT_UG     = 5
+            - MASS_UNIT_MOL    = 6
+            - MASS_UNIT_MMOL   = 7
+            - MASS_UNIT_CUSTOM = 9
 
     Returns
     -------
@@ -136,6 +143,8 @@ def massunit_to_str(unit_id: int) -> str:
         return "MOL"
     elif unit_id == MASS_UNIT_MMOL:
         return "MMOL"
+    elif unit_id == MASS_UNIT_CUSTOM:
+        return "CUSTOM UNIT"
     else:
         raise ValueError(f"Unknown mass unit ID '{unit_id}'")
 
@@ -698,7 +707,8 @@ class SensorConfig(JsonSerializable):
             raise ValueError("Inconsistency between 'bulk_species_mass_unit' and 'bulk_species'")
         if any(not isinstance(mass_unit, int) for mass_unit in bulk_species_mass_unit):
             raise TypeError("All items in 'bulk_species_mass_unit' must be an instance of 'int'")
-        if any(mass_unit not in [MASS_UNIT_MG, MASS_UNIT_UG, MASS_UNIT_MOL, MASS_UNIT_MMOL]
+        if any(mass_unit not in [MASS_UNIT_MG, MASS_UNIT_UG, MASS_UNIT_MOL, MASS_UNIT_MMOL,
+                                 MASS_UNIT_CUSTOM]
                for mass_unit in bulk_species_mass_unit):
             raise ValueError("Invalid mass unit in 'bulk_species_mass_unit'")
 
@@ -707,7 +717,8 @@ class SensorConfig(JsonSerializable):
                              "and 'surface_species'")
         if any(not isinstance(mass_unit, int) for mass_unit in surface_species_mass_unit):
             raise TypeError("All items in 'surface_species_mass_unit' must be an instance of 'int'")
-        if any(mass_unit not in [MASS_UNIT_MG, MASS_UNIT_UG, MASS_UNIT_MOL, MASS_UNIT_MMOL]
+        if any(mass_unit not in [MASS_UNIT_MG, MASS_UNIT_UG, MASS_UNIT_MOL, MASS_UNIT_MMOL,
+                                 MASS_UNIT_CUSTOM]
                for mass_unit in surface_species_mass_unit):
             raise ValueError("Invalid mass unit in 'surface_species_mass_unit'")
 

{epyt_flow-0.7.1.dist-info → epyt_flow-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: epyt-flow
-Version: 0.7.1
+Version: 0.7.3
 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

{epyt_flow-0.7.1.dist-info → epyt_flow-0.7.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-epyt_flow/VERSION,sha256=kCMRx7s4-hZY_0A972FY7nN4_p1uLihPocOHNcMb0ws,6
+epyt_flow/VERSION,sha256=nHiKg43B9r_YD6OXV6lflCYAccNQEcmgUwHaHHNQdlc,6
 epyt_flow/__init__.py,sha256=KNDiPWiHdB9a5ZF1ipjA1uoq61TwU2ThjaStpvSLBtY,1742
 epyt_flow/metrics.py,sha256=W-dolnrmWfoanyvg-knoe2QMUtFwV1xODp4D4EwsQ00,14261
 epyt_flow/serialization.py,sha256=ltWcLiTw62s0KG2DSgkQBkn6CCkxy9soDGq_ENohkrI,13998
@@ -114,7 +114,7 @@ epyt_flow/simulation/parallel_simulation.py,sha256=VmC7xemjxRB_N0fx1AAQ7ux82tnyT
 epyt_flow/simulation/scenario_config.py,sha256=NyadeCihpR4bpsWVPj7J-1DU2w1CEN0pAo2yh0t8Xkg,26751
 epyt_flow/simulation/scenario_simulator.py,sha256=RnPvgEvEZO2rxXPu3jpBGTCjl7LQ6pnSjjPrRhvsMgY,110315
 epyt_flow/simulation/scenario_visualizer.py,sha256=fpj67zl69q-byg7Oxocqhmu1S3P7B3ROCkSYzWyM--0,2187
-epyt_flow/simulation/sensor_config.py,sha256=1YduJTNpEhbndIxRXGGx9_nNxH45RIA9bSNJQFXRatA,92255
+epyt_flow/simulation/sensor_config.py,sha256=ZiTFQpyftLSVXd0p5egBxxHe47vD9af_1Tv7ppJR8Y0,92637
 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
@@ -132,8 +132,8 @@ epyt_flow/uncertainty/model_uncertainty.py,sha256=SD2sYGqj7K0Ys0Lvak4HsbP18A0Smw
 epyt_flow/uncertainty/sensor_noise.py,sha256=zJVULxnxVPSSqc6UW0iwZ9O-HGf9dn4CwScPqf4yCY0,2324
 epyt_flow/uncertainty/uncertainties.py,sha256=jzaAwv5--HGc-H4-SwB0s-pAnzhhFuc06IXck7rC5l8,17902
 epyt_flow/uncertainty/utils.py,sha256=gq66c9-QMOxOqI6wgWLyFxjVV0fbG0_8Yzd6mQjNYNo,5315
-epyt_flow-0.7.1.dist-info/LICENSE,sha256=-4hYIY2BLmCkdOv2_PehEwlnMKTCes8_oyIUXjKtkug,1076
-epyt_flow-0.7.1.dist-info/METADATA,sha256=t8szo6HkAXOXM1sWpoOUvx1zqkzZoWjm8dhgC_6CTms,9420
-epyt_flow-0.7.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-epyt_flow-0.7.1.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
-epyt_flow-0.7.1.dist-info/RECORD,,
+epyt_flow-0.7.3.dist-info/LICENSE,sha256=-4hYIY2BLmCkdOv2_PehEwlnMKTCes8_oyIUXjKtkug,1076
+epyt_flow-0.7.3.dist-info/METADATA,sha256=99ee4DSGioBMjHr18mIDadIA1U6wp-nHxo6YnaD7hU8,9420
+epyt_flow-0.7.3.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
+epyt_flow-0.7.3.dist-info/top_level.txt,sha256=Wh_kd7TRL8ownCw3Y3dxx-9C0iTSk6wNauv_NX9JcrY,10
+epyt_flow-0.7.3.dist-info/RECORD,,

{epyt_flow-0.7.1.dist-info → epyt_flow-0.7.3.dist-info}/WHEEL

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