[Lemon-commits] deba: r3250 - in lemon/trunk: lemon tools

[Lemon SVN]

Author: deba
Date: Sat Apr  7 00:50:27 2007
New Revision: 3250

Modified:
   lemon/trunk/lemon/dimacs.h
   lemon/trunk/tools/dim_to_lgf.cc

Log:
Parameter reordering 

Patch from Kovacs Peter



Modified: lemon/trunk/lemon/dimacs.h
==============================================================================
--- lemon/trunk/lemon/dimacs.h	(original)
+++ lemon/trunk/lemon/dimacs.h	Sat Apr  7 00:50:27 2007
@@ -54,14 +54,15 @@
   /// \c lower, \c capacity and \c cost.
   ///
   /// \author Marton Makai and Peter Kovacs
-  template <typename Graph, typename SupplyMap, 
-    typename CapacityMap, typename CostMap>
+  template <typename Graph, typename LowerMap, 
+    typename CapacityMap, typename CostMap, 
+    typename SupplyMap>
   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<typename Graph::Node> nodes;

Modified: lemon/trunk/tools/dim_to_lgf.cc
==============================================================================
--- lemon/trunk/tools/dim_to_lgf.cc	(original)
+++ lemon/trunk/tools/dim_to_lgf.cc	Sat Apr  7 00:50:27 2007
@@ -116,9 +116,9 @@
 
   if (mincostflow) {
     Graph graph;
-    DoubleNodeMap supply(graph);
     DoubleEdgeMap lower(graph), capacity(graph), cost(graph);
-    readDimacs(is, graph, supply, lower, capacity, cost);
+    DoubleNodeMap supply(graph);
+    readDimacs(is, graph, lower, capacity, cost, supply);
     GraphWriter<Graph>(os, graph).
       writeNodeMap("supply", supply).
       writeEdgeMap("lower", lower).