Changeset - r386:9d1faab5e0f1
« 385:50d96f
387:24a2c6 »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Give different names to the different DIMACS readers
0 2 0
default
2 files changed with 17 insertions and 16 deletions:
lemon/dimacs.h
12
11
tools/dimacs-to-lgf.cc
5
5
↑ Collapse diff ↑
lemon/dimacs.h
Show white space 6 line context
... ... 
@@ -56,3 +56,3 @@
56 56 
    typename SupplyMap>
57 
  void readDimacs( std::istream& is,
57 
  void readDimacsMin( std::istream& is,
58 58 
                   Digraph &g,
... ... 
@@ -120,3 +120,3 @@
120 120 
  template<typename Digraph, typename CapacityMap>
121 
  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity,
121 
  void readDimacsMax(std::istream& is, Digraph &g, CapacityMap& capacity,
122 122 
                  typename Digraph::Node &s, typename Digraph::Node &t) {
... ... 
@@ -183,5 +183,6 @@
183 183 
  template<typename Digraph, typename CapacityMap>
184 
  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity,
184 
  void readDimacsSp(std::istream& is, Digraph &g, CapacityMap& capacity,
185 185 
                  typename Digraph::Node &s) {
186 
    readDimacs(is, g, capacity, s, s);
186 
    typename Digraph::Node t;
187 
    readDimacsMax(is, g, capacity, s, t);
187 188 
  }
... ... 
@@ -194,5 +195,5 @@
194 195 
  template<typename Digraph, typename CapacityMap>
195 
  void readDimacs(std::istream& is, Digraph &g, CapacityMap& capacity) {
196 
    typename Digraph::Node u;
197 
    readDimacs(is, g, capacity, u, u);
196 
  void readDimacsMax(std::istream& is, Digraph &g, CapacityMap& capacity) {
197 
    typename Digraph::Node u,v;
198 
    readDimacsMax(is, g, capacity, u, v);
198 199 
  }
... ... 
@@ -209,6 +210,6 @@
209 210 
  template<typename Digraph>
210 
  void readDimacs(std::istream& is, Digraph &g) {
211 
    typename Digraph::Node u;
211 
  void readDimacsMat(std::istream& is, Digraph &g) {
212 
    typename Digraph::Node u,v;
212 213 
    NullMap<typename Digraph::Arc, int> n;
213 
    readDimacs(is, g, n, u, u);
214 
    readDimacsMax(is, g, n, u, v);
214 215 
  }
... ... 
@@ -224,3 +225,3 @@
224 225 
  template<typename Digraph>
225 
  void writeDimacs(std::ostream& os, const Digraph &g) {
226 
  void writeDimacsMat(std::ostream& os, const Digraph &g) {
226 227 
    typedef typename Digraph::NodeIt NodeIt;
tools/dimacs-to-lgf.cc
Ignore white space 6 line context
... ... 
@@ -125,3 +125,3 @@
125 125 
    DoubleNodeMap supply(digraph);
126 
    readDimacs(is, digraph, lower, capacity, cost, supply);
126 
    readDimacsMin(is, digraph, lower, capacity, cost, supply);
127 127 
    DigraphWriter<Digraph>(digraph, os).
... ... 
@@ -136,3 +136,3 @@
136 136 
    DoubleArcMap capacity(digraph);
137 
    readDimacs(is, digraph, capacity, s, t);
137 
    readDimacsMax(is, digraph, capacity, s, t);
138 138 
    DigraphWriter<Digraph>(digraph, os).
... ... 
@@ -146,3 +146,3 @@
146 146 
    DoubleArcMap capacity(digraph);
147 
    readDimacs(is, digraph, capacity, s);
147 
    readDimacsSp(is, digraph, capacity, s);
148 148 
    DigraphWriter<Digraph>(digraph, os).
... ... 
@@ -154,3 +154,3 @@
154 154 
    DoubleArcMap capacity(digraph);
155 
    readDimacs(is, digraph, capacity);
155 
    readDimacsMax(is, digraph, capacity);
156 156 
    DigraphWriter<Digraph>(digraph, os).
... ... 
@@ -160,3 +160,3 @@
160 160 
    Digraph digraph;
161 
    readDimacs(is, digraph);
161 
    readDimacsMat(is, digraph);
162 162 
    DigraphWriter<Digraph>(digraph, os).run();
0 comments (0 inline)