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/phutils.py

    r3143 r3168  
    189189                                verbose,
    190190                                preprocess = True,
    191                                 linearize = True):
     191                                linearize = True,
     192                                simplify = True):
    192193
    193194   if verbose is True:
     
    208209         if verbose is True:
    209210            print "Data for scenario=" + scenario._name + " loads from file=" + scenario_data_filename
    210          scenario_instance = reference_model.create(scenario_data_filename)
     211         scenario_instance = reference_model.create(scenario_data_filename, simplify=simplify)
    211212      else:
    212213         scenario_instance = reference_model.clone()
     
    220221            current_node = current_node._parent
    221222         scenario_data.read(model=scenario_instance)
    222          scenario_instance.load(scenario_data)
     223         scenario_instance.load(scenario_data, simplify=simplify)
    223224         if preprocess is True:
    224225            scenario_instance.preprocess()         
Note: See TracChangeset for help on using the changeset viewer.