1.1 --- a/tools/dimacs-to-lgf.cc Thu Nov 27 22:04:46 2008 +0000
1.2 +++ b/tools/dimacs-to-lgf.cc Thu Nov 27 22:05:35 2008 +0000
1.3 @@ -123,7 +123,7 @@
1.4 Digraph digraph;
1.5 DoubleArcMap lower(digraph), capacity(digraph), cost(digraph);
1.6 DoubleNodeMap supply(digraph);
1.7 - readDimacs(is, digraph, lower, capacity, cost, supply);
1.8 + readDimacsMin(is, digraph, lower, capacity, cost, supply);
1.9 DigraphWriter<Digraph>(digraph, os).
1.10 nodeMap("supply", supply).
1.11 arcMap("lower", lower).
1.12 @@ -134,7 +134,7 @@
1.13 Digraph digraph;
1.14 Node s, t;
1.15 DoubleArcMap capacity(digraph);
1.16 - readDimacs(is, digraph, capacity, s, t);
1.17 + readDimacsMax(is, digraph, capacity, s, t);
1.18 DigraphWriter<Digraph>(digraph, os).
1.19 arcMap("capacity", capacity).
1.20 node("source", s).
1.21 @@ -144,7 +144,7 @@
1.22 Digraph digraph;
1.23 Node s;
1.24 DoubleArcMap capacity(digraph);
1.25 - readDimacs(is, digraph, capacity, s);
1.26 + readDimacsSp(is, digraph, capacity, s);
1.27 DigraphWriter<Digraph>(digraph, os).
1.28 arcMap("capacity", capacity).
1.29 node("source", s).
1.30 @@ -152,13 +152,13 @@
1.31 } else if (capacitated) {
1.32 Digraph digraph;
1.33 DoubleArcMap capacity(digraph);
1.34 - readDimacs(is, digraph, capacity);
1.35 + readDimacsMax(is, digraph, capacity);
1.36 DigraphWriter<Digraph>(digraph, os).
1.37 arcMap("capacity", capacity).
1.38 run();
1.39 } else if (plain) {
1.40 Digraph digraph;
1.41 - readDimacs(is, digraph);
1.42 + readDimacsMat(is, digraph);
1.43 DigraphWriter<Digraph>(digraph, os).run();
1.44 } else {
1.45 cerr << "Invalid type error" << endl;