Changeset 2324

Timestamp:

Feb 11, 2010 9:38:45 PM (11 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:

• phinit.py (modified) (2 diffs)
• phserver.py (modified) (1 diff)

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

@@ -345 +345 @@
                                 scenariotreeinstance=scenario_tree_instance)
 
-   return reference_model, reference_instance, scenario_tree
+   return reference_model, reference_instance, scenario_tree, scenario_tree_instance
 
 #
@@ -579 +579 @@
    else:
 
-      reference_model, reference_instance, scenario_tree = load_reference_and_scenario_models(options)
+      reference_model, reference_instance, scenario_tree, scenario_tree_instance = load_reference_and_scenario_models(options)
       if reference_model is None or reference_instance is None or scenario_tree is None:
          return

coopr.pysp/trunk/coopr/pysp/phserver.py

@@ -286 +286 @@
    # the scenarios that this server is responsible for.
    print "LOADING REFERENCE AND SCENARIO MODELS/INSTANCES"
-   reference_model, reference_instance, scenario_tree = load_reference_and_scenario_models(options)
+   reference_model, reference_instance, scenario_tree, scenario_tree_instance = load_reference_and_scenario_models(options)
    if reference_model is None or reference_instance is None or scenario_tree is None:
       print "***Unable to launch PH solver server"