py-ewr 2.1.5__py3-none-any.whl → 2.1.6__py3-none-any.whl

py_ewr/scenario_handling.py

@@ -143,9 +143,18 @@ def build_MDBA_columns(input_data: pd.DataFrame, input_header: pd.DataFrame) ->
     numRows = int(input_header['Field'].iloc[1]) 
     df = input_header.drop([0,1])     
     df = df.astype(str)
-    df['Site'] = df['Site'].map(lambda x: x.strip("'"))
-    df['Measurand'] = df['Measurand'].map(lambda x: x.strip("'"))
-    df['Quality'] = df['Quality'].map(lambda x: x.strip("'"))
+    # Remove rogue quotes, spaces, and apostrophes
+    df['Site'] = df['Site'].map(lambda x: x.replace("'", ""))
+    df['Site'] = df['Site'].map(lambda x: x.replace('"', ''))
+    df['Site'] = df['Site'].map(lambda x: x.replace(" ", ""))
+
+    df['Measurand'] = df['Measurand'].map(lambda x: x.replace("'", ""))
+    df['Measurand'] = df['Measurand'].map(lambda x: x.replace('"', ''))
+    df['Measurand'] = df['Measurand'].map(lambda x: x.replace(" ", ""))
+
+    df['Quality'] = df['Quality'].map(lambda x: x.replace("'", ""))
+    df['Quality'] = df['Quality'].map(lambda x: x.replace('"', ''))
+    df['Quality'] = df['Quality'].map(lambda x: x.replace(" ", ""))
 
     # Construct refs and save to list:
     listOfCols = []
@@ -449,10 +458,6 @@ class ScenarioHandler:
             elif self.model_format == 'ten thousand year':
                 df = pd.read_csv(scenarios[scenario], index_col = 'Date')
                 df_F, df_L = cleaner_ten_thousand_year(df, self.parameter_sheet)
-
-            elif self.model_format == 'Source - Qld':
-                df = pd.read_csv(scenarios[scenario], index_col = 'Date')
-                df_F, df_L = cleaner_Qld_source(data)
             
             gauge_results = {}
             gauge_events = {}

{py_ewr-2.1.5.dist-info → py_ewr-2.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.1.5
+Version: 2.1.6
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -32,11 +32,11 @@ Requires-Dist: cachetools ==5.2.0
 [![PyPI](https://img.shields.io/pypi/v/py-ewr)](https://pypi.org/project/py-ewr/)
 [![DOI](https://zenodo.org/badge/342122359.svg)](https://zenodo.org/badge/latestdoi/342122359)
 
-### **EWR tool version 2.1.5 README**
+### **EWR tool version 2.1.6 README**
 
 ### **Notes on recent version update**
 - Standard time-series handling added - each column needs a gauge, followed by and underscore, followed by either flow or level (e.g. 409025_flow). This handling also has missing date filling - so any missing dates will be filled with NaN values in all columns.
-- ten thousand year handling - the same formatting as above is required (gauge_flow OR gauge_level)
+- ten thousand year handling - This has been briefly taken offline for this version.
 - bug fixes: spells of length equal to the minimum required spell length were getting filtered out of the successful events table and successful interevents table.
 
 ### **Installation**
@@ -103,7 +103,7 @@ all_successful_interEvents = ewr_oh.get_all_successful_interEvents()
 ### Option 2: Running model scenarios through the EWR tool
 
 1. Tell the tool where the model files are (can either be local or in a remote location)
-2. Tell the tool what format the model files are in (Current model format options: 'Bigmod - MDBA', 'Source - NSW (res.csv)', 'IQQM - NSW 10,000 years' - see manual for formatting requirements)
+2. Tell the tool what format the model files are in (Current model format options: 'Bigmod - MDBA', 'Source - NSW (res.csv)', 'Standard time-series' - see manual for formatting requirements)
 
 ```python
 #USER INPUT REQUIRED>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

{py_ewr-2.1.5.dist-info → py_ewr-2.1.6.dist-info}/RECORD

@@ -2,14 +2,14 @@ py_ewr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 py_ewr/data_inputs.py,sha256=BLJrrasZYpSUkC0yVBzVqnz6WGT2Y3SJYJJhguDi-Vo,18046
 py_ewr/evaluate_EWRs.py,sha256=1JYWNtw5MYgf92jXhDNlgGkDx2mcfBP34OO-0jgal1w,229279
 py_ewr/observed_handling.py,sha256=NaySsqe8nWgZdDRSr22EYmCwf0uNzVj9DFF6hzNr6ws,18173
-py_ewr/scenario_handling.py,sha256=BNMKQmDIcT7mYd0jnSGUBfcZ2AzCvxgHGwJA9KxyQ_A,28184
+py_ewr/scenario_handling.py,sha256=yMAfRNIZtuGntdey2-FML5nfUaGXMIApAUvIzQbyXUs,28476
 py_ewr/summarise_results.py,sha256=7w2Tbriwob21UXG0N2rSKffneg3M49hWouJPTHVjDAU,29747
 py_ewr/model_metadata/SiteID_MDBA.csv,sha256=ZVY_P-lq_tHNELfUrTTveNPWcumKHot7yWvdjje0I2k,164412
 py_ewr/model_metadata/SiteID_NSW.csv,sha256=UVBxN43Z5KWCvWhQ5Rh6TNEn35q4_sjPxKyHg8wPFws,6805
-py_ewr/parameter_metadata/ewr_calc_config.json,sha256=BkuSJI6NqZzJxZMd8eh3GBs5uoHfI2joOkPrKLu9-60,17556
-py_ewr/parameter_metadata/parameter_sheet.csv,sha256=ufOYn59cS4kl9XF1WaNqBhodcsBxUWH8Y0g1qHVUAcg,594257
-py_ewr-2.1.5.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
-py_ewr-2.1.5.dist-info/METADATA,sha256=Sw5eAbah1SeV6Bd4BUCOXOqgEl6QgHSdaAg79Qixp5k,9570
-py_ewr-2.1.5.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-py_ewr-2.1.5.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
-py_ewr-2.1.5.dist-info/RECORD,,
+py_ewr/parameter_metadata/ewr_calc_config.json,sha256=LEnaueNT60FFEPSJDgLpD8EGo_CguTPlZJ3Q5t_-XQ4,17610
+py_ewr/parameter_metadata/parameter_sheet.csv,sha256=H5f2jzR5FpsjIm9hYh26qth0Z2LNlZfeWpXysQel4y8,895653
+py_ewr-2.1.6.dist-info/LICENSE,sha256=ogEPNDSH0_dhiv_lT3ifVIdgIzHAqNA_SemnxUfPBJk,7048
+py_ewr-2.1.6.dist-info/METADATA,sha256=npduQ6-A-263ruoja__ytTnOOwcijpUNt51dOIjFfmY,9552
+py_ewr-2.1.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+py_ewr-2.1.6.dist-info/top_level.txt,sha256=n3725d-64Cjyb-YMUMV64UAuIflzUh2_UZSxiIbrur4,7
+py_ewr-2.1.6.dist-info/RECORD,,