Changeset 2383


Ignore:
Timestamp:
Feb 21, 2010 10:58:35 AM (10 years ago)
Author:
jwatson
Message:

More buried presolve->preprocess name changes in the PySP EF writer.

File:
1 edited

Legend:

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

    r2329 r2383  
    181181            scenario_data.read(model=scenario_instance)
    182182            scenario_instance._load_model_data(scenario_data)
    183             scenario_instance.presolve()
     183            scenario_instance.preprocess()
    184184      except:
    185185         print "Encountered exception in model instance creation - traceback:"
     
    190190      scenario_instance.name = scenario._name
    191191     
    192       scenario_instance.presolve()
     192      scenario_instance.preprocess()
    193193      instances[scenario._name] = scenario_instance
    194194
     
    296296      cvar_eta_variable.construct()
    297297
    298    master_binding_instance.presolve()
     298   master_binding_instance.preprocess()
    299299
    300300   # ditto above for the (non-expected) cost variable.
     
    459459   for scenario_name in instances.keys():
    460460      scenario_instance = instances[scenario_name]   
    461       scenario_instance.presolve()         
    462 
    463    master_binding_instance.presolve()
     461      scenario_instance.preprocess()         
     462
     463   master_binding_instance.preprocess()
    464464
    465465   ################################################################################################
     
    695695            setattr(master_binding_instance, expected_cost_variable_name, expected_cost_variable)
    696696
    697    master_binding_instance.presolve()
     697   master_binding_instance.preprocess()
    698698
    699699   # ditto above for the (non-expected) cost variable.
     
    781781            setattr(master_binding_instance, "MASTER", new_objective)
    782782
    783    master_binding_instance.presolve()
     783   master_binding_instance.preprocess()
    784784
    785785   ################################################################################################
Note: See TracChangeset for help on using the changeset viewer.