Changeset 3263 for coopr.pysp/trunk/coopr/pysp/scenariotree.py

Timestamp:

Dec 1, 2010 12:47:21 PM (10 years ago)

Author:

jwatson

Message:

Corrected issue with cvar generation introduced a while back.

File:

• coopr.pysp/trunk/coopr/pysp/scenariotree.py (modified) (2 diffs)

coopr.pysp/trunk/coopr/pysp/scenariotree.py

@@ -29 +29 @@
    #
    def _update_solution_map(self, variable, match_template, scenario_instance_map):
-
-
 
       # don't bother copying bounds for variables, as the values stored
@@ -237 +235 @@
    # add a new variable to the stage, which will include updating the solution maps for each associated ScenarioTreeNode.
    #
-   def add_variable(self, variable, match_template):
+   def add_variable(self, variable, match_template, scenario_instance_map):
 
       self._variables.append((variable, match_template))
+      match_indices = extractVariableIndices(variable, match_template)
 
       for tree_node in self._tree_nodes:
-         tree_node._update_solution_map(variable, match_template)
+         tree_node._variable_indices[variable.name] = match_indices
+         tree_node._update_solution_map(variable, match_template, scenario_instance_map)
 
 class Scenario(object):