Skip to content

Brought code up to date #145

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

Open
bobo-baggins wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Brought code up to date #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b93b15
Updated Requirement.txt and deprecaited NumPy function calls of np.float
bobo-baggins Nov 13, 2023
f8a5c4f
11_14_23 up to date package list
bobo-baggins Nov 14, 2023
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
56 changes: 28 additions & 28 deletions classes/Gauge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ def all_year(self):
average_annual_flows, standard_deviations, coefficient_variations = calc_all_year(
self.flow_matrix)
self.average_annual_flows = np.array(
average_annual_flows, dtype=np.float)
average_annual_flows, dtype=np.float64)
self.standard_deviations = np.array(
standard_deviations, dtype=np.float)
standard_deviations, dtype=np.float64)
self.coefficient_variations = np.array(
coefficient_variations, dtype=np.float)
coefficient_variations, dtype=np.float64)

def winter_highflow_annual(self):
winter_timings, winter_durations, winter_frequencys, winter_magnitudes = calc_winter_highflow_annual(
Expand All @@ -72,13 +72,13 @@ def winter_highflow_annual(self):
all_exceedances = [2, 5, 10, 20, 50, 12, 15, 110, 120]
for percent in all_exceedances:
self.winter_timings[percent] = np.array(
winter_timings[percent], dtype=np.float)
winter_timings[percent], dtype=np.float64)
self.winter_durations[percent] = np.array(
winter_durations[percent], dtype=np.float)
winter_durations[percent], dtype=np.float64)
self.winter_frequencys[percent] = np.array(
winter_frequencys[percent], dtype=np.float)
winter_frequencys[percent], dtype=np.float64)
self.winter_magnitudes[percent] = np.array(
winter_magnitudes[percent], dtype=np.float)
winter_magnitudes[percent], dtype=np.float64)

def winter_highflow_POR(self):
winter_timings_POR, winter_durations_POR, winter_frequencys_POR, winter_magnitudes_POR = calc_winter_highflow_POR(
Expand All @@ -91,68 +91,68 @@ def winter_highflow_POR(self):

for percent in self.exceedance_percent:
self.winter_timings_POR[percent] = np.array(
winter_timings_POR[percent], dtype=np.float)
winter_timings_POR[percent], dtype=np.float64)
self.winter_durations_POR[percent] = np.array(
winter_durations_POR[percent], dtype=np.float)
winter_durations_POR[percent], dtype=np.float64)
self.winter_frequencys_POR[percent] = np.array(
winter_frequencys_POR[percent], dtype=np.float)
winter_frequencys_POR[percent], dtype=np.float64)
self.winter_magnitudes_POR[percent] = np.array(
winter_magnitudes_POR[percent], dtype=np.float)
winter_magnitudes_POR[percent], dtype=np.float64)

def spring_transition_timing_magnitude(self):
spring_timings, spring_magnitudes = calc_spring_transition_timing_magnitude(
self.flow_matrix, self.class_number, self.summer_timings)
self.spring_timings = np.array(spring_timings, dtype=np.float)
self.spring_magnitudes = np.array(spring_magnitudes, dtype=np.float)
self.spring_timings = np.array(spring_timings, dtype=np.float64)
self.spring_magnitudes = np.array(spring_magnitudes, dtype=np.float64)

def spring_transition_duration(self):
spring_durations = calc_spring_transition_duration(
self.spring_timings, self.summer_timings)
self.spring_durations = np.array(spring_durations, dtype=np.float)
self.spring_durations = np.array(spring_durations, dtype=np.float64)

def spring_transition_roc(self):
spring_rocs = calc_spring_transition_roc(
self.flow_matrix, self.spring_timings, self.summer_timings)
self.spring_rocs = np.array(spring_rocs, dtype=np.float)
self.spring_rocs = np.array(spring_rocs, dtype=np.float64)

def start_of_summer(self):
summer_timings = calc_start_of_summer(
self.flow_matrix, self.class_number)
self.summer_timings = np.array(summer_timings, dtype=np.float)
self.summer_timings = np.array(summer_timings, dtype=np.float64)

def summer_baseflow_durations_magnitude(self):
summer_90_magnitudes, summer_50_magnitudes, summer_flush_durations, summer_wet_durations, summer_no_flow_counts = calc_summer_baseflow_durations_magnitude(
self.flow_matrix, self.summer_timings, self.fall_timings, self.fall_wet_timings)
self.summer_90_magnitudes = np.array(
summer_90_magnitudes, dtype=np.float)
summer_90_magnitudes, dtype=np.float64)
self.summer_50_magnitudes = np.array(
summer_50_magnitudes, dtype=np.float)
summer_50_magnitudes, dtype=np.float64)
self.summer_flush_durations = np.array(
summer_flush_durations, dtype=np.float)
summer_flush_durations, dtype=np.float64)
self.summer_wet_durations = np.array(
summer_wet_durations, dtype=np.float)
summer_wet_durations, dtype=np.float64)
self.summer_no_flow_counts = np.array(
summer_no_flow_counts, dtype=np.float)
summer_no_flow_counts, dtype=np.float64)

