Skip to content

Commit

Permalink
style: adapt to new numpy version 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkusPic committed Jul 11, 2024
1 parent 70d8713 commit c893cef
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions idf_analysis/heavy_rainfall_index.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ def get_sri(self, height_of_rainfall, duration):
if height_of_rainfall < 25:
return 0
else:
return np.NaN
return np.nan

else:
raise NotImplementedError(f'Method {self.method} not implemented!')
Expand Down Expand Up @@ -290,9 +290,9 @@ def result_sri_table(self, durations=None):
sri_table.loc[dur] = self.depth_of_rainfall(dur, rp_table.loc[dur])

# extrapolation vermutlich nicht sehr seriös
sri_table[rp_table >= 100] = np.NaN
sri_table[rp_table >= 100] = np.nan
# sri_table.loc[:12] = self.depth_of_rainfall(sri_table.index.values, 100)
sri_table[rp_table < 1] = np.NaN
sri_table[rp_table < 1] = np.nan
sri_table = sri_table.astype(float).round(2)
sri_table = sri_table.ffill(axis=1, limit=None) # .fillna(method='ffill', axis=1, limit=None)

Expand Down
2 changes: 1 addition & 1 deletion idf_analysis/idf_backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def get_scalar_param(self, p, duration):
param = self.get_duration_section(duration, p) # type: _Formulation

if param is None:
return np.NaN
return np.nan

return param.get_param(duration)

Expand Down
8 changes: 4 additions & 4 deletions idf_analysis/idf_class.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def set_series(self, series):
self._freq = guess_freq(series.index)
freq_minutes = delta2min(self._freq)
self._parameter.filter_durations(freq_minutes)
self.series = series.replace(0, np.NaN).dropna()
self.series = series.replace(0, np.nan).dropna()
self._return_periods_frame = None
self._rain_events = None
self._rainfall_sum_frame = None
Expand Down Expand Up @@ -409,7 +409,7 @@ def command_line_tool(cls):
print('Found existing interim-results in "{}" and using them for calculations.'.format(parameters_fn))
else:
print('Start reading the time-series {} for the analysis.'.format(user.input))
ts = import_series(user.input).replace(0, np.NaN).dropna()
ts = import_series(user.input).replace(0, np.nan).dropna()
# --------------------------------------------------
idf.set_series(ts)
print('Finished reading.')
Expand Down Expand Up @@ -495,7 +495,7 @@ def get_rainfall_sum_frame(self, series=None, durations=None):
freq = guess_freq(series.index)
ts = series.copy()
ts = ts.asfreq(freq).fillna(0)
# ts = series.replace(0, np.NaN).dropna()
# ts = series.replace(0, np.nan).dropna()

df = pd.DataFrame(index=ts.index)
# df = {}
Expand Down Expand Up @@ -794,7 +794,7 @@ def return_period_event_figure(self, event):
import matplotlib.pyplot as plt
period_line = self.return_periods_frame[event[COL.START]:event[COL.END]].max()

# period_line[period_line < 0.75] = np.NaN
# period_line[period_line < 0.75] = np.nan
period_line = period_line.dropna()

ax = period_line.plot() # type: plt.Axes
Expand Down
2 changes: 1 addition & 1 deletion idf_analysis/interim_result_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def return_period_scatter(idf: IntensityDurationFrequencyAnalyse, filename='all_
# save true
idf_table = idf.return_periods_frame[start:end]
idf_table = idf_table.rename(minutes_readable, axis=0)
# idf_table[idf_table < min_return_period] = np.NaN
# idf_table[idf_table < min_return_period] = np.nan

tn = idf_table.loc[start:end]
tn_short = tn[dur_short].max().max()
Expand Down

0 comments on commit c893cef

Please sign in to comment.