Changes in / [1008:d216e1c8b3fa:999:00f8d9f9920d] in lemon-main

Files:

• lemon/concepts/graph_components.h (modified) (1 diff)
• test/bfs_test.cc (modified) (2 diffs)
• test/circulation_test.cc (modified) (1 diff)
• test/dfs_test.cc (modified) (2 diffs)
• test/dijkstra_test.cc (modified) (2 diffs)
• test/gomory_hu_test.cc (modified) (1 diff)
• test/hao_orlin_test.cc (modified) (1 diff)
• test/matching_test.cc (modified) (1 diff)
• test/min_cost_arborescence_test.cc (modified) (1 diff)
• test/preflow_test.cc (modified) (1 diff)
• test/suurballe_test.cc (modified) (1 diff)
• tools/dimacs-solver.cc (modified) (2 diffs)

lemon/concepts/graph_components.h

@@ -109 +109 @@
 
           bool b;
-          ignore_unused_variable_warning(b);
-
           b = (ia == ib) && (ia != ib);
           b = (ia == INVALID) && (ib != INVALID);

test/bfs_test.cc

@@ -62 +62 @@
   Arc e;
   int l, i;
-  ignore_unused_variable_warning(l,i);
   bool b;
   BType::DistMap d(G);
@@ -152 +151 @@
   Digraph g;
   bool b;
-  ignore_unused_variable_warning(b);
-
   bfs(g).run(Node());
   b=bfs(g).run(Node(),Node());

test/circulation_test.cc

@@ -74 +74 @@
   VType v;
   bool b;
-  ignore_unused_variable_warning(v,b);
 
   typedef Circulation<Digraph, CapMap, CapMap, SupplyMap>

test/dfs_test.cc

@@ -68 +68 @@
   int l, i;
   bool b;
-  ignore_unused_variable_warning(l,i,b);
-
   DType::DistMap d(G);
   DType::PredMap p(G);
@@ -154 +152 @@
   Digraph g;
   bool b;
-  ignore_unused_variable_warning(b);
-
   dfs(g).run(Node());
   b=dfs(g).run(Node(),Node());

test/dijkstra_test.cc

@@ -66 +66 @@
   int i;
   bool b;
-  ignore_unused_variable_warning(l,i,b);
-
   DType::DistMap d(G);
   DType::PredMap p(G);
@@ -165 +163 @@
   Digraph g;
   bool b;
-  ignore_unused_variable_warning(b);
-
   dijkstra(g,LengthMap()).run(Node());
   b=dijkstra(g,LengthMap()).run(Node(),Node());

test/gomory_hu_test.cc

@@ -69 +69 @@
   Value v;
   int d;
-  ignore_unused_variable_warning(v,d);
 
   GomoryHu<Graph, CapMap> gh_test(g, cap);

test/hao_orlin_test.cc

@@ -67 +67 @@
   CutMap cut;
   Value v;
-  ignore_unused_variable_warning(v);
 
   HaoOrlin<Digraph, CapMap> ho_test(g, cap);

test/matching_test.cc

@@ -146 +146 @@
   MaxMatching<Graph>::Status stat =
     const_mat_test.status(n);
-  ignore_unused_variable_warning(stat);
   const MaxMatching<Graph>::StatusMap& smap =
     const_mat_test.statusMap();

test/min_cost_arborescence_test.cc

@@ -92 +92 @@
   VType c;
   bool b;
-  ignore_unused_variable_warning(c,b);
   int i;
   CostMap cost;

test/preflow_test.cc

@@ -87 +87 @@
   VType v;
   bool b;
-  ignore_unused_variable_warning(v,b);
 
   typedef Preflow<Digraph, CapMap>

test/suurballe_test.cc

@@ -118 +118 @@
   int f;
   VType c;
-  ignore_unused_variable_warning(f,c);
-
   c = const_suurb_test.totalLength();
   f = const_suurb_test.flow(e);

tools/dimacs-solver.cc

@@ -118 +118 @@
   if (report) std::cerr << "Read the file: " << ti << '\n';
 
-  typedef NetworkSimplex<Digraph, Value> MCF;
-  ti.restart();
-  MCF ns(g);
+  ti.restart();
+  NetworkSimplex<Digraph, Value> 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();
-  typename MCF::ProblemType res = ns.run();
+  bool res = ns.run();
   if (report) {
     std::cerr << "Run NetworkSimplex: " << ti << "\n\n";
-    std::cerr << "Feasible flow: " << (res == MCF::OPTIMAL ? "found" : "not found") << '\n';
+    std::cerr << "Feasible flow: " << (res ? "found" : "not found") << '\n';
     if (res) std::cerr << "Min flow cost: "
                        << ns.template totalCost<LargeValue>() << '\n';
@@ -189 +188 @@
 
 int main(int argc, const char *argv[]) {
+  typedef SmartDigraph Digraph;
+
+  typedef Digraph::Arc Arc;
 
   std::string inputName;