Skip to content

Commit

Permalink
ammend changes in linear_optimiation after commiting the in PR #825 (#…
Browse files Browse the repository at this point in the history
…836)

Signed-off-by: Victor Garcia Reolid <victor@seita.nl>
  • Loading branch information
victorgarcia98 authored Aug 25, 2023
1 parent 0667a0c commit 5113257
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions flexmeasures/data/models/planning/linear_optimization.py
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

0 comments on commit 5113257

Please sign in to comment.