Changeset 3168 for coopr.pysp/trunk/coopr/pysp/phinit.py

Timestamp:

Oct 26, 2010 10:12:23 PM (10 years ago)

Author:

jwatson

Message:

Completing implementation of optional processing of expression simplification in PySP.

File:

• coopr.pysp/trunk/coopr/pysp/phinit.py (modified) (2 diffs)

coopr.pysp/trunk/coopr/pysp/phinit.py

@@ -378 +378 @@
       if options.verbose is True:
          print "Scenario reference instance filename="+reference_instance_filename
-      reference_instance = reference_model.create(reference_instance_filename, preprocess=False)
+      reference_instance = reference_model.create(reference_instance_filename, preprocess=False, simplify=options.simplify_expressions)
       # IMPT: disable canonical representation construction for ASL solvers.
       #       this is a hack, in that we need to address encodings and
@@ -402 +402 @@
       if options.verbose is True:
          print "Scenario tree instance filename="+scenario_tree_instance_filename
-      scenario_tree_instance = scenario_tree_model.create(scenario_tree_instance_filename)
+      scenario_tree_instance = scenario_tree_model.create(scenario_tree_instance_filename, simplify=options.simplify_expressions)
    except IOError:
       print "***ERROR: Failed to load scenario tree reference instance data from file="+scenario_tree_instance_filename