Changeset 2324


Ignore:
Timestamp:
Feb 11, 2010 9:38:45 PM (10 years ago)
Author:
jwatson
Message:

Passing additional argument (scenario tree instance) out of the construction routine for reference model/instance and scenario model/instance.

Location:
coopr.pysp/trunk/coopr/pysp
Files:
2 edited

Legend:

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

    r2323 r2324  
    345345                                scenariotreeinstance=scenario_tree_instance)
    346346
    347    return reference_model, reference_instance, scenario_tree
     347   return reference_model, reference_instance, scenario_tree, scenario_tree_instance
    348348
    349349#
     
    579579   else:
    580580
    581       reference_model, reference_instance, scenario_tree = load_reference_and_scenario_models(options)
     581      reference_model, reference_instance, scenario_tree, scenario_tree_instance = load_reference_and_scenario_models(options)
    582582      if reference_model is None or reference_instance is None or scenario_tree is None:
    583583         return
  • coopr.pysp/trunk/coopr/pysp/phserver.py

    r2320 r2324  
    286286   # the scenarios that this server is responsible for.
    287287   print "LOADING REFERENCE AND SCENARIO MODELS/INSTANCES"
    288    reference_model, reference_instance, scenario_tree = load_reference_and_scenario_models(options)
     288   reference_model, reference_instance, scenario_tree, scenario_tree_instance = load_reference_and_scenario_models(options)
    289289   if reference_model is None or reference_instance is None or scenario_tree is None:
    290290      print "***Unable to launch PH solver server"
Note: See TracChangeset for help on using the changeset viewer.