# HG changeset patch # User deba # Date 1175899827 0 # Node ID 113d381c916002f1edb49d9cb3741e298c35d890 # Parent 261b4701405d42284633f813b8ad1a586bb4f011 Parameter reordering Patch from Kovacs Peter diff -r 261b4701405d -r 113d381c9160 lemon/dimacs.h --- a/lemon/dimacs.h Fri Mar 30 14:17:28 2007 +0000 +++ b/lemon/dimacs.h Fri Apr 06 22:50:27 2007 +0000 @@ -54,14 +54,15 @@ /// \c lower, \c capacity and \c cost. /// /// \author Marton Makai and Peter Kovacs - template + template void readDimacs( std::istream& is, Graph &g, - SupplyMap& supply, - CapacityMap& lower, + LowerMap& lower, CapacityMap& capacity, - CostMap& cost ) + CostMap& cost, + SupplyMap& supply ) { g.clear(); std::vector nodes; diff -r 261b4701405d -r 113d381c9160 tools/dim_to_lgf.cc --- a/tools/dim_to_lgf.cc Fri Mar 30 14:17:28 2007 +0000 +++ b/tools/dim_to_lgf.cc Fri Apr 06 22:50:27 2007 +0000 @@ -116,9 +116,9 @@ if (mincostflow) { Graph graph; + DoubleEdgeMap lower(graph), capacity(graph), cost(graph); DoubleNodeMap supply(graph); - DoubleEdgeMap lower(graph), capacity(graph), cost(graph); - readDimacs(is, graph, supply, lower, capacity, cost); + readDimacs(is, graph, lower, capacity, cost, supply); GraphWriter(os, graph). writeNodeMap("supply", supply). writeEdgeMap("lower", lower).