Merge pull request #232 from bknueven/itervalues

Eliminating Pyomo 6 deprecation warning
grid-parity-exchange · Jun 1, 2021 · 9d3c6cc · 9d3c6cc
2 parents cfad87a + cc3c375
commit 9d3c6cc
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/egret/common/lazy_ptdf_utils.py b/egret/common/lazy_ptdf_utils.py
@@ -818,16 +818,16 @@ def uc_instance_binary_relaxer(model, solver):
     for ivar in _binary_var_generator(model):
         ivar.domain = pyo.UnitInterval
         if persistent_solver:
-            for var in ivar.itervalues():
-                solver.update_var(var)
+            for k in ivar:
+                solver.update_var(ivar[k])
 
 def uc_instance_binary_enforcer(model, solver):
     persistent_solver = isinstance(solver, PersistentSolver)
     for ivar in _binary_var_generator(model):
         ivar.domain = pyo.Binary
         if persistent_solver:
-            for var in ivar.itervalues():
-                solver.update_var(var)
+            for k in ivar:
+                solver.update_var(ivar[k])
 
 def _load_pf_slacks(solver, m, t_subset):
     ## ensure the slack variables are loaded