Changeset 386:9d1faab5e0f1 in lemon-main

Timestamp:

11/27/08 23:05:35 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Give different names to the different DIMACS readers

Files:

• lemon/dimacs.h (modified) (6 diffs)
• tools/dimacs-to-lgf.cc (modified) (5 diffs)

lemon/dimacs.h

@@ -55 +55 @@
     typename CapacityMap, typename CostMap,
     typename SupplyMap>
-  void readDimacs( std::istream& is,
+  void readDimacsMin( std::istream& is,
                    Digraph &g,
                    LowerMap& lower,
@@ -119 +119 @@
   /// set to the source and the target nodes.
   template<typename Digraph, typename CapacityMap>
-  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity,
+  void readDimacsMax(std::istream& is, Digraph &g, CapacityMap& capacity,
                   typename Digraph::Node &s, typename Digraph::Node &t) {
     g.clear();
@@ -182 +182 @@
   /// source node.
   template<typename Digraph, typename CapacityMap>
-  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity,
+  void readDimacsSp(std::istream& is, Digraph &g, CapacityMap& capacity,
                   typename Digraph::Node &s) {
-    readDimacs(is, g, capacity, s, s);
+    typename Digraph::Node t;
+    readDimacsMax(is, g, capacity, s, t);
   }
 
@@ -193 +194 @@
   /// and the arc capacities are written to \c capacity.
   template<typename Digraph, typename CapacityMap>
-  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity) {
-    typename Digraph::Node u;
-    readDimacs(is, g, capacity, u, u);
+  void readDimacsMax(std::istream& is, Digraph &g, CapacityMap& capacity) {
+    typename Digraph::Node u,v;
+    readDimacsMax(is, g, capacity, u, v);
   }
 
@@ -208 +209 @@
   /// At the beginning \c g is cleared by \c g.clear().
   template<typename Digraph>
-  void readDimacs(std::istream& is, Digraph &g) {
-    typename Digraph::Node u;
+  void readDimacsMat(std::istream& is, Digraph &g) {
+    typename Digraph::Node u,v;
     NullMap<typename Digraph::Arc, int> n;
-    readDimacs(is, g, n, u, u);
+    readDimacsMax(is, g, n, u, v);
   }
 
@@ -223 +224 @@
   /// \endcode
   template<typename Digraph>
-  void writeDimacs(std::ostream& os, const Digraph &g) {
+  void writeDimacsMat(std::ostream& os, const Digraph &g) {
     typedef typename Digraph::NodeIt NodeIt;
     typedef typename Digraph::ArcIt ArcIt;

tools/dimacs-to-lgf.cc

@@ -124 +124 @@
     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>(digraph, os).
       nodeMap("supply", supply).
@@ -135 +135 @@
     Node s, t;
     DoubleArcMap capacity(digraph);
-    readDimacs(is, digraph, capacity, s, t);
+    readDimacsMax(is, digraph, capacity, s, t);
     DigraphWriter<Digraph>(digraph, os).
       arcMap("capacity", capacity).
@@ -145 +145 @@
     Node s;
     DoubleArcMap capacity(digraph);
-    readDimacs(is, digraph, capacity, s);
+    readDimacsSp(is, digraph, capacity, s);
     DigraphWriter<Digraph>(digraph, os).
       arcMap("capacity", capacity).
@@ -153 +153 @@
     Digraph digraph;
     DoubleArcMap capacity(digraph);
-    readDimacs(is, digraph, capacity);
+    readDimacsMax(is, digraph, capacity);
     DigraphWriter<Digraph>(digraph, os).
       arcMap("capacity", capacity).
@@ -159 +159 @@
   } else if (plain) {
     Digraph digraph;
-    readDimacs(is, digraph);
+    readDimacsMat(is, digraph);
     DigraphWriter<Digraph>(digraph, os).run();
   } else {