Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • coopr.pysp/trunk/coopr/pysp/phinit.py

    r3138 r3168  
    378378      if options.verbose is True:
    379379         print "Scenario reference instance filename="+reference_instance_filename
    380       reference_instance = reference_model.create(reference_instance_filename, preprocess=False)
     380      reference_instance = reference_model.create(reference_instance_filename, preprocess=False, simplify=options.simplify_expressions)
    381381      # IMPT: disable canonical representation construction for ASL solvers.
    382382      #       this is a hack, in that we need to address encodings and
     
    402402      if options.verbose is True:
    403403         print "Scenario tree instance filename="+scenario_tree_instance_filename
    404       scenario_tree_instance = scenario_tree_model.create(scenario_tree_instance_filename)
     404      scenario_tree_instance = scenario_tree_model.create(scenario_tree_instance_filename, simplify=options.simplify_expressions)
    405405   except IOError:
    406406      print "***ERROR: Failed to load scenario tree reference instance data from file="+scenario_tree_instance_filename
Note: See TracChangeset for help on using the changeset viewer.