1.1 --- a/lemon/list_graph.h Fri Nov 13 12:33:33 2009 +0100
1.2 +++ b/lemon/list_graph.h Thu Dec 10 17:05:35 2009 +0100
1.3 @@ -2,7 +2,7 @@
1.4 *
1.5 * This file is a part of LEMON, a generic C++ optimization library.
1.6 *
1.7 - * Copyright (C) 2003-2008
1.8 + * Copyright (C) 2003-2009
1.9 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
1.10 * (Egervary Research Group on Combinatorial Optimization, EGRES).
1.11 *
1.12 @@ -320,12 +320,11 @@
1.13 ///Most of the member functions and nested classes are documented
1.14 ///only in the concept class.
1.15 ///
1.16 - ///An important extra feature of this digraph implementation is that
1.17 - ///its maps are real \ref concepts::ReferenceMap "reference map"s.
1.18 - ///
1.19 ///\sa concepts::Digraph
1.20
1.21 class ListDigraph : public ExtendedListDigraphBase {
1.22 + typedef ExtendedListDigraphBase Parent;
1.23 +
1.24 private:
1.25 ///ListDigraph is \e not copy constructible. Use copyDigraph() instead.
1.26
1.27 @@ -340,8 +339,6 @@
1.28 void operator=(const ListDigraph &) {}
1.29 public:
1.30
1.31 - typedef ExtendedListDigraphBase Parent;
1.32 -
1.33 /// Constructor
1.34
1.35 /// Constructor.
1.36 @@ -351,14 +348,14 @@
1.37 ///Add a new node to the digraph.
1.38
1.39 ///Add a new node to the digraph.
1.40 - ///\return the new node.
1.41 + ///\return The new node.
1.42 Node addNode() { return Parent::addNode(); }
1.43
1.44 ///Add a new arc to the digraph.
1.45
1.46 ///Add a new arc to the digraph with source node \c s
1.47 ///and target node \c t.
1.48 - ///\return the new arc.
1.49 + ///\return The new arc.
1.50 Arc addArc(const Node& s, const Node& t) {
1.51 return Parent::addArc(s, t);
1.52 }
1.53 @@ -796,7 +793,7 @@
1.54
1.55 public:
1.56
1.57 - typedef ListGraphBase Digraph;
1.58 + typedef ListGraphBase Graph;
1.59
1.60 class Node;
1.61 class Arc;
1.62 @@ -840,8 +837,8 @@
1.63 explicit Arc(int pid) { id = pid;}
1.64
1.65 public:
1.66 - operator Edge() const {
1.67 - return id != -1 ? edgeFromId(id / 2) : INVALID;
1.68 + operator Edge() const {
1.69 + return id != -1 ? edgeFromId(id / 2) : INVALID;
1.70 }
1.71
1.72 Arc() {}
1.73 @@ -1176,12 +1173,11 @@
1.74 ///Most of the member functions and nested classes are documented
1.75 ///only in the concept class.
1.76 ///
1.77 - ///An important extra feature of this graph implementation is that
1.78 - ///its maps are real \ref concepts::ReferenceMap "reference map"s.
1.79 - ///
1.80 ///\sa concepts::Graph
1.81
1.82 class ListGraph : public ExtendedListGraphBase {
1.83 + typedef ExtendedListGraphBase Parent;
1.84 +
1.85 private:
1.86 ///ListGraph is \e not copy constructible. Use copyGraph() instead.
1.87
1.88 @@ -1201,21 +1197,19 @@
1.89 ///
1.90 ListGraph() {}
1.91
1.92 - typedef ExtendedListGraphBase Parent;
1.93 -
1.94 typedef Parent::OutArcIt IncEdgeIt;
1.95
1.96 /// \brief Add a new node to the graph.
1.97 ///
1.98 /// Add a new node to the graph.
1.99 - /// \return the new node.
1.100 + /// \return The new node.
1.101 Node addNode() { return Parent::addNode(); }
1.102
1.103 /// \brief Add a new edge to the graph.
1.104 ///
1.105 /// Add a new edge to the graph with source node \c s
1.106 /// and target node \c t.
1.107 - /// \return the new edge.
1.108 + /// \return The new edge.
1.109 Edge addEdge(const Node& s, const Node& t) {
1.110 return Parent::addEdge(s, t);
1.111 }