LEMON/LEMON-official Changeset - r660:b1811c363299

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r660:b1811c363299

« 658:85cb3a

661:19b6f2 »

r660:b1811c363299

Fri, 24 Apr 2009 12:22:06

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Bug fix in NetworkSimplex (#234)

0 1 0

default

1 file changed with 7 insertions and 6 deletions:

lemon/network_simplex.h

↑ Collapse diff ↑

lemon/network_simplex.h

Show inline comments

@@ -1141,12 +1141,13 @@
+		        }
 		        art_cost = (art_cost + 1) * _node_num;
+		      }
 		      // 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;
 		      if (_psupply) {
 		        csup = _psupply;
 		      } else {
 		        csup = new FlowNodeMap(_graph, 0);
@@ -1161,23 +1162,23 @@
 		          if (_pupper) {
 		            Circulation<GR, FlowArcMap, FlowArcMap, FlowNodeMap>
 		              circ(_graph, *_plower, *_pupper, *csup);
 		            circ_result = circ.run();
 		          } else {
 		            Circulation<GR, FlowArcMap, ConstArcMap, FlowNodeMap>
-		              circ(_graph, *_plower, ConstArcMap(inf_cap), *csup);
+		              circ(_graph, *_plower, inf_arc_map, *csup);
 		            circ_result = circ.run();
+		          }
 		        } else {
 		          if (_pupper) {
 		            Circulation<GR, ConstArcMap, FlowArcMap, FlowNodeMap>
-		              circ(_graph, ConstArcMap(0), *_pupper, *csup);
+		              circ(_graph, zero_arc_map, *_pupper, *csup);
 		            circ_result = circ.run();
 		          } else {
 		            Circulation<GR, ConstArcMap, ConstArcMap, FlowNodeMap>
-		              circ(_graph, ConstArcMap(0), ConstArcMap(inf_cap), *csup);
+		              circ(_graph, zero_arc_map, inf_arc_map, *csup);
 		            circ_result = circ.run();
+		          }
+		        }
 		      } else {
 		        // LEQ problem type
 		        typedef ReverseDigraph<const GR> RevGraph;
@@ -1188,23 +1189,23 @@
 		          if (_pupper) {
 		            Circulation<RevGraph, FlowArcMap, FlowArcMap, NegNodeMap>
 		              circ(rgraph, *_plower, *_pupper, neg_csup);
 		            circ_result = circ.run();
 		          } else {
 		            Circulation<RevGraph, FlowArcMap, ConstArcMap, NegNodeMap>
-		              circ(rgraph, *_plower, ConstArcMap(inf_cap), neg_csup);
+		              circ(rgraph, *_plower, inf_arc_map, neg_csup);
 		            circ_result = circ.run();
+		          }
 		        } else {
 		          if (_pupper) {
 		            Circulation<RevGraph, ConstArcMap, FlowArcMap, NegNodeMap>
-		              circ(rgraph, ConstArcMap(0), *_pupper, neg_csup);
+		              circ(rgraph, zero_arc_map, *_pupper, neg_csup);
 		            circ_result = circ.run();
 		          } else {
 		            Circulation<RevGraph, ConstArcMap, ConstArcMap, NegNodeMap>
-		              circ(rgraph, ConstArcMap(0), ConstArcMap(inf_cap), neg_csup);
+		              circ(rgraph, zero_arc_map, inf_arc_map, neg_csup);
 		            circ_result = circ.run();
+		          }
+		        }
+		      }
 		      if (local_csup) delete csup;
 		      if (!circ_result) return false;

0 comments (0 inline)

RhodeCode

Login to your account