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
Ignore white space 6 line context
... ... 
@@ -54,7 +54,7 @@
54 54 
  template <typename Digraph, typename LowerMap,
55 55 
    typename CapacityMap, typename CostMap,
56 56 
    typename SupplyMap>
57 
  void readDimacs( std::istream& is,
57 
  void readDimacsMin( std::istream& is,
58 58 
                   Digraph &g,
59 59 
                   LowerMap& lower,
60 60 
                   CapacityMap& capacity,
... ... 
@@ -118,7 +118,7 @@
118 118 
  /// capacities are written to \c capacity and \c s and \c t are
119 119 
  /// set to the source and the target nodes.
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) {
123 123 
    g.clear();
124 124 
    std::vector<typename Digraph::Node> nodes;
... ... 
@@ -181,9 +181,10 @@
181 181 
  /// capacities are written to \c capacity and \c s is set to the
182 182 
  /// source node.
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 
  }
188 189 

			




	189
	190
	
		
  /// DIMACS capacitated digraph reader function.


			




	...
	...
	
		
@@ -192,9 +193,9 @@


			




	192
	193
	
		
  /// DIMACS format. At the beginning \c g is cleared by \c g.clear()


			




	193
	194
	
		
  /// and the arc capacities are written to \c capacity.


			




	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
	
		
  }


			




	199
	200
	
		

			




	200
	201
	
		
  /// DIMACS plain digraph reader function.


			




	...
	...
	
		
@@ -207,10 +208,10 @@


			




	207
	208
	
		
  /// \endcode


			




	208
	209
	
		
  /// At the beginning \c g is cleared by \c g.clear().


			




	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
	
		
  }


			




	215
	216
	
		

			




	216
	217
	
		
  /// DIMACS plain digraph writer function.


			




	...
	...
	
		
@@ -222,7 +223,7 @@


			




	222
	223
	
		
  ///   p mat


			




	223
	224
	
		
  /// \endcode


			




	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;


			




	227
	228
	
		
    typedef typename Digraph::ArcIt ArcIt;


			




	228
	229
	
		

			




        

    

    

    

        

            

                

                    tools/dimacs-to-lgf.cc
                

                

                  
                  
                  
                  Ignore white space
                  6 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -123,7 +123,7 @@


			




	123
	123
	
		
    Digraph digraph;


			




	124
	124
	
		
    DoubleArcMap lower(digraph), capacity(digraph), cost(digraph);


			




	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).


			




	128
	128
	
		
      nodeMap("supply", supply).


			




	129
	129
	
		
      arcMap("lower", lower).


			




	...
	...
	
		
@@ -134,7 +134,7 @@


			




	134
	134
	
		
    Digraph digraph;


			




	135
	135
	
		
    Node s, t;


			




	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).


			




	139
	139
	
		
      arcMap("capacity", capacity).


			




	140
	140
	
		
      node("source", s).


			




	...
	...
	
		
@@ -144,7 +144,7 @@


			




	144
	144
	
		
    Digraph digraph;


			




	145
	145
	
		
    Node s;


			




	146
	146
	
		
    DoubleArcMap capacity(digraph);


			




	147
	
	
		
    readDimacs(is, digraph, capacity, s);


			




	
	147
	
		
    readDimacsSp(is, digraph, capacity, s);


			




	148
	148
	
		
    DigraphWriter<Digraph>(digraph, os).


			




	149
	149
	
		
      arcMap("capacity", capacity).


			




	150
	150
	
		
      node("source", s).


			




	...
	...
	
		
@@ -152,13 +152,13 @@


			




	152
	152
	
		
  } else if (capacitated) {


			




	153
	153
	
		
    Digraph digraph;


			




	154
	154
	
		
    DoubleArcMap capacity(digraph);


			




	155
	
	
		
    readDimacs(is, digraph, capacity);


			




	
	155
	
		
    readDimacsMax(is, digraph, capacity);


			




	156
	156
	
		
    DigraphWriter<Digraph>(digraph, os).


			




	157
	157
	
		
      arcMap("capacity", capacity).


			




	158
	158
	
		
      run();


			




	159
	159
	
		
  } else if (plain) {


			




	160
	160
	
		
    Digraph digraph;


			




	161
	
	
		
    readDimacs(is, digraph);


			




	
	161
	
		
    readDimacsMat(is, digraph);


			




	162
	162
	
		
    DigraphWriter<Digraph>(digraph, os).run();


			




	163
	163
	
		
  } else {


			




	164
	164
	
		
    cerr << "Invalid type error" << endl;


			




        

    






    
    



    


    

     
    
0 comments (0 inline)