Changes in / [647:0ba8dfce7259:642:16d7255a6849] in lemon
- Files:
-
- 6 edited
-
lemon/gomory_hu.h (modified) (14 diffs)
-
lemon/hao_orlin.h (modified) (12 diffs)
-
lemon/lgf_reader.h (modified) (27 diffs)
-
lemon/lgf_writer.h (modified) (30 diffs)
-
test/gomory_hu_test.cc (modified) (4 diffs)
-
test/hao_orlin_test.cc (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
lemon/gomory_hu.h
r643 r628 43 43 /// between these nodes. Moreover the components obtained by removing 44 44 /// this edge from the tree determine the corresponding minimum cut. 45 /// 45 46 /// Therefore once this tree is computed, the minimum cut between any pair 46 47 /// of nodes can easily be obtained. 47 48 /// 48 49 /// The algorithm calculates \e n-1 distinct minimum cuts (currently with 49 /// the \ref Preflow algorithm), thus it has \f$O(n^3\sqrt{e})\f$ overall 50 /// time complexity. It calculates a rooted Gomory-Hu tree. 51 /// The structure of the tree and the edge weights can be 52 /// obtained using \c predNode(), \c predValue() and \c rootDist(). 53 /// The functions \c minCutMap() and \c minCutValue() calculate 50 /// the \ref Preflow algorithm), therefore the algorithm has 51 /// \f$(O(n^3\sqrt{e})\f$ overall time complexity. It calculates a 52 /// rooted Gomory-Hu tree, its structure and the weights can be obtained 53 /// by \c predNode(), \c predValue() and \c rootDist(). 54 /// 55 /// The members \c minCutMap() and \c minCutValue() calculate 54 56 /// the minimum cut and the minimum cut value between any two nodes 55 57 /// in the graph. You can also list (iterate on) the nodes and the … … 57 59 /// 58 60 /// \tparam GR The type of the undirected graph the algorithm runs on. 59 /// \tparam CAP The type of the edge map containing the capacities.60 /// The default map type is \ref concepts::Graph::EdgeMap "GR::EdgeMap<int>".61 /// \tparam CAP The type of the edge map describing the edge capacities. 62 /// It is \ref concepts::Graph::EdgeMap "GR::EdgeMap<int>" by default. 61 63 #ifdef DOXYGEN 62 64 template <typename GR, … … 69 71 public: 70 72 71 /// The graph type of the algorithm73 /// The graph type 72 74 typedef GR Graph; 73 /// The capacity map type of the algorithm75 /// The type of the edge capacity map 74 76 typedef CAP Capacity; 75 77 /// The value type of capacities … … 116 118 /// \brief Constructor 117 119 /// 118 /// Constructor .120 /// Constructor 119 121 /// \param graph The undirected graph the algorithm runs on. 120 122 /// \param capacity The edge capacity map. … … 129 131 /// \brief Destructor 130 132 /// 131 /// Destructor .133 /// Destructor 132 134 ~GomoryHu() { 133 135 destroyStructures(); … … 214 216 ///The results of the algorithm can be obtained using these 215 217 ///functions.\n 216 ///\ref run() should be called before using them.\n218 ///\ref run() "run()" should be called before using them.\n 217 219 ///See also \ref MinCutNodeIt and \ref MinCutEdgeIt. 218 220 … … 221 223 /// \brief Return the predecessor node in the Gomory-Hu tree. 222 224 /// 223 /// This function returns the predecessor node of the given node 225 /// This function returns the predecessor node in the Gomory-Hu tree. 226 /// If the node is 227 /// the root of the Gomory-Hu tree, then it returns \c INVALID. 228 Node predNode(const Node& node) { 229 return (*_pred)[node]; 230 } 231 232 /// \brief Return the distance from the root node in the Gomory-Hu tree. 233 /// 234 /// This function returns the distance of \c node from the root node 224 235 /// in the Gomory-Hu tree. 225 /// If \c node is the root of the tree, then it returns \c INVALID. 226 /// 227 /// \pre \ref run() must be called before using this function. 228 Node predNode(const Node& node) const { 229 return (*_pred)[node]; 236 int rootDist(const Node& node) { 237 return (*_order)[node]; 230 238 } 231 239 … … 233 241 /// Gomory-Hu tree. 234 242 /// 235 /// This function returns the weight of the predecessor edge of the 236 /// given node in the Gomory-Hu tree. 237 /// If \c node is the root of the tree, the result is undefined. 238 /// 239 /// \pre \ref run() must be called before using this function. 240 Value predValue(const Node& node) const { 243 /// This function returns the weight of the predecessor edge in the 244 /// Gomory-Hu tree. If the node is the root, the result is undefined. 245 Value predValue(const Node& node) { 241 246 return (*_weight)[node]; 242 247 } 243 248 244 /// \brief Return the distance from the root node in the Gomory-Hu tree.245 ///246 /// This function returns the distance of the given node from the root247 /// node in the Gomory-Hu tree.248 ///249 /// \pre \ref run() must be called before using this function.250 int rootDist(const Node& node) const {251 return (*_order)[node];252 }253 254 249 /// \brief Return the minimum cut value between two nodes 255 250 /// 256 /// This function returns the minimum cut value between the nodes 257 /// \c s and \c t. 258 /// It finds the nearest common ancestor of the given nodes in the 259 /// Gomory-Hu tree and calculates the minimum weight edge on the 260 /// paths to the ancestor. 261 /// 262 /// \pre \ref run() must be called before using this function. 251 /// This function returns the minimum cut value between two nodes. The 252 /// algorithm finds the nearest common ancestor in the Gomory-Hu 253 /// tree and calculates the minimum weight edge on the paths to 254 /// the ancestor. 263 255 Value minCutValue(const Node& s, const Node& t) const { 264 256 Node sn = s, tn = t; … … 283 275 /// \c s to \c true and the other nodes to \c false. 284 276 /// 285 /// For higher level interfaces see MinCutNodeIt and MinCutEdgeIt. 286 /// 287 /// \param s The base node. 288 /// \param t The node you want to separate from node \c s. 289 /// \param cutMap The cut will be returned in this map. 290 /// It must be a \c bool (or convertible) \ref concepts::ReadWriteMap 291 /// "ReadWriteMap" on the graph nodes. 292 /// 293 /// \return The value of the minimum cut between \c s and \c t. 294 /// 295 /// \pre \ref run() must be called before using this function. 277 /// For higher level interfaces, see MinCutNodeIt and MinCutEdgeIt. 296 278 template <typename CutMap> 297 Value minCutMap(const Node& s, ///< 279 Value minCutMap(const Node& s, ///< The base node. 298 280 const Node& t, 299 ///< 281 ///< The node you want to separate from node \c s. 300 282 CutMap& cutMap 301 ///< 283 ///< The cut will be returned in this map. 284 /// It must be a \c bool (or convertible) 285 /// \ref concepts::ReadWriteMap "ReadWriteMap" 286 /// on the graph nodes. 302 287 ) const { 303 288 Node sn = s, tn = t; … … 354 339 355 340 /// This iterator class lists the nodes of a minimum cut found by 356 /// GomoryHu. Before using it, you must allocate a GomoryHu class 341 /// GomoryHu. Before using it, you must allocate a GomoryHu class, 357 342 /// and call its \ref GomoryHu::run() "run()" method. 358 343 /// … … 451 436 452 437 /// This iterator class lists the edges of a minimum cut found by 453 /// GomoryHu. Before using it, you must allocate a GomoryHu class 438 /// GomoryHu. Before using it, you must allocate a GomoryHu class, 454 439 /// and call its \ref GomoryHu::run() "run()" method. 455 440 /// … … 463 448 /// value+=capacities[e]; 464 449 /// \endcode 465 /// The result will be the same as the valuereturned by466 /// \ref GomoryHu::minCutValue() "gom.minCutValue(s,t)" .450 /// the result will be the same as it is returned by 451 /// \ref GomoryHu::minCutValue() "gom.minCutValue(s,t)" 467 452 class MinCutEdgeIt 468 453 { … … 484 469 485 470 public: 486 /// Constructor487 488 /// Constructor.489 ///490 471 MinCutEdgeIt(GomoryHu const &gomory, 491 472 ///< The GomoryHu class. You must call its … … 498 479 ///< If it is \c true (default) then the listed arcs 499 480 /// will be oriented from the 500 /// nodes of the component containing \c s,481 /// the nodes of the component containing \c s, 501 482 /// otherwise they will be oriented in the opposite 502 483 /// direction. -
lemon/hao_orlin.h
r644 r628 32 32 /// \brief Implementation of the Hao-Orlin algorithm. 33 33 /// 34 /// Implementation of the Hao-Orlin algorithm for finding a minimum cut35 /// in a digraph.34 /// Implementation of the Hao-Orlin algorithm class for testing network 35 /// reliability. 36 36 37 37 namespace lemon { … … 39 39 /// \ingroup min_cut 40 40 /// 41 /// \brief Hao-Orlin algorithm for finding a minimum cut in a digraph.41 /// \brief %Hao-Orlin algorithm to find a minimum cut in directed graphs. 42 42 /// 43 /// This class implements the Hao-Orlin algorithm for finding a minimum 44 /// value cut in a directed graph \f$D=(V,A)\f$. 45 /// It takes a fixed node \f$ source \in V \f$ and 43 /// Hao-Orlin calculates a minimum cut in a directed graph 44 /// \f$D=(V,A)\f$. It takes a fixed node \f$ source \in V \f$ and 46 45 /// consists of two phases: in the first phase it determines a 47 46 /// minimum cut with \f$ source \f$ on the source-side (i.e. a set 48 /// \f$ X\subsetneq V \f$ with \f$ source \in X \f$ and minimal outgoing49 /// capacity) and in the second phase it determines a minimum cut47 /// \f$ X\subsetneq V \f$ with \f$ source \in X \f$ and minimal 48 /// out-degree) and in the second phase it determines a minimum cut 50 49 /// with \f$ source \f$ on the sink-side (i.e. a set 51 /// \f$ X\subsetneq V \f$ with \f$ source \notin X \f$ and minimal outgoing52 /// capacity). Obviously, the smaller of these two cuts will be a50 /// \f$ X\subsetneq V \f$ with \f$ source \notin X \f$ and minimal 51 /// out-degree). Obviously, the smaller of these two cuts will be a 53 52 /// minimum cut of \f$ D \f$. The algorithm is a modified 54 /// p reflow push-relabel algorithm. Our implementation calculates53 /// push-relabel preflow algorithm and our implementation calculates 55 54 /// the minimum cut in \f$ O(n^2\sqrt{m}) \f$ time (we use the 56 55 /// highest-label rule), or in \f$O(nm)\f$ for unit capacities. The 57 /// purpose of such algorithm is e.g. testing network reliability. 56 /// purpose of such algorithm is testing network reliability. For an 57 /// undirected graph you can run just the first phase of the 58 /// algorithm or you can use the algorithm of Nagamochi and Ibaraki 59 /// which solves the undirected problem in 60 /// \f$ O(nm + n^2 \log n) \f$ time: it is implemented in the 61 /// NagamochiIbaraki algorithm class. 58 62 /// 59 /// For an undirected graph you can run just the first phase of the 60 /// algorithm or you can use the algorithm of Nagamochi and Ibaraki, 61 /// which solves the undirected problem in \f$ O(nm + n^2 \log n) \f$ 62 /// time. It is implemented in the NagamochiIbaraki algorithm class. 63 /// 64 /// \tparam GR The type of the digraph the algorithm runs on. 65 /// \tparam CAP The type of the arc map containing the capacities, 66 /// which can be any numreric type. The default map type is 67 /// \ref concepts::Digraph::ArcMap "GR::ArcMap<int>". 68 /// \tparam TOL Tolerance class for handling inexact computations. The 63 /// \param GR The digraph class the algorithm runs on. 64 /// \param CAP An arc map of capacities which can be any numreric type. 65 /// The default type is \ref concepts::Digraph::ArcMap "GR::ArcMap<int>". 66 /// \param TOL Tolerance class for handling inexact computations. The 69 67 /// default tolerance type is \ref Tolerance "Tolerance<CAP::Value>". 70 68 #ifdef DOXYGEN … … 76 74 #endif 77 75 class HaoOrlin { 78 public: 79 80 /// The digraph type of the algorithm 76 private: 77 81 78 typedef GR Digraph; 82 /// The capacity map type of the algorithm83 79 typedef CAP CapacityMap; 84 /// The tolerance type of the algorithm85 80 typedef TOL Tolerance; 86 81 87 private:88 89 82 typedef typename CapacityMap::Value Value; 90 83 91 TEMPLATE_ DIGRAPH_TYPEDEFS(Digraph);84 TEMPLATE_GRAPH_TYPEDEFS(Digraph); 92 85 93 86 const Digraph& _graph; … … 227 220 for (NodeIt n(_graph); n != INVALID; ++n) { 228 221 (*_excess)[n] = 0; 229 (*_source_set)[n] = false;230 222 } 231 223 … … 527 519 for (NodeIt n(_graph); n != INVALID; ++n) { 528 520 (*_excess)[n] = 0; 529 (*_source_set)[n] = false;530 521 } 531 522 … … 825 816 public: 826 817 827 /// \name Execution Control818 /// \name Execution control 828 819 /// The simplest way to execute the algorithm is to use 829 820 /// one of the member functions called \ref run(). 830 821 /// \n 831 /// If you need bettercontrol on the execution,832 /// you have to call one of the \ref init() functions first, then833 /// \ref calculateOut() and/or \ref calculateIn().822 /// If you need more control on the execution, 823 /// first you must call \ref init(), then the \ref calculateIn() or 824 /// \ref calculateOut() functions. 834 825 835 826 /// @{ 836 827 837 /// \brief Initialize the internal data structures.828 /// \brief Initializes the internal data structures. 838 829 /// 839 /// This function initializes the internal data structures. It creates 840 /// the maps and some bucket structures for the algorithm. 841 /// The first node is used as the source node for the push-relabel 842 /// algorithm. 830 /// Initializes the internal data structures. It creates 831 /// the maps, residual graph adaptors and some bucket structures 832 /// for the algorithm. 843 833 void init() { 844 834 init(NodeIt(_graph)); 845 835 } 846 836 847 /// \brief Initialize the internal data structures.837 /// \brief Initializes the internal data structures. 848 838 /// 849 /// This function initializes the internal data structures. It creates850 /// the maps and some bucket structures for the algorithm.851 /// The given node is used as the source node forthe push-relabel852 /// algorithm .839 /// Initializes the internal data structures. It creates 840 /// the maps, residual graph adaptor and some bucket structures 841 /// for the algorithm. Node \c source is used as the push-relabel 842 /// algorithm's source. 853 843 void init(const Node& source) { 854 844 _source = source; … … 890 880 891 881 892 /// \brief Calculate a minimum cut with \f$ source \f$ on the882 /// \brief Calculates a minimum cut with \f$ source \f$ on the 893 883 /// source-side. 894 884 /// 895 /// This function calculates a minimum cut with \f$ source \f$ on the885 /// Calculates a minimum cut with \f$ source \f$ on the 896 886 /// source-side (i.e. a set \f$ X\subsetneq V \f$ with 897 /// \f$ source \in X \f$ and minimal outgoing capacity). 898 /// 899 /// \pre \ref init() must be called before using this function. 887 /// \f$ source \in X \f$ and minimal out-degree). 900 888 void calculateOut() { 901 889 findMinCutOut(); 902 890 } 903 891 904 /// \brief Calculate a minimum cut with \f$ source \f$ on the905 /// sink-side.892 /// \brief Calculates a minimum cut with \f$ source \f$ on the 893 /// target-side. 906 894 /// 907 /// This function calculates a minimum cut with \f$ source \f$ on the 908 /// sink-side (i.e. a set \f$ X\subsetneq V \f$ with 909 /// \f$ source \notin X \f$ and minimal outgoing capacity). 910 /// 911 /// \pre \ref init() must be called before using this function. 895 /// Calculates a minimum cut with \f$ source \f$ on the 896 /// target-side (i.e. a set \f$ X\subsetneq V \f$ with 897 /// \f$ source \in X \f$ and minimal out-degree). 912 898 void calculateIn() { 913 899 findMinCutIn(); … … 915 901 916 902 917 /// \brief Run the algorithm.903 /// \brief Runs the algorithm. 918 904 /// 919 /// This function runs the algorithm. It finds nodes \c source and920 /// \c targetarbitrarily and then calls \ref init(), \ref calculateOut()905 /// Runs the algorithm. It finds nodes \c source and \c target 906 /// arbitrarily and then calls \ref init(), \ref calculateOut() 921 907 /// and \ref calculateIn(). 922 908 void run() { … … 926 912 } 927 913 928 /// \brief Run the algorithm.914 /// \brief Runs the algorithm. 929 915 /// 930 /// This function runs the algorithm. It uses the given \c source node,931 /// finds a proper \c target node and then calls the \ref init(),932 /// \refcalculateOut() and \ref calculateIn().916 /// Runs the algorithm. It uses the given \c source node, finds a 917 /// proper \c target and then calls the \ref init(), \ref 918 /// calculateOut() and \ref calculateIn(). 933 919 void run(const Node& s) { 934 920 init(s); … … 941 927 /// \name Query Functions 942 928 /// The result of the %HaoOrlin algorithm 943 /// can be obtained using these functions.\n 944 /// \ref run(), \ref calculateOut() or \ref calculateIn() 945 /// should be called before using them. 929 /// can be obtained using these functions. 930 /// \n 931 /// Before using these functions, either \ref run(), \ref 932 /// calculateOut() or \ref calculateIn() must be called. 946 933 947 934 /// @{ 948 935 949 /// \brief Return the value of the minimumcut.936 /// \brief Returns the value of the minimum value cut. 950 937 /// 951 /// This function returns the value of the minimum cut. 952 /// 953 /// \pre \ref run(), \ref calculateOut() or \ref calculateIn() 954 /// must be called before using this function. 938 /// Returns the value of the minimum value cut. 955 939 Value minCutValue() const { 956 940 return _min_cut; … … 958 942 959 943 960 /// \brief Return a minimum cut.944 /// \brief Returns a minimum cut. 961 945 /// 962 /// This function sets \c cutMap to the characteristic vector of a 963 /// minimum value cut: it will give a non-empty set \f$ X\subsetneq V \f$ 964 /// with minimal outgoing capacity (i.e. \c cutMap will be \c true exactly 965 /// for the nodes of \f$ X \f$). 966 /// 967 /// \param cutMap A \ref concepts::WriteMap "writable" node map with 968 /// \c bool (or convertible) value type. 969 /// 970 /// \return The value of the minimum cut. 971 /// 972 /// \pre \ref run(), \ref calculateOut() or \ref calculateIn() 973 /// must be called before using this function. 974 template <typename CutMap> 975 Value minCutMap(CutMap& cutMap) const { 946 /// Sets \c nodeMap to the characteristic vector of a minimum 947 /// value cut: it will give a nonempty set \f$ X\subsetneq V \f$ 948 /// with minimal out-degree (i.e. \c nodeMap will be true exactly 949 /// for the nodes of \f$ X \f$). \pre nodeMap should be a 950 /// bool-valued node-map. 951 template <typename NodeMap> 952 Value minCutMap(NodeMap& nodeMap) const { 976 953 for (NodeIt it(_graph); it != INVALID; ++it) { 977 cutMap.set(it, (*_min_cut_map)[it]);954 nodeMap.set(it, (*_min_cut_map)[it]); 978 955 } 979 956 return _min_cut; … … 984 961 }; //class HaoOrlin 985 962 963 986 964 } //namespace lemon 987 965 -
lemon/lgf_reader.h
r646 r631 102 102 }; 103 103 104 template <typename _G R, bool _dir, typename _Map,104 template <typename _Graph, bool _dir, typename _Map, 105 105 typename _Converter = DefaultConverter<typename _Map::Value> > 106 class GraphArcMapStorage : public MapStorageBase<typename _G R::Edge> {106 class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> { 107 107 public: 108 108 typedef _Map Map; 109 109 typedef _Converter Converter; 110 typedef _G R GR;111 typedef typename G R::Edge Item;110 typedef _Graph Graph; 111 typedef typename Graph::Edge Item; 112 112 static const bool dir = _dir; 113 113 114 114 private: 115 const G R& _graph;115 const Graph& _graph; 116 116 Map& _map; 117 117 Converter _converter; 118 118 119 119 public: 120 GraphArcMapStorage(const G R& graph, Map& map,120 GraphArcMapStorage(const Graph& graph, Map& map, 121 121 const Converter& converter = Converter()) 122 122 : _graph(graph), _map(map), _converter(converter) {} … … 174 174 }; 175 175 176 template <typename G R>176 template <typename Graph> 177 177 struct GraphArcLookUpConverter { 178 const G R& _graph;179 const std::map<std::string, typename G R::Edge>& _map;180 181 GraphArcLookUpConverter(const G R& graph,178 const Graph& _graph; 179 const std::map<std::string, typename Graph::Edge>& _map; 180 181 GraphArcLookUpConverter(const Graph& graph, 182 182 const std::map<std::string, 183 typename G R::Edge>& map)183 typename Graph::Edge>& map) 184 184 : _graph(graph), _map(map) {} 185 185 186 typename G R::Arc operator()(const std::string& str) {186 typename Graph::Arc operator()(const std::string& str) { 187 187 if (str.empty() || (str[0] != '+' && str[0] != '-')) { 188 188 throw FormatError("Item must start with '+' or '-'"); 189 189 } 190 typename std::map<std::string, typename G R::Edge>190 typename std::map<std::string, typename Graph::Edge> 191 191 ::const_iterator it = _map.find(str.substr(1)); 192 192 if (it == _map.end()) { … … 388 388 } 389 389 390 template <typename D GR>390 template <typename Digraph> 391 391 class DigraphReader; 392 392 393 template <typename TDGR> 394 DigraphReader<TDGR> digraphReader(TDGR& digraph, std::istream& is = std::cin); 395 template <typename TDGR> 396 DigraphReader<TDGR> digraphReader(TDGR& digraph, const std::string& fn); 397 template <typename TDGR> 398 DigraphReader<TDGR> digraphReader(TDGR& digraph, const char *fn); 393 template <typename Digraph> 394 DigraphReader<Digraph> digraphReader(Digraph& digraph, 395 std::istream& is = std::cin); 396 template <typename Digraph> 397 DigraphReader<Digraph> digraphReader(Digraph& digraph, const std::string& fn); 398 template <typename Digraph> 399 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char *fn); 399 400 400 401 /// \ingroup lemon_io … … 419 420 /// 420 421 ///\code 421 /// DigraphReader<D GR>(digraph, std::cin).422 /// DigraphReader<Digraph>(digraph, std::cin). 422 423 /// nodeMap("coordinates", coord_map). 423 424 /// arcMap("capacity", cap_map). … … 448 449 /// a single pass, because the arcs are not constructed when the node 449 450 /// maps are read. 450 template <typename DGR>451 template <typename GR> 451 452 class DigraphReader { 452 453 public: 453 454 454 typedef DGR Digraph;455 typedef GR Digraph; 455 456 456 457 private: 457 458 458 TEMPLATE_DIGRAPH_TYPEDEFS(D GR);459 TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); 459 460 460 461 std::istream* _is; … … 462 463 std::string _filename; 463 464 464 D GR& _digraph;465 Digraph& _digraph; 465 466 466 467 std::string _nodes_caption; … … 500 501 /// Construct a directed graph reader, which reads from the given 501 502 /// input stream. 502 DigraphReader(D GR& digraph, std::istream& is = std::cin)503 DigraphReader(Digraph& digraph, std::istream& is = std::cin) 503 504 : _is(&is), local_is(false), _digraph(digraph), 504 505 _use_nodes(false), _use_arcs(false), … … 509 510 /// Construct a directed graph reader, which reads from the given 510 511 /// file. 511 DigraphReader(D GR& digraph, const std::string& fn)512 DigraphReader(Digraph& digraph, const std::string& fn) 512 513 : _is(new std::ifstream(fn.c_str())), local_is(true), 513 514 _filename(fn), _digraph(digraph), … … 524 525 /// Construct a directed graph reader, which reads from the given 525 526 /// file. 526 DigraphReader(D GR& digraph, const char* fn)527 DigraphReader(Digraph& digraph, const char* fn) 527 528 : _is(new std::ifstream(fn)), local_is(true), 528 529 _filename(fn), _digraph(digraph), … … 560 561 private: 561 562 562 template <typename TDGR>563 friend DigraphReader< TDGR> digraphReader(TDGR& digraph, std::istream& is);564 template <typename TDGR>565 friend DigraphReader< TDGR> digraphReader(TDGR& digraph,566 567 template <typename TDGR>568 friend DigraphReader< TDGR> digraphReader(TDGR& digraph, const char *fn);563 template <typename DGR> 564 friend DigraphReader<DGR> digraphReader(DGR& digraph, std::istream& is); 565 template <typename DGR> 566 friend DigraphReader<DGR> digraphReader(DGR& digraph, 567 const std::string& fn); 568 template <typename DGR> 569 friend DigraphReader<DGR> digraphReader(DGR& digraph, const char *fn); 569 570 570 571 DigraphReader(DigraphReader& other) … … 1188 1189 1189 1190 }; 1190 1191 /// \ingroup lemon_io1192 ///1193 /// \brief Return a \ref DigraphReader class1194 ///1195 /// This function just returns a \ref DigraphReader class.1196 ///1197 /// With this function a digraph can be read from an1198 /// \ref lgf-format "LGF" file or input stream with several maps and1199 /// attributes. For example, there is network flow problem on a1200 /// digraph, i.e. a digraph with a \e capacity map on the arcs and1201 /// \e source and \e target nodes. This digraph can be read with the1202 /// following code:1203 ///1204 ///\code1205 ///ListDigraph digraph;1206 ///ListDigraph::ArcMap<int> cm(digraph);1207 ///ListDigraph::Node src, trg;1208 ///digraphReader(digraph, std::cin).1209 /// arcMap("capacity", cap).1210 /// node("source", src).1211 /// node("target", trg).1212 /// run();1213 ///\endcode1214 ///1215 /// For a complete documentation, please see the \ref DigraphReader1216 /// class documentation.1217 /// \warning Don't forget to put the \ref DigraphReader::run() "run()"1218 /// to the end of the parameter list.1219 /// \relates DigraphReader1220 /// \sa digraphReader(TDGR& digraph, const std::string& fn)1221 /// \sa digraphReader(TDGR& digraph, const char* fn)1222 template <typename TDGR>1223 DigraphReader<TDGR> digraphReader(TDGR& digraph, std::istream& is) {1224 DigraphReader<TDGR> tmp(digraph, is);1225 return tmp;1226 }1227 1191 1228 1192 /// \brief Return a \ref DigraphReader class … … 1230 1194 /// This function just returns a \ref DigraphReader class. 1231 1195 /// \relates DigraphReader 1232 /// \sa digraphReader(TDGR& digraph, std::istream& is) 1233 template <typename TDGR> 1234 DigraphReader<TDGR> digraphReader(TDGR& digraph, const std::string& fn) { 1235 DigraphReader<TDGR> tmp(digraph, fn); 1196 template <typename Digraph> 1197 DigraphReader<Digraph> digraphReader(Digraph& digraph, std::istream& is) { 1198 DigraphReader<Digraph> tmp(digraph, is); 1236 1199 return tmp; 1237 1200 } … … 1241 1204 /// This function just returns a \ref DigraphReader class. 1242 1205 /// \relates DigraphReader 1243 /// \sa digraphReader(TDGR& digraph, std::istream& is)1244 template <typename TDGR>1245 DigraphReader<TDGR> digraphReader(TDGR& digraph, const char*fn) {1246 DigraphReader< TDGR> tmp(digraph, fn);1206 template <typename Digraph> 1207 DigraphReader<Digraph> digraphReader(Digraph& digraph, 1208 const std::string& fn) { 1209 DigraphReader<Digraph> tmp(digraph, fn); 1247 1210 return tmp; 1248 1211 } 1249 1212 1250 template <typename GR> 1213 /// \brief Return a \ref DigraphReader class 1214 /// 1215 /// This function just returns a \ref DigraphReader class. 1216 /// \relates DigraphReader 1217 template <typename Digraph> 1218 DigraphReader<Digraph> digraphReader(Digraph& digraph, const char* fn) { 1219 DigraphReader<Digraph> tmp(digraph, fn); 1220 return tmp; 1221 } 1222 1223 template <typename Graph> 1251 1224 class GraphReader; 1252 1225 1253 template <typename TGR> 1254 GraphReader<TGR> graphReader(TGR& graph, std::istream& is = std::cin); 1255 template <typename TGR> 1256 GraphReader<TGR> graphReader(TGR& graph, const std::string& fn); 1257 template <typename TGR> 1258 GraphReader<TGR> graphReader(TGR& graph, const char *fn); 1226 template <typename Graph> 1227 GraphReader<Graph> graphReader(Graph& graph, 1228 std::istream& is = std::cin); 1229 template <typename Graph> 1230 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); 1231 template <typename Graph> 1232 GraphReader<Graph> graphReader(Graph& graph, const char *fn); 1259 1233 1260 1234 /// \ingroup lemon_io … … 1281 1255 private: 1282 1256 1283 TEMPLATE_GRAPH_TYPEDEFS(G R);1257 TEMPLATE_GRAPH_TYPEDEFS(Graph); 1284 1258 1285 1259 std::istream* _is; … … 1287 1261 std::string _filename; 1288 1262 1289 G R& _graph;1263 Graph& _graph; 1290 1264 1291 1265 std::string _nodes_caption; … … 1325 1299 /// Construct an undirected graph reader, which reads from the given 1326 1300 /// input stream. 1327 GraphReader(G R& graph, std::istream& is = std::cin)1301 GraphReader(Graph& graph, std::istream& is = std::cin) 1328 1302 : _is(&is), local_is(false), _graph(graph), 1329 1303 _use_nodes(false), _use_edges(false), … … 1334 1308 /// Construct an undirected graph reader, which reads from the given 1335 1309 /// file. 1336 GraphReader(G R& graph, const std::string& fn)1310 GraphReader(Graph& graph, const std::string& fn) 1337 1311 : _is(new std::ifstream(fn.c_str())), local_is(true), 1338 1312 _filename(fn), _graph(graph), … … 1349 1323 /// Construct an undirected graph reader, which reads from the given 1350 1324 /// file. 1351 GraphReader(G R& graph, const char* fn)1325 GraphReader(Graph& graph, const char* fn) 1352 1326 : _is(new std::ifstream(fn)), local_is(true), 1353 1327 _filename(fn), _graph(graph), … … 1384 1358 1385 1359 private: 1386 template <typename TGR>1387 friend GraphReader< TGR> graphReader(TGR& graph, std::istream& is);1388 template <typename TGR>1389 friend GraphReader< TGR> graphReader(TGR& graph, const std::string& fn);1390 template <typename TGR>1391 friend GraphReader< TGR> graphReader(TGR& graph, const char *fn);1360 template <typename Graph> 1361 friend GraphReader<Graph> graphReader(Graph& graph, std::istream& is); 1362 template <typename Graph> 1363 friend GraphReader<Graph> graphReader(Graph& graph, const std::string& fn); 1364 template <typename Graph> 1365 friend GraphReader<Graph> graphReader(Graph& graph, const char *fn); 1392 1366 1393 1367 GraphReader(GraphReader& other) … … 1481 1455 _edge_maps.push_back(std::make_pair('+' + caption, forward_storage)); 1482 1456 _reader_bits::MapStorageBase<Edge>* backward_storage = 1483 new _reader_bits::GraphArcMapStorage<G R, false, Map>(_graph, map);1457 new _reader_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map); 1484 1458 _edge_maps.push_back(std::make_pair('-' + caption, backward_storage)); 1485 1459 return *this; … … 1495 1469 checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>(); 1496 1470 _reader_bits::MapStorageBase<Edge>* forward_storage = 1497 new _reader_bits::GraphArcMapStorage<G R, true, Map, Converter>1471 new _reader_bits::GraphArcMapStorage<Graph, true, Map, Converter> 1498 1472 (_graph, map, converter); 1499 1473 _edge_maps.push_back(std::make_pair('+' + caption, forward_storage)); 1500 1474 _reader_bits::MapStorageBase<Edge>* backward_storage = 1501 new _reader_bits::GraphArcMapStorage<G R, false, Map, Converter>1475 new _reader_bits::GraphArcMapStorage<Graph, false, Map, Converter> 1502 1476 (_graph, map, converter); 1503 1477 _edge_maps.push_back(std::make_pair('-' + caption, backward_storage)); … … 1557 1531 /// Add an arc reading rule to reader. 1558 1532 GraphReader& arc(const std::string& caption, Arc& arc) { 1559 typedef _reader_bits::GraphArcLookUpConverter<G R> Converter;1533 typedef _reader_bits::GraphArcLookUpConverter<Graph> Converter; 1560 1534 Converter converter(_graph, _edge_index); 1561 1535 _reader_bits::ValueStorageBase* storage = … … 2060 2034 }; 2061 2035 2062 /// \ingroup lemon_io2063 ///2064 /// \brief Return a \ref GraphReader class2065 ///2066 /// This function just returns a \ref GraphReader class.2067 ///2068 /// With this function a graph can be read from an2069 /// \ref lgf-format "LGF" file or input stream with several maps and2070 /// attributes. For example, there is weighted matching problem on a2071 /// graph, i.e. a graph with a \e weight map on the edges. This2072 /// graph can be read with the following code:2073 ///2074 ///\code2075 ///ListGraph graph;2076 ///ListGraph::EdgeMap<int> weight(graph);2077 ///graphReader(graph, std::cin).2078 /// edgeMap("weight", weight).2079 /// run();2080 ///\endcode2081 ///2082 /// For a complete documentation, please see the \ref GraphReader2083 /// class documentation.2084 /// \warning Don't forget to put the \ref GraphReader::run() "run()"2085 /// to the end of the parameter list.2086 /// \relates GraphReader2087 /// \sa graphReader(TGR& graph, const std::string& fn)2088 /// \sa graphReader(TGR& graph, const char* fn)2089 template <typename TGR>2090 GraphReader<TGR> graphReader(TGR& graph, std::istream& is) {2091 GraphReader<TGR> tmp(graph, is);2092 return tmp;2093 }2094 2095 2036 /// \brief Return a \ref GraphReader class 2096 2037 /// 2097 2038 /// This function just returns a \ref GraphReader class. 2098 2039 /// \relates GraphReader 2099 /// \sa graphReader(TGR& graph, std::istream& is) 2100 template <typename TGR> 2101 GraphReader<TGR> graphReader(TGR& graph, const std::string& fn) { 2102 GraphReader<TGR> tmp(graph, fn); 2040 template <typename Graph> 2041 GraphReader<Graph> graphReader(Graph& graph, std::istream& is) { 2042 GraphReader<Graph> tmp(graph, is); 2103 2043 return tmp; 2104 2044 } … … 2108 2048 /// This function just returns a \ref GraphReader class. 2109 2049 /// \relates GraphReader 2110 /// \sa graphReader(TGR& graph, std::istream& is) 2111 template <typename TGR> 2112 GraphReader<TGR> graphReader(TGR& graph, const char* fn) { 2113 GraphReader<TGR> tmp(graph, fn); 2050 template <typename Graph> 2051 GraphReader<Graph> graphReader(Graph& graph, const std::string& fn) { 2052 GraphReader<Graph> tmp(graph, fn); 2053 return tmp; 2054 } 2055 2056 /// \brief Return a \ref GraphReader class 2057 /// 2058 /// This function just returns a \ref GraphReader class. 2059 /// \relates GraphReader 2060 template <typename Graph> 2061 GraphReader<Graph> graphReader(Graph& graph, const char* fn) { 2062 GraphReader<Graph> tmp(graph, fn); 2114 2063 return tmp; 2115 2064 } … … 2368 2317 }; 2369 2318 2370 /// \ingroup lemon_io2371 ///2372 2319 /// \brief Return a \ref SectionReader class 2373 2320 /// 2374 2321 /// This function just returns a \ref SectionReader class. 2375 ///2376 /// Please see SectionReader documentation about the custom section2377 /// input.2378 ///2379 2322 /// \relates SectionReader 2380 /// \sa sectionReader(const std::string& fn)2381 /// \sa sectionReader(const char *fn)2382 2323 inline SectionReader sectionReader(std::istream& is) { 2383 2324 SectionReader tmp(is); … … 2389 2330 /// This function just returns a \ref SectionReader class. 2390 2331 /// \relates SectionReader 2391 /// \sa sectionReader(std::istream& is)2392 2332 inline SectionReader sectionReader(const std::string& fn) { 2393 2333 SectionReader tmp(fn); … … 2399 2339 /// This function just returns a \ref SectionReader class. 2400 2340 /// \relates SectionReader 2401 /// \sa sectionReader(std::istream& is)2402 2341 inline SectionReader sectionReader(const char* fn) { 2403 2342 SectionReader tmp(fn); -
lemon/lgf_writer.h
r646 r631 348 348 } 349 349 350 template <typename D GR>350 template <typename Digraph> 351 351 class DigraphWriter; 352 352 353 template <typename TDGR> 354 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph, 355 std::ostream& os = std::cout); 356 template <typename TDGR> 357 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph, const std::string& fn); 358 359 template <typename TDGR> 360 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph, const char* fn); 353 template <typename Digraph> 354 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 355 std::ostream& os = std::cout); 356 template <typename Digraph> 357 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 358 const std::string& fn); 359 360 template <typename Digraph> 361 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 362 const char* fn); 361 363 362 364 … … 380 382 /// 381 383 ///\code 382 /// DigraphWriter<D GR>(digraph, std::cout).384 /// DigraphWriter<Digraph>(digraph, std::cout). 383 385 /// nodeMap("coordinates", coord_map). 384 386 /// nodeMap("size", size). … … 405 407 /// the \c ostream() function, hence the second pass can append its 406 408 /// output to the output of the first pass. 407 template <typename DGR>409 template <typename GR> 408 410 class DigraphWriter { 409 411 public: 410 412 411 typedef DGR Digraph;412 TEMPLATE_DIGRAPH_TYPEDEFS(D GR);413 typedef GR Digraph; 414 TEMPLATE_DIGRAPH_TYPEDEFS(Digraph); 413 415 414 416 private: … … 418 420 bool local_os; 419 421 420 const D GR& _digraph;422 const Digraph& _digraph; 421 423 422 424 std::string _nodes_caption; … … 450 452 /// Construct a directed graph writer, which writes to the given 451 453 /// output stream. 452 DigraphWriter(const D GR& digraph, std::ostream& os = std::cout)454 DigraphWriter(const Digraph& digraph, std::ostream& os = std::cout) 453 455 : _os(&os), local_os(false), _digraph(digraph), 454 456 _skip_nodes(false), _skip_arcs(false) {} … … 458 460 /// Construct a directed graph writer, which writes to the given 459 461 /// output file. 460 DigraphWriter(const D GR& digraph, const std::string& fn)462 DigraphWriter(const Digraph& digraph, const std::string& fn) 461 463 : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph), 462 464 _skip_nodes(false), _skip_arcs(false) { … … 471 473 /// Construct a directed graph writer, which writes to the given 472 474 /// output file. 473 DigraphWriter(const D GR& digraph, const char* fn)475 DigraphWriter(const Digraph& digraph, const char* fn) 474 476 : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph), 475 477 _skip_nodes(false), _skip_arcs(false) { … … 504 506 private: 505 507 506 template <typename TDGR>507 friend DigraphWriter< TDGR> digraphWriter(const TDGR& digraph,508 509 template <typename TDGR>510 friend DigraphWriter< TDGR> digraphWriter(const TDGR& digraph,511 512 template <typename TDGR>513 friend DigraphWriter< TDGR> digraphWriter(const TDGR& digraph,514 508 template <typename DGR> 509 friend DigraphWriter<DGR> digraphWriter(const DGR& digraph, 510 std::ostream& os); 511 template <typename DGR> 512 friend DigraphWriter<DGR> digraphWriter(const DGR& digraph, 513 const std::string& fn); 514 template <typename DGR> 515 friend DigraphWriter<DGR> digraphWriter(const DGR& digraph, 516 const char *fn); 515 517 516 518 DigraphWriter(DigraphWriter& other) … … 723 725 724 726 if (label == 0) { 725 IdMap<D GR, Node> id_map(_digraph);726 _writer_bits::MapLess<IdMap<D GR, Node> > id_less(id_map);727 IdMap<Digraph, Node> id_map(_digraph); 728 _writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map); 727 729 std::sort(nodes.begin(), nodes.end(), id_less); 728 730 } else { … … 808 810 809 811 if (label == 0) { 810 IdMap<D GR, Arc> id_map(_digraph);811 _writer_bits::MapLess<IdMap<D GR, Arc> > id_less(id_map);812 IdMap<Digraph, Arc> id_map(_digraph); 813 _writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map); 812 814 std::sort(arcs.begin(), arcs.end(), id_less); 813 815 } else { … … 914 916 }; 915 917 916 /// \ingroup lemon_io917 ///918 918 /// \brief Return a \ref DigraphWriter class 919 919 /// 920 /// This function just returns a \ref DigraphWriter class. 921 /// 922 /// With this function a digraph can be write to a file or output 923 /// stream in \ref lgf-format "LGF" format with several maps and 924 /// attributes. For example, with the following code a network flow 925 /// problem can be written to the standard output, i.e. a digraph 926 /// with a \e capacity map on the arcs and \e source and \e target 927 /// nodes: 928 /// 929 ///\code 930 ///ListDigraph digraph; 931 ///ListDigraph::ArcMap<int> cap(digraph); 932 ///ListDigraph::Node src, trg; 933 /// // Setting the capacity map and source and target nodes 934 ///digraphWriter(digraph, std::cout). 935 /// arcMap("capacity", cap). 936 /// node("source", src). 937 /// node("target", trg). 938 /// run(); 939 ///\endcode 940 /// 941 /// For a complete documentation, please see the \ref DigraphWriter 942 /// class documentation. 943 /// \warning Don't forget to put the \ref DigraphWriter::run() "run()" 944 /// to the end of the parameter list. 920 /// This function just returns a \ref DigraphWriter class. 945 921 /// \relates DigraphWriter 946 /// \sa digraphWriter(const TDGR& digraph, const std::string& fn) 947 /// \sa digraphWriter(const TDGR& digraph, const char* fn) 948 template <typename TDGR> 949 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph, std::ostream& os) { 950 DigraphWriter<TDGR> tmp(digraph, os); 922 template <typename Digraph> 923 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 924 std::ostream& os) { 925 DigraphWriter<Digraph> tmp(digraph, os); 951 926 return tmp; 952 927 } … … 956 931 /// This function just returns a \ref DigraphWriter class. 957 932 /// \relates DigraphWriter 958 /// \sa digraphWriter(const TDGR& digraph, std::ostream& os) 959 template <typename TDGR> 960 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph, 961 const std::string& fn) { 962 DigraphWriter<TDGR> tmp(digraph, fn); 933 template <typename Digraph> 934 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 935 const std::string& fn) { 936 DigraphWriter<Digraph> tmp(digraph, fn); 963 937 return tmp; 964 938 } … … 968 942 /// This function just returns a \ref DigraphWriter class. 969 943 /// \relates DigraphWriter 970 /// \sa digraphWriter(const TDGR& digraph, std::ostream& os)971 template <typename TDGR>972 DigraphWriter<TDGR> digraphWriter(const TDGR& digraph,const char* fn) {973 DigraphWriter< TDGR> tmp(digraph, fn);944 template <typename Digraph> 945 DigraphWriter<Digraph> digraphWriter(const Digraph& digraph, 946 const char* fn) { 947 DigraphWriter<Digraph> tmp(digraph, fn); 974 948 return tmp; 975 949 } 976 950 977 template <typename G R>951 template <typename Graph> 978 952 class GraphWriter; 979 953 980 template <typename TGR> 981 GraphWriter<TGR> graphWriter(const TGR& graph, std::ostream& os = std::cout); 982 template <typename TGR> 983 GraphWriter<TGR> graphWriter(const TGR& graph, const std::string& fn); 984 template <typename TGR> 985 GraphWriter<TGR> graphWriter(const TGR& graph, const char* fn); 954 template <typename Graph> 955 GraphWriter<Graph> graphWriter(const Graph& graph, 956 std::ostream& os = std::cout); 957 template <typename Graph> 958 GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn); 959 template <typename Graph> 960 GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn); 986 961 987 962 /// \ingroup lemon_io … … 1005 980 1006 981 typedef GR Graph; 1007 TEMPLATE_GRAPH_TYPEDEFS(G R);982 TEMPLATE_GRAPH_TYPEDEFS(Graph); 1008 983 1009 984 private: … … 1013 988 bool local_os; 1014 989 1015 const G R& _graph;990 const Graph& _graph; 1016 991 1017 992 std::string _nodes_caption; … … 1045 1020 /// Construct a directed graph writer, which writes to the given 1046 1021 /// output stream. 1047 GraphWriter(const G R& graph, std::ostream& os = std::cout)1022 GraphWriter(const Graph& graph, std::ostream& os = std::cout) 1048 1023 : _os(&os), local_os(false), _graph(graph), 1049 1024 _skip_nodes(false), _skip_edges(false) {} … … 1053 1028 /// Construct a directed graph writer, which writes to the given 1054 1029 /// output file. 1055 GraphWriter(const G R& graph, const std::string& fn)1030 GraphWriter(const Graph& graph, const std::string& fn) 1056 1031 : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph), 1057 1032 _skip_nodes(false), _skip_edges(false) { … … 1066 1041 /// Construct a directed graph writer, which writes to the given 1067 1042 /// output file. 1068 GraphWriter(const G R& graph, const char* fn)1043 GraphWriter(const Graph& graph, const char* fn) 1069 1044 : _os(new std::ofstream(fn)), local_os(true), _graph(graph), 1070 1045 _skip_nodes(false), _skip_edges(false) { … … 1099 1074 private: 1100 1075 1101 template <typename TGR> 1102 friend GraphWriter<TGR> graphWriter(const TGR& graph, std::ostream& os); 1103 template <typename TGR> 1104 friend GraphWriter<TGR> graphWriter(const TGR& graph, 1105 const std::string& fn); 1106 template <typename TGR> 1107 friend GraphWriter<TGR> graphWriter(const TGR& graph, const char *fn); 1076 template <typename Graph> 1077 friend GraphWriter<Graph> graphWriter(const Graph& graph, 1078 std::ostream& os); 1079 template <typename Graph> 1080 friend GraphWriter<Graph> graphWriter(const Graph& graph, 1081 const std::string& fn); 1082 template <typename Graph> 1083 friend GraphWriter<Graph> graphWriter(const Graph& graph, 1084 const char *fn); 1108 1085 1109 1086 GraphWriter(GraphWriter& other) … … 1192 1169 checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>(); 1193 1170 _writer_bits::MapStorageBase<Edge>* forward_storage = 1194 new _writer_bits::GraphArcMapStorage<G R, true, Map>(_graph, map);1171 new _writer_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map); 1195 1172 _edge_maps.push_back(std::make_pair('+' + caption, forward_storage)); 1196 1173 _writer_bits::MapStorageBase<Edge>* backward_storage = 1197 new _writer_bits::GraphArcMapStorage<G R, false, Map>(_graph, map);1174 new _writer_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map); 1198 1175 _edge_maps.push_back(std::make_pair('-' + caption, backward_storage)); 1199 1176 return *this; … … 1209 1186 checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>(); 1210 1187 _writer_bits::MapStorageBase<Edge>* forward_storage = 1211 new _writer_bits::GraphArcMapStorage<G R, true, Map, Converter>1188 new _writer_bits::GraphArcMapStorage<Graph, true, Map, Converter> 1212 1189 (_graph, map, converter); 1213 1190 _edge_maps.push_back(std::make_pair('+' + caption, forward_storage)); 1214 1191 _writer_bits::MapStorageBase<Edge>* backward_storage = 1215 new _writer_bits::GraphArcMapStorage<G R, false, Map, Converter>1192 new _writer_bits::GraphArcMapStorage<Graph, false, Map, Converter> 1216 1193 (_graph, map, converter); 1217 1194 _edge_maps.push_back(std::make_pair('-' + caption, backward_storage)); … … 1271 1248 /// Add an arc writing rule to writer. 1272 1249 GraphWriter& arc(const std::string& caption, const Arc& arc) { 1273 typedef _writer_bits::GraphArcLookUpConverter<G R> Converter;1250 typedef _writer_bits::GraphArcLookUpConverter<Graph> Converter; 1274 1251 Converter converter(_graph, _edge_index); 1275 1252 _writer_bits::ValueStorageBase* storage = … … 1362 1339 1363 1340 if (label == 0) { 1364 IdMap<G R, Node> id_map(_graph);1365 _writer_bits::MapLess<IdMap<G R, Node> > id_less(id_map);1341 IdMap<Graph, Node> id_map(_graph); 1342 _writer_bits::MapLess<IdMap<Graph, Node> > id_less(id_map); 1366 1343 std::sort(nodes.begin(), nodes.end(), id_less); 1367 1344 } else { … … 1447 1424 1448 1425 if (label == 0) { 1449 IdMap<G R, Edge> id_map(_graph);1450 _writer_bits::MapLess<IdMap<G R, Edge> > id_less(id_map);1426 IdMap<Graph, Edge> id_map(_graph); 1427 _writer_bits::MapLess<IdMap<Graph, Edge> > id_less(id_map); 1451 1428 std::sort(edges.begin(), edges.end(), id_less); 1452 1429 } else { … … 1553 1530 }; 1554 1531 1555 /// \ingroup lemon_io1556 ///1557 1532 /// \brief Return a \ref GraphWriter class 1558 1533 /// 1559 /// This function just returns a \ref GraphWriter class. 1560 /// 1561 /// With this function a graph can be write to a file or output 1562 /// stream in \ref lgf-format "LGF" format with several maps and 1563 /// attributes. For example, with the following code a weighted 1564 /// matching problem can be written to the standard output, i.e. a 1565 /// graph with a \e weight map on the edges: 1566 /// 1567 ///\code 1568 ///ListGraph graph; 1569 ///ListGraph::EdgeMap<int> weight(graph); 1570 /// // Setting the weight map 1571 ///graphWriter(graph, std::cout). 1572 /// edgeMap("weight", weight). 1573 /// run(); 1574 ///\endcode 1575 /// 1576 /// For a complete documentation, please see the \ref GraphWriter 1577 /// class documentation. 1578 /// \warning Don't forget to put the \ref GraphWriter::run() "run()" 1579 /// to the end of the parameter list. 1534 /// This function just returns a \ref GraphWriter class. 1580 1535 /// \relates GraphWriter 1581 /// \sa graphWriter(const TGR& graph, const std::string& fn) 1582 /// \sa graphWriter(const TGR& graph, const char* fn) 1583 template <typename TGR> 1584 GraphWriter<TGR> graphWriter(const TGR& graph, std::ostream& os) { 1585 GraphWriter<TGR> tmp(graph, os); 1536 template <typename Graph> 1537 GraphWriter<Graph> graphWriter(const Graph& graph, 1538 std::ostream& os) { 1539 GraphWriter<Graph> tmp(graph, os); 1586 1540 return tmp; 1587 1541 } … … 1591 1545 /// This function just returns a \ref GraphWriter class. 1592 1546 /// \relates GraphWriter 1593 /// \sa graphWriter(const TGR& graph, std::ostream& os) 1594 template <typename TGR> 1595 GraphWriter<TGR> graphWriter(const TGR& graph, const std::string& fn) { 1596 GraphWriter<TGR> tmp(graph, fn); 1547 template <typename Graph> 1548 GraphWriter<Graph> graphWriter(const Graph& graph, const std::string& fn) { 1549 GraphWriter<Graph> tmp(graph, fn); 1597 1550 return tmp; 1598 1551 } … … 1602 1555 /// This function just returns a \ref GraphWriter class. 1603 1556 /// \relates GraphWriter 1604 /// \sa graphWriter(const TGR& graph, std::ostream& os) 1605 template <typename TGR> 1606 GraphWriter<TGR> graphWriter(const TGR& graph, const char* fn) { 1607 GraphWriter<TGR> tmp(graph, fn); 1557 template <typename Graph> 1558 GraphWriter<Graph> graphWriter(const Graph& graph, const char* fn) { 1559 GraphWriter<Graph> tmp(graph, fn); 1608 1560 return tmp; 1609 1561 } … … 1795 1747 }; 1796 1748 1797 /// \ingroup lemon_io1798 ///1799 1749 /// \brief Return a \ref SectionWriter class 1800 1750 /// 1801 1751 /// This function just returns a \ref SectionWriter class. 1802 ///1803 /// Please see SectionWriter documentation about the custom section1804 /// output.1805 ///1806 1752 /// \relates SectionWriter 1807 /// \sa sectionWriter(const std::string& fn)1808 /// \sa sectionWriter(const char *fn)1809 1753 inline SectionWriter sectionWriter(std::ostream& os) { 1810 1754 SectionWriter tmp(os); … … 1816 1760 /// This function just returns a \ref SectionWriter class. 1817 1761 /// \relates SectionWriter 1818 /// \sa sectionWriter(std::ostream& os)1819 1762 inline SectionWriter sectionWriter(const std::string& fn) { 1820 1763 SectionWriter tmp(fn); … … 1826 1769 /// This function just returns a \ref SectionWriter class. 1827 1770 /// \relates SectionWriter 1828 /// \sa sectionWriter(std::ostream& os)1829 1771 inline SectionWriter sectionWriter(const char* fn) { 1830 1772 SectionWriter tmp(fn); -
test/gomory_hu_test.cc
r643 r593 3 3 #include "test_tools.h" 4 4 #include <lemon/smart_graph.h> 5 #include <lemon/concepts/graph.h>6 #include <lemon/concepts/maps.h>7 5 #include <lemon/lgf_reader.h> 8 6 #include <lemon/gomory_hu.h> … … 35 33 "target 3\n"; 36 34 37 void checkGomoryHuCompile()38 {39 typedef int Value;40 typedef concepts::Graph Graph;41 42 typedef Graph::Node Node;43 typedef Graph::Edge Edge;44 typedef concepts::ReadMap<Edge, Value> CapMap;45 typedef concepts::ReadWriteMap<Node, bool> CutMap;46 47 Graph g;48 Node n;49 CapMap cap;50 CutMap cut;51 Value v;52 int d;53 54 GomoryHu<Graph, CapMap> gh_test(g, cap);55 const GomoryHu<Graph, CapMap>&56 const_gh_test = gh_test;57 58 gh_test.run();59 60 n = const_gh_test.predNode(n);61 v = const_gh_test.predValue(n);62 d = const_gh_test.rootDist(n);63 v = const_gh_test.minCutValue(n, n);64 v = const_gh_test.minCutMap(n, n, cut);65 }66 67 35 GRAPH_TYPEDEFS(Graph); 68 36 typedef Graph::EdgeMap<int> IntEdgeMap; … … 103 71 ght.minCutMap(u, v, cm); 104 72 check(pf.flowValue() == ght.minCutValue(u, v), "Wrong cut 1"); 105 check(cm[u] != cm[v], "Wrong cut 2");106 check(pf.flowValue() == cutValue(graph, cm, capacity), "Wrong cut 3");73 check(cm[u] != cm[v], "Wrong cut 3"); 74 check(pf.flowValue() == cutValue(graph, cm, capacity), "Wrong cut 2"); 107 75 108 76 int sum=0; … … 117 85 sum++; 118 86 check(sum == countNodes(graph), "Problem with MinCutNodeIt"); 87 119 88 } 120 89 } -
test/hao_orlin_test.cc
r644 r463 20 20 21 21 #include <lemon/smart_graph.h> 22 #include <lemon/adaptors.h>23 #include <lemon/concepts/digraph.h>24 #include <lemon/concepts/maps.h>25 #include <lemon/lgf_reader.h>26 22 #include <lemon/hao_orlin.h> 27 23 24 #include <lemon/lgf_reader.h> 28 25 #include "test_tools.h" 29 26 … … 41 38 "5\n" 42 39 "@edges\n" 43 " cap1 cap2 cap3\n" 44 "0 1 1 1 1 \n" 45 "0 2 2 2 4 \n" 46 "1 2 4 4 4 \n" 47 "3 4 1 1 1 \n" 48 "3 5 2 2 4 \n" 49 "4 5 4 4 4 \n" 50 "5 4 4 4 4 \n" 51 "2 3 1 6 6 \n" 52 "4 0 1 6 6 \n"; 53 54 void checkHaoOrlinCompile() 55 { 56 typedef int Value; 57 typedef concepts::Digraph Digraph; 58 59 typedef Digraph::Node Node; 60 typedef Digraph::Arc Arc; 61 typedef concepts::ReadMap<Arc, Value> CapMap; 62 typedef concepts::WriteMap<Node, bool> CutMap; 63 64 Digraph g; 65 Node n; 66 CapMap cap; 67 CutMap cut; 68 Value v; 69 70 HaoOrlin<Digraph, CapMap> ho_test(g, cap); 71 const HaoOrlin<Digraph, CapMap>& 72 const_ho_test = ho_test; 73 74 ho_test.init(); 75 ho_test.init(n); 76 ho_test.calculateOut(); 77 ho_test.calculateIn(); 78 ho_test.run(); 79 ho_test.run(n); 80 81 v = const_ho_test.minCutValue(); 82 v = const_ho_test.minCutMap(cut); 83 } 84 85 template <typename Graph, typename CapMap, typename CutMap> 86 typename CapMap::Value 87 cutValue(const Graph& graph, const CapMap& cap, const CutMap& cut) 88 { 89 typename CapMap::Value sum = 0; 90 for (typename Graph::ArcIt a(graph); a != INVALID; ++a) { 91 if (cut[graph.source(a)] && !cut[graph.target(a)]) 92 sum += cap[a]; 93 } 94 return sum; 95 } 40 " label capacity\n" 41 "0 1 0 2\n" 42 "1 2 1 2\n" 43 "2 0 2 2\n" 44 "3 4 3 2\n" 45 "4 5 4 2\n" 46 "5 3 5 2\n" 47 "2 3 6 3\n"; 96 48 97 49 int main() { 98 SmartDigraph graph; 99 SmartDigraph::ArcMap<int> cap1(graph), cap2(graph), cap3(graph); 100 SmartDigraph::NodeMap<bool> cut(graph); 50 SmartGraph graph; 51 SmartGraph::EdgeMap<int> capacity(graph); 101 52 102 istringstream input(lgf); 103 digraphReader(graph, input) 104 .arcMap("cap1", cap1) 105 .arcMap("cap2", cap2) 106 .arcMap("cap3", cap3) 107 .run(); 53 istringstream lgfs(lgf); 54 graphReader(graph, lgfs). 55 edgeMap("capacity", capacity).run(); 108 56 109 { 110 HaoOrlin<SmartDigraph> ho(graph, cap1); 111 ho.run(); 112 ho.minCutMap(cut); 113 114 check(ho.minCutValue() == 1, "Wrong cut value"); 115 check(ho.minCutValue() == cutValue(graph, cap1, cut), "Wrong cut value"); 116 } 117 { 118 HaoOrlin<SmartDigraph> ho(graph, cap2); 119 ho.run(); 120 ho.minCutMap(cut); 57 HaoOrlin<SmartGraph, SmartGraph::EdgeMap<int> > ho(graph, capacity); 58 ho.run(); 121 59 122 check(ho.minCutValue() == 1, "Wrong cut value"); 123 check(ho.minCutValue() == cutValue(graph, cap2, cut), "Wrong cut value"); 124 } 125 { 126 HaoOrlin<SmartDigraph> ho(graph, cap3); 127 ho.run(); 128 ho.minCutMap(cut); 129 130 check(ho.minCutValue() == 1, "Wrong cut value"); 131 check(ho.minCutValue() == cutValue(graph, cap3, cut), "Wrong cut value"); 132 } 133 134 typedef Undirector<SmartDigraph> UGraph; 135 UGraph ugraph(graph); 136 137 { 138 HaoOrlin<UGraph, SmartDigraph::ArcMap<int> > ho(ugraph, cap1); 139 ho.run(); 140 ho.minCutMap(cut); 141 142 check(ho.minCutValue() == 2, "Wrong cut value"); 143 check(ho.minCutValue() == cutValue(ugraph, cap1, cut), "Wrong cut value"); 144 } 145 { 146 HaoOrlin<UGraph, SmartDigraph::ArcMap<int> > ho(ugraph, cap2); 147 ho.run(); 148 ho.minCutMap(cut); 149 150 check(ho.minCutValue() == 5, "Wrong cut value"); 151 check(ho.minCutValue() == cutValue(ugraph, cap2, cut), "Wrong cut value"); 152 } 153 { 154 HaoOrlin<UGraph, SmartDigraph::ArcMap<int> > ho(ugraph, cap3); 155 ho.run(); 156 ho.minCutMap(cut); 157 158 check(ho.minCutValue() == 5, "Wrong cut value"); 159 check(ho.minCutValue() == cutValue(ugraph, cap3, cut), "Wrong cut value"); 160 } 60 check(ho.minCutValue() == 3, "Wrong cut value"); 161 61 162 62 return 0;
Note: See TracChangeset
for help on using the changeset viewer.
