Skip to content

Fix centering of hourly interval #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leonardolaiolo merged 3 commits into from
May 16, 2022
+9 −8
Merged

Fix centering of hourly interval #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
981030d
fix centering of averaging interval in hourly_timeseries
mhidas Apr 28, 2022
201bc08
update expected hourly file with correctly averaged values
mhidas Apr 28, 2022
96f8040
use old pandas API for compatibility with Python 3.5
mhidas May 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions aodntools/timeseries_products/hourly_timeseries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,22 +305,22 @@ def PDresample_by_hour(df, function_dict, function_stats):
:param df: pandas dataframe with ancillary variables and coords removed but with TIME as index
:return: pandas dataframe
"""
## back the index 30min
df.index = df.index - pd.Timedelta(30, units='m')

varnames = df.columns
df_data = pd.DataFrame()
df_data = pd.DataFrame(index=pd.DatetimeIndex([]))
for variable in varnames:
ds_var = df[variable]
ds_var_mean = ds_var.resample('1H').apply(function_dict[variable]).astype(np.float32)
ds_var_resample = ds_var.resample('1H', base=0.5) # shift by half hour to centre bin on the hour
ds_var_mean = ds_var_resample.apply(function_dict[variable]).astype(np.float32)
df_data = pd.concat([df_data, ds_var_mean], axis=1, sort=False)
for stat_method in function_stats:
ds_var_stat = ds_var.resample('1H').apply(stat_method).astype(np.float32)
ds_var_stat = ds_var_resample.apply(stat_method).astype(np.float32)
ds_var_stat = ds_var_stat.rename("_".join([variable, stat_method]))
df_data = pd.concat([df_data, ds_var_stat], axis=1, sort=False)

##forward the index 30min
df_data.index = df_data.index + pd.Timedelta(30, units='m')
##forward the index 30min so the timestamps are on the hour
df_data.index += pd.to_timedelta('30min')

return df_data


Expand Down
Binary file renamed ...rly-timeseries_END-20190523_C-20220404.nc → ...rly-timeseries_END-20190523_C-20220428.nc
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion test_aodntools/timeseries_products/test_hourly_timeseries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
]
INPUT_PATHS = [os.path.join(TEST_ROOT, f) for f in INPUT_FILES]
EXPECTED_OUTPUT_FILE = os.path.join(
TEST_ROOT, 'IMOS_ANMN-NRS_STZ_20181213_NRSROT_FV02_hourly-timeseries_END-20190523_C-20220404.nc'
TEST_ROOT, 'IMOS_ANMN-NRS_STZ_20181213_NRSROT_FV02_hourly-timeseries_END-20190523_C-20220428.nc'
)

INST_VARIABLES = {'instrument_id', 'source_file', 'LONGITUDE', 'LATITUDE', 'NOMINAL_DEPTH'}
Expand Down Expand Up @@ -89,6 +89,7 @@ def test_hourly_aggregator(self):

# check variable values
expected = Dataset(EXPECTED_OUTPUT_FILE)
self.assertEqual(len(expected['TIME']), len(dataset['TIME']))
compare_vars = ('TIME', 'NOMINAL_DEPTH', 'instrument_index',
'TEMP', 'TEMP_count', 'TEMP_min', 'TEMP_max')
non_match_vars = [var for var in compare_vars
Expand Down