Changeset 3078

Timestamp:

Oct 5, 2010 10:46:33 AM (11 years ago)

Author:

jwatson

Message:

Fixing long-present bug in network flow model, exposed by Bill's recent commit.

File:

• coopr.pysp/trunk/examples/pysp/networkflow/models/ReferenceModel.py (modified) (1 diff)

coopr.pysp/trunk/examples/pysp/networkflow/models/ReferenceModel.py

@@ -35 +35 @@
 model.b0Cost = Param(model.Arcs)
 
-model.FCost = Param(model.Arcs)
+model.FCost = Param(model.Nodes, model.Nodes)
 
 def compute_scenario_m_rule(model):
    max_value = 0.0
    for index in model.Demand:
-      max_value = max(max_value, model.Demand[index]())
+      max_value = max(max_value, value(model.Demand[index]))
    return max_value
 model.M = Param(within=NonNegativeReals, default=0.0, rule=compute_scenario_m_rule)