From 14f8daeeaf69584f25576075817b7691835e56ec Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 14:16:02 -0600
Subject: [PATCH 1/8] Renaming main development branch (master -> main)

---
 .github/workflows/{push_branch_test.yml => test_branches.yml} | 2 +-
 .github/workflows/{pr_master_test.yml => test_pr_main.yml}    | 4 ++--
 README.md                                                     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename .github/workflows/{push_branch_test.yml => test_branches.yml} (99%)
 rename .github/workflows/{pr_master_test.yml => test_pr_main.yml} (99%)

diff --git a/.github/workflows/push_branch_test.yml b/.github/workflows/test_branches.yml
similarity index 99%
rename from .github/workflows/push_branch_test.yml
rename to .github/workflows/test_branches.yml
index 84f9211..d3d4bb3 100644
--- a/.github/workflows/push_branch_test.yml
+++ b/.github/workflows/test_branches.yml
@@ -3,7 +3,7 @@ name: GitHub Branch CI
 on:
   push:
     branches-ignore:
-      - master
+      - main
   workflow_dispatch:
     inputs:
       git-ref:
diff --git a/.github/workflows/pr_master_test.yml b/.github/workflows/test_pr_main.yml
similarity index 99%
rename from .github/workflows/pr_master_test.yml
rename to .github/workflows/test_pr_main.yml
index 995f7c7..69ec1a6 100644
--- a/.github/workflows/pr_master_test.yml
+++ b/.github/workflows/test_pr_main.yml
@@ -3,10 +3,10 @@ name: GitHub CI
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
     branches:
-      - master
+      - main
   workflow_dispatch:
     inputs:
       git-ref:
