Skip to content

pass inflow actions as method references instead of strings #26

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
adamkorynta wants to merge 1 commit into from
+123 −129
Open

pass inflow actions as method references instead of strings #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 36 additions & 40 deletions district-scripts/SWL/Big3-InflowCalcMultipleActions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,6 @@ def run_calculations(registry):
from java.util import TimeZone
from usace.rowcps.headless import LoggingOptions

def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, freezerain):
# Takes in locations defined by user in group and computes the given command at the given station.
try:
if function.lower() == "cloneinflows":
inflowCalc.cloneInflows(officeID, location, startCal.getTime())
elif function.lower() == "computeinflow":
inflowCalc.computeInflow(officeID, location, startCal.getTime(), endCal.getTime())
elif function.lower() == "zeronegatives":
inflowCalc.zeroNegatives(officeID, location, startCal.getTime())
elif function.lower() == "balanceall":
inflowCalc.balanceAll(officeID, location, startCal.getTime())
elif function.lower() == "autoadjust":
inflowCalc.autoAdjust(officeID, location, startCal.getTime(), uselimits, freezerain)
else:
print("Input command", function, "is not recognized. Please edit your input and try again.")
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(function, officeID, location))
print(e)
print("")
# Description of: LoggingOptions.setDbMessageLevel(int level)
#
# Adds Time Series logging messages in the OracleTimeSeriesDaoImpl. Recommended
Expand Down Expand Up @@ -85,6 +66,8 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
endCal.set(Calendar.MILLISECOND, 0)

officeID = "SWL"
startDate = startCal.getTime()
endDate = endCal.getTime()

# inflowCalc contains 4 callable methods:
# autoAdjust
Expand All @@ -107,27 +90,40 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
useLimits_ON = False
freezeRain_ON = False

# Commands can be input in a list format as seen below. The format is as follows "[ACTION] @ [LOCATION]", reading like "Perform [ACITON] at [LOCATION].
# The action must come first, and they must be separated by a "@" symbol.
# Spaces between the Action/Location and "@" symbol can vary, although 1 space is recommended for readability. Lines can be commented out as needed.
actions = ["computeInflow @ Blue_Mtn_Dam",
"cloneInflows @ Blue_Mtn_Dam",
"autoAdjust @ Blue_Mtn_Dam",
"computeInflow @ Nimrod_Dam",
"cloneInflows @ Nimrod_Dam",
"autoAdjust @ Nimrod_Dam",
"computeInflow @ Clearwater_Dam",
"cloneInflows @ Clearwater_Dam",
"autoAdjust @ Clearwater_Dam",
]

for command in actions:
location = command.split('@')[1].strip()
function = command.split('@')[0].strip()
print("")
print("Now running", function, "at", location)
print("")
inflow_Actions(function, officeID, location, startCal, endCal, useLimits_ON, freezeRain_ON)
# Commands are a dict of location -> list of (method, extra_args)
# pairs to run there, in order. `method` is the real inflowCalc method
# reference; `extra_args` is whatever it needs after (officeID,
# location). Locations/actions can be commented out or removed as
# needed.
actions = {
"Blue_Mtn_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Nimrod_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Clearwater_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
}

for location, calls in actions.items():
for method, extra_args in calls:
print("")
print("Now running", method.__name__, "at", location)
print("")
try:
method(officeID, location, *extra_args)
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(method.__name__, officeID, location))
print(e)
print("")


if __name__ == "__main__":
Expand Down
84 changes: 41 additions & 43 deletions district-scripts/SWL/Millwd-Tri-Lks-InflowCalcMultipleActions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,6 @@ def run_calculations(registry):
from java.util import TimeZone
from usace.rowcps.headless import LoggingOptions

def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, freezerain):
# Takes in locations defined by user in group and computes the given command at the given station.
try:
if function.lower() == "cloneinflows":
inflowCalc.cloneInflows(officeID, location, startCal.getTime())
elif function.lower() == "computeinflow":
inflowCalc.computeInflow(officeID, location, startCal.getTime(), endCal.getTime())
elif function.lower() == "zeronegatives":
inflowCalc.zeroNegatives(officeID, location, startCal.getTime())
elif function.lower() == "balanceall":
inflowCalc.balanceAll(officeID, location, startCal.getTime())
elif function.lower() == "autoadjust":
inflowCalc.autoAdjust(officeID, location, startCal.getTime(), uselimits, freezerain)
else:
print("Input command", function, "is not recognized. Please edit your input and try again.")
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(function, officeID, location))
print(e)
print("")
# Description of: LoggingOptions.setDbMessageLevel(int level)
#
# Adds Time Series logging messages in the OracleTimeSeriesDaoImpl. Recommended
Expand Down Expand Up @@ -85,6 +66,8 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
endCal.set(Calendar.MILLISECOND, 0)

officeID = "SWL"
startDate = startCal.getTime()
endDate = endCal.getTime()

# inflowCalc contains 4 callable methods:
# autoAdjust
Expand All @@ -107,30 +90,45 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
useLimits_ON = False
freezeRain_ON = False

