# HG changeset patch
# User Peter Kovacs <kpeter@inf.elte.hu>
# Date 1332956396 -7200
# Node ID c5990f454032cfd31db5d95262a48bb626e137bb
# Parent  761fe0846f49ded656f1d1e3d40e92c7ea2c89f9
Fix a bug + remove redundant typedefs in dimacs-solver (#440)

diff -r 761fe0846f49 -r c5990f454032 tools/dimacs-solver.cc
--- a/tools/dimacs-solver.cc	Thu Sep 13 11:45:36 2012 +0200
+++ b/tools/dimacs-solver.cc	Wed Mar 28 19:39:56 2012 +0200
@@ -117,16 +117,17 @@
   }
   if (report) std::cerr << "Read the file: " << ti << '\n';
 
+  typedef NetworkSimplex<Digraph, Value> MCF;
   ti.restart();
-  NetworkSimplex<Digraph, Value> ns(g);
+  MCF ns(g);
   ns.lowerMap(lower).upperMap(cap).costMap(cost).supplyMap(sup);
   if (sum_sup > 0) ns.supplyType(ns.LEQ);
   if (report) std::cerr << "Setup NetworkSimplex class: " << ti << '\n';
   ti.restart();
-  bool res = ns.run();
+  typename MCF::ProblemType res = ns.run();
   if (report) {
     std::cerr << "Run NetworkSimplex: " << ti << "\n\n";
-    std::cerr << "Feasible flow: " << (res ? "found" : "not found") << '\n';
+    std::cerr << "Feasible flow: " << (res == MCF::OPTIMAL ? "found" : "not found") << '\n';
     if (res) std::cerr << "Min flow cost: " << ns.totalCost() << '\n';
   }
 }
@@ -186,9 +187,6 @@
 }
 
 int main(int argc, const char *argv[]) {
-  typedef SmartDigraph Digraph;
-
-  typedef Digraph::Arc Arc;
 
   std::string inputName;
   std::string outputName;