diff --git a/README.md b/README.md
index 632dc4b..b1463e3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Github Actions Status](https://github.com/Pyomo/pysp/workflows/GitHub%20CI/badge.svg?event=push)](https://github.com/Pyomo/pysp/actions?query=event%3Apush+workflow%3A%22GitHub+CI%22)
 [![Jenkins Status](https://img.shields.io/jenkins/s/https/software.sandia.gov/downloads/pub/pyomo/jenkins/PySP_trunk.svg?logo=jenkins&logoColor=white)](https://jenkins-srn.sandia.gov/job/Pyomo_pysp_trunk)
-[![codecov](https://codecov.io/gh/Pyomo/pysp/branch/master/graph/badge.svg)](https://codecov.io/gh/Pyomo/pysp)
+[![codecov](https://codecov.io/gh/Pyomo/pysp/branch/main/graph/badge.svg)](https://codecov.io/gh/Pyomo/pysp)
 
 [![GitHub contributors](https://img.shields.io/github/contributors/pyomo/pysp.svg)](https://github.com/pyomo/pysp/graphs/contributors)
 [![Merged PRs](https://img.shields.io/github/issues-pr-closed-raw/pyomo/pysp.svg?label=merged+PRs)](https://github.com/pyomo/pysp/pulls?q=is:pr+is:merged)

From 531c5e99bbdfd66a140bbb9de0917ecc3a0b5883 Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 14:50:06 -0600
Subject: [PATCH 2/8] Tracking changes in Pyomo 6.0

---
 pysp/scenariotree/__init__.py         | 3 ++-
 pysp/scenariotree/instance_factory.py | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pysp/scenariotree/__init__.py b/pysp/scenariotree/__init__.py
index 7e36c82..a78c1f7 100644
--- a/pysp/scenariotree/__init__.py
+++ b/pysp/scenariotree/__init__.py
@@ -19,6 +19,8 @@
                         ComponentUID)
 from pyomo.core.base.sos import _SOSConstraintData
 from pyomo.repn import generate_standard_repn
+from pyomo.scripting.interface import IPyomoScriptModifyInstance
+
 from pysp.phutils import (BasicSymbolMap,
                                 indexToString,
                                 isVariableNameIndexed,
@@ -32,7 +34,6 @@
                                                     ScenarioTreeBundle,
                                                     ScenarioTree)
 from pysp.scenariotree.instance_factory import (DataPortal, Block,
-                                                      IPyomoScriptModifyInstance,
                                                       AbstractModel, _BlockData,
                                                       ExtensionPoint,
                                                       load_external_module,
diff --git a/pysp/scenariotree/instance_factory.py b/pysp/scenariotree/instance_factory.py
index 9d07ea3..d81df32 100644
--- a/pysp/scenariotree/instance_factory.py
+++ b/pysp/scenariotree/instance_factory.py
@@ -22,12 +22,12 @@
 
 from pyomo.dataportal import DataPortal
 from pyomo.core import (Block,
-                        IPyomoScriptModifyInstance,
                         AbstractModel)
 from pyomo.core.base.block import _BlockData
 from pyomo.common.dependencies import yaml, yaml_available, yaml_load_args
 from pyomo.common.gc_manager import PauseGC
 from pyomo.common.plugin import ExtensionPoint
+from pyomo.scripting.interface import IPyomoScriptModifyInstance
 from pysp.util.misc import load_external_module
 from pysp.scenariotree.tree_structure_model import \
     (CreateAbstractScenarioTreeModel,

From 0b8b8d0912ebf3a476a1a3d4a18e00d2e43d005b Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 14:50:39 -0600
Subject: [PATCH 3/8] Updating minimum Python version [forced on pysp by Pyomo
 6.0]

---
 setup.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index 489b8d3..297bbd7 100644
--- a/setup.py
+++ b/setup.py
@@ -62,11 +62,7 @@ def run_setup():
         'Operating System :: Microsoft :: Windows',
         'Operating System :: Unix',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
@@ -75,11 +71,10 @@ def run_setup():
         'Programming Language :: Python :: Implementation :: PyPy',
         'Topic :: Scientific/Engineering :: Mathematics',
         'Topic :: Software Development :: Libraries :: Python Modules' ],
-      python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+      python_requires='>=3.6',
       install_requires=[
-          'Pyomo>=6.0.0.dev0',
-          'PyUtilib>=6.0.1.dev0',
-          'enum34;python_version<"3.4"',
+          'Pyomo>=6.0',
+          'PyUtilib>=6.0.0',
           'ply',
           'six>=1.4',
       ],

From 2972e4094c5badc393fedce3ba3d55788ea42c46 Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 15:07:06 -0600
Subject: [PATCH 4/8] Additional updates tracking Pyomo 6.0

---
 pysp/tests/unit/test_scenariotree.py | 58 ++++++++++++++--------------
 pysp/util/rapper.py                  |  4 +-
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/pysp/tests/unit/test_scenariotree.py b/pysp/tests/unit/test_scenariotree.py
index 5947980..75c0d81 100644
--- a/pysp/tests/unit/test_scenariotree.py
+++ b/pysp/tests/unit/test_scenariotree.py
@@ -485,9 +485,9 @@ def test_two_stage(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted(["Child1", "Child2"]))
-        self.assertEqual(model.ConditionalProbability["Root"], 1.0)
-        self.assertEqual(model.ConditionalProbability["Child1"], 0.8)
-        self.assertEqual(model.ConditionalProbability["Child2"], 0.2)
+        self.assertEqual(value(model.ConditionalProbability["Root"]), 1.0)
+        self.assertEqual(value(model.ConditionalProbability["Child1"]), 0.8)
+        self.assertEqual(value(model.ConditionalProbability["Child2"]), 0.2)
         model.StageCost["Stage1"] = "c1"
         model.StageCost["Stage2"] = "c2"
         model.StageVariables["Stage1"].add("x")
@@ -531,9 +531,9 @@ def test_two_stage_more_node_attributes(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted(["Child1", "Child2"]))
-        self.assertEqual(model.ConditionalProbability["Root"], 1.0)
-        self.assertEqual(model.ConditionalProbability["Child1"], 0.8)
-        self.assertEqual(model.ConditionalProbability["Child2"], 0.2)
+        self.assertEqual(value(model.ConditionalProbability["Root"]), 1.0)
+        self.assertEqual(value(model.ConditionalProbability["Child1"]), 0.8)
+        self.assertEqual(value(model.ConditionalProbability["Child2"]), 0.2)
 
         self.assertEqual(model.StageCost["Stage1"].value, None)
         self.assertEqual(list(model.StageVariables["Stage1"]), [])
@@ -590,9 +590,9 @@ def test_two_stage_custom_names(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted(["S1", "S2"]))
-        self.assertEqual(model.ConditionalProbability["Root"], 1.0)
-        self.assertEqual(model.ConditionalProbability["Child1"], 0.8)
-        self.assertEqual(model.ConditionalProbability["Child2"], 0.2)
+        self.assertEqual(value(model.ConditionalProbability["Root"]), 1.0)
+        self.assertEqual(value(model.ConditionalProbability["Child1"]), 0.8)
+        self.assertEqual(value(model.ConditionalProbability["Child2"]), 0.2)
         model.StageCost["T1"] = "c1"
         model.StageCost["T2"] = "c2"
         model.StageVariables["T1"].add("x")
@@ -654,19 +654,19 @@ def test_multi_stage(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted([4, 5, 6, 7, 8, 9, 10, 11, 12]))
-        self.assertEqual(model.ConditionalProbability[0], 1.0)
-        self.assertAlmostEqual(model.ConditionalProbability[1], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[2], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[3], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[4], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[5], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[6], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[7], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[8], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[9], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[10], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[11], 1.0/3)
-        self.assertAlmostEqual(model.ConditionalProbability[12], 1.0/3)
+        self.assertEqual(value(model.ConditionalProbability[0]), 1.0)
+        self.assertAlmostEqual(value(model.ConditionalProbability[1]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[2]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[3]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[4]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[5]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[6]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[7]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[8]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[9]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[10]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[11]), 1.0/3)
+        self.assertAlmostEqual(value(model.ConditionalProbability[12]), 1.0/3)
         model.StageCost["Stage1"] = "c1"
         model.StageCost["Stage2"] = "c2"
         model.StageCost["Stage3"] = "c3"
@@ -716,11 +716,11 @@ def test_unbalanced(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted(["00", "01", "1"]))
-        self.assertEqual(model.ConditionalProbability["R"], 1.0)
-        self.assertEqual(model.ConditionalProbability["0"], 0.5)
-        self.assertEqual(model.ConditionalProbability["1"], 0.5)
-        self.assertEqual(model.ConditionalProbability["00"], 0.5)
-        self.assertEqual(model.ConditionalProbability["01"], 0.5)
+        self.assertEqual(value(model.ConditionalProbability["R"]), 1.0)
+        self.assertEqual(value(model.ConditionalProbability["0"]), 0.5)
+        self.assertEqual(value(model.ConditionalProbability["1"]), 0.5)
+        self.assertEqual(value(model.ConditionalProbability["00"]), 0.5)
+        self.assertEqual(value(model.ConditionalProbability["01"]), 0.5)
         model.StageCost["Stage1"] = "c1"
         model.StageCost["Stage2"] = "c2"
         model.StageCost["Stage3"] = "c3"
@@ -756,9 +756,9 @@ def test_bundles(self):
         self.assertEqual(
             sorted(list(model.Scenarios)),
             sorted(["u0", "u1", "u2", "u3"]))
-        self.assertEqual(model.ConditionalProbability["r"], 1.0)
+        self.assertEqual(value(model.ConditionalProbability["r"]), 1.0)
         for i in range(4):
-            self.assertEqual(model.ConditionalProbability["u"+str(i)],
+            self.assertEqual(value(model.ConditionalProbability["u"+str(i)]),
                              0.25)
         self.assertEqual(model.Bundling.value, True)
         self.assertEqual(list(model.Bundles), [0, 1])
diff --git a/pysp/util/rapper.py b/pysp/util/rapper.py
index a69ea30..effc6ca 100644
--- a/pysp/util/rapper.py
+++ b/pysp/util/rapper.py
@@ -6,7 +6,7 @@
 """
 
 import inspect
-from pyomo.core.base.component import _name_index_generator
+from pyomo.core.base.component_namer import index_repr
 from pyomo.environ import SolverFactory
 from pysp.scenariotree.instance_factory \
     import ScenarioTreeInstanceFactory
@@ -308,7 +308,7 @@ def root_Var_solution(self):
             var_name, index = root_node._variable_ids[variable_id]
             name = var_name
             if index is not None:
-                name += _name_index_generator(index)
+                name += index_repr(index)
             yield name, root_node._solution[variable_id]
 
     #=========================

From e18061c35b4a4fd17312338fb5564ae99918b2a6 Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 16:16:51 -0600
Subject: [PATCH 5/8] Adding missing import

---
 pysp/tests/unit/test_scenariotree.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pysp/tests/unit/test_scenariotree.py b/pysp/tests/unit/test_scenariotree.py
index 75c0d81..c838231 100644
--- a/pysp/tests/unit/test_scenariotree.py
+++ b/pysp/tests/unit/test_scenariotree.py
@@ -18,7 +18,8 @@
                         Var,
                         Expression,
                         Objective,
-                        Block)
+                        Block,
+                        value)
 from pyomo.common.dependencies import (
     networkx, networkx_available as has_networkx
 )

From 65fec1c615396263ff952166acbc478c9221c447 Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 16:19:26 -0600
Subject: [PATCH 6/8] track rename of Simple -> Scalar components

---
 pysp/tests/convert/test_ddsip.py | 2 +-
 pysp/tests/convert/test_smps.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pysp/tests/convert/test_ddsip.py b/pysp/tests/convert/test_ddsip.py
index 2b9e353..2f37f91 100644
--- a/pysp/tests/convert/test_ddsip.py
+++ b/pysp/tests/convert/test_ddsip.py
@@ -145,7 +145,7 @@ def test_bad_component_type(self):
             b"TypeError: Declarations "
             b"in annotation type StochasticConstraintBodyAnnotation "
             b"must be of types Constraint or Block. Invalid type: "
-            b"<class 'pyomo.core.base.objective.SimpleObjective'>")
+            b"<class 'pyomo.core.base.objective.ScalarObjective'>")
         shutil.rmtree(output_dir,
                       ignore_errors=True)
         os.remove(outfile)
diff --git a/pysp/tests/convert/test_smps.py b/pysp/tests/convert/test_smps.py
index a890e5f..91c1252 100644
--- a/pysp/tests/convert/test_smps.py
+++ b/pysp/tests/convert/test_smps.py
@@ -177,7 +177,7 @@ def test_bad_component_type(self):
             b"TypeError: Declarations "
             b"in annotation type StochasticConstraintBodyAnnotation "
             b"must be of types Constraint or Block. Invalid type: "
-            b"<class 'pyomo.core.base.objective.SimpleObjective'>")
+            b"<class 'pyomo.core.base.objective.ScalarObjective'>")
         shutil.rmtree(output_dir,
                       ignore_errors=True)
         os.remove(outfile)

From 4af050edfb969d8cfdfed7855d896f22e55befef Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 16:31:34 -0600
Subject: [PATCH 7/8] Updating LP baselines to track changes in Pyomo string
 labeler

---
 .../unit/baselines/farmer_ef.baseline.lp      |  24 +--
 .../unit/baselines/farmer_ef_cvar.baseline.lp |  24 +--
 .../baselines/farmer_maximize_ef.baseline.lp  |  24 +--
 .../baselines/farmer_piecewise_ef.baseline.lp |  24 +--
 .../tests/unit/baselines/hydro_ef.baseline.lp | 176 +++++++++---------
 .../unit/baselines/sizes3_ef.baseline.lp.gz   | Bin 10586 -> 10613 bytes
 6 files changed, 136 insertions(+), 136 deletions(-)

diff --git a/pysp/tests/unit/baselines/farmer_ef.baseline.lp b/pysp/tests/unit/baselines/farmer_ef.baseline.lp
index 0ac0036..1e14e59 100644
--- a/pysp/tests/unit/baselines/farmer_ef.baseline.lp
+++ b/pysp/tests/unit/baselines/farmer_ef.baseline.lp
@@ -37,47 +37,47 @@ s.t.
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(1)_:
 -1 BelowAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(2)_:
 -1 AverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(3)_:
 -1 AboveAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(4)_:
 -1 BelowAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(5)_:
 -1 AverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(6)_:
 -1 AboveAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(7)_:
 -1 BelowAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(8)_:
 -1 AverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(9)_:
 -1 AboveAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_u_BelowAverageScenario_ConstrainTotalAcreage_:
@@ -291,9 +291,9 @@ c_e_ONE_VAR_CONSTANT:
 ONE_VAR_CONSTANT = 1.0
 
 bounds
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_) <= +inf
    0 <= BelowAverageScenario_DevotedAcreage(CORN) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(SUGAR_BEETS) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(WHEAT) <= 500
diff --git a/pysp/tests/unit/baselines/farmer_ef_cvar.baseline.lp b/pysp/tests/unit/baselines/farmer_ef_cvar.baseline.lp
index 06c3a0c..6fa8799 100644
--- a/pysp/tests/unit/baselines/farmer_ef_cvar.baseline.lp
+++ b/pysp/tests/unit/baselines/farmer_ef_cvar.baseline.lp
@@ -57,47 +57,47 @@ c_l_COMPUTE_SCENARIO_EXCESS(3)_:
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(1)_:
 -1 BelowAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(2)_:
 -1 AverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(3)_:
 -1 AboveAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(4)_:
 -1 BelowAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(5)_:
 -1 AverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(6)_:
 -1 AboveAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(7)_:
 -1 BelowAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(8)_:
 -1 AverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(9)_:
 -1 AboveAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_u_BelowAverageScenario_ConstrainTotalAcreage_:
@@ -315,9 +315,9 @@ bounds
    0 <= CVAR_EXCESS_BelowAverageScenario <= +inf
    0 <= CVAR_EXCESS_AverageScenario <= +inf
    0 <= CVAR_EXCESS_AboveAverageScenario <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_) <= +inf
    0 <= BelowAverageScenario_DevotedAcreage(CORN) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(SUGAR_BEETS) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(WHEAT) <= 500
diff --git a/pysp/tests/unit/baselines/farmer_maximize_ef.baseline.lp b/pysp/tests/unit/baselines/farmer_maximize_ef.baseline.lp
index a4e528c..f25ae8f 100644
--- a/pysp/tests/unit/baselines/farmer_maximize_ef.baseline.lp
+++ b/pysp/tests/unit/baselines/farmer_maximize_ef.baseline.lp
@@ -13,47 +13,47 @@ s.t.
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(1)_:
 -1 BelowAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(2)_:
 -1 AverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(3)_:
 -1 AboveAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(4)_:
 -1 BelowAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(5)_:
 -1 AverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(6)_:
 -1 AboveAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(7)_:
 -1 BelowAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(8)_:
 -1 AverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(9)_:
 -1 AboveAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_u_BelowAverageScenario_ConstrainTotalAcreage_:
@@ -321,9 +321,9 @@ c_e_ONE_VAR_CONSTANT:
 ONE_VAR_CONSTANT = 1.0
 
 bounds
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_) <= +inf
    0 <= BelowAverageScenario_DevotedAcreage(CORN) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(SUGAR_BEETS) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(WHEAT) <= 500
diff --git a/pysp/tests/unit/baselines/farmer_piecewise_ef.baseline.lp b/pysp/tests/unit/baselines/farmer_piecewise_ef.baseline.lp
index 98b82e4..2945aeb 100644
--- a/pysp/tests/unit/baselines/farmer_piecewise_ef.baseline.lp
+++ b/pysp/tests/unit/baselines/farmer_piecewise_ef.baseline.lp
@@ -13,47 +13,47 @@ s.t.
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(1)_:
 -1 BelowAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(2)_:
 -1 AverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(3)_:
 -1 AboveAverageScenario_DevotedAcreage(CORN)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(4)_:
 -1 BelowAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(5)_:
 -1 AverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(6)_:
 -1 AboveAverageScenario_DevotedAcreage(SUGAR_BEETS)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(7)_:
 -1 BelowAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(8)_:
 -1 AverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(9)_:
 -1 AboveAverageScenario_DevotedAcreage(WHEAT)
-+1 MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT)
++1 MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_)
 = 0
 
 c_u_BelowAverageScenario_ConstrainTotalAcreage_:
@@ -390,9 +390,9 @@ c_e_ONE_VAR_CONSTANT:
 ONE_VAR_CONSTANT = 1.0
 
 bounds
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__CORN) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__SUGAR_BEETS) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(DevotedAcreage__WHEAT) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__CORN_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__SUGAR_BEETS_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_DevotedAcreage__WHEAT_) <= +inf
    0 <= BelowAverageScenario_DevotedAcreage(CORN) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(SUGAR_BEETS) <= 500
    0 <= BelowAverageScenario_DevotedAcreage(WHEAT) <= 500
diff --git a/pysp/tests/unit/baselines/hydro_ef.baseline.lp b/pysp/tests/unit/baselines/hydro_ef.baseline.lp
index 8340526..ebd0fab 100644
--- a/pysp/tests/unit/baselines/hydro_ef.baseline.lp
+++ b/pysp/tests/unit/baselines/hydro_ef.baseline.lp
@@ -33,362 +33,362 @@ MASTER:
 s.t.
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(1)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen1_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(2)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen2_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(3)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen3_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(4)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen4_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(5)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen5_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(6)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen6_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(7)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen7_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(8)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen8_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(9)_:
-+1 MASTER_BLEND_VAR_RootNode(PDns__1)
++1 MASTER_BLEND_VAR_RootNode(_PDns__1_)
 -1 Scen9_PDns(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(10)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen1_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(11)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen2_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(12)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen3_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(13)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen4_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(14)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen5_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(15)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen6_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(16)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen7_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(17)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen8_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(18)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgh__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgh__1_)
 -1 Scen9_Pgh(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(19)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen1_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(20)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen2_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(21)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen3_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(22)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen4_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(23)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen5_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(24)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen6_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(25)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen7_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(26)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen8_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(27)_:
-+1 MASTER_BLEND_VAR_RootNode(Pgt__1)
++1 MASTER_BLEND_VAR_RootNode(_Pgt__1_)
 -1 Scen9_Pgt(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(28)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen1_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(29)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen2_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(30)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen3_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(31)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen4_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(32)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen5_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(33)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen6_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(34)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen7_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(35)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen8_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_RootNode(36)_:
-+1 MASTER_BLEND_VAR_RootNode(Vol__1)
++1 MASTER_BLEND_VAR_RootNode(_Vol__1_)
 -1 Scen9_Vol(1)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(1)_:
-+1 MASTER_BLEND_VAR_Node2_1(PDns__2)
++1 MASTER_BLEND_VAR_Node2_1(_PDns__2_)
 -1 Scen1_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(2)_:
-+1 MASTER_BLEND_VAR_Node2_1(PDns__2)
++1 MASTER_BLEND_VAR_Node2_1(_PDns__2_)
 -1 Scen2_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(3)_:
-+1 MASTER_BLEND_VAR_Node2_1(PDns__2)
++1 MASTER_BLEND_VAR_Node2_1(_PDns__2_)
 -1 Scen3_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(4)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgh__2_)
 -1 Scen1_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(5)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgh__2_)
 -1 Scen2_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(6)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgh__2_)
 -1 Scen3_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(7)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgt__2_)
 -1 Scen1_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(8)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgt__2_)
 -1 Scen2_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(9)_:
-+1 MASTER_BLEND_VAR_Node2_1(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_1(_Pgt__2_)
 -1 Scen3_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(10)_:
-+1 MASTER_BLEND_VAR_Node2_1(Vol__2)
++1 MASTER_BLEND_VAR_Node2_1(_Vol__2_)
 -1 Scen1_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(11)_:
-+1 MASTER_BLEND_VAR_Node2_1(Vol__2)
++1 MASTER_BLEND_VAR_Node2_1(_Vol__2_)
 -1 Scen2_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_1(12)_:
-+1 MASTER_BLEND_VAR_Node2_1(Vol__2)
++1 MASTER_BLEND_VAR_Node2_1(_Vol__2_)
 -1 Scen3_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(1)_:
-+1 MASTER_BLEND_VAR_Node2_2(PDns__2)
++1 MASTER_BLEND_VAR_Node2_2(_PDns__2_)
 -1 Scen4_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(2)_:
-+1 MASTER_BLEND_VAR_Node2_2(PDns__2)
++1 MASTER_BLEND_VAR_Node2_2(_PDns__2_)
 -1 Scen5_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(3)_:
-+1 MASTER_BLEND_VAR_Node2_2(PDns__2)
++1 MASTER_BLEND_VAR_Node2_2(_PDns__2_)
 -1 Scen6_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(4)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgh__2_)
 -1 Scen4_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(5)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgh__2_)
 -1 Scen5_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(6)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgh__2_)
 -1 Scen6_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(7)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgt__2_)
 -1 Scen4_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(8)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgt__2_)
 -1 Scen5_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(9)_:
-+1 MASTER_BLEND_VAR_Node2_2(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_2(_Pgt__2_)
 -1 Scen6_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(10)_:
-+1 MASTER_BLEND_VAR_Node2_2(Vol__2)
++1 MASTER_BLEND_VAR_Node2_2(_Vol__2_)
 -1 Scen4_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(11)_:
-+1 MASTER_BLEND_VAR_Node2_2(Vol__2)
++1 MASTER_BLEND_VAR_Node2_2(_Vol__2_)
 -1 Scen5_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_2(12)_:
-+1 MASTER_BLEND_VAR_Node2_2(Vol__2)
++1 MASTER_BLEND_VAR_Node2_2(_Vol__2_)
 -1 Scen6_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(1)_:
-+1 MASTER_BLEND_VAR_Node2_3(PDns__2)
++1 MASTER_BLEND_VAR_Node2_3(_PDns__2_)
 -1 Scen7_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(2)_:
-+1 MASTER_BLEND_VAR_Node2_3(PDns__2)
++1 MASTER_BLEND_VAR_Node2_3(_PDns__2_)
 -1 Scen8_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(3)_:
-+1 MASTER_BLEND_VAR_Node2_3(PDns__2)
++1 MASTER_BLEND_VAR_Node2_3(_PDns__2_)
 -1 Scen9_PDns(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(4)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgh__2_)
 -1 Scen7_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(5)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgh__2_)
 -1 Scen8_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(6)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgh__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgh__2_)
 -1 Scen9_Pgh(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(7)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgt__2_)
 -1 Scen7_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(8)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgt__2_)
 -1 Scen8_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(9)_:
-+1 MASTER_BLEND_VAR_Node2_3(Pgt__2)
++1 MASTER_BLEND_VAR_Node2_3(_Pgt__2_)
 -1 Scen9_Pgt(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(10)_:
-+1 MASTER_BLEND_VAR_Node2_3(Vol__2)
++1 MASTER_BLEND_VAR_Node2_3(_Vol__2_)
 -1 Scen7_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(11)_:
-+1 MASTER_BLEND_VAR_Node2_3(Vol__2)
++1 MASTER_BLEND_VAR_Node2_3(_Vol__2_)
 -1 Scen8_Vol(2)
 = 0
 
 c_e_MASTER_BLEND_CONSTRAINT_Node2_3(12)_:
-+1 MASTER_BLEND_VAR_Node2_3(Vol__2)
++1 MASTER_BLEND_VAR_Node2_3(_Vol__2_)
 -1 Scen9_Vol(2)
 = 0
 
@@ -927,22 +927,22 @@ c_e_ONE_VAR_CONSTANT:
 ONE_VAR_CONSTANT = 1.0
 
 bounds
-    -inf <= MASTER_BLEND_VAR_RootNode(PDns__1) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(Pgh__1) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(Pgt__1) <= +inf
-    -inf <= MASTER_BLEND_VAR_RootNode(Vol__1) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_1(PDns__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_1(Pgh__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_1(Pgt__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_1(Vol__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_2(PDns__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_2(Pgh__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_2(Pgt__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_2(Vol__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_3(PDns__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_3(Pgh__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_3(Pgt__2) <= +inf
-    -inf <= MASTER_BLEND_VAR_Node2_3(Vol__2) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_PDns__1_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_Pgh__1_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_Pgt__1_) <= +inf
+    -inf <= MASTER_BLEND_VAR_RootNode(_Vol__1_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_1(_PDns__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_1(_Pgh__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_1(_Pgt__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_1(_Vol__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_2(_PDns__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_2(_Pgh__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_2(_Pgt__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_2(_Vol__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_3(_PDns__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_3(_Pgh__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_3(_Pgt__2_) <= +inf
+    -inf <= MASTER_BLEND_VAR_Node2_3(_Vol__2_) <= +inf
    0 <= Scen1_Pgt(1) <= 100
    0 <= Scen1_Pgt(2) <= 100
    0 <= Scen1_Pgt(3) <= 100
diff --git a/pysp/tests/unit/baselines/sizes3_ef.baseline.lp.gz b/pysp/tests/unit/baselines/sizes3_ef.baseline.lp.gz
index ba463026e1fab5ff563ec1e327d63243fc8357b1..d93b243e2358a4093384c42f40d2caf182318f9e 100644
GIT binary patch
literal 10613
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
L-)jOj;U4`D7pg24

literal 10586
zcmd^kg<F)}*RFI(gVH4e(xt%A0)jM>(j7`SNQprUB14yS57H?}2@FF^3=WJS&Ct?y
zp26Syz2A4PbN+#Iu4`YcweP*w+Ur?s&vVaam}BtqpXdubzlG)X;+373h=rX!zqOT@
zo%0J<JAP;PTU%Lk@n*`^y~s;L7#jw=gx4_KBGQ!WohbnU1J&yOyNAMiuX(LVRZ%?4
zSBHKwC|loS$Yh89S5{2tJ<JLTU9-tnU;QopxzMxI-r9^tWQbSrUc`=@`J8E6OMu5^
zW6bo3g<0s?`ABx~Wv?N%?Da$<XO($-yZ`<!GW2wbIzmfx=bDk}%FJBqeC6!$z|CUb
z)co>z(5)lz05x>bVICTCFqd)n41OpkR%Ib~GIq9?f3df`fV{xEC<qC{GP^oS+>r@5
z7)azqnwnWiKi}Ax?l@mucZ0}W@2}TZb)2CZwL03*Hda=KCQPudQTzGjCX(jn6|X}t
zQ02_zTFCaZ?nW_z`4F$mMdf-3gkSd6{+`W&OP6ct)j%;dUdf;bvsql=n&+%?$^=tO
z=0poaY9dLTXt(C<JJ*^zTEB4)Z*budcyc9@!N=P>?RbpcGqG^6CZ0bbk=M*sI$dw&
zU8Z*pSfvk1x&NtHUE)^G#|$aEaq^Q`gm(j2CE}NeXCeS&<|LqD41YOSI$pc+JwG|u
zeXt7NFO22^T@J=D<)xxA=)pL-zakn|{zd*5=3FWo&;gb?mpHW2ys@+YhW1x-P3Hr)
z0OXA^?O$W+rJ`Q6G4&FMTAHo|ra-?&w(u5y(6PhS>fxXmGWhCfs4TMeTx+YG?yPo@
zr|QBD&l)n}!I?F?m%8aat5WRyoWw`MeU(wYa&`|s%I%#~t}m%gZ~UIbyZ)uJbLnJQ
z>*&kE%-PPLV``wWiE_q1#;;&{zOTbuA0dAvti_CnlD(9jtLiB<|I}?nZr2-hz0Wpa
z+`BX=r#$*R838(easnvD`WEkGtw>)PA3iw|0q{ID4k!Q~Bx`enA7ccLZp;$}R|kJ%
z0z$=XVcje{GgsqPejgsC{;7<5tX1AVBV&y=?>!;_%umtgU4PC0?&6#SnEQ?b<_@UG
zYUR}e4I?vevkd^VPNq7ECpH$&7GLnBE6=RY-$<{$NQ&Q5Mx=sXeGM04hC5~5J8qU(
z{{5;_cS*{yI7m-+QRiw+zt~2mXj-DT{lFWl{KvR>#xGe@S0+1W*UNAJXaXF+Qm>h?
zW16*J-8RLwpH;3a^9j8qe5@-I_aCpmJ+xQ0=Bao{*HCTZG->+22Vi`ZRs7#=MB>sM
z1n$C4#mzUVPKPJCnEQZykm!6)X!~Hb)VEiH7^-}tgICwV@xSXet9PWb_B}3QZC2nh
zI9~s!y}swr4VxbaZAbs!Rd`!EF@C3S!2uU|EC%M?bJyL)lTYX{H>snuxk){a^dwl!
z-y>+?-;{xD&W9&}Z167H>D$EHmwx+K>Y^mIfH*hV483L84-5Jx(AIf-DJ25(lmzMD
zpktQH(7x|n*kTR3_#)$vj20j@>tqNqY)smSUfHc}snnCnj2E|~{c5<k%*s6CRCw<g
zuDXo%s#0%B#-ubzk=bKP_?6plHNmKXr06*Z?xgs&dY$TX^}>Df;GU>K$M%n%?>G#(
zeRE3nWb&p}d$&cBfYy)~^XH$+<0fX9md*qh>6no-7V!hApamMI%tGVYI+itwJa<}0
z^vZbh6y$%cc_8>Z3poD<GgOT5mP03y<Gun)JEcm!wXFJNyA~bXxU@gGLFY75W&!3U
ze84403;pkzNfmx8DA6Xg&rVF!@==eS`X?phn@s-kDviq>`-=cc*=OJ6_CH-VqSpiu
z>VPT%A`=!=W}{taaPyczW@*KhdVuhHkSJ#C0T*I7{^u#Wxu|Y(_E-?iSa<J>bo{4`
zRY}nZ2Ogk!BK!>YB8=Oqq?JI@t6Y;pOn;rZna3PV#bNdm2qA|5LYxY%kJD6_+0J5b
zN5Iu1BsmoRB0f*NpNr3^-iRBQyZ>g;)u~@*^T7N2`)=o=Zbp&ZzujuNC&9}AoC35!
z?@xn|-rs?H^3Ismf+Y_i7XF-}h;1!=VekHy40v#N-#G&yFKW|cKKn-#Lg-DJN6^TB
zP6^xDo6Yv#3VVrv@>*sC&J9XN7igP>`&?t{q<Wt_P=db*P=deb=Qia0Zf*Mdza?P#
zH~SVhq4Kmi@_&0X1+*Gy(Nu7Z(U7-#)PLpn1vm>pieI)(U@wdQdvAPl%Juq6*8Y>3
z{gZzy1{`dlV*a-9#jGwLxDfxpyJ8J8@f<dmGjE+`Y#NSObod`#3=QsF?bkF>?L00|
zCS{5f=ah?-lt&OO4wH$=A@DsYdxpsTELyIoi>dn-ESvWF=ltJoTQyPkWU;!wZX#dg
zh|FN!ZhzR}Gh*Ak+B4_%#@?Yxq=%SHOdf&lA<{FK@}tqd;}27eNaH!}Y~liLBt5I^
zn<m=DZ6}0e;JjJ-;1<X|kYrSo=pP5_#718U;^ZtP*J5%=&cfgLbb-gB!c($)hg$At
zL}Chv;55(1>#sgTL1rR9QWmxkJY}!=Op!Pn)wX|5tTs{$(jv|~ZZRCJk+^2{L0$_d
zn6Ywc7uCdv38w@Tfd^1FpJDdQSauTUG!G8oeR64|GPvy{jsk989NqcCg?v)no{jbS
zEZX+<PRfrz!<?q$-pHlFA&fX-J6=B*96_oajqmdn8yXvAv7r~fE}{5f+U?mZvIky>
z`b*|d2za2j?I)8N3)={%TKUf~uW9@Da%t<3Aws}?ZXhtf-?UM%{3*xu6cBYAQi&5L
zykKUs$@*J5`={GU5;VM7al5$z6B}CL=YoSDlyhwUMk2H@$_gi;6he&`CVXrrux+*<
zxO<ng7HREquhMLjC~Sw)QbZJr-K1?~`^`xsIhI2LhhOAJH>v*WT#o<wnpV)>nSdDZ
zmFm(R1C@~?Ruy`=e{_A?J~=+uBzPpsbAIA)c+Jf87`c%B^`c|*(I3N|S!gzYh6*B_
zUl}qeR6b~*U6VT)wdo1ns5u>;A6<s|fE;|_L1Qj!!tQ3_75o`)30w5@rTjJqDMQcO
zgFk>K?Eq8SSB*OxMJ+HRGf|t3qxV1bQrOD}ef8!Deeu|48F_uuT_TS+D#DDjFf;U&
z!;z0ZmjA~2Wnb7-sL6v(JyRedj9(RI$|yi2b~}#G$2hF%8^>fqu0Qe8hJR;Mnvq-S
z1YsYJXlWc#zY~jL-|c}RDL=I=18x2<aKQ)No?#C$b4g%1ve)MaZszT$SAGH(UxU;?
ze})SNefZ*?%%0ARV>>{rmhoJ^TZcFq8}SO&+1cX~j~GH0c;|PDu?8u0is8ks366K+
z<Fir5((sX99UWeqcZ7K98s@S$$4L8;mp_#{GofS1#RZco1ZYUe&W``VepHAcgI45G
zF=tu3RIU*jDjHFPv6Kd$f~E6on=6w@-Iu}4kBwZw=1)%Lz^i$bFuvO#M&-e@k57ZZ
z&y~`&!3zqs{1RgGHA~ohDxkaIy{DyqU>+rqHW*8>Sy<u{S#v_frwL~UORB2Gf_;?X
zwqT7XM#|vce4bps5#CV|@Txq#1uUu>5C`s1K6L`GJ_*nTR~5wc4aM%s>3;v9C-aNK
zisedW#Z7&w7pALT+LI}--rnup5E1X#v!y=*)+Zz{dq%2+gL6iw%oAU>163uhDF~H&
zFP|J2;L@~Gn%-Hl#wvP7;KXKqPyMp{hlpviKA)RG3VHtZZLnJpIMp?3JtQ?HTn)CN
zhEXmQMScB2^_jINEUh<FL!H0J8)Rx|XyN?aN~57S)bdip^ljRY)PWeT;#9?`)3;5V
z+QHE_E_gK~GTxkB+t?ng94MPEaeGl42!BzjH3z5bydJZQ(Q&vlf>a}Wn}gKj5!1uY
zw<M_v@t~Dd^AEKBsY5Xtc6TgZ`waFc?&g*rX*rc8@Uaqq#a$d@k?MX^EW9g+xq`B}
zlH|y8m^IR*r+ic=Qz!Xox7fumkK-P*#N;s7=iT+?w|+s2v0Bo5VazgA-JI%E((9Yb
zq<gDkRad~5TeiiWRWamOE*0g?>*ImG2(6+6L`a=%i^A~g;NI>UGZ8^!sCBB=V1B5L
z?(PYT*zmz`S%0OWNt5OmpuFT?eBS2aePtRY1U^nN-Degi^?Q%E_uY@2#ijchNfV1#
zFIfCqq-3rFu~ZXCau`UK3F8H=SKr4=cNH@&c*XCIvPm7`Ye{!`#k+?jGDsfvm#T?&
zd>v*CJw_b*9kjk$8x25@anLnO9OEXV<dmdug&)e;O=er2u_0Z;`H|1e%Z)FSKkUkb
zBC{n?QhqZ5+g}b4R;$h3!(J&_2X0-3-O6ea@yR62e2g;25<zv|Cywj;V`ep;Oq%f@
z7c9lP8CiDmJvbvJ6%e;P*m^X`l!-4-zRZ+i2kTX}mp|6eGKx!Bl&?*1?Mku-aYw5S
zd6wu-rZ4xf^NS9`pPITP>&7-Acvp!%z8Y!bF21SFToA!jn2X%_D2nAj_Z|>${pTvt
zvw*otK=6#ToF^qUIE_T_B~x$DIQpI%J!{+VVw6Nc<ai)D=1po_ajWAHd7d{K=1n$3
zzO2RxUNv35T*g9jfE8|S`B=2{C+cndIp4>|W8?rd)!;N94gE;HUE|vqI1W)O-}x1=
zKw=0ld~rxDEr3|yZk4EP@95LlH9`u0=G7iN!@;nNGQP`${~+c^4b5XYqoU+qT+C#P
zx|rFzcC#f%1V4pYkxno(X&9Md97M6nlb5Y4i4v0>vXrdc^huFnLDkbCD2lhcw=w2{
zSaRP}0x_oCKpF@`c+_0CJA1yYFKKrYcy>mbh#JYChtOpzXGh#HsV9_ORI)os@ni-?
zWVkQ2%$N7Gc$TL%Wi^7JH78e^7Q(<5wKd?*9xvIz*&X%s30Qg%YxJEoo+D>CPanIr
zq>$+VZt}5%D-ac>mkr}UJ?uIZF&!9=pB`~v^d+yq+J7KkeMJC?Sy0t%XiM`r2QbLK
zI;a{#yD^BiD0B;0%N+F!d-bj{rk}S~%0;s<ZEWk_B=hqW)<x2%c@D7!a%oTlVna;u
zKt(#3C`>p@zgv}6o1;#DZbW$2=T5)$f03!aKstyJ)6Tj)y!Tx`%V@vLw7$3>xc_MC
zC_*j`X+Z344=^bgB;AhUXjNsqrL~ihWxTuI3<%buuaFJDgJ}mb@!7SkX?4Z*XpQ#v
zbm7Mb6Sz&ja#(pI$GK|O*wfUkcyz;@ZH+HOMR;~$esep&4ak}|UU`r`s7026h$fIe
z@t*`V?>9JQv5u;QO>gNyYM;KDF5Bg8atxz4+K?a(0od|HEEaK{Ye`fj{_}JVAt>(+
zS6_NVKwC1nVx^>*GGxl0+7i~{oV};u4G(g`vys+L8A^N^$)8cxVyTC}Q4=6VIA(Vs
zO%cod*i1Bjl%>U4>A<pp09fG09J3QS!L`u=Jes}p2JN+pm8w4TXS{8DFy*2&>F67;
z)H?JQrQnlZ85v1e_Jiw-ijVCHpKPm+Pund-#a%XGZvDQP&Y@YZMKmOc;04{g%LhO`
zLtvT36#%kCz$)3k3jk2xkhAzAxvo#!M})dJo3AhcLAPwhY+HWIm0*dqSSi|e?>_1p
zH%fM_q58<~!0Td7K&<xYIRzO)t9q+Jd3(i8r)BI{23dRVuM8|DZ<-fY*zXbulwy<d
z28h|ddr=F;^yF)~(g-n4kqqm&&q99GNjXpB(=b+WsUivDYLa-kwQ3%{F~RGIq4@AX
zghTvFAJQguIf*~R82d;yE6<b}YDJ(apLCa-RQ{2<0i&t3DqTJ=Cv-j+mGrAZ>&3u+
ziPrD;^PTnubrMjl{0k1~POenyuaBxP_V!~{*+8?lueGlpunX&~Fxr8iDc!MSdd3kC
zdDl<Oc8?W@4(#x!S6r2`&{P?^kk23rJ<LOJL5;?H*;=f6xVkW9$Z;2QY_GoCn!{vz
z>r`PpJ=jt(#~4?d(mC@(b)!PET)IO`J?+m`9(DUAXON0NENW+XdJk;ZQ-6j#WtY*y
zqM5AobH0e)<LLS$t1jDZXEeEQ??Wqe)**MQq#nhUlDZ$!{GzF+qMhmsU84UUvV@AA
zqp!^f_Ol0D0hZeB<8#;>erL+o<N|LB+4Cq>;{&`c)i*i-occJjm1MG5e9D*Q9HroQ
z52Z;)Z9Oi-@xjJdq-fJRk9);)aYf^BEZN7c|NG_W(z@$Dnc;6MN-5N9qtjITID)Cv
zx3Q;fO-2TLIL{knr3jeQUtZT0(ZMOkN1a%hNV~jv{ROe&?^{mE*nhK`4JgW5t`mBu
zu&L0hixoQS%lY!&ey8qMCMIEyxlB-BanA{YlKFJOMkwg}{T8dGr>-<0QCAuQ=B@9Y
zRl@g6ye#zDj2O?$(#v~GtIF6*NP_h>9{8-3Z|Ib;S?EueY6j`6bV%&#7d|~J;bW{m
z=-Sd9^KKiy-Kh0s!UK5C%G}ZDyKZwo&osQueoC0AYtClm+3&=gfiz!=oPOT0y0hZ<
z2!zycXq%{!mRMz0^lT_cEf?7xY_j9ELS@`_k{LF+&l6t2+ba9hAT=pz$wLv2o}bH|
za|-Pad^w7np;IQt4SmC>VyvJ6eNo@>ngHem8&f;o2YeaF<e+YSQLq7Cbaba{I1j1&
zoe4O;Arq3jD4iT4)uykG#bz4dU7nivq^Xi#DefdZp-F6sDt!`h2l8<6*)!9Z$qHFz
zQ@ot~9@R#}N{cURGp&1;?Llsln?s($WYn3<L^<R%8%lZ+b+q3$`O%_h(^Vf3{hJVj
zh&rQysky3(I<r87*v2;ZKBd~hk?6%FfZ7&(ag05Z_Pfkp`bnku-Z3V32H47};r3W`
zX5yU&wXtXnfX4(=%{~~Q658CA*BWk*N5=s?_NBor(LgV}%{`@Faz4@5%s3ct<hEZE
zlwYIVZS98ICSM$0N<-42XW<xjVa8Je_z%>6)I0~MtRT4;9}_BE&nrsy<s#4QN6{fM
z8|Uxvgv1L9rPu#=I(x?h@+9Y%i8pGlmQqq}+QSE!Y*|np#T3p%dsz*TTfvX-z(w(d
z%6>U}|2f}6HswQr$#nUv;k1zZU46hc@zW}8hO|_W5&Wx^toqC)5kO?iG%C(o;XDC|
zYH3<chL#GH5z}i96i5yrG7vxc&!`1eQFrI!-8wtF;(c3DtD765s&7bJNI2yxZ~0-0
za%a@d717YM=C{v#W!`e1BnN1e&yco7IAtFXPw=3^>bv&aKiH&9jO^2vUwCm3#R4Dt
zt8Xnt<e_pD(l+;Tpn452n<zf3+fNqQ;)B;K=nM$MgmWu5u3BkcwK@>RL%{|$&hKw7
zhyRn$c7t78)sypWJ$Y1yyMW8!!Oya=VH9bYaIb!?de_y?C&XBwj%_ke^Y1PQ*#pYC
zGS(3k5PG^&!r#wVI$(z?ZA-Q2s~|Nt^j+i2uOeQLf1PI@OVuIwHj`<@Qu<}44PMKo
z9UE-9*}vb5XiT=jNjrl+Bdiw32gBVa8QKHy-F5R2zD}B8mUqCvV8s#5&xeI=3hb#T
zu@^>bz8&N}WF=*a*w>!cT?|h+m!*pBq;inV$)r~Tcq__OkQK`ZE(MERt4S-z))fQj
zNhAbKXj_&QcmQwd5Cep!PaR8$CNyQ%7Uy>5H+yUVACl7neCWs&`w&>rdIB&VF49t+
zaH9s4qUjAMD(hUk^TW>TBXw`fPzl}8_LyU1z{lVc&DuNU&lHj*Zmw<}%MONRan!Ff
zCao2f3OD?Pnv5i$1fiku40h$7JOD~)N*h;3m;z92Mzc@P2>|Uir4cJjSp(3gj40P0
z&7uweXU$otaCJWhd>>0CvDipwns%k<5`z>P$(S`uv4tAExmKmPYM5`%xf<q<`sXe*
zRK@6mD7(a{g1o*(lCbf`z7`bjj2zo%X}0R|-@a#`;Qt5BbKSF@MueI_lhTtTw&*bO
z-#&V>F4_64!Sl(oN`sR7<}bfzdE|EAvHLopNh!r0bQrB~tCdQ1!J7&o-cFU0arx!P
zCEo|j-j*w?*npQ6;gaC56q$!yd`3)%FWN>WXJWwy$^n*Oq~fVG7>|-chl|fV``L^8
z${9ptQ078KC1_iItT41B55@*v8cQN;wo<%bAoq4Zww*?~G#|YA6chyRR%$i}OFjXq
zwfHNF#fm?9{*ALs?jjL}Oohe3i&G7v0^X;-j-YiJBWA1rS)R>RPIXT&pDC7*@Xw<-
z115cBQWBG`%Jpl)_q>c=Ki!9PAH6jiQ*i!6Ii=L2n0ghl?$E?rZaiPX&!%)u{Qw!s
zCA3VTdnG7FoRT`3f@xqwA#g>Xl-IMADi#xvk!l%9>(vB-w9kC$N_URA{&tqpgj-uG
zltDeADHKm3g6}b%dq&kaOJbW7yr%hXj$lz<eYUT_1LpeO+e}@r*HjbHRw^@FvrP<d
zVosNu(_mVBDdqeof>Dr%c>*TXN$2%ZD2G~Xkh}fXW^w}Of`aZ=&XgXTi9Fpa;-24+
z{o`;*?SCa;!)E)4{M98#>S{AZIbJ#jJNmu+rS)@LQA1J2zbs2vZee0DV&?=*lM}ee
zCL6>XK9UMlE))3bQ2d>kZ6SY7{6s$-+h@D{<^6IS3w^J8@k9N3?8)4!GJ?Y4Abm4J
zpQZ9LiOHxc?sY@F_A)9J=K4Z5U-PD5?)13nfQ6${M+wO4`=7;m>nAzXt~m!~NJ<qe
zPpH#<HIjf2b_YLW820D}k1pmeARMc$&}2X32IbX@w@-(ClfEMAoI}1YSsKFeG@+kt
z%<N=^`7#>sfF|^hgePiF$uvm3leTK>oacv^9vZ@5sSO^@fUY_2b2dZ2YZ{C0uzALo
zI}-xrCv(rC2^v1WA@@vZX2^XR17a;fzX1Jh(yJ%Zl@!q!{lfAcPrU0L-8%e6pYDDF
zq#(s{c;^2f*R?-=+((1O7N(bbwN?N5WluKn>`*`;8+<*{TTGpjgXp>rIygFv*~vCV
zT%DgRZ+4hoY)r%;Lyu6K0_`nlhdb^5XBmNMRj#h{QeT0eCToYPoDCbbj<aS2Tze%$
zSHDb<GWwlmO=xy_&9D1~XN5Q**8PeA0nF|m`!!^EH%jhp%eG$5SRGqPqRzbf%tE*7
zHmkDyF6*tPE$9L9V%j1D5O$3glG~@e49AGpV(CYcTNUsS(#e1kyX<4rm4H>dZEA^d
zX%|t{i&`tK3}VTj&K-`D+v~4AwD4jBB`gsW7{7-}W_Db}w$_JUXt`+yzVe!#$e75U
z&-6W72`L?HTb)WhM$jE(o7l{IIl%&5KLm_a3hlH#I#PR?B7F?6S(Pz4LO2X&pF6|7
za`*zbYwbpY8&GW{(X;FB#}@O)yZj2<Ba9mqzvDTsY!^p3LIn5nqjJ<QoENDnuOVJ=
zvgdvy8W>B9KJf@DIZg9p7%*A!A)TX=i!(p|Vb<3RnMbL%AN*-mcvU(o#O4jf&k~VW
zP;!LfYtZI`*y?QG&2Qn})0e%3P$8*&7~Bg_8cNvS@bro)G18lIwLjW;U=`T>6(ma2
zm14LxSIz1Ri>~*Z44>gTp4NnSOwISuTd!t*LXV11Tgom9&i$1x{~3@<MrF~S@0lw9
zjtZ68Y99q>sFCOY7{)c1>9b@RUL>ji+o&aR<RqlGRvUKvKa452Eh0A_eaWSZVA+a<
zM74m65IHu^l>O67Z6!_q<-_yGv6-f`J5r4nN!Z`Rx%#9%J%jR-DDQ!qQOMu)t(lwy
z1IvHBKV8%_gx(tLOw2TO4c5%F&`e)i@_)@0q3h`hY88ivfIfUm9GrcRH}C1o&Y4nM
zoOqDZ%?)bKl+LOP<?FMsUDi|6<X^?(JQV1A4!FpQ!$U!hpAvr)JOOP0o~I*R7*Kd}
zrs;5~<{fR4+NGtMtKS4xkJ_@RU;*=GIAt%k3M_|D4M5r-95`{jt{S=Dcw#+NeZzb^
zvh_t)>$SiyY$`8l)_unsyn8`^UVyrkEt1)S{#XGDG6_(O&<I+2hDN{&p-*za@%(`-
zRC4?rs4(qYptLV|@)%3@T}=2mAM*(US$s`V8^5q>qq!132IVWt@4HYC42Y@RzmL2J
z0B-?ciyQ!y0e~*oYnk4L{XHBj7dRWK(qyW8E@3wlnwv=_FsV-YnbGY)s%ZV;%9?j-
zUSB4V<*wRQ{Sn6zu=ZSaK*>hvu9NJ`8@RG^OfR<glao^)d5$z$OriSt8s~RwuEd8e
zQPs~S8_rN+&w1?zlsJX%su|UcDFdd-&K*TTM{>N$o^tu`X<`Z)MjcrI54?x75rD_D
zUGyGMw+~ZRyvh3}`5u79#grrccWaf7dXYBlK)L=xhWQN|!e;QG$)!ANis!3xlLt#W
zu5O2fNyq?KH=r^g&Q`G*tlZ2*Bs~g)wNI>}lZng|B%O61X-WFdQ!^c~d51n1MSqQ_
z0b_Z72Wrkav=WDB{#Kf0$@9qDGvq(YIG~V0K~Wtyab(4t|54Tf1%Ejc^P43peskt^
zCfz@ZFj@g+lS!a3*i#SM^lyu!6|Z)Ek{jiqL!bOPDvZsJltCzvrQL6dL_ah)w(8E_
z?pVt5Njf<xbFg7t6(cY;Tt1<r0H(Tkk2`K*bTN^w?x$n+_q~&58Qy$^^D%=UP%iVg
z6CsNh+mT!lyfl()?|mTw>#1ne4xa}8K;zROn-}s=+ocy<RVn57D_LC&3UyMYSs-_z
zPxs7#PA|U7jio{Yoo8{q13+Ip;aCekB@(3i)VW1Hv#n4E(h?J0UF$6kR4v|*JLO!}
z1;G1Y2tdo9>spuAKYA4nv@Grfh2dl3q{?geNlEgV*+@EtQ=dVO^yh6)ji^Fixa0k@
zK@(kT6}1KnU70{Rv;A}mHPGj=$9jz|MLjwsj&-Cq)xLSZfDL-9xT?WOx-12s2_V{X
zqtZ`pvn?Q+gFnI1>yK)nwn-r>Pp*{4v-k4+%YO_SwfhSZ^BZ@#I}Q-@mZbgV9A3b?
zfEI-jAY`W*=jIG_uc{h0V0XAg`ni+o<FVPwlINzEa4>)ie1{DzqZVz?aRcSd-=rn}
z4x0u7@Q8SMf&wK}fUbU=wpm#^iGcy=;6niY+w_mr4l7GFA-@RT0~TV=K)frjm$!g;
zZWBPfi`5?(xPd@pGF87>kv{0m+^n?zs~lIpx=}809l_WirM2g{&an2YrmLztg0C7)
zqK;>FpQ7S#tv!|F#FU^Mm6Kz`(7=93IVvyb=eLSmawsPKCi+ABmA$fdHGCSmgwHK{
zah5^<xVOk6R9C^E@&j{_2-X+2_mk#??P07m7xlC2onn003ZZ}0uN}WmzH!sR5BH`|
zb;X*j3?X^r_7p!nS+IsZ)|r6KO#YG=59v=vROxNalQpBt*)SdjsUtDz6r;vgz)eeg
zY;XTDjn>v4H?8#Xh8$DSft;Xi<9oP^m9I(a++BOLn(JGRd_5+H8?J!cUPVtsl6KP0
zZ7FWMbe@^B@G)&i<dx&9`1FIo6YS!e4>ihK?%c=+fxAT1ZtrUPhTTy+Wd-@DG|Eg>
zNoclsx6q~D%Cn;;0?lP6JJO7W8410!XGaCJ{2`-**&^N5hh+=}C{_^$lPXmOXtrQy
zsbT@@RG6VQ2Kofb#NRE{TH;-R8lcEjeG1Ly=@vRK%`8CW0_!=dYS8Ql-Ms>^vQ>gG
z*toD*>8n(-{#d?=#4=6*m={(k4U7f;J)h=_?S20<B}Nv3Bg^N6*BqGX1dflt$7(P&
zT+8b@|M_xBoo8JevDHC#hhE0{`hCgFAFFeLhL<iEzUKmO7`ZBrbXqT|yMI+pYPvOE
zThpB7JDe$RR!+HI_X-yL{N_zx;(F*cik{WIOW?DzRijy_*l=i`yNa=LETlA9?=g_5
zPSW%)1b$>dy9@Wjh=fJn!eA^SBK_*bI(YlQHsP$Td@$GBwLiO14T3jny~!mm_Lgjz
z0xrL<bC?1LKPB*2iGRW=Ou?Q%(a8=dKN*m6aSid<6(yc?HBy%#!tpxlZPg4?9|ULw
zrfnEc&b5A}hH&qZ0dZoO$pAy~29l)U$fKNZV?I5kEr1nJb?9S7z;5Q1KHa_9(8XW(
z?5UHY&?Z3PZ58XTvEydhNlx-EIo)9)-0b8)D4Qc)qbRg*y~RbB-j*zmZE|vR)XQrw
z7Lf*ZExmIsjI^(I;rD)qF62`Ezg~IDebljD7wc@OwP)6)S&|pJaJ}@}=(4RBQ;-5B
zZ#u!aDcYts9NiWMGv$lVF@P2N+~1V9(y)*fC@)8RnwcI4&;rapRNg0YbhBQji2p*H
z0%sn4V+z-@V@G%5N66l7-TG^)k4DBT9A%fquVFL7($CPHI7+64DxL3)2)J1xWht77
zM#%6!vteZ6uc^ynVSK=TNIt4AcN-%qpLL;h9{UcxGzv4kWCmqLEvVQVPTKmKm0L7;
z1}C=CI4BkGTpE*+U`<iZ0h12j@&4zi*Y=pkABAiZBhJlCgS51(C%Z5Cx9d4eW_A}s
zsHdkW^_&AI4{^_>+i5UgYhrtId=7i9gqe=-$nhD6Rz$S<1gdb<+LROa*}68SO3Jn)
fMv@wM<9$7WvK^ftZc=MqG2=)(HH$pQy!F2Tn8FAa


From 1deea042f66715b179a412afd00e1254d375762e Mon Sep 17 00:00:00 2001
From: John Siirola <jsiirola@users.noreply.github.com>
Date: Thu, 20 May 2021 16:59:08 -0600
Subject: [PATCH 8/8] Update ReferenceModel to remove implicit ranged
 inequality statements

---
 examples/networkx_scenariotree/ReferenceModel.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/networkx_scenariotree/ReferenceModel.py b/examples/networkx_scenariotree/ReferenceModel.py
index 711ac1f..d51bab3 100644
--- a/examples/networkx_scenariotree/ReferenceModel.py
+++ b/examples/networkx_scenariotree/ReferenceModel.py
@@ -32,7 +32,7 @@ def pysp_instance_creation_callback(scenario_name, node_names):
         model.SecondStageCost.expr = (model.xu0 - 1)**2
 
         model.y0 = aml.Var()
-        model.c.add(expr= -10 <= model.y0 <= 10)
+        model.c.add(expr= aml.inequality(-10, model.y0, 10))
         if scenario_name == "u00":
             model.yu00 = aml.Var()
             model.c.add(model.yu00 == model.y0)
@@ -50,7 +50,7 @@ def pysp_instance_creation_callback(scenario_name, node_names):
         model.SecondStageCost.expr = (model.xu1 + 1)**2
 
         model.y1 = aml.Var()
-        model.c.add(expr= -10 <= model.y1 <= 10)
+        model.c.add(expr= aml.inequality(-10, model.y1, 10))
         if scenario_name == "u10":
             model.yu10 = aml.Var()
             model.c.add(model.yu10 == model.y1)
@@ -68,7 +68,7 @@ def pysp_instance_creation_callback(scenario_name, node_names):
         model.SecondStageCost.expr = (model.xu2 - 0.5)**2
 
         model.y2 = aml.Var()
-        model.c.add(expr= -10 <= model.y2 <= 10)
+        model.c.add(expr= aml.inequality(-10, model.y2, 10))
         if scenario_name == "u20":
             model.yu20 = aml.Var()
             model.c.add(model.yu20 == model.y2)