Skip to content

Commit

Permalink
update token
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusPic committed Jul 11, 2024
1 parent f4a151c commit 47c1e8a
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
30 changes: 15 additions & 15 deletions ehyd_tools/data_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ def data_validation(series):

first_index = ts.index[0].replace(day=1, month=1, hour=0, minute=0)
if first_index not in series.index:
ts = pd.concat([pd.Series(index=[first_index], data=[np.NaN]), ts])
ts = pd.concat([pd.Series(index=[first_index], data=[np.nan]), ts])

last_index = ts.index[-1].replace(day=31, month=12, hour=23, minute=59)
if last_index not in ts.index:
ts = pd.concat([ts, pd.Series(index=[last_index], data=[np.NaN])])
ts = pd.concat([ts, pd.Series(index=[last_index], data=[np.nan])])

if ts.index.has_duplicates: # very slow an large data sets
ts = ts[~ts.index.duplicated()].copy()
Expand Down Expand Up @@ -238,19 +238,19 @@ def create_statistics(series, availability, availability_cut=0.2):
warn('ATTENTION: only very small data availability! The statistic may be not very meaningful.', EhydWarning)
if (avail < 0.1).all():
return {}
sums[avail < 0.1] = np.NaN
sums[avail < 0.1] = np.nan
else:
sums[avail < availability_cut] = np.NaN

stats = {}
stats['maximum'] = sums.max()
stats['maximum_date'] = sums.idxmax()
stats['maximum_avail'] = avail.loc[sums.idxmax()]

stats['minimum'] = sums.min()
stats['minimum_date'] = sums.idxmin()
stats['minimum_avail'] = avail.loc[sums.idxmin()]
sums[avail < availability_cut] = np.nan

stats = {
'maximum': sums.max(),
'maximum_date': sums.idxmax(),
'maximum_avail': avail.loc[sums.idxmax()],
'minimum': sums.min(),
'minimum_date': sums.idxmin(),
'minimum_avail': avail.loc[sums.idxmin()],
'mean': sums.mean(),
'mean_avail': avail.mean()
}

stats['mean'] = sums.mean()
stats['mean_avail'] = avail.mean()
return stats
2 changes: 1 addition & 1 deletion ehyd_tools/synthetic_rainseries_v0.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def block_rain(idf_table, return_period, duration, interval=5):
if isinstance(return_period, float):
idf_table.columns = idf_table.columns.astype(float)
if return_period not in idf_table.columns:
idf_table[return_period] = np.NaN
idf_table[return_period] = np.nan
idf_table = idf_table.sort_index(axis=1)

if any(idf_table.isna()):
Expand Down

0 comments on commit 47c1e8a

Please sign in to comment.