Changes in tools/dimacs-solver.cc [614:19b6f20e0ea2:611:85cb3aa71cce] in lemon-main

File:

• tools/dimacs-solver.cc (modified) (3 diffs)

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: