Changeset 2329


Ignore:
Timestamp:
Feb 12, 2010 1:27:48 PM (10 years ago)
Author:
jwatson
Message:

Missed one usage of ScenarioTree? construct in recent migration of constructor signature.

File:
1 edited

Legend:

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

    r2291 r2329  
    124124   from coopr.pysp.util.scenariomodels import scenario_tree_model
    125125
    126    tree_data = scenario_tree_model.create(instance_directory+os.sep+"ScenarioStructure.dat")
     126   scenario_tree_instance = scenario_tree_model.create(instance_directory+os.sep+"ScenarioStructure.dat")
    127127
    128128   #
    129129   # construct the scenario tree
    130130   #
    131    scenario_tree = ScenarioTree(model=master_scenario_instance,
    132                                 nodes=tree_data.Nodes,
    133                                 nodechildren=tree_data.Children,
    134                                 nodestages=tree_data.NodeStage,
    135                                 nodeprobabilities=tree_data.ConditionalProbability,
    136                                 stages=tree_data.Stages,
    137                                 stagevariables=tree_data.StageVariables,
    138                                 stagecostvariables=tree_data.StageCostVariable,
    139                                 scenarios=tree_data.Scenarios,
    140                                 scenarioleafs=tree_data.ScenarioLeafNode,
    141                                 scenariobaseddata=tree_data.ScenarioBasedData)
     131   scenario_tree = ScenarioTree(scenarioinstance=master_scenario_instance,
     132                                scenariotreeinstance=scenario_tree_instance)
    142133
    143134   #
Note: See TracChangeset for help on using the changeset viewer.