diff -r 50d96f2166d7 -r 9d1faab5e0f1 tools/dimacs-to-lgf.cc --- a/tools/dimacs-to-lgf.cc Thu Nov 27 22:04:46 2008 +0000 +++ b/tools/dimacs-to-lgf.cc Thu Nov 27 22:05:35 2008 +0000 @@ -123,7 +123,7 @@ Digraph digraph; DoubleArcMap lower(digraph), capacity(digraph), cost(digraph); DoubleNodeMap supply(digraph); - readDimacs(is, digraph, lower, capacity, cost, supply); + readDimacsMin(is, digraph, lower, capacity, cost, supply); DigraphWriter(digraph, os). nodeMap("supply", supply). arcMap("lower", lower). @@ -134,7 +134,7 @@ Digraph digraph; Node s, t; DoubleArcMap capacity(digraph); - readDimacs(is, digraph, capacity, s, t); + readDimacsMax(is, digraph, capacity, s, t); DigraphWriter(digraph, os). arcMap("capacity", capacity). node("source", s). @@ -144,7 +144,7 @@ Digraph digraph; Node s; DoubleArcMap capacity(digraph); - readDimacs(is, digraph, capacity, s); + readDimacsSp(is, digraph, capacity, s); DigraphWriter(digraph, os). arcMap("capacity", capacity). node("source", s). @@ -152,13 +152,13 @@ } else if (capacitated) { Digraph digraph; DoubleArcMap capacity(digraph); - readDimacs(is, digraph, capacity); + readDimacsMax(is, digraph, capacity); DigraphWriter(digraph, os). arcMap("capacity", capacity). run(); } else if (plain) { Digraph digraph; - readDimacs(is, digraph); + readDimacsMat(is, digraph); DigraphWriter(digraph, os).run(); } else { cerr << "Invalid type error" << endl;