Changeset 2324
- Timestamp:
- Feb 11, 2010 9:38:45 PM (11 years ago)
- Location:
- coopr.pysp/trunk/coopr/pysp
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
coopr.pysp/trunk/coopr/pysp/phinit.py
r2323 r2324 345 345 scenariotreeinstance=scenario_tree_instance) 346 346 347 return reference_model, reference_instance, scenario_tree 347 return reference_model, reference_instance, scenario_tree, scenario_tree_instance 348 348 349 349 # … … 579 579 else: 580 580 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) 582 582 if reference_model is None or reference_instance is None or scenario_tree is None: 583 583 return -
coopr.pysp/trunk/coopr/pysp/phserver.py
r2320 r2324 286 286 # the scenarios that this server is responsible for. 287 287 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) 289 289 if reference_model is None or reference_instance is None or scenario_tree is None: 290 290 print "***Unable to launch PH solver server"
Note: See TracChangeset
for help on using the changeset viewer.