Changeset 660:b1811c363299 in lemon for lemon
- Timestamp:
- 04/24/09 12:22:06 (16 years ago)
- Branch:
- default
- Phase:
- public
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/network_simplex.h
r656 r660 1145 1145 // Run Circulation to check if a feasible solution exists 1146 1146 typedef ConstMap<Arc, Flow> ConstArcMap; 1147 ConstArcMap zero_arc_map(0), inf_arc_map(inf_cap); 1147 1148 FlowNodeMap *csup = NULL; 1148 1149 bool local_csup = false; … … 1165 1166 } else { 1166 1167 Circulation<GR, FlowArcMap, ConstArcMap, FlowNodeMap> 1167 circ(_graph, *_plower, ConstArcMap(inf_cap), *csup);1168 circ(_graph, *_plower, inf_arc_map, *csup); 1168 1169 circ_result = circ.run(); 1169 1170 } … … 1171 1172 if (_pupper) { 1172 1173 Circulation<GR, ConstArcMap, FlowArcMap, FlowNodeMap> 1173 circ(_graph, ConstArcMap(0), *_pupper, *csup);1174 circ(_graph, zero_arc_map, *_pupper, *csup); 1174 1175 circ_result = circ.run(); 1175 1176 } else { 1176 1177 Circulation<GR, ConstArcMap, ConstArcMap, FlowNodeMap> 1177 circ(_graph, ConstArcMap(0), ConstArcMap(inf_cap), *csup);1178 circ(_graph, zero_arc_map, inf_arc_map, *csup); 1178 1179 circ_result = circ.run(); 1179 1180 } … … 1192 1193 } else { 1193 1194 Circulation<RevGraph, FlowArcMap, ConstArcMap, NegNodeMap> 1194 circ(rgraph, *_plower, ConstArcMap(inf_cap), neg_csup);1195 circ(rgraph, *_plower, inf_arc_map, neg_csup); 1195 1196 circ_result = circ.run(); 1196 1197 } … … 1198 1199 if (_pupper) { 1199 1200 Circulation<RevGraph, ConstArcMap, FlowArcMap, NegNodeMap> 1200 circ(rgraph, ConstArcMap(0), *_pupper, neg_csup);1201 circ(rgraph, zero_arc_map, *_pupper, neg_csup); 1201 1202 circ_result = circ.run(); 1202 1203 } else { 1203 1204 Circulation<RevGraph, ConstArcMap, ConstArcMap, NegNodeMap> 1204 circ(rgraph, ConstArcMap(0), ConstArcMap(inf_cap), neg_csup);1205 circ(rgraph, zero_arc_map, inf_arc_map, neg_csup); 1205 1206 circ_result = circ.run(); 1206 1207 }
Note: See TracChangeset
for help on using the changeset viewer.