Changes in / [665:b95898314e09:664:4137ef9aacc6] in lemon

Files:

• lemon/network_simplex.h (modified) (5 diffs)
• test/min_cost_flow_test.cc (modified) (1 diff)
• tools/dimacs-solver.cc (modified) (3 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();
           }

test/min_cost_flow_test.cc

@@ -234 +234 @@
     typedef int Flow;
     typedef int Cost;
-    typedef concepts::Digraph GR;
+    // TODO: This typedef should be enabled if the standard maps are
+    // reference maps in the graph concepts (See #190).
+/**/
+    //typedef concepts::Digraph GR;
+    typedef ListDigraph GR;
+/**/
     checkConcept< McfClassConcept<GR, Flow, Cost>,
                   NetworkSimplex<GR, Flow, Cost> >();

tools/dimacs-solver.cc

@@ -94 +94 @@
 template<class Value>
 void solve_min(ArgParser &ap, std::istream &is, std::ostream &,
-               Value infty, DimacsDescriptor &desc)
+               DimacsDescriptor &desc)
 {
   bool report = !ap.given("q");
@@ -101 +101 @@
   Digraph::NodeMap<Value> sup(g);
   Timer ti;
-
-  ti.restart();
-  readDimacsMin(is, g, lower, cap, cost, sup, infty, desc);
-  ti.stop();
-  Value sum_sup = 0;
-  for (Digraph::NodeIt n(g); n != INVALID; ++n) {
-    sum_sup += sup[n];
-  }
-  if (report) {
-    std::cerr << "Sum of supply values: " << sum_sup << "\n";
-    if (sum_sup <= 0)
-      std::cerr << "GEQ supply contraints are used for NetworkSimplex\n\n";
-    else
-      std::cerr << "LEQ supply contraints are used for NetworkSimplex\n\n";
-  }
+  ti.restart();
+  readDimacsMin(is, g, lower, cap, cost, sup, 0, desc);
   if (report) std::cerr << "Read the file: " << ti << '\n';
-
   ti.restart();
   NetworkSimplex<Digraph, Value> ns(g);
   ns.lowerMap(lower).capacityMap(cap).costMap(cost).supplyMap(sup);
-  if (sum_sup > 0) ns.problemType(ns.LEQ);
   if (report) std::cerr << "Setup NetworkSimplex class: " << ti << '\n';
   ti.restart();
-  bool res = ns.run();
-  if (report) {
-    std::cerr << "Run NetworkSimplex: " << ti << "\n\n";
-    std::cerr << "Feasible flow: " << (res ? "found" : "not found") << '\n';
-    if (res) std::cerr << "Min flow cost: " << ns.totalCost() << '\n';
-  }
+  ns.run();
+  if (report) std::cerr << "Run NetworkSimplex: " << ti << '\n';
+  if (report) std::cerr << "\nMin flow cost: " << ns.totalCost() << '\n';
 }
 
@@ -170 +152 @@
     {
     case DimacsDescriptor::MIN:
-      solve_min<Value>(ap,is,os,infty,desc);
+      solve_min<Value>(ap,is,os,desc);
       break;
     case DimacsDescriptor::MAX: