Changeset 9535


Ignore:
Timestamp:
Dec 22, 2014 10:35:34 PM (4 years ago)
Author:
gahacke
Message:

fixing syntax error with overrelax ph option

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pyomo/trunk/pyomo/pysp/ph.py

    r9519 r9535  
    28022802                        tree_node._minimums[variable_id] = min(values)
    28032803                        tree_node._maximums[variable_id] = max(values)
    2804                         tree_node._averages[variable_id] = avg_value
    28052804
    28062805                        if compute_xbars:
    28072806                            if (overrelax) and (current_iteration >= 1):
    2808                                 xbars[variable_id] = self._nu*avg_value + (1-self._nu)*var_xbar
     2807                                xbars[variable_id] = self._nu*avg_value + (1-self._nu)*tree_node._averages[variable_id]
    28092808                            else:
    28102809                                xbars[variable_id] = avg_value
     2810
     2811                        tree_node._averages[variable_id] = avg_value
    28112812
    28122813        end_time = time.time()
Note: See TracChangeset for help on using the changeset viewer.