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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. epyt_flow/VERSION +1 -1
  2. epyt_flow/data/benchmarks/leakdb.py +1 -0
  3. epyt_flow/metrics.py +66 -4
  4. epyt_flow/serialization.py +33 -0
  5. epyt_flow/simulation/scada/scada_data.py +715 -16
  6. epyt_flow/simulation/scada/scada_data_export.py +5 -1
  7. epyt_flow/simulation/scenario_simulator.py +306 -99
  8. epyt_flow/simulation/sensor_config.py +49 -2
  9. epyt_flow/topology.py +3 -3
  10. epyt_flow/uncertainty/model_uncertainty.py +11 -5
  11. epyt_flow/uncertainty/uncertainties.py +8 -0
  12. epyt_flow/utils.py +69 -2
  13. {epyt_flow-0.6.0.dist-info → epyt_flow-0.7.1.dist-info}/METADATA +50 -7
  14. {epyt_flow-0.6.0.dist-info → epyt_flow-0.7.1.dist-info}/RECORD +17 -17
  15. {epyt_flow-0.6.0.dist-info → epyt_flow-0.7.1.dist-info}/WHEEL +1 -1
  16. {epyt_flow-0.6.0.dist-info → epyt_flow-0.7.1.dist-info}/LICENSE +0 -0
  17. {epyt_flow-0.6.0.dist-info → epyt_flow-0.7.1.dist-info}/top_level.txt +0 -0
epyt_flow/simulation/scada/scada_data_export.py CHANGED
@@ -142,7 +142,11 @@ class ScadaDataExport():
142
142
  unit_desc = massunit_to_str(sensor_config.
143
143
  bulk_species_mass_unit[surface_species_idx])
144
144
 
145
- col_desc[col_id] = [sensor_type, item_id, unit_desc]
145
+ if sensor_type not in ["bulk_species_node", "bulk_species_link", "surface_species"]:
146
+ col_desc[col_id] = [sensor_type, item_id, unit_desc]
147
+ else:
148
+ for location_id, c_id in col_id.items():
149
+ col_desc[c_id] = [sensor_type, f"{item_id} @ {location_id}", unit_desc]
146
150
 
147
151
  return np.array(col_desc, dtype=object)
148
152