Changes in lemon/network_simplex.h [665:b95898314e09:659:0c8e5c688440] in lemon

File:

• lemon/network_simplex.h (modified) (5 diffs)

lemon/network_simplex.h

@@ -1148 +1148 @@
       // Run Circulation to check if a feasible solution exists
       typedef ConstMap<Arc, Flow> ConstArcMap;
-      ConstArcMap zero_arc_map(0), inf_arc_map(inf_cap);
       FlowNodeMap *csup = NULL;
       bool local_csup = false;
@@ -1169 +1168 @@
           } else {
             Circulation<GR, FlowArcMap, ConstArcMap, FlowNodeMap>
-              circ(_graph, *_plower, inf_arc_map, *csup);
+              circ(_graph, *_plower, ConstArcMap(inf_cap), *csup);
             circ_result = circ.run();
           }
@@ -1175 +1174 @@
           if (_pupper) {
             Circulation<GR, ConstArcMap, FlowArcMap, FlowNodeMap>
-              circ(_graph, zero_arc_map, *_pupper, *csup);
+              circ(_graph, ConstArcMap(0), *_pupper, *csup);
             circ_result = circ.run();
           } else {
             Circulation<GR, ConstArcMap, ConstArcMap, FlowNodeMap>
-              circ(_graph, zero_arc_map, inf_arc_map, *csup);
+              circ(_graph, ConstArcMap(0), ConstArcMap(inf_cap), *csup);
             circ_result = circ.run();
           }
@@ -1196 +1195 @@
           } else {
             Circulation<RevGraph, FlowArcMap, ConstArcMap, NegNodeMap>
-              circ(rgraph, *_plower, inf_arc_map, neg_csup);
+              circ(rgraph, *_plower, ConstArcMap(inf_cap), neg_csup);
             circ_result = circ.run();
           }
@@ -1202 +1201 @@
           if (_pupper) {
             Circulation<RevGraph, ConstArcMap, FlowArcMap, NegNodeMap>
-              circ(rgraph, zero_arc_map, *_pupper, neg_csup);
+              circ(rgraph, ConstArcMap(0), *_pupper, neg_csup);
             circ_result = circ.run();
           } else {
             Circulation<RevGraph, ConstArcMap, ConstArcMap, NegNodeMap>
-              circ(rgraph, zero_arc_map, inf_arc_map, neg_csup);
+              circ(rgraph, ConstArcMap(0), ConstArcMap(inf_cap), neg_csup);
             circ_result = circ.run();
           }