Changeset 386:9d1faab5e0f1 in lemon1.2
 Timestamp:
 11/27/08 23:05:35 (12 years ago)
 Branch:
 default
 Phase:
 public
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

lemon/dimacs.h
r385 r386 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, … … 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(); … … 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 … … 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 … … 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 … … 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; 
tools/dimacstolgf.cc
r385 r386 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). … … 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). … … 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). … … 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). … … 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 {
Note: See TracChangeset
for help on using the changeset viewer.