Changeset 3105

Timestamp:

Oct 15, 2010 2:41:47 AM (11 years ago)

Author:

khunter

Message:

NFC: EOL whitespace removal

File:

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

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

@@ -24 +24 @@
    #
    # update the _solutions attribute of a tree node, given a specific
-   # variable/match-template/variable-index triple. 
+   # variable/match-template/variable-index triple.
    #
    def _update_solution_map(self, variable, match_template, variable_indices):
@@ -51 +51 @@
          new_variable[index].activate()
 
-      self._solutions[new_variable_name] = new_variable      
+      self._solutions[new_variable_name] = new_variable
 
    #
@@ -176 +176 @@
          my_cost = stage_cost_variable.value
       else:
-         # depending on the situation (and the model), the stage cost variables might not have values.                        
+         # depending on the situation (and the model), the stage cost variables might not have values.
          my_cost = 0.0
       child_cost = 0.0
@@ -191 +191 @@
 
       self._name = ""
-      
+
       # a collection of ScenarioTreeNode objects.
-      self._tree_nodes = []      
-      
+      self._tree_nodes = []
+
       # a collection of triples consisting of (1) a reference to a Pyomo model Var object, (2) the original match
       # template string (for output purposes), and (3) a *list* of the corresponding indices. the variables are
@@ -201 +201 @@
       # NOTE: if the variable index is none, it is assumed that the entire variable is blended.
       self._variables = []
-      
+
       # a tuple consisting of (1) a reference to a pyomo model Var that computes the stage-specific cost and (2) the corresponding
       # index. the index *is* the sole index in the cost variable, as the cost variable refers to a single variable index.
@@ -221 +221 @@
    """
    def __init__(self, *args, **kwds):
-      
+
       self._name = None
       self._leaf_node = None  # allows for construction of node list
@@ -360 +360 @@
    """
    def __init__(self, *args, **kwds):
-      
+
       self._name = None # some arbitrary identifier
       self._reference_instance = None # the reference (deterministic) base model
@@ -473 +473 @@
          if string.find(scenario_name, "_") != -1:
             raise ValueError, "By convention, scenario names in PySP cannot contain underscore (_) characters; the scenario in violation="+scenario_name
-         
+
          new_scenario = Scenario()
          new_scenario._name=scenario_name
@@ -536 +536 @@
             instance_cost_variable = instance.active_components(Var)[stage._cost_variable[0].name][stage._cost_variable[1]]
             if instance_cost_variable.value is not None:
-                # depending on the situation (and the model), the stage cost variables might not have values.               
+                # depending on the situation (and the model), the stage cost variables might not have values.
                aggregate_cost += instance_cost_variable
       return aggregate_cost
@@ -722 +722 @@
 
    def variableStage(self, variable, index):
-      
+
       for stage in self._stages:
-         # stage_var is a VarValue - the rest are strings and list of indices, respectively.         
+         # stage_var is a VarValue - the rest are strings and list of indices, respectively.
          for (stage_var, match_template, match_indices) in stage._variables:
             if (variable.name == stage_var.name) and (index in match_indices):
@@ -733 +733 @@
          # automatically or explicitly.
          if (variable.name == stage._cost_variable[0].name):
-            return stage 
+            return stage
 
       raise RuntimeError, "The variable="+str(variable.name)+", index="+str(index)+" does not belong to any stage in the scenario tree"
@@ -740 +740 @@
    # a utility to determine the stage to which the input constraint "belongs".
    # a constraint belongs to the latest stage in which referenced variables
-   # in the constraint appears in that stage. 
+   # in the constraint appears in that stage.
    # input is a constraint is of type "Constraint", and an index of that
    # constraint - which might be None in the case of singleton constraints.