Skip to content
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

amend changes in linear_optimization after commiting in PR #825 #836

Merged
merged 1 commit into from
Aug 25, 2023
Merged

amend changes in linear_optimization after commiting in PR #825 #836

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
10 changes: 0 additions & 10 deletions flexmeasures/data/models/planning/linear_optimization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,29 +140,19 @@ def commitment_quantity_select(m, c, j):
return commitment_quantities[c].iloc[j]

def device_max_select(m, d, j):
min_v = device_constraints[d]["min"].iloc[j]
max_v = device_constraints[d]["max"].iloc[j]
equal_v = device_constraints[d]["equals"].iloc[j]
if np.isnan(max_v) and np.isnan(equal_v):
return infinity
else:
if not np.isnan(equal_v):
# make min_v < equal_v
equal_v = np.nanmax([equal_v, min_v])

return np.nanmin([max_v, equal_v])

def device_min_select(m, d, j):
min_v = device_constraints[d]["min"].iloc[j]
max_v = device_constraints[d]["max"].iloc[j]
equal_v = device_constraints[d]["equals"].iloc[j]
if np.isnan(min_v) and np.isnan(equal_v):
return -infinity
else:
if not np.isnan(equal_v):
# make equal_v <= max_v
equal_v = np.nanmin([equal_v, max_v])

return np.nanmax([min_v, equal_v])

def device_derivative_max_select(m, d, j):
Expand Down