py-ewr 2.2.1__tar.gz → 2.2.4__tar.gz

{py_ewr-2.2.1 → py_ewr-2.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.1
+Version: 2.2.4
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -23,7 +23,6 @@ Requires-Dist: ipython==8.8.0
 Requires-Dist: ipywidgets==7.7.0
 Requires-Dist: pandas==2.0.3
 Requires-Dist: requests==2.25.1
-Requires-Dist: tqdm>=4.66.1
 Requires-Dist: mdba-gauge-getter==0.5.1
 Requires-Dist: cachetools==5.2.0
 Requires-Dist: xarray==2023.01.0
@@ -35,9 +34,11 @@ Requires-Dist: numpy<2
 [![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.2.1 README**
+### **EWR tool version 2.2.4 README**
 
 ### **Notes on recent version update**
+- Remove TQDM loading bars
+- Handle duplicate sites in MDBA siteID file - where a duplicate exists, the first match is used and the rest are skipped over
 - Adding new model format handling - 'IQQM - netcdf'
 - 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 - This has been briefly taken offline for this version.

{py_ewr-2.2.1 → py_ewr-2.2.4}/README.md

@@ -3,9 +3,11 @@
 [![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.2.1 README**
+### **EWR tool version 2.2.4 README**
 
 ### **Notes on recent version update**
+- Remove TQDM loading bars
+- Handle duplicate sites in MDBA siteID file - where a duplicate exists, the first match is used and the rest are skipped over
 - Adding new model format handling - 'IQQM - netcdf'
 - 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 - This has been briefly taken offline for this version.

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr/data_inputs.py

@@ -416,3 +416,27 @@ def get_scenario_gauges(gauge_results: dict) -> list:
         for gauge in scenario.keys():
             scenario_gauges.append(gauge)
     return list(set(scenario_gauges))
+
+
+def gauge_groups(parameter_sheet: pd.DataFrame) -> dict:
+    '''
+    Returns a dictionary of flow, level, and lake level gauges based on the parameter sheet and some hard coding of other EWRs
+
+    Args:
+        parameter_sheet (pd.DataFrame): input parameter sheet
+    
+    Returns:
+        dict: keys as flow, level, and lake level gauges, values as the list of gauges
+    '''
+    
+    # Hard coded gauges for the CLLMM EWRs
+    hard_code_levels = ['A4260527', 'A4260524', 'A4260633', 'A4261209', 'A4261165']
+    hard_code_lake_levels = ['A4261133', 'A4260574', 'A4260575']
+
+    flow_gauges = set(parameter_sheet[parameter_sheet['GaugeType'] == 'F']['Gauge']) + set(parameter_sheet['Multigauge'])
+    level_gauges = set(parameter_sheet[parameter_sheet['GaugeType'] == 'L']['Gauge']) + set(parameter_sheet['WeirpoolGauge']) + set(hard_code_levels)
+    lake_level_gauges = set(parameter_sheet[parameter_sheet['GaugeType'] == 'LL']['Gauge'])+set(hard_code_lake_levels)
+
+    return flow_gauges, level_gauges, lake_level_gauges
+
+# def gauges_to_measurand()

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr/evaluate_EWRs.py

@@ -10,7 +10,6 @@ import logging
 
 import pandas as pd
 import numpy as np
-from tqdm import tqdm
 
 from . import data_inputs
 
@@ -446,8 +445,8 @@ def get_index_date(date_index:Any)-> datetime.date:
     """
     if type(date_index) == pd._libs.tslibs.timestamps.Timestamp:
         return date_index.date()
-    if type(date_index) == pd._libs.tslibs.period.Period:
-        return date_index.to_timestamp().date()
+    # if type(date_index) == pd._libs.tslibs.period.Period:
+    #     return date_index.date()#.to_timestamp()
     else:
         return date_index
 
@@ -1959,7 +1958,7 @@ def water_stability_check(EWR_info:Dict, iteration:int, flows:List, all_events:D
     if levels_are_stable:
         # record event opportunity for the next n days for the total period of (EggDaysSpell)+ larvae (LarvaeDaysSpell)
         # if the last day of the event is not over the last day of the event window
-        iteration_date = flow_date.to_timestamp().date()
+        iteration_date = flow_date.date()#flow_date.to_timestamp().date()
         last_day_window = get_last_day_of_window(iteration_date, EWR_info['end_month'])
         event_size = EWR_info['eggs_days_spell'] + EWR_info['larvae_days_spell']
         if is_date_in_window(iteration_date, last_day_window, event_size):
@@ -1996,7 +1995,7 @@ def water_stability_level_check(EWR_info:Dict, iteration:int, all_events:Dict, w
     if levels_are_stable:
         # record event opportunity for the next n days for the total period of (EggDaysSpell)+ larvae (LarvaeDaysSpell)
         # if the last day of the event is not over the last day of the event window
-        iteration_date = flow_date.to_timestamp().date()
+        iteration_date = flow_date.date()#flow_date.to_timestamp().date()
         last_day_window = get_last_day_of_window(iteration_date, EWR_info['end_month'])
         event_size = EWR_info['eggs_days_spell'] + EWR_info['larvae_days_spell']
         if is_date_in_window(iteration_date, last_day_window, event_size):
@@ -2605,7 +2604,7 @@ def lower_lakes_level_check(EWR_info: dict, levels: pd.Series, event: list, all_
 #------------------------------------ Calculation functions --------------------------------------#
 
 
-def create_water_stability_event(flow_date: pd.Period, flows:List, iteration: int, EWR_info:dict)->List:
+def create_water_stability_event(flow_date: pd.Timestamp, flows:List, iteration: int, EWR_info:dict)->List:#pd.Period
     """create overlapping event that meets an achievement for fish recruitment water stability
 
     Args:
@@ -2618,7 +2617,7 @@ def create_water_stability_event(flow_date: pd.Period, flows:List, iteration: in
     """
     event_size = EWR_info['eggs_days_spell'] + EWR_info['larvae_days_spell']
     event_flows = flows[iteration: iteration + event_size]
-    start_event_date = flow_date.to_timestamp().date()
+    start_event_date = flow_date.date()#flow_date.to_timestamp().date()
     event_dates = [ start_event_date + timedelta(i) for i in range(event_size)]
     
     return [(d, flow)  for d, flow in zip(event_dates, event_flows)]
@@ -3811,16 +3810,16 @@ def nest_calc_percent_trigger(EWR_info:Dict, flows:List, water_years:List, dates
             flow_percent_change = calc_flow_percent_change(i, flows)
             trigger_day = date(dates[i].year,EWR_info["trigger_month"], EWR_info["trigger_day"])
             cut_date = calc_nest_cut_date(EWR_info, i, dates)
-            is_in_trigger_window = dates[i].to_timestamp().date() >= trigger_day \
-                                   and dates[i].to_timestamp().date() <= trigger_day + timedelta(days=14)
+            is_in_trigger_window = dates[i].date() >= trigger_day \
+                                   and dates[i].date() <= trigger_day + timedelta(days=14) #.to_timestamp() .to_timestamp()
             iteration_no_event = 0
             
             ## if there IS an ongoing event check if we are on the trigger season window 
             # if yes then check the current flow
             if total_event > 0:
-                if (dates[i].to_timestamp().date() >= trigger_day) and (dates[i].to_timestamp().date() <= cut_date):
+                if (dates[i].date() >= trigger_day) and (dates[i].date() <= cut_date):
                     event, all_events, gap_track, total_event, iteration_no_event = nest_flow_check(EWR_info, i, flow, event, all_events, 
-                                                         gap_track, water_years, total_event, flow_date, flow_percent_change, iteration_no_event)
+                                                         gap_track, water_years, total_event, flow_date, flow_percent_change, iteration_no_event) #.to_timestamp() .to_timestamp()
 
                 # this path will only be executed if an event extends beyond the cut date    
                 else:
@@ -3841,12 +3840,12 @@ def nest_calc_percent_trigger(EWR_info:Dict, flows:List, water_years:List, dates
     
     # Check final iteration in the flow timeseries, saving any ongoing events/event gaps to their spots in the dictionaries:
     # reset all variable to last flow
-    flow_date = dates[-1].to_timestamp().date()
+    flow_date = dates[-1].date()#.to_timestamp()
     flow_percent_change = calc_flow_percent_change(-1, flows)
     trigger_day = date(dates[-1].year,EWR_info["trigger_month"], EWR_info["trigger_day"])
     cut_date = calc_nest_cut_date(EWR_info, -1, dates)
-    is_in_trigger_window = dates[-1].to_timestamp().date() >= trigger_day - timedelta(days=7) \
-    and dates[-1].to_timestamp().date() <= trigger_day + timedelta(days=7)
+    is_in_trigger_window = dates[-1].date() >= trigger_day - timedelta(days=7) \
+    and dates[-1].date() <= trigger_day + timedelta(days=7) #.to_timestamp() .to_timestamp()
     iteration_no_event = 0
 
     if total_event > 0:
@@ -5086,9 +5085,7 @@ def calc_sorter(df_F:pd.DataFrame, df_L:pd.DataFrame, gauge:str, EWR_table:pd.Da
         EWR_codes = PU_table['Code']
         PU_df = pd.DataFrame()
         PU_events = {}
-        for i, EWR in enumerate(tqdm(EWR_codes, position = 0, leave = False,
-                                     bar_format='{l_bar}{bar:10}{r_bar}{bar:-10b}',
-                                     desc= str('Evaluating ewrs for '+ gauge))):
+        for i, EWR in enumerate(EWR_codes):
             events = {}
 
             MULTIGAUGE = is_multigauge(EWR_table, gauge, EWR, PU)

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr/observed_handling.py

@@ -3,7 +3,6 @@ from typing import Dict, List
 import logging
 
 import pandas as pd
-from tqdm import tqdm
 import numpy as np
 
 from . import data_inputs, evaluate_EWRs, summarise_results, scenario_handling
@@ -131,7 +130,7 @@ def observed_cleaner(input_df: pd.DataFrame, dates: dict) -> pd.DataFrame:
     start_date = datetime(dates['start_date'].year, dates['start_date'].month, dates['start_date'].day)
     end_date = datetime(dates['end_date'].year, dates['end_date'].month, dates['end_date'].day)
     
-    df_index = pd.date_range(start=start_date,end=end_date - timedelta(days=1)).to_period()
+    df_index = pd.date_range(start=start_date,end=end_date - timedelta(days=1))#.to_period()
     gauge_data_df = pd.DataFrame()
     gauge_data_df['Date'] = df_index
     gauge_data_df = gauge_data_df.set_index('Date')
@@ -140,7 +139,7 @@ def observed_cleaner(input_df: pd.DataFrame, dates: dict) -> pd.DataFrame:
     
     
     input_df['Date'] = pd.to_datetime(input_df['DATETIME'], format = '%Y-%m-%d')
-    input_df['Date'] = input_df['Date'].apply(lambda x: x.to_period(freq='D'))
+    # input_df['Date'] = input_df['Date'].apply(lambda x: x.to_period(freq='D'))
 
     # Check with states for more codes:
     bad_data_codes = data_inputs.get_bad_QA_codes()

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr/scenario_handling.py

@@ -7,7 +7,6 @@ from datetime import datetime, date
 import logging
 
 import pandas as pd
-from tqdm import tqdm
 import xarray as xr
 import netCDF4
  
@@ -259,7 +258,7 @@ def cleaner_MDBA(input_df: pd.DataFrame) -> pd.DataFrame:
     
     cleaned_df = input_df.rename(columns={'Mn': 'Month', 'Dy': 'Day'})
     cleaned_df['Date'] = pd.to_datetime(cleaned_df[['Year', 'Month', 'Day']], format = '%Y-%m-%d')
-    cleaned_df['Date'] = cleaned_df['Date'].apply(lambda x: x.to_period(freq='D'))
+    # cleaned_df['Date'] = cleaned_df['Date'].apply(lambda x: x.to_period(freq='D'))
     cleaned_df = cleaned_df.drop(['Day', 'Month', 'Year'], axis = 1)
     cleaned_df = cleaned_df.set_index('Date')
     
@@ -437,6 +436,42 @@ def extract_gauge_from_string(input_string: str) -> str:
     gauge = input_string.split('_')[0]
     return gauge
 
+# def match_MDBA_nodes_dev(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_table_path: str) -> tuple:
+#     '''
+#     Iterate over the gauges in the parameter sheet, 
+#     find all the occurences of that gauge in the ARWC column in the model metadata file,
+#     for each match, search for the matching siteID in the model file,
+#     append the column to the flow dataframe.
+
+#     Args:
+#         input_df (pd.DataFrame): flow/water level dataframe
+#         model_metadata (pd.DataFrame): dataframe linking model nodes to gauges
+
+#     Returns:
+#         tuple[pd.DataFrame, pd.DataFrame]: flow dataframe, water level dataframe
+
+#     '''
+#     df_flow = pd.DataFrame(index = input_df.index)
+#     df_level = pd.DataFrame(index = input_df.index)
+
+#     unique_gauges = #Get unique gauges from the parameter sheet
+#     #TODO: include logic to have the measurand included
+#     for i in unique_gauges:
+#         # Subset of the SiteID file with the gauges
+#         subset_df = model_metadata[model_metadata['AWRC'] == i]
+#         # Iterate over the occurences of the gauge and check if the matching SiteID file is in the model file
+#         for j in subset_df.iterrows:
+#             site_mm = j['SITEID']
+#             if site_mm in input_df.columns:
+#                 df_flow[i] = input_df[site_mm+INPUT_MEASURAND+ANY_QUALITY_CODE]
+#                 or
+#                 df_level[i] = input_df[site_mm+INPUT_MEASURAND+ANY_QUALITY_CODE]
+
+#     if df_flow.empty and df_level.empty:
+#         raise ValueError('No relevant gauges and or measurands found in dataset, the EWR tool cannot evaluate this model output file')      
+#     return df_flow, df_level
+
+
 def match_MDBA_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_table_path: str) -> tuple:
     '''Checks if the source file columns have EWRs available, returns a flow and level dataframe with only 
     the columns with EWRs available. Renames columns to gauges
@@ -461,11 +496,19 @@ def match_MDBA_nodes(input_df: pd.DataFrame, model_metadata: pd.DataFrame, ewr_t
         measure = col_clean.split('-')[1]
         if ((measure in measurands) and (model_metadata['SITEID'] == site).any()):
             subset = model_metadata.query("SITEID==@site")
-            gauge = subset["AWRC"].iloc[0]
-            if gauge in flow_gauges and measure == '1':
-                df_flow[gauge] = input_df[col]
-            if gauge in level_gauges and measure == '35':
-                df_level[gauge] = input_df[col]
+            for iset in range(len(subset)):
+                gauge = subset["AWRC"].iloc[iset]
+                if gauge in flow_gauges and measure == '1':
+                    df_flow[gauge] = input_df[col]
+                if gauge in level_gauges and measure == '35':
+                    aa=input_df[[col]]
+                    if (len(aa.columns)>1):
+                        print('More than one site has been identified, the first site is used')
+                        print('Site info: ', col)
+                        df_level[gauge] = aa.iloc[:,0]
+                    else:
+                        df_level[gauge] = input_df[col]
+
     if df_flow.empty:
         raise ValueError('No relevant gauges and or measurands found in dataset, the EWR tool cannot evaluate this model output file')      
     return df_flow, df_level
@@ -538,9 +581,7 @@ class ScenarioHandler:
         # Analyse all scenarios for EWRs
         detailed_results = {}
         detailed_events = {}
-        for scenario in tqdm(scenarios, position = 0, leave = True, 
-                            bar_format='{l_bar}{bar:10}{r_bar}{bar:-10b}',
-                            desc= 'Evaluating scenarios'):
+        for scenario in scenarios:
             if self.model_format == 'Bigmod - MDBA':
                 
                 data, header = unpack_model_file(scenarios[scenario], 'Dy', 'Field')

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py_ewr
-Version: 2.2.1
+Version: 2.2.4
 Summary: Environmental Water Requirement calculator
 Home-page: https://github.com/MDBAuth/EWR_tool
 Author: Martin Job
@@ -23,7 +23,6 @@ Requires-Dist: ipython==8.8.0
 Requires-Dist: ipywidgets==7.7.0
 Requires-Dist: pandas==2.0.3
 Requires-Dist: requests==2.25.1
-Requires-Dist: tqdm>=4.66.1
 Requires-Dist: mdba-gauge-getter==0.5.1
 Requires-Dist: cachetools==5.2.0
 Requires-Dist: xarray==2023.01.0
@@ -35,9 +34,11 @@ Requires-Dist: numpy<2
 [![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.2.1 README**
+### **EWR tool version 2.2.4 README**
 
 ### **Notes on recent version update**
+- Remove TQDM loading bars
+- Handle duplicate sites in MDBA siteID file - where a duplicate exists, the first match is used and the rest are skipped over
 - Adding new model format handling - 'IQQM - netcdf'
 - 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 - This has been briefly taken offline for this version.

{py_ewr-2.2.1 → py_ewr-2.2.4}/py_ewr.egg-info/requires.txt

@@ -2,7 +2,6 @@ ipython==8.8.0
 ipywidgets==7.7.0
 pandas==2.0.3
 requests==2.25.1
-tqdm>=4.66.1
 mdba-gauge-getter==0.5.1
 cachetools==5.2.0
 xarray==2023.01.0

{py_ewr-2.2.1 → py_ewr-2.2.4}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="py_ewr",
-    version="2.2.1",
+    version="2.2.4",
     author="Martin Job",
     author_email="Martin.Job@mdba.gov.au",
     description="Environmental Water Requirement calculator",
@@ -35,7 +35,6 @@ setup(
         "ipywidgets==7.7.0",
         "pandas==2.0.3",
         "requests==2.25.1",
-        "tqdm>=4.66.1",
         "mdba-gauge-getter==0.5.1",
         "cachetools==5.2.0",
         "xarray==2023.01.0",

{py_ewr-2.2.1 → py_ewr-2.2.4}/tests/test_evaluate_ewr_rest.py

@@ -520,8 +520,8 @@ def test_flow_calc(flows,expected_all_events,expected_all_no_events):
 	# Set up input data
 	EWR_info = {'min_flow': 5, 'max_flow': 20, 'gap_tolerance': 0, 'min_event':10, 'duration': 10}
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	# Set up expected output data        
 	expected_durations = [10]*4
 	# Send inputs to test function and test
@@ -542,8 +542,8 @@ def test_lowflow_calc():
 	EWR_info = {'min_flow': 10, 'max_flow': 20, 'min_event':1, 'duration': 300, 'duration_VD': 10}
 	flows = np.array([5]*295+[0]*25+[10]*45 + [0]*355+[5000]*10 + [0]*355+[10]*10 + [5]*295+[0]*25+[10]*45+[10]*1)
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	# Set up expected output data
 	expected_all_events = {2012: [[(date(2013, 5, 17), 10), (date(2013, 5, 18), 10), (date(2013, 5, 19), 10), 
 	(date(2013, 5, 20), 10), (date(2013, 5, 21), 10), (date(2013, 5, 22), 10), (date(2013, 5, 23), 10), 
@@ -590,8 +590,8 @@ def test_lowflow_calc():
 					'duration_VD': 5, 'start_month': 7, 'end_month': 12, 'start_day': None, 'end_day': None}
 	flows = np.array([10]*5+[0]*35+[5]*5+[0]*295+[0]*25 + [0]*355+[5]*10 + [10]*10+[0]*355 + [5]*295+[0]*25+[10]*45+[10]*1)
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	masked_dates = masked_dates[((masked_dates.month >= 7) & (masked_dates.month <= 12))] # Just want the dates in the date range
 	# Set up expected output data
 	expected_all_events = {2012: [[(date(2012, 7, 1), 10), (date(2012, 7, 2), 10), (date(2012, 7, 3), 10), 
@@ -618,8 +618,8 @@ def test_ctf_calc():
 	EWR_info = {'min_flow': 0, 'max_flow': 1, 'min_event':5, 'duration': 20, 'duration_VD': 10}
 	flows = np.array([5]*295+[0]*25+[10]*45 + [20]*355+[5000]*5+[0]*5 + [0]*355+[10]*10 + [1]*295+[20]*25+[0]*45+[0]*1)
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	# Set up expected output data
 	expected_all_events = {2012: [[(date(2013, 4, 22)+timedelta(days=i), 0) for i in range(25)]],
 	  					   2013: [[(date(2014, 6, 26)+timedelta(days=i), 0) for i in range(5)]], 
@@ -643,8 +643,8 @@ def test_ctf_calc():
 	[10]*10+[0]*355 +
 	[5]*295+[0]*25+[10]*45+[10]*1)
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	masked_dates = masked_dates[((masked_dates.month >= 7) & (masked_dates.month <= 12))] # Just want the dates in the date range
 	# Set up expected output data
 	expected_all_events = {2012: [[(date(2012, 7, 1)+timedelta(days=i), 10) for i in range(5)],
@@ -738,7 +738,7 @@ def test_ctf_calc_anytime(flows, expected_all_events, expected_all_no_events):
 	# Set up input data
 	EWR_info = {'min_flow': 0, 'max_flow': 1, 'min_event':5, 'duration': 20, 'duration_VD': 10}
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	# Send to test function and then test
 	all_events, durations = evaluate_EWRs.ctf_calc_anytime(EWR_info, flows, water_years, dates)
 	for year in all_events:
@@ -799,7 +799,7 @@ def test_flow_calc_anytime(flows, expected_all_events, expected_all_no_events):
 	expected_durations = [10]*4
 	# Send to test function and then test
 	dates = 1
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	all_events, durations = evaluate_EWRs.flow_calc_anytime(EWR_info, flows, water_years, dates)
 
 	for year in all_events:
@@ -808,8 +808,8 @@ def test_flow_calc_anytime(flows, expected_all_events, expected_all_no_events):
 	assert durations == expected_durations
 
 
-def test_get_index_date(period_date, stamp_date):
-	assert evaluate_EWRs.get_index_date(period_date) == evaluate_EWRs.get_index_date(stamp_date)
+def test_get_index_date(datetime_date, stamp_date):#period_date
+	assert evaluate_EWRs.get_index_date(datetime_date) == evaluate_EWRs.get_index_date(stamp_date)
 
 
 @pytest.mark.parametrize("EWR_info,flows,expected_all_events,expected_all_no_events",[
@@ -870,7 +870,7 @@ def test_get_index_date(period_date, stamp_date):
 def test_cumulative_calc(EWR_info, flows, expected_all_events, expected_all_no_events):
 	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	all_events, durations = evaluate_EWRs.cumulative_calc(EWR_info, flows, water_years, dates, masked_dates)
 
 	assert all_events == expected_all_events
@@ -932,7 +932,7 @@ def test_cumulative_calc_qld(EWR_info, flows, expected_all_events):
 	"""
 	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	all_events, _ = evaluate_EWRs.cumulative_calc_qld(EWR_info, flows, water_years, dates, masked_dates)
 
 	assert all_events == expected_all_events
@@ -2112,7 +2112,7 @@ def test_nest_calc_percent_trigger(EWR_info, flows, expected_all_events, expecte
 	"""
 	# non changing parameters
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	
 	all_events, _  = evaluate_EWRs.nest_calc_percent_trigger(EWR_info, flows, water_years, dates)
 								
@@ -3176,8 +3176,8 @@ def test_coorong_check(EWR_info, iteration, levels_data, event, all_events,
 ])
 def test_coorong_level_calc(EWR_info, levels_data, expected_all_events):
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	levels = pd.Series(levels_data, index=dates)
 
 	all_events, _ = evaluate_EWRs.coorong_level_calc(EWR_info, levels, water_years, dates, masked_dates)
@@ -3258,8 +3258,8 @@ def test_lower_lakes_level_check(EWR_info, iteration, levels_data, event, all_ev
 def test_lower_lakes_level_calc(EWR_info, levels_data, expected_all_events):
 
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	levels = pd.Series(levels_data, index=dates)
 
 	all_events, _ = evaluate_EWRs.lower_lakes_level_calc(EWR_info, levels, water_years, dates, masked_dates)
@@ -3382,8 +3382,8 @@ def test_flow_calc_sa(EWR_info, flows_data, expected_all_events):
 	"""
 	
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	flow_series = pd.Series(flows_data, index=dates)
 
 	all_events, _ = evaluate_EWRs.flow_calc_sa(EWR_info, flow_series, water_years, dates, masked_dates)
@@ -3805,8 +3805,8 @@ def test_flow_calc_check_ctf(EWR_info,flows_data,expected_all_events):
 	'''
 	
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	flows = pd.Series(flows_data, index=dates)
 
 	all_events, _ = evaluate_EWRs.flow_calc_check_ctf(EWR_info, flows, water_years, dates, masked_dates)
@@ -4083,7 +4083,7 @@ def test_cumulative_calc_bbr(EWR_info, flows, levels, expected_all_events, expec
 	"""
 	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	all_events, _ = evaluate_EWRs.cumulative_calc_bbr(EWR_info, flows, levels, water_years, dates, masked_dates)
 
 	assert all_events == expected_all_events
@@ -4117,7 +4117,7 @@ def test_achieved_min_volume(event, EWR_info, expected_result):
 	
 @pytest.mark.parametrize("flow_date, flows, iteration, EWR_info, expected_results", [
 	(
-	pd.Period('2023-05-24', freq='D'),
+	pd.to_datetime('2023-05-24', format='%Y-%m-%d'),#pd.Period('2023-05-24', freq='D'),
 	[1,1,3,4,5,6,7,1,1,1],
 	6,
 	{"larvae_days_spell":1,"eggs_days_spell":2},
@@ -4209,7 +4209,7 @@ def test_check_water_stability_flow(flows, iteration, EWR_info, expected_result)
 ])
 def test_water_stability_check(EWR_info, iteration, flows, all_events, levels, expected_all_events):
 	
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
 	flow_date = dates[iteration]
 	
@@ -4370,9 +4370,9 @@ def test_water_stability_calc(EWR_info, flows, levels, expected_all_events):
 	5. meeting 2 opportunity but second one the last day is outside window
 	"""
 
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	
 	all_events, _ = evaluate_EWRs.water_stability_calc(EWR_info, flows, levels,water_years, dates, masked_dates)
 
@@ -4508,7 +4508,7 @@ def test_check_water_stability_height(levels, iteration, EWR_info, expected_resu
 ])
 def test_water_stability_level_check(EWR_info, iteration, all_events, levels, expected_all_events):
 	
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
 	flow_date = dates[iteration]
 	
@@ -4573,9 +4573,9 @@ def test_water_stability_level_calc(EWR_info, levels, expected_all_events):
 	2. meeting 2 opportunity but second one the last day is outside window
 	"""
 
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	
 	all_events, _ = evaluate_EWRs.water_stability_level_calc(EWR_info, levels, water_years, dates, masked_dates)
 
@@ -4801,9 +4801,9 @@ def test_check_period_flow_change_stepped(flows, EWR_info, iteration, mode, expe
 ])
 def test_rate_rise_flow_calc(EWR_info, flows, expected_all_events):
     # non changing variable
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 
 	all_events, _ = evaluate_EWRs.rate_rise_flow_calc(EWR_info, flows, water_years, dates, masked_dates)
 
@@ -4960,9 +4960,9 @@ def test_rate_rise_flow_check(EWR_info, iteration, event, all_events, total_even
 ])
 def test_rate_fall_flow_calc(EWR_info, flows, expected_all_events):
 	  # non changing variable
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 
 	all_events, _ = evaluate_EWRs.rate_fall_flow_calc(EWR_info, flows, water_years, dates, masked_dates)
 
@@ -5118,9 +5118,9 @@ def test_rate_fall_flow_check(EWR_info, iteration, event, all_events, total_even
 def test_rate_rise_level_calc(EWR_info, levels, expected_all_events):
 	
 	# non changing variable
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 
 	all_events, _ = evaluate_EWRs.rate_rise_level_calc(EWR_info, levels, water_years, dates, masked_dates)
 
@@ -5279,9 +5279,9 @@ def test_rate_rise_level_check(EWR_info, iteration, event, all_events, total_eve
 def test_rate_fall_level_calc(EWR_info, levels, expected_all_events):
 
 	# non changing variable
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 
 	all_events, _ = evaluate_EWRs.rate_fall_level_calc(EWR_info, levels, water_years, dates, masked_dates)
 
@@ -5548,9 +5548,9 @@ def test_level_change_check(EWR_info, iteration, event, all_events, total_event,
 def test_level_change_calc(EWR_info, levels, expected_all_events):
 	
 	# non changing variable
-	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 	water_years = np.array([2012]*365 + [2013]*365 + [2014]*365 + [2015]*366)
-	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()
+	masked_dates = pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))#.to_period()
 
 	all_events, _ = evaluate_EWRs.level_change_calc(EWR_info, levels, water_years, dates, masked_dates)
 

{py_ewr-2.2.1 → py_ewr-2.2.4}/tests/test_evaluate_ewrs.py

@@ -16,7 +16,7 @@ def test_ctf_handle():
     gauge = '410007'
     EWR = 'CF1'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: [0]*1+[0]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*10+[0]*345+[0]*1+[0]*9 + [0]*5+[0]*351+[0]*10}
     df_F = pd.DataFrame(data = data_for_df_F)
     df_F = df_F.set_index('Date')
@@ -55,7 +55,7 @@ def test_lowflow_handle():
     gauge = '410007'
     EWR = 'BF1_a'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: [0]*1+[249]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[249]*345+[0]*1+[249]*17 + [0]*5+[249]*351+[249]*10}
     df_F = pd.DataFrame(data = data_for_df_F)
     df_F = df_F.set_index('Date')
@@ -95,7 +95,7 @@ def test_flow_handle():
     gauge = '410007'
     EWR = 'SF1_S'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: [0]*1+[250]*350+[450]*10+[0]*4 + 
                                [0]*360+[450]*5 + 
                                [450]*5+[250]*345+[0]*1+[450]*14 + 
@@ -212,7 +212,7 @@ def test_cumulative_handle_qld(qld_parameter_sheet,expected_events, expected_PU_
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         '422016': ( [2500]*10+[0]*355   + 
                                     [0]*365 + 
                                     [0]*365 + 
@@ -245,7 +245,7 @@ def test_level_handle():
     gauge = '425022'
     EWR = 'LLLF'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: [0]*1+[0]*260+[56]*90+[0]*1+[0]*4+[0]*9 + 
                                [56]*45+[55.9]*1+[56]*45+[0]*269+[0]*3+[19000]*1+[1000]*1 + 
                                [0]*5+[0]*345+[0]*1+[0]*13+[56]*1 + 
@@ -309,7 +309,7 @@ def test_nest_handle():
     threshold_flows = threshold_flows + [5300]*50
     # input data for df_F:
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: ([0]*76+acceptable_flows+[0]*229 + 
                                 [0]*76+unnacceptable_flows+[0]*229 + 
                                 [0]*76+threshold_flows+[0]*229 + 
@@ -373,7 +373,7 @@ def test_flow_handle_multi():
     gauge1_flows = ([0]*76+[1250]*5+[0]*229+[0]*55 + [0]*76+[0]*55+[0]*231+[1250]*3 + [1250]*3+[0]*76+[0]*50+[1250]*5+[0]*231 + [0]*77+[1250]*5+[0]*229+[0]*55)
     gauge2_flows = ([0]*76+[1250]*5+[0]*229+[0]*55 + [0]*76+[0]*55+[0]*231+[1250]*3 + [1250]*3+[0]*76+[0]*50+[1250]*5+[0]*231 + [0]*76+[1250]*5+[0]*230+[0]*55)
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge1: gauge1_flows,
                         gauge2: gauge2_flows
                     }
@@ -418,7 +418,7 @@ def test_lowflow_handle_multi():
     gauge2 = '421088'
     EWR = 'BF1_a'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge1: [40]*76+[1250]*5+[40]*229+[40]*15+[0]*40 + [40]*3+[0]*76+[0]*50+[0]*5+[0]*231 + [40]*75+[0]*50+[40]*230+[40]*10 + [0]*77+[40]*5+[0]*229+[40]*55,
                         gauge2: [40]*76+[1250]*5+[40]*229+[0]*40+[40]*15 + [40]*3+[0]*76+[0]*50+[0]*5+[0]*231 + [40]*75+[0]*50+[40]*230+[40]*10 + [0]*76+[40]*5+[0]*230+[40]*55
                     }
@@ -460,7 +460,7 @@ def test_ctf_handle_multi():
     gauge2 = '421088'
     EWR = 'CF'
     EWR_table, bad_EWRs = data_inputs.get_EWR_table()
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge1: [0]*1+[2]*350+[0]*9+[0]*5 + [2]*360+[0]*5 + [0]*10+[2]*345+[0]*1+[2]*9 + [0]*5+[0]*351+[0]*10,
                         gauge2: [0]*1+[2]*350+[0]*9+[0]*5 + [2]*360+[0]*5 + [0]*10+[2]*345+[0]*1+[2]*9 + [0]*5+[0]*351+[0]*10
                     }
@@ -836,7 +836,7 @@ def test_merge_weirpool_with_freshes(PU_df_wp, wp_freshes, freshes_eventYears, w
 
 
 @pytest.mark.parametrize("data_for_df_F,EWR,main_gauge,expected_events,pu_df_data", [
-    ({'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    ({'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         'A4261002': (
                                [5000]*62 + [16500]*122 + [5000]*181 + 
                                 [5000]*62 + [16500]*122 + [5000]*181 +
@@ -858,7 +858,7 @@ def test_merge_weirpool_with_freshes(PU_df_wp, wp_freshes, freshes_eventYears, w
                             'CLLMM1a_P_maxRollingEvents': [1, 1, 1, 1], 'CLLMM1a_P_maxRollingAchievement': [1, 1, 1, 1],
                             'CLLMM1a_P_missingDays': [0,0,0,0], 'CLLMM1a_P_totalPossibleDays': [365,365,365,366]}
                         ),
-    ({'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    ({'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         'A4261002': (
                                [5000]*62 + [16500]*122 + [5000]*181 + 
                                 [5000]*62 + [16500]*122 + [5000]*181 +
@@ -948,7 +948,7 @@ def test_barrage_level_handle(sa_parameter_sheet, expected_events, expected_PU_d
     gauge_levels_data = { gauge:gauge_levels for gauge in barrage_gauges }
 
     EWR_table = sa_parameter_sheet
-    DATE = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period()}
+    DATE = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d'))}#.to_period()}
     
     data_for_df_L = {**DATE, **gauge_levels_data}
     df_L = pd.DataFrame(data = data_for_df_L)
@@ -1001,7 +1001,7 @@ def test_flow_handle_sa(sa_parameter_sheet, expected_events, expected_PU_df_data
 
     EWR_table = sa_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: (
                                 [0]*31+ [400 + i*400 for i in range(30)] + [12001]*61 + [10000] + 
                                 [9900 - i*200 for i in range(30)] + [0]*212 + 
@@ -1098,7 +1098,7 @@ def test_flow_handle_check_ctf(qld_parameter_sheet, expected_events, expected_PU
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: (  [0]*365 + # first dry spell
                                 [19]*10 + # in between
                                 [0]*365 + # second dry spell
@@ -1157,7 +1157,7 @@ def test_cumulative_handle_bbr(qld_parameter_sheet, expected_events, expected_PU
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: (
                                 [15400]*20+[0]*345 + 
                                 [0]*365 + 
@@ -1168,7 +1168,7 @@ def test_cumulative_handle_bbr(qld_parameter_sheet, expected_events, expected_PU
 
     df_F = df_F.set_index('Date')
     
-    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         "422034": (
                                [1.]*10 +[1.3]*3+[1.]*5+[0]*347  + 
                                 [0]*365 + 
@@ -1401,7 +1401,7 @@ def test_water_stability_handle(qld_parameter_sheet, expected_events, expected_P
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: (    [0]*31 + [71]*10 + [0]*324 + 
                                     [0]*365 + 
                                     [0]*365 + 
@@ -1410,7 +1410,7 @@ def test_water_stability_handle(qld_parameter_sheet, expected_events, expected_P
 
     df_F = df_F.set_index('Date')
     
-    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         "416011": (     [1]*365 + 
                                         [0]*365 + 
                                         [0]*365 + 
@@ -1468,7 +1468,7 @@ def test_water_stability_level_handle(qld_parameter_sheet, expected_events, expe
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         "422015": (     [2]*31 + [1]*10 + [2]*324 +
                                         [2]*365 + 
                                         [2]*365 + 
@@ -1525,7 +1525,7 @@ def test_flow_handle_anytime(qld_parameter_sheet, expected_events, expected_PU_d
 
     EWR_table = qld_parameter_sheet
 
-    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         '416011': (    [0]*350+[5600]*15 + 
 	                                   [5600]*11+ [0]*354 + 
 									   [0]*365 +
@@ -1675,7 +1675,7 @@ def test_flow_handle_anytime(qld_parameter_sheet, expected_events, expected_PU_d
 def test_rise_and_fall_handle(pu, gauge, ewr, gauge_data, expected_events, expected_PU_df_data, vic_parameter_sheet):
     EWR_table = vic_parameter_sheet
 
-    data_for_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: gauge_data } 
     
 
@@ -1737,7 +1737,7 @@ def test_level_change_handle(pu, gauge, ewr, gauge_data, expected_events, expect
     
     EWR_table = vic_parameter_sheet
 
-    data_for_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_for_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                         gauge: gauge_data } 
     
 

{py_ewr-2.2.1 → py_ewr-2.2.4}/tests/test_observed_handling.py

@@ -24,7 +24,7 @@ def test_observed_cleaner():
     output_df = 'unit_testing_files/observed_flows_test_output.csv'
     expected_result = pd.read_csv(output_df, index_col = 'Date')
     expected_result.index = pd.to_datetime(expected_result.index, format='%Y-%m-%d')
-    expected_result.index = expected_result.index.to_period()
+    expected_result.index = expected_result.index#.to_period()
     expected_result.columns = ['419039']
     assert_frame_equal(result, expected_result)
 

{py_ewr-2.2.1 → py_ewr-2.2.4}/tests/test_scenario_handling.py

@@ -12,7 +12,9 @@ from py_ewr import scenario_handling, data_inputs
 def test_match_MDBA_nodes():
     '''
     1. Ensure dataframe with flows and levels is split into two dataframes (one flow and one level dataframe)
+    2. Ensure first column is used when duplicate columns are loaded
     '''
+    # TEST 1 # >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     # Set up input data and pass to test function:
     model_metadata = data_inputs.get_MDBA_codes()
     data_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),
@@ -39,6 +41,36 @@ def test_match_MDBA_nodes():
     assert_frame_equal(df_F, expected_df_F)
     assert_frame_equal(df_L, expected_df_L)
 
+    # TEST 2 #>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+        # Set up input data and pass to test function:
+    model_metadata = data_inputs.get_MDBA_codes()
+    data_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),
+                'EUSTDS-1-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10, # Use
+                'EUSTDS-35-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10, # Skip
+                'EUSTUS-35-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10, # Skip
+                'EUSTUS-35-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10, # Use
+                'EUSTUS-1-8': [1]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10, # Skip
+                }
+    df = pd.DataFrame(data = data_df)
+    df = df.set_index('Date')
+    
+    df_F, df_L = scenario_handling.match_MDBA_nodes(df, model_metadata, 'py_ewr/parameter_metadata/parameter_sheet.csv')
+
+    # Set up expected outputs and test:
+    data_expected_df_L = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),
+                            '414209': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10
+                            }
+    expected_df_L = pd.DataFrame(data_expected_df_L)
+    expected_df_L = expected_df_L.set_index('Date') 
+    data_expected_df_F = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),
+                            '414203': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10
+                            }
+    expected_df_F = pd.DataFrame(data_expected_df_F)
+    expected_df_F = expected_df_F.set_index('Date')
+    
+    assert_frame_equal(df_F, expected_df_F)
+    assert_frame_equal(df_L, expected_df_L)
+
 def test_match_NSW_nodes():
     '''
     1. Check NSW model nodes are mapped correctly to their gauges
@@ -188,7 +220,7 @@ def test_cleaner_MDBA():
     
     df_clean = scenario_handling.cleaner_MDBA(df)
     # Set up expected output data and test:
-    data_expected_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')).to_period(),
+    data_expected_df = {'Date': pd.date_range(start= datetime.strptime('2012-07-01', '%Y-%m-%d'), end = datetime.strptime('2016-06-30', '%Y-%m-%d')),#.to_period(),
                             'EUSTDS-1-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10,
                             'EUSTUS-35-8': [0]*1+[250]*350+[0]*9+[0]*5 + [0]*360+[0]*5 + [0]*2+[250]*345+[0]*1+[250]*17 + [0]*5+[250]*351+[250]*10
                             }