def fall_flush_timings_durations(self):
summer_timings = calc_start_of_summer(
self.flow_matrix, self.class_number)
fall_timings, fall_magnitudes, fall_wet_timings, fall_durations = calc_fall_flush_timings_durations(
self.flow_matrix, summer_timings, self.class_number)
self.fall_timings = np.array(fall_timings, dtype=np.float)
self.fall_magnitudes = np.array(fall_magnitudes, dtype=np.float)
self.fall_wet_timings = np.array(fall_wet_timings, dtype=np.float)
self.fall_durations = np.array(fall_durations, dtype=np.float)
self.fall_timings = np.array(fall_timings, dtype=np.float64)
self.fall_magnitudes = np.array(fall_magnitudes, dtype=np.float64)
self.fall_wet_timings = np.array(fall_wet_timings, dtype=np.float64)
self.fall_durations = np.array(fall_durations, dtype=np.float64)

def fall_winter_baseflow(self):
spring_timings, spring_magnitudes = calc_spring_transition_timing_magnitude(
self.flow_matrix, self.class_number, self.summer_timings)
self.fall_flush_timings_durations()
wet_baseflows_10, wet_baseflows_50, wet_bfl_durs = calc_fall_winter_baseflow(
self.flow_matrix, self.fall_wet_timings, spring_timings)
self.wet_baseflows_10 = np.array(wet_baseflows_10, dtype=np.float)
self.wet_baseflows_50 = np.array(wet_baseflows_50, dtype=np.float)
self.wet_bfl_durs = np.array(wet_bfl_durs, dtype=np.float)
self.wet_baseflows_10 = np.array(wet_baseflows_10, dtype=np.float64)
self.wet_baseflows_50 = np.array(wet_baseflows_50, dtype=np.float64)
self.wet_bfl_durs = np.array(wet_bfl_durs, dtype=np.float64)

def create_flow_matrix(self):
self.year_ranges = [year + 1 for year in self.year_ranges]
Expand Down
115 changes: 60 additions & 55 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,60 @@
absl-py==0.7.0
astor==0.7.1
astroid==1.6.1
autopep8==1.3.4
Click==7.0
cvxpy==1.0.14
cycler==0.10.0
dill==0.2.9
ecos==2.0.7.post1
fancyimpute==0.4.2
fastcache==1.0.2
Flask==1.0.2
future==0.17.1
gast==0.2.2
grpcio==1.18.0
gunicorn==19.9.0
h5py==2.9.0
pyyaml==5.1.0
isort==4.3.4
itsdangerous==0.24
Jinja2==2.10
joblib==0.13.1
Keras==2.2.4
Keras-Applications==1.0.7
Keras-Preprocessing==1.0.8
knnimpute==0.1.0
lazy-object-proxy==1.3.1
Markdown==3.0.1
MarkupSafe==1.0
matplotlib==2.1.2
mccabe==0.6.1
multiprocess==0.70.7
np-utils==0.5.9.0
numpy==1.14.0
osqp==0.5.0
pandas==0.22.0
protobuf==3.6.1
pycodestyle==2.3.1
pydot==1.4.1
pylint==1.8.2
pyparsing==2.2.0
python-dateutil==2.6.1
python-dotenv==0.9.1
pytz==2017.3
scikit-learn==0.20.2
scipy==1.0.0
scs==2.0.2
simplejson==3.16.0
six==1.11.0
sklearn==0.0
tensorboard==1.12.2
tensorflow==1.12.0
termcolor==1.1.0
Werkzeug==0.14.1
wrapt==1.10.11
absl-py==2.0.0
astunparse==1.6.3
cachetools==5.3.2
certifi==2023.7.22
charset-normalizer==3.3.2
clarabel==0.6.0
contourpy==1.2.0
cvxpy==1.4.1
cycler==0.12.1
dill==0.3.7
ecos==2.0.12
flatbuffers==23.5.26
fonttools==4.44.0
gast==0.5.4
google-auth==2.23.4
google-auth-oauthlib==1.0.0
google-pasta==0.2.0
grpcio==1.59.2
h5py==3.10.0
idna==3.4
keras==2.14.0
kiwisolver==1.4.5
libclang==16.0.6
Markdown==3.5.1
MarkupSafe==2.1.3
matplotlib==3.8.1
ml-dtypes==0.2.0
multiprocess==0.70.15
numpy==1.26.2
oauthlib==3.2.2
opt-einsum==3.3.0
osqp==0.6.3
packaging==23.2
pandas==2.1.3
Pillow==10.1.0
protobuf==4.25.0
pyasn1==0.5.0
pyasn1-modules==0.3.0
pybind11==2.11.1
pyparsing==3.1.1
python-dateutil==2.8.2
pytz==2023.3.post1
qdldl==0.1.7.post0
requests==2.31.0
requests-oauthlib==1.3.1
rsa==4.9
scipy==1.11.3
scs==3.2.4
six==1.16.0
tensorboard==2.14.1
tensorboard-data-server==0.7.2
tensorflow==2.14.0
tensorflow-estimator==2.14.0
tensorflow-io-gcs-filesystem==0.34.0
termcolor==2.3.0
typing_extensions==4.8.0
tzdata==2023.3
urllib3==2.1.0
Werkzeug==3.0.1
wrapt==1.14.1
4 changes: 2 additions & 2 deletions utils/calc_spring_transition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@ def calc_spring_transition_roc(flow_matrix, spring_timings, summer_timings):
index = index + 1
continue

rate_of_change = np.array(rate_of_change, dtype=np.float)
rate_of_change_neg = np.array(rate_of_change_neg, dtype=np.float)
rate_of_change = np.array(rate_of_change, dtype=np.float64)
rate_of_change_neg = np.array(rate_of_change_neg, dtype=np.float64)

rocs.append(np.nanmedian(rate_of_change))
rocs_start_end.append(rate_of_change_start_end)
Expand Down