Changeset 2417:113d381c9160 in lemon-0.x

Timestamp:

04/07/07 00:50:27 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3249

Message:

Parameter reordering

Patch from Kovacs Peter

Files:

• lemon/dimacs.h (modified) (1 diff)
• tools/dim_to_lgf.cc (modified) (1 diff)

lemon/dimacs.h

@@ -55 +55 @@
   ///
   /// \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();

tools/dim_to_lgf.cc

@@ -117 +117 @@
   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<Graph>(os, graph).
       writeNodeMap("supply", supply).