# Commands can be input in a list format as seen below. The format is as follows "[ACTION] @ [LOCATION]", reading like "Perform [ACITON] at [LOCATION].
# The action must come first, and they must be separated by a "@" symbol.
# Spaces between the Action/Location and "@" symbol can vary, although 1 space is recommended for readability. Lines can be commented out as needed.
actions = ["computeInflow @ Dequeen_Dam",
"cloneInflows @ Dequeen_Dam",
"autoAdjust @ Dequeen_Dam",
"computeInflow @ Dierks_Dam",
"cloneInflows @ Dierks_Dam",
"autoAdjust @ Dierks_Dam",
"computeInflow @ Gillham_Dam",
"cloneInflows @ Gillham_Dam",
"autoAdjust @ Gillham_Dam",
"computeInflow @ Millwood_Dam",
"cloneInflows @ Millwood_Dam",
"autoAdjust @ Millwood_Dam",
]

for command in actions:
location = command.split('@')[1].strip()
function = command.split('@')[0].strip()
print("")
print("Now running", function, "at", location)
print("")
inflow_Actions(function, officeID, location, startCal, endCal, useLimits_ON, freezeRain_ON)
# Commands are a dict of location -> list of (method, extra_args)
# pairs to run there, in order. `method` is the real inflowCalc method
# reference; `extra_args` is whatever it needs after (officeID,
# location). Locations/actions can be commented out or removed as
# needed.
actions = {
"Dequeen_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Dierks_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Gillham_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Millwood_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
}

for location, calls in actions.items():
for method, extra_args in calls:
print("")
print("Now running", method.__name__, "at", location)
print("")
try:
method(officeID, location, *extra_args)
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(method.__name__, officeID, location))
print(e)
print("")



Expand Down
92 changes: 46 additions & 46 deletions district-scripts/SWL/WhiteR-InflowCalcMultipleActions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,6 @@ def run_calculations(registry):
from java.util import TimeZone
from usace.rowcps.headless import LoggingOptions

def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, freezerain):
# Takes in locations defined by user in group and computes the given command at the given station.
try:
if function.lower() == "cloneinflows":
inflowCalc.cloneInflows(officeID, location, startCal.getTime())
elif function.lower() == "computeinflow":
inflowCalc.computeInflow(officeID, location, startCal.getTime(), endCal.getTime())
elif function.lower() == "zeronegatives":
inflowCalc.zeroNegatives(officeID, location, startCal.getTime())
elif function.lower() == "balanceall":
inflowCalc.balanceAll(officeID, location, startCal.getTime())
elif function.lower() == "autoadjust":
inflowCalc.autoAdjust(officeID, location, startCal.getTime(), uselimits, freezerain)
else:
print("Input command", function, "is not recognized. Please edit your input and try again.")
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(function, officeID, location))
print(e)
print("")
# Description of: LoggingOptions.setDbMessageLevel(int level)
#
# Adds Time Series logging messages in the OracleTimeSeriesDaoImpl. Recommended
Expand Down Expand Up @@ -85,6 +66,8 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
endCal.set(Calendar.MILLISECOND, 0)

officeID = "SWL"
startDate = startCal.getTime()
endDate = endCal.getTime()

# inflowCalc contains 4 callable methods:
# autoAdjust
Expand All @@ -107,33 +90,50 @@ def inflow_Actions(function, officeID, location, startCal, endCal, uselimits, fr
useLimits_ON = True
freezeRain_ON = True

# Commands can be input in a list format as seen below. The format is as follows "[ACTION] @ [LOCATION]", reading like "Perform [ACITON] at [LOCATION].
# The action must come first, and they must be separated by a "@" symbol.
# Spaces between the Action/Location and "@" symbol can vary, although 1 space is recommended for readability. Lines can be commented out as needed.
actions = ["computeInflow @ Beaver_Dam",
"cloneInflows @ Beaver_Dam",
"autoAdjust @ Beaver_Dam",
"computeInflow @ Table_Rock_Dam",
"cloneInflows @ Table_Rock_Dam",
"autoAdjust @ Table_Rock_Dam",
"computeInflow @ Bull_Shoals_Dam",
"cloneInflows @ Bull_Shoals_Dam",
"autoAdjust @ Bull_Shoals_Dam",
"computeInflow @ Norfork_Dam",
"cloneInflows @ Norfork_Dam",
"autoAdjust @ Nofork_Dam",

@adamkorynta adamkorynta Aug 19, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@eabkrebs - note that this typo has been fixed with the refactor here

"computeInflow @ GreersFerry_Dam",
"cloneInflows @ GreersFerry_Dam",
"autoAdjust @ GreersFerry_Dam",
]

for command in actions:
location = command.split('@')[1].strip()
function = command.split('@')[0].strip()
print("")
print("Now running", function, "at", location)
print("")
inflow_Actions(function, officeID, location, startCal, endCal, useLimits_ON, freezeRain_ON)
# Commands are a dict of location -> list of (method, extra_args)
# pairs to run there, in order. `method` is the real inflowCalc method
# reference; `extra_args` is whatever it needs after (officeID,
# location). Locations/actions can be commented out or removed as
# needed.
actions = {
"Beaver_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Table_Rock_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Bull_Shoals_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"Norfork_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
"GreersFerry_Dam": [
(inflowCalc.computeInflow, (startDate, endDate)),
(inflowCalc.cloneInflows, (startDate,)),
(inflowCalc.autoAdjust, (startDate, useLimits_ON, freezeRain_ON)),
],
}

for location, calls in actions.items():
for method, extra_args in calls:
print("")
print("Now running", method.__name__, "at", location)
print("")
try:
method(officeID, location, *extra_args)
except Exception as e:
print("Error Completing action {0} at {1} {2}".format(method.__name__, officeID, location))
print(e)
print("")


if __name__ == "__main__":
Expand Down
Loading