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

Jump to bottom

Unlock pyomo version(s) #142

Merged
merged 2 commits into from
Apr 12, 2022
Merged

Unlock pyomo version(s) #142

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
78834eb
use lambda functions instead of functools.partial for pyomo 6.40
dgarrett622 Mar 31, 2022
98c71cd
removing commented out block and unnecessary print statements
dgarrett622 Apr 1, 2022
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
2 changes: 1 addition & 1 deletion dependencies.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<dependencies>
<main>
<dill/>
<pyomo source='forge'>5.7.0</pyomo>
<pyomo source='forge'/>
<glpk source='forge' skip_check='True'/>
<ipopt source='forge' skip_check='True'/>
<!-- Windows doesn't have a reasonably-accessible installer for coincbc -->
Expand Down
27 changes: 13 additions & 14 deletions src/dispatch/pyomo_dispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import os
import sys
import time as time_mod
from functools import partial
import platform
from itertools import compress
import pprint
Expand Down Expand Up @@ -404,7 +403,7 @@ def _create_production_limit(self, m, validation):
limits[t] = limit
limit_type = validation['limit_type']
prod_name = f'{comp.name}_production'
rule = partial(self._prod_limit_rule, prod_name, r, limits, limit_type, t)
rule = lambda mod: self._prod_limit_rule(prod_name, r, limits, limit_type, t, mod)
constr = pyo.Constraint(rule=rule)
counter = 1
name_template = '{c}_{r}_{t}_vld_limit_constr_{{i}}'.format(c=comp.name,
Expand Down Expand Up @@ -518,11 +517,11 @@ def _create_capacity_constraints(self, m, comp, prod_name, meta):
r = m.resource_index_map[comp][cap_res] # production index of the governing resource
caps, mins = self._find_production_limits(m, comp, meta)
# capacity
max_rule = partial(self._capacity_rule, prod_name, r, caps)
max_rule = lambda mod, t: self._capacity_rule(prod_name, r, caps, mod, t)
dylanjm marked this conversation as resolved.
Show resolved Hide resolved
constr = pyo.Constraint(m.T, rule=max_rule)
setattr(m, '{c}_{r}_capacity_constr'.format(c=comp.name, r=cap_res), constr)
# minimum
min_rule = partial(self._min_prod_rule, prod_name, r, caps, mins)
min_rule = lambda mod, t: self._min_prod_rule(prod_name, r, caps, mins, mod, t)
constr = pyo.Constraint(m.T, rule=min_rule)
# set initial conditions
for t, time in enumerate(m.Times):
Expand Down Expand Up @@ -584,7 +583,7 @@ def _create_transfer(self, m, comp, prod_name):
for resource, ratio in ratios.items():
r = m.resource_index_map[comp][resource]
rule_name = '{c}_{r}_{fr}_transfer'.format(c=name, r=resource, fr=ref_name)
rule = partial(self._transfer_rule, ratio, r, ref_r, prod_name) # XXX
rule = lambda mod, t: self._transfer_rule(ratio, r, ref_r, prod_name, mod, t)
constr = pyo.Constraint(m.T, rule=rule)
setattr(m, rule_name, constr)

Expand All @@ -611,8 +610,8 @@ def _create_storage(self, m, comp, initial_storage, meta):
discharge_name = self._create_production_variable(m, comp, meta, tag='discharge', add_bounds=False, within=pyo.NonNegativeReals)
# balance level, charge/discharge
level_rule_name = prefix + '_level_constr'
rule = partial(self._level_rule, comp, level_name, charge_name, discharge_name,
initial_storage, r)
rule = lambda mod, t: self._level_rule(comp, level_name, charge_name, discharge_name,
initial_storage, r, mod, t)
setattr(m, level_rule_name, pyo.Constraint(m.T, rule=rule))
# (4) a binary variable to track whether we're charging or discharging, to prevent BOTH happening
# -> 0 is charging, 1 is discharging
Expand All @@ -629,10 +628,10 @@ def _create_storage(self, m, comp, initial_storage, meta):
large_eps = 1e8 #0.01 * sys.float_info.max
# charging constraint: don't charge while discharging (note the sign matters)
charge_rule_name = prefix + '_charge_constr'
rule = partial(self._charge_rule, charge_name, bin_name, large_eps, r)
rule = lambda mod, t: self._charge_rule(charge_name, bin_name, large_eps, r, mod, t)
setattr(m, charge_rule_name, pyo.Constraint(m.T, rule=rule))
discharge_rule_name = prefix + '_discharge_constr'
rule = partial(self._discharge_rule, discharge_name, bin_name, large_eps, r)
rule = lambda mod, t: self._discharge_rule(discharge_name, bin_name, large_eps, r, mod, t)
setattr(m, discharge_rule_name, pyo.Constraint(m.T, rule=rule))

def _create_conservation(self, m, resources, initial_storage, meta):
Expand All @@ -645,7 +644,7 @@ def _create_conservation(self, m, resources, initial_storage, meta):
@ Out, None
"""
for res, resource in enumerate(resources):
rule = partial(self._conservation_rule, initial_storage, meta, resource)
rule = lambda mod, t: self._conservation_rule(initial_storage, meta, resource, mod, t)
constr = pyo.Constraint(m.T, rule=rule)
setattr(m, '{r}_conservation'.format(r=resource), constr)

Expand All @@ -656,8 +655,8 @@ def _create_objective(self, meta, m):
@ In, m, pyo.ConcreteModel, associated model
@ Out, None
"""
## cashflow eval
rule = partial(self._cashflow_rule, meta)
# cashflow eval
rule = lambda mod: self._cashflow_rule(meta, mod)
m.obj = pyo.Objective(rule=rule, sense=pyo.maximize)

### UTILITIES for general use
Expand Down Expand Up @@ -768,8 +767,8 @@ def _retrieve_value_from_model(self, m, comp, tag):
result[res] = np.fromiter((prod[comp_r, t] for t in m.T), dtype=float, count=len(m.T))
return result

### RULES for partial function calls
# these get called using "functools.partial" to make Pyomo constraints, vars, objectives, etc
### RULES for lambda function calls
# these get called using lambda functions to make Pyomo constraints, vars, objectives, etc

def _charge_rule(self, charge_name, bin_name, large_eps, r, m, t):
"""
Expand Down