LEMON/LEMON-official Changeset - r474:fbd6e04acf44

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r474:fbd6e04acf44

« 473:14bb88

475:aea2dc »

r474:fbd6e04acf44

Fri, 09 Jan 2009 12:54:27

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Various doc improvements for graph adaptors (#67) - Add notes about modifying the adapted graphs through adaptors if it is possible. - Add notes about the possible conversions between the Node, Arc and Edge types of the adapted graphs and the adaptors. - Hide the default values for template parameters (describe them in the doc instead). - More precise docs for template parameters. - More precise docs for member functions. - Add docs for important public typedefs. - Unify the docs of the adaptors. - Add \relates commands for the creator functions. - Fixes and improvements the module documentation.

0 2 0

default

2 files changed with 593 insertions and 403 deletions:

doc/groups.dox

lemon/adaptors.h

567

380

↑ Collapse diff ↑

doc/groups.dox

Show inline comments

@@ -64,8 +64,10 @@
 		/**
-		@defgroup graph_adaptors Adaptor Classes for graphs
+		@defgroup graph_adaptors Adaptor Classes for Graphs
 		@ingroup graphs
-		\brief This group contains several adaptor classes for digraphs and graphs
+		\brief Adaptor classes for digraphs and graphs
 		This group contains several useful adaptor classes for digraphs and graphs.
 		The main parts of LEMON are the different graph structures, generic
-		graph algorithms, graph concepts which couple these, and graph
+		graph algorithms, graph concepts, which couple them, and graph
 		adaptors. While the previous notions are more or less clear, the
@@ -75,3 +77,3 @@
 		A short example makes this much clearer.  Suppose that we have an
 		instance \c g of a directed graph type say ListDigraph and an algorithm
+		instance \c g of a directed graph type, say ListDigraph and an algorithm
 		\code
@@ -83,9 +85,9 @@
 		arcs.  In this case, an adaptor class is used, which (according
 		to LEMON digraph concepts) works as a digraph.  The adaptor uses the
 		original digraph structure and digraph operations when methods of the
 		reversed oriented graph are called.  This means that the adaptor have
 		minor memory usage, and do not perform sophisticated algorithmic
 		to LEMON \ref concepts::Digraph "digraph concepts") works as a digraph.
 		The adaptor uses the original digraph structure and digraph operations when
 		methods of the reversed oriented graph are called.  This means that the adaptor
 		have minor memory usage, and do not perform sophisticated algorithmic
 		actions.  The purpose of it is to give a tool for the cases when a
 		graph have to be used in a specific alteration.  If this alteration is
-		obtained by a usual construction like filtering the arc-set or
+		obtained by a usual construction like filtering the node or the arc set or
 		considering a new orientation, then an adaptor is worthwhile to use.
@@ -98,12 +100,12 @@
 		ListDigraph g;
-		ReverseDigraph<ListGraph> rg(g);
+		ReverseDigraph<ListDigraph> rg(g);
 		int result = algorithm(rg);
 		\endcode
 		After running the algorithm, the original graph \c g is untouched.
 		This techniques gives rise to an elegant code, and based on stable
 		During running the algorithm, the original digraph \c g is untouched.
 		This techniques give rise to an elegant code, and based on stable
 		graph adaptors, complex algorithms can be implemented easily.
-		In flow, circulation and bipartite matching problems, the residual
 		In flow, circulation and matching problems, the residual
 		graph is of particular importance. Combining an adaptor implementing
-		this, shortest path algorithms and minimum mean cycle algorithms,
+		this with shortest path algorithms or minimum mean cycle algorithms,
 		a range of weighted and cardinality optimization algorithms can be
@@ -114,10 +116,11 @@
 		capabilities of the original graph while in other cases this would be
 		meaningless. This means that the concepts that they are models of depend
 		on the graph adaptor, and the wrapped graph(s).
 		If an arc of \c rg is deleted, this is carried out by deleting the
 		corresponding arc of \c g, thus the adaptor modifies the original graph.
 		meaningless. This means that the concepts that they meet depend
 		on the graph adaptor, and the wrapped graph.
 		For example, if an arc of a reversed digraph is deleted, this is carried
 		out by deleting the corresponding arc of the original digraph, thus the
 		adaptor modifies the original digraph.
 		However in case of a residual digraph, this operation has no sense.
 		But for a residual graph, this operation has no sense.
 		Let us stand one more example here to simplify your work.
-		RevGraphAdaptor has constructor
+		ReverseDigraph has constructor
 		\code
@@ -125,8 +128,8 @@
 		\endcode
 		This means that in a situation, when a <tt>const ListDigraph&</tt>
+		This means that in a situation, when a <tt>const %ListDigraph&</tt>
 		reference to a graph is given, then it have to be instantiated with
 		<tt>Digraph=const ListDigraph</tt>.
+		<tt>Digraph=const %ListDigraph</tt>.
 		\code
 		int algorithm1(const ListDigraph& g) {
-		  RevGraphAdaptor<const ListDigraph> rg(g);
+		  ReverseDigraph<const ListDigraph> rg(g);
 		  return algorithm2(rg);

lemon/adaptors.h

Show inline comments

@@ -23,3 +23,3 @@
 		/// \file
-		/// \brief Several graph adaptors
+		/// \brief Adaptor classes for digraphs and graphs
 		///
@@ -348,10 +348,18 @@
 		  ///
-		  /// \brief A digraph adaptor which reverses the orientation of the arcs.
+		  /// \brief Adaptor class for reversing the orientation of the arcs in
 		  /// a digraph.
 		  ///
 		  /// ReverseDigraph reverses the arcs in the adapted digraph. The
 		  /// SubDigraph is conform to the \ref concepts::Digraph
-		  /// "Digraph concept".
+		  /// ReverseDigraph can be used for reversing the arcs in a digraph.
 		  /// It conforms to the \ref concepts::Digraph "Digraph" concept.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type can be specified to be const.
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c _Digraph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
 		  template<typename _Digraph>
@@ -369,3 +377,3 @@
 		    ///
 		    /// Creates a reverse digraph adaptor for the given digraph
+		    /// Creates a reverse digraph adaptor for the given digraph.
 		    explicit ReverseDigraph(Digraph& digraph) {
@@ -375,5 +383,7 @@
-		  /// \brief Just gives back a reverse digraph adaptor
+		  /// \brief Returns a read-only ReverseDigraph adaptor
 		  ///
-		  /// Just gives back a reverse digraph adaptor
+		  /// This function just returns a read-only \ref ReverseDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates ReverseDigraph
 		  template<typename Digraph>
@@ -383,2 +393,3 @@
 		  template <typename _Digraph, typename _NodeFilterMap,
@@ -687,20 +698,33 @@
 		  ///
-		  /// \brief An adaptor for hiding nodes and arcs in a digraph
+		  /// \brief Adaptor class for hiding nodes and arcs in a digraph
 		  ///
 		  /// SubDigraph hides nodes and arcs in a digraph. A bool node map
 		  /// and a bool arc map must be specified, which define the filters
 		  /// for nodes and arcs. Just the nodes and arcs with true value are
 		  /// shown in the subdigraph. The SubDigraph is conform to the \ref
 		  /// concepts::Digraph "Digraph concept". If the \c _checked parameter
 		  /// is true, then the arcs incident to filtered nodes are also
 		  /// SubDigraph can be used for hiding nodes and arcs in a digraph.
 		  /// A \c bool node map and a \c bool arc map must be specified, which
 		  /// define the filters for nodes and arcs.
 		  /// Only the nodes and arcs with \c true filter value are
 		  /// shown in the subdigraph. This adaptor conforms to the \ref
 		  /// concepts::Digraph "Digraph" concept. If the \c _checked parameter
 		  /// is \c true, then the arcs incident to hidden nodes are also
 		  /// filtered out.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref
 		  /// concepts::Digraph "Digraph concept". The type can be specified
 		  /// to const.
 		  /// \tparam _NodeFilterMap A bool valued node map of the the adapted digraph.
 		  /// \tparam _ArcFilterMap A bool valued arc map of the the adapted digraph.
 		  /// \tparam _checked If the parameter is false then the arc filtering
 		  /// is not checked with respect to node filter. Otherwise, each arc
 		  /// is automatically filtered, which is incident to a filtered node.
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c _Digraph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _NodeFilterMap A \c bool (or convertible) node map of the
 		  /// adapted digraph. The default map type is
 		  /// \ref concepts::Digraph::NodeMap "_Digraph::NodeMap<bool>".
 		  /// \tparam _ArcFilterMap A \c bool (or convertible) arc map of the
 		  /// adapted digraph. The default map type is
 		  /// \ref concepts::Digraph::ArcMap "_Digraph::ArcMap<bool>".
 		  /// \tparam _checked If this parameter is set to \c false, then the arc
 		  /// filtering is not checked with respect to the node filter.
 		  /// Otherwise, each arc that is incident to a hidden node is automatically
 		  /// filtered out. This is the default option.
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
 		  ///
@@ -708,2 +732,8 @@
 		  /// \see FilterArcs
 		#ifdef DOXYGEN
 		  template<typename _Digraph,
 		           typename _NodeFilterMap,
 		           typename _ArcFilterMap,
 		           bool _checked>
 		#else
 		  template<typename _Digraph,
@@ -712,2 +742,3 @@
 		           bool _checked = true>
 		#endif
 		  class SubDigraph
@@ -716,4 +747,7 @@
 		  public:
 		    /// The type of the adapted digraph.
 		    typedef _Digraph Digraph;
 		    /// The type of the node filter map.
 		    typedef _NodeFilterMap NodeFilterMap;
 		    /// The type of the arc filter map.
 		    typedef _ArcFilterMap ArcFilterMap;
@@ -721,3 +755,3 @@
 		    typedef DigraphAdaptorExtender<
-		      SubDigraphBase<Digraph, NodeFilterMap, ArcFilterMap, _checked> >
+		      SubDigraphBase<_Digraph, _NodeFilterMap, _ArcFilterMap, _checked> >
 		    Parent;
@@ -733,4 +767,4 @@
 		    ///
 		    /// Creates a subdigraph for the given digraph with
 		    /// given node and arc map filters.
 		    /// Creates a subdigraph for the given digraph with the
 		    /// given node and arc filter maps.
 		    SubDigraph(Digraph& digraph, NodeFilterMap& node_filter,
@@ -742,40 +776,40 @@
-		    /// \brief Hides the node of the graph
+		    /// \brief Hides the given node
 		    ///
 		    /// This function hides \c n in the digraph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c n
-		    /// to be false in the corresponding node-map.
+		    /// This function hides the given node in the subdigraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c false in the node filter map.
 		    void hide(const Node& n) const { Parent::hide(n); }
-		    /// \brief Hides the arc of the graph
+		    /// \brief Hides the given arc
 		    ///
 		    /// This function hides \c a in the digraph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c a
-		    /// to be false in the corresponding arc-map.
+		    /// This function hides the given arc in the subdigraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c a
 		    /// to be \c false in the arc filter map.
 		    void hide(const Arc& a) const { Parent::hide(a); }
-		    /// \brief Unhides the node of the graph
+		    /// \brief Shows the given node
 		    ///
 		    /// The value of \c n is set to be true in the node-map which stores
 		    /// hide information. If \c n was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given node in the subdigraph.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c true in the node filter map.
 		    void unHide(const Node& n) const { Parent::unHide(n); }
-		    /// \brief Unhides the arc of the graph
+		    /// \brief Shows the given arc
 		    ///
 		    /// The value of \c a is set to be true in the arc-map which stores
 		    /// hide information. If \c a was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given arc in the subdigraph.
 		    /// It is done by simply setting the assigned value of \c a
 		    /// to be \c true in the arc filter map.
 		    void unHide(const Arc& a) const { Parent::unHide(a); }
-		    /// \brief Returns true if \c n is hidden.
+		    /// \brief Returns \c true if the given node is hidden.
 		    ///
-		    /// Returns true if \c n is hidden.
+		    /// This function returns \c true if the given node is hidden.
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		    /// \brief Returns \c true if the given arc is hidden.
 		    ///
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		    /// \brief Returns true if \c a is hidden.
 		    ///
 		    /// Returns true if \c a is hidden.
 		    ///
 		    /// This function returns \c true if the given arc is hidden.
 		    bool hidden(const Arc& a) const { return Parent::hidden(a); }
@@ -784,5 +818,7 @@
-		  /// \brief Just gives back a subdigraph
+		  /// \brief Returns a read-only SubDigraph adaptor
 		  ///
-		  /// Just gives back a subdigraph
+		  /// This function just returns a read-only \ref SubDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates SubDigraph
 		  template<typename Digraph, typename NodeFilterMap, typename ArcFilterMap>
@@ -1251,21 +1287,34 @@
 		  ///
 		  /// \brief A graph adaptor for hiding nodes and edges in an
 		  /// undirected graph.
 		  /// \brief Adaptor class for hiding nodes and edges in an undirected
 		  /// graph.
 		  ///
 		  /// SubGraph hides nodes and edges in a graph. A bool node map and a
 		  /// bool edge map must be specified, which define the filters for
 		  /// nodes and edges. Just the nodes and edges with true value are
 		  /// shown in the subgraph. The SubGraph is conform to the \ref
 		  /// concepts::Graph "Graph concept". If the \c _checked parameter is
 		  /// true, then the edges incident to filtered nodes are also
 		  /// SubGraph can be used for hiding nodes and edges in a graph.
 		  /// A \c bool node map and a \c bool edge map must be specified, which
 		  /// define the filters for nodes and edges.
 		  /// Only the nodes and edges with \c true filter value are
 		  /// shown in the subgraph. This adaptor conforms to the \ref
 		  /// concepts::Graph "Graph" concept. If the \c _checked parameter is
 		  /// \c true, then the edges incident to hidden nodes are also
 		  /// filtered out.
 		  ///
 		  /// \tparam _Graph It must be conform to the \ref
 		  /// concepts::Graph "Graph concept". The type can be specified
 		  /// to const.
 		  /// \tparam _NodeFilterMap A bool valued node map of the the adapted graph.
 		  /// \tparam _EdgeFilterMap A bool valued edge map of the the adapted graph.
 		  /// \tparam _checked If the parameter is false then the edge filtering
 		  /// is not checked with respect to node filter. Otherwise, each edge
 		  /// is automatically filtered, which is incident to a filtered node.
 		  /// The adapted graph can also be modified through this adaptor
 		  /// by adding or removing nodes or edges, unless the \c _Graph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Graph The type of the adapted graph.
 		  /// It must conform to the \ref concepts::Graph "Graph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _NodeFilterMap A \c bool (or convertible) node map of the
 		  /// adapted graph. The default map type is
 		  /// \ref concepts::Graph::NodeMap "_Graph::NodeMap<bool>".
 		  /// \tparam _EdgeFilterMap A \c bool (or convertible) edge map of the
 		  /// adapted graph. The default map type is
 		  /// \ref concepts::Graph::EdgeMap "_Graph::EdgeMap<bool>".
 		  /// \tparam _checked If this parameter is set to \c false, then the edge
 		  /// filtering is not checked with respect to the node filter.
 		  /// Otherwise, each edge that is incident to a hidden node is automatically
 		  /// filtered out. This is the default option.
 		  ///
 		  /// \note The \c Node, \c Edge and \c Arc types of this adaptor and the
 		  /// adapted graph are convertible to each other.
 		  ///
@@ -1273,11 +1322,26 @@
 		  /// \see FilterEdges
 		  template<typename _Graph, typename NodeFilterMap,
 		           typename EdgeFilterMap, bool _checked = true>
 		#ifdef DOXYGEN
 		  template<typename _Graph,
 		           typename _NodeFilterMap,
 		           typename _EdgeFilterMap,
 		           bool _checked>
 		#else
 		  template<typename _Graph,
 		           typename _NodeFilterMap = typename _Graph::template NodeMap<bool>,
 		           typename _EdgeFilterMap = typename _Graph::template EdgeMap<bool>,
 		           bool _checked = true>
 		#endif
 		  class SubGraph
 		    : public GraphAdaptorExtender<
-		      SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap, _checked> > {
+		      SubGraphBase<_Graph, _NodeFilterMap, _EdgeFilterMap, _checked> > {
 		  public:
 		    /// The type of the adapted graph.
 		    typedef _Graph Graph;
 		    /// The type of the node filter map.
 		    typedef _NodeFilterMap NodeFilterMap;
 		    /// The type of the edge filter map.
 		    typedef _EdgeFilterMap EdgeFilterMap;
 		    typedef GraphAdaptorExtender<
-		      SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap> > Parent;
+		      SubGraphBase<_Graph, _NodeFilterMap, _EdgeFilterMap, _checked> > Parent;
@@ -1292,7 +1356,7 @@
 		    ///
 		    /// Creates a subgraph for the given graph with given node and
 		    /// edge map filters.
-		    SubGraph(Graph& _graph, NodeFilterMap& node_filter_map,
+		    /// Creates a subgraph for the given graph with the given node
 		    /// and edge filter maps.
 		    SubGraph(Graph& graph, NodeFilterMap& node_filter_map,
 		             EdgeFilterMap& edge_filter_map) {
-		      setGraph(_graph);
+		      setGraph(graph);
 		      setNodeFilterMap(node_filter_map);
@@ -1301,40 +1365,40 @@
-		    /// \brief Hides the node of the graph
+		    /// \brief Hides the given node
 		    ///
 		    /// This function hides \c n in the graph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c n
-		    /// to be false in the corresponding node-map.
+		    /// This function hides the given node in the subgraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c false in the node filter map.
 		    void hide(const Node& n) const { Parent::hide(n); }
-		    /// \brief Hides the edge of the graph
+		    /// \brief Hides the given edge
 		    ///
 		    /// This function hides \c e in the graph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c e
-		    /// to be false in the corresponding edge-map.
+		    /// This function hides the given edge in the subgraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c e
 		    /// to be \c false in the edge filter map.
 		    void hide(const Edge& e) const { Parent::hide(e); }
-		    /// \brief Unhides the node of the graph
+		    /// \brief Shows the given node
 		    ///
 		    /// The value of \c n is set to be true in the node-map which stores
 		    /// hide information. If \c n was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given node in the subgraph.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c true in the node filter map.
 		    void unHide(const Node& n) const { Parent::unHide(n); }
-		    /// \brief Unhides the edge of the graph
+		    /// \brief Shows the given edge
 		    ///
 		    /// The value of \c e is set to be true in the edge-map which stores
 		    /// hide information. If \c e was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given edge in the subgraph.
 		    /// It is done by simply setting the assigned value of \c e
 		    /// to be \c true in the edge filter map.
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
-		    /// \brief Returns true if \c n is hidden.
+		    /// \brief Returns \c true if the given node is hidden.
 		    ///
-		    /// Returns true if \c n is hidden.
+		    /// This function returns \c true if the given node is hidden.
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		    /// \brief Returns \c true if the given edge is hidden.
 		    ///
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		    /// \brief Returns true if \c e is hidden.
 		    ///
 		    /// Returns true if \c e is hidden.
 		    ///
 		    /// This function returns \c true if the given edge is hidden.
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
@@ -1342,5 +1406,7 @@
-		  /// \brief Just gives back a subgraph
+		  /// \brief Returns a read-only SubGraph adaptor
 		  ///
-		  /// Just gives back a subgraph
+		  /// This function just returns a read-only \ref SubGraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates SubGraph
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
@@ -1375,28 +1441,38 @@
 		  /// \ingroup graph_adaptors
 		  ///
-		  /// \brief An adaptor for hiding nodes from a digraph or a graph.
+		  /// \brief Adaptor class for hiding nodes in a digraph or a graph.
 		  ///
 		  /// FilterNodes adaptor hides nodes in a graph or a digraph. A bool
 		  /// node map must be specified, which defines the filters for
 		  /// nodes. Just the unfiltered nodes and the arcs or edges incident
 		  /// to unfiltered nodes are shown in the subdigraph or subgraph. The
 		  /// FilterNodes is conform to the \ref concepts::Digraph
 		  /// "Digraph concept" or \ref concepts::Graph "Graph concept" depending
 		  /// on the \c _Digraph template parameter. If the \c _checked
 		  /// parameter is true, then the arc or edges incident to filtered nodes
-		  /// are also filtered out.
+		  /// FilterNodes adaptor can be used for hiding nodes in a digraph or a
 		  /// graph. A \c bool node map must be specified, which defines the filter
 		  /// for the nodes. Only the nodes with \c true filter value and the
 		  /// arcs/edges incident to nodes both with \c true filter value are shown
 		  /// in the subgraph. This adaptor conforms to the \ref concepts::Digraph
 		  /// "Digraph" concept or the \ref concepts::Graph "Graph" concept
 		  /// depending on the \c _Graph template parameter.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref
 		  /// concepts::Digraph "Digraph concept" or \ref concepts::Graph
 		  /// "Graph concept". The type can be specified to be const.
 		  /// \tparam _NodeFilterMap A bool valued node map of the the adapted graph.
 		  /// \tparam _checked If the parameter is false then the arc or edge
 		  /// filtering is not checked with respect to node filter. In this
 		  /// case just isolated nodes can be filtered out from the
 		  /// graph.
 		  /// The adapted (di)graph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs/edges, unless the \c _Graph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Graph The type of the adapted digraph or graph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept
 		  /// or the \ref concepts::Graph "Graph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _NodeFilterMap A \c bool (or convertible) node map of the
 		  /// adapted (di)graph. The default map type is
 		  /// \ref concepts::Graph::NodeMap "_Graph::NodeMap<bool>".
 		  /// \tparam _checked If this parameter is set to \c false then the arc/edge
 		  /// filtering is not checked with respect to the node filter. In this
 		  /// case only isolated nodes can be filtered out from the graph.
 		  /// Otherwise, each arc/edge that is incident to a hidden node is
 		  /// automatically filtered out. This is the default option.
 		  ///
 		  /// \note The \c Node and <tt>Arc/Edge</tt> types of this adaptor and the
 		  /// adapted (di)graph are convertible to each other.
 		#ifdef DOXYGEN
 		  template<typename _Digraph,
 		           typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
-		           bool _checked = true>
+		  template<typename _Graph,
 		           typename _NodeFilterMap,
 		           bool _checked>
 		#else
@@ -1432,7 +1508,11 @@
 		    ///
-		    /// Creates an adaptor for the given digraph or graph with
+		    /// Creates a subgraph for the given digraph or graph with the
 		    /// given node filter map.
-		    FilterNodes(Digraph& _digraph, NodeFilterMap& node_filter) :
+		#ifdef DOXYGEN
 		    FilterNodes(_Graph& graph, _NodeFilterMap& node_filter) :
 		#else
 		    FilterNodes(Digraph& graph, NodeFilterMap& node_filter) :
 		#endif
 		      Parent(), const_true_map(true) {
-		      Parent::setDigraph(_digraph);
+		      Parent::setDigraph(graph);
 		      Parent::setNodeFilterMap(node_filter);
@@ -1441,20 +1521,20 @@
-		    /// \brief Hides the node of the graph
+		    /// \brief Hides the given node
 		    ///
 		    /// This function hides \c n in the digraph or graph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c n
-		    /// to be false in the corresponding node map.
+		    /// This function hides the given node in the subgraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c false in the node filter map.
 		    void hide(const Node& n) const { Parent::hide(n); }
-		    /// \brief Unhides the node of the graph
+		    /// \brief Shows the given node
 		    ///
 		    /// The value of \c n is set to be true in the node-map which stores
 		    /// hide information. If \c n was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given node in the subgraph.
 		    /// It is done by simply setting the assigned value of \c n
 		    /// to be \c true in the node filter map.
 		    void unHide(const Node& n) const { Parent::unHide(n); }
-		    /// \brief Returns true if \c n is hidden.
+		    /// \brief Returns \c true if the given node is hidden.
 		    ///
 		    /// Returns true if \c n is hidden.
 		    ///
 		    /// This function returns \c true if the given node is hidden.
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
@@ -1498,5 +1578,7 @@
-		  /// \brief Just gives back a FilterNodes adaptor
+		  /// \brief Returns a read-only FilterNodes adaptor
 		  ///
-		  /// Just gives back a FilterNodes adaptor
+		  /// This function just returns a read-only \ref FilterNodes adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterNodes
 		  template<typename Digraph, typename NodeFilterMap>
@@ -1515,14 +1597,30 @@
 		  ///
-		  /// \brief An adaptor for hiding arcs from a digraph.
+		  /// \brief Adaptor class for hiding arcs in a digraph.
 		  ///
 		  /// FilterArcs adaptor hides arcs in a digraph. A bool arc map must
 		  /// be specified, which defines the filters for arcs. Just the
 		  /// unfiltered arcs are shown in the subdigraph. The FilterArcs is
 		  /// conform to the \ref concepts::Digraph "Digraph concept".
 		  /// FilterArcs adaptor can be used for hiding arcs in a digraph.
 		  /// A \c bool arc map must be specified, which defines the filter for
 		  /// the arcs. Only the arcs with \c true filter value are shown in the
 		  /// subdigraph. This adaptor conforms to the \ref concepts::Digraph
 		  /// "Digraph" concept.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type can be specified to be const.
 		  /// \tparam _ArcFilterMap A bool valued arc map of the the adapted
 		  /// graph.
-		  template<typename _Digraph, typename _ArcFilterMap>
+		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c _Digraph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _ArcFilterMap A \c bool (or convertible) arc map of the
 		  /// adapted digraph. The default map type is
 		  /// \ref concepts::Digraph::ArcMap "_Digraph::ArcMap<bool>".
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
 		#ifdef DOXYGEN
 		  template<typename _Digraph,
 		           typename _ArcFilterMap>
 		#else
 		  template<typename _Digraph,
 		           typename _ArcFilterMap = typename _Digraph::template ArcMap<bool> >
 		#endif
 		  class FilterArcs :
@@ -1531,2 +1629,3 @@
 		  public:
 		    typedef _Digraph Digraph;
@@ -1550,4 +1649,4 @@
 		    ///
 		    /// Creates a FilterArcs adaptor for the given graph with
 		    /// given arc map filter.
 		    /// Creates a subdigraph for the given digraph with the given arc
 		    /// filter map.
 		    FilterArcs(Digraph& digraph, ArcFilterMap& arc_filter)
@@ -1559,20 +1658,20 @@
-		    /// \brief Hides the arc of the graph
+		    /// \brief Hides the given arc
 		    ///
 		    /// This function hides \c a in the graph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c a
-		    /// to be false in the corresponding arc map.
+		    /// This function hides the given arc in the subdigraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c a
 		    /// to be \c false in the arc filter map.
 		    void hide(const Arc& a) const { Parent::hide(a); }
-		    /// \brief Unhides the arc of the graph
+		    /// \brief Shows the given arc
 		    ///
 		    /// The value of \c a is set to be true in the arc-map which stores
 		    /// hide information. If \c a was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given arc in the subdigraph.
 		    /// It is done by simply setting the assigned value of \c a
 		    /// to be \c true in the arc filter map.
 		    void unHide(const Arc& a) const { Parent::unHide(a); }
-		    /// \brief Returns true if \c a is hidden.
+		    /// \brief Returns \c true if the given arc is hidden.
 		    ///
 		    /// Returns true if \c a is hidden.
 		    ///
 		    /// This function returns \c true if the given arc is hidden.
 		    bool hidden(const Arc& a) const { return Parent::hidden(a); }
@@ -1581,5 +1680,7 @@
-		  /// \brief Just gives back an FilterArcs adaptor
+		  /// \brief Returns a read-only FilterArcs adaptor
 		  ///
-		  /// Just gives back an FilterArcs adaptor
+		  /// This function just returns a read-only \ref FilterArcs adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterArcs
 		  template<typename Digraph, typename ArcFilterMap>
@@ -1598,14 +1699,30 @@
 		  ///
-		  /// \brief An adaptor for hiding edges from a graph.
+		  /// \brief Adaptor class for hiding edges in a graph.
 		  ///
 		  /// FilterEdges adaptor hides edges in a digraph. A bool edge map must
 		  /// be specified, which defines the filters for edges. Just the
 		  /// unfiltered edges are shown in the subdigraph. The FilterEdges is
 		  /// conform to the \ref concepts::Graph "Graph concept".
 		  /// FilterEdges adaptor can be used for hiding edges in a graph.
 		  /// A \c bool edge map must be specified, which defines the filter for
 		  /// the edges. Only the edges with \c true filter value are shown in the
 		  /// subgraph. This adaptor conforms to the \ref concepts::Graph
 		  /// "Graph" concept.
 		  ///
 		  /// \tparam _Graph It must be conform to the \ref concepts::Graph
 		  /// "Graph concept". The type can be specified to be const.
 		  /// \tparam _EdgeFilterMap A bool valued edge map of the the adapted
 		  /// graph.
-		  template<typename _Graph, typename _EdgeFilterMap>
+		  /// The adapted graph can also be modified through this adaptor
 		  /// by adding or removing nodes or edges, unless the \c _Graph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Graph The type of the adapted graph.
 		  /// It must conform to the \ref concepts::Graph "Graph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _EdgeFilterMap A \c bool (or convertible) edge map of the
 		  /// adapted graph. The default map type is
 		  /// \ref concepts::Graph::EdgeMap "_Graph::EdgeMap<bool>".
 		  ///
 		  /// \note The \c Node, \c Edge and \c Arc types of this adaptor and the
 		  /// adapted graph are convertible to each other.
 		#ifdef DOXYGEN
 		  template<typename _Graph,
 		           typename _EdgeFilterMap>
 		#else
 		  template<typename _Graph,
 		           typename _EdgeFilterMap = typename _Graph::template EdgeMap<bool> >
 		#endif
 		  class FilterEdges :
@@ -1630,7 +1747,7 @@
 		    ///
 		    /// Creates a FilterEdges adaptor for the given graph with
 		    /// given edge map filters.
-		    FilterEdges(Graph& _graph, EdgeFilterMap& edge_filter_map) :
+		    /// Creates a subgraph for the given graph with the given edge
 		    /// filter map.
 		    FilterEdges(Graph& graph, EdgeFilterMap& edge_filter_map) :
 		      Parent(), const_true_map(true) {
-		      Parent::setGraph(_graph);
+		      Parent::setGraph(graph);
 		      Parent::setNodeFilterMap(const_true_map);
@@ -1639,20 +1756,20 @@
-		    /// \brief Hides the edge of the graph
+		    /// \brief Hides the given edge
 		    ///
 		    /// This function hides \c e in the graph, i.e. the iteration
 		    /// jumps over it. This is done by simply setting the value of \c e
-		    /// to be false in the corresponding edge-map.
+		    /// This function hides the given edge in the subgraph,
 		    /// i.e. the iteration jumps over it.
 		    /// It is done by simply setting the assigned value of \c e
 		    /// to be \c false in the edge filter map.
 		    void hide(const Edge& e) const { Parent::hide(e); }
-		    /// \brief Unhides the edge of the graph
+		    /// \brief Shows the given edge
 		    ///
 		    /// The value of \c e is set to be true in the edge-map which stores
 		    /// hide information. If \c e was hidden previuosly, then it is shown
-		    /// again
+		    /// This function shows the given edge in the subgraph.
 		    /// It is done by simply setting the assigned value of \c e
 		    /// to be \c true in the edge filter map.
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
-		    /// \brief Returns true if \c e is hidden.
+		    /// \brief Returns \c true if the given edge is hidden.
 		    ///
 		    /// Returns true if \c e is hidden.
 		    ///
 		    /// This function returns \c true if the given edge is hidden.
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
@@ -1661,5 +1778,7 @@
-		  /// \brief Just gives back a FilterEdges adaptor
+		  /// \brief Returns a read-only FilterEdges adaptor
 		  ///
-		  /// Just gives back a FilterEdges adaptor
+		  /// This function just returns a read-only \ref FilterEdges adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterEdges
 		  template<typename Graph, typename EdgeFilterMap>
@@ -1676,2 +1795,3 @@
 		  template <typename _Digraph>
@@ -1715,4 +1835,2 @@
 		    void first(Node& n) const {
@@ -2070,12 +2188,23 @@
 		  ///
-		  /// \brief Undirect the graph
+		  /// \brief Adaptor class for viewing a digraph as an undirected graph.
 		  ///
 		  /// This adaptor makes an undirected graph from a directed
 		  /// graph. All arcs of the underlying digraph will be showed in the
 		  /// adaptor as an edge. The Orienter adaptor is conform to the \ref
 		  /// concepts::Graph "Graph concept".
 		  /// Undirector adaptor can be used for viewing a digraph as an undirected
 		  /// graph. All arcs of the underlying digraph are showed in the
 		  /// adaptor as an edge (and also as a pair of arcs, of course).
 		  /// This adaptor conforms to the \ref concepts::Graph "Graph" concept.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref
 		  /// concepts::Digraph "Digraph concept". The type can be specified
-		  /// to const.
+		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or edges, unless the \c _Digraph template
 		  /// parameter is set to be \c const.
 		  ///
 		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  ///
 		  /// \note The \c Node type of this adaptor and the adapted digraph are
 		  /// convertible to each other, moreover the \c Edge type of the adaptor
 		  /// and the \c Arc type of the adapted digraph are also convertible to
 		  /// each other.
 		  /// (Thus the \c Arc type of the adaptor is convertible to the \c Arc type
 		  /// of the adapted digraph.)
 		  template<typename _Digraph>
@@ -2092,3 +2221,3 @@
 		    ///
-		    /// Creates a undirected graph from the given digraph
+		    /// Creates an undirected graph from the given digraph.
 		    Undirector(_Digraph& digraph) {
@@ -2097,6 +2226,8 @@
-		    /// \brief ArcMap combined from two original ArcMap
+		    /// \brief Arc map combined from two original arc maps
 		    ///
 		    /// This class adapts two original digraph ArcMap to
 		    /// get an arc map on the undirected graph.
 		    /// This map adaptor class adapts two arc maps of the underlying
 		    /// digraph to get an arc map of the undirected graph.
 		    /// Its value type is inherited from the first arc map type
 		    /// (\c %ForwardMap).
 		    template <typename _ForwardMap, typename _BackwardMap>
@@ -2110,4 +2241,6 @@
 		      /// The key type of the map
 		      typedef typename Parent::Arc Key;
 		      /// The value type of the map
 		      typedef typename ForwardMap::Value Value;
 		      typedef typename Parent::Arc Key;
@@ -2118,4 +2251,2 @@
 		      /// \brief Constructor
 		      ///
 		      /// Constructor
@@ -2124,6 +2255,3 @@
 		      /// \brief Sets the value associated with a key.
 		      ///
 		      /// Sets the value associated with a key.
 		      /// Sets the value associated with the given key.
 		      void set(const Key& e, const Value& a) {
@@ -2136,5 +2264,3 @@
 		      /// \brief Returns the value associated with a key.
 		      ///
-		      /// Returns the value associated with a key.
+		      /// Returns the value associated with the given key.
 		      ConstReturnValue operator[](const Key& e) const {
@@ -2147,5 +2273,3 @@
 		      /// \brief Returns the value associated with a key.
 		      ///
-		      /// Returns the value associated with a key.
+		      /// Returns a reference to the value associated with the given key.
 		      ReturnValue operator[](const Key& e) {
@@ -2165,5 +2289,5 @@
-		    /// \brief Just gives back a combined arc map
+		    /// \brief Returns a combined arc map
 		    ///
-		    /// Just gives back a combined arc map
+		    /// This function just returns a combined arc map.
 		    template <typename ForwardMap, typename BackwardMap>
@@ -2197,5 +2321,7 @@
-		  /// \brief Just gives back an undirected view of the given digraph
+		  /// \brief Returns a read-only Undirector adaptor
 		  ///
-		  /// Just gives back an undirected view of the given digraph
+		  /// This function just returns a read-only \ref Undirector adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates Undirector
 		  template<typename Digraph>
@@ -2206,2 +2332,3 @@
 		  template <typename _Graph, typename _DirectionMap>
@@ -2366,24 +2493,44 @@
 		  ///
-		  /// \brief Orients the edges of the graph to get a digraph
+		  /// \brief Adaptor class for orienting the edges of a graph to get a digraph
 		  ///
 		  /// This adaptor orients each edge in the undirected graph. The
 		  /// direction of the arcs stored in an edge node map.  The arcs can
 		  /// be easily reverted by the \c reverseArc() member function in the
 		  /// adaptor. The Orienter adaptor is conform to the \ref
-		  /// concepts::Digraph "Digraph concept".
+		  /// Orienter adaptor can be used for orienting the edges of a graph to
 		  /// get a digraph. A \c bool edge map of the underlying graph must be
 		  /// specified, which define the direction of the arcs in the adaptor.
 		  /// The arcs can be easily reversed by the \c reverseArc() member function
 		  /// of the adaptor.
 		  /// This class conforms to the \ref concepts::Digraph "Digraph" concept.
 		  ///
 		  /// \tparam _Graph It must be conform to the \ref concepts::Graph
 		  /// "Graph concept". The type can be specified to be const.
 		  /// \tparam _DirectionMap A bool valued edge map of the the adapted
 		  /// graph.
 		  /// The adapted graph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c _Graph template
 		  /// parameter is set to be \c const.
 		  ///
-		  /// \sa orienter
+		  /// \tparam _Graph The type of the adapted graph.
 		  /// It must conform to the \ref concepts::Graph "Graph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam _DirectionMap A \c bool (or convertible) edge map of the
 		  /// adapted graph. The default map type is
 		  /// \ref concepts::Graph::EdgeMap "_Graph::EdgeMap<bool>".
 		  ///
 		  /// \note The \c Node type of this adaptor and the adapted graph are
 		  /// convertible to each other, moreover the \c Arc type of the adaptor
 		  /// and the \c Edge type of the adapted graph are also convertible to
 		  /// each other.
 		#ifdef DOXYGEN
 		  template<typename _Graph,
-		           typename DirectionMap = typename _Graph::template EdgeMap<bool> >
+		           typename _DirectionMap>
 		#else
 		  template<typename _Graph,
 		           typename _DirectionMap = typename _Graph::template EdgeMap<bool> >
 		#endif
 		  class Orienter :
-		    public DigraphAdaptorExtender<OrienterBase<_Graph, DirectionMap> > {
+		    public DigraphAdaptorExtender<OrienterBase<_Graph, _DirectionMap> > {
 		  public:
 		    /// The type of the adapted graph.
 		    typedef _Graph Graph;
 		    /// The type of the direction edge map.
 		    typedef _DirectionMap DirectionMap;
 		    typedef DigraphAdaptorExtender<
-		      OrienterBase<_Graph, DirectionMap> > Parent;
+		      OrienterBase<_Graph, _DirectionMap> > Parent;
 		    typedef typename Parent::Arc Arc;
@@ -2393,5 +2540,5 @@
-		    /// \brief Constructor of the adaptor
 		    /// \brief Constructor
 		    ///
 		    /// Constructor of the adaptor
+		    /// Constructor of the adaptor.
 		    Orienter(Graph& graph, DirectionMap& direction) {
@@ -2401,5 +2548,7 @@
-		    /// \brief Reverse arc
+		    /// \brief Reverses the given arc
 		    ///
-		    /// It reverse the given arc. It simply negate the direction in the map.
+		    /// This function reverses the given arc.
 		    /// It is done by simply negate the assigned value of \c a
 		    /// in the direction map.
 		    void reverseArc(const Arc& a) {
@@ -2409,5 +2558,7 @@
-		  /// \brief Just gives back a Orienter
+		  /// \brief Returns a read-only Orienter adaptor
 		  ///
-		  /// Just gives back a Orienter
+		  /// This function just returns a read-only \ref Orienter adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates Orienter
 		  template<typename Graph, typename DirectionMap>
@@ -2493,27 +2644,47 @@
 		  ///
-		  /// \brief An adaptor for composing the residual graph for directed
+		  /// \brief Adaptor class for composing the residual digraph for directed
 		  /// flow and circulation problems.
 		  ///
 		  /// An adaptor for composing the residual graph for directed flow and
 		  /// circulation problems.  Let \f$ G=(V, A) \f$ be a directed graph
 		  /// and let \f$ F \f$ be a number type. Let moreover \f$ f,c:A\to F \f$,
 		  /// be functions on the arc-set.
 		  /// Residual can be used for composing the \e residual digraph for directed
 		  /// flow and circulation problems. Let \f$ G=(V, A) \f$ be a directed graph
 		  /// and let \f$ F \f$ be a number type. Let \f$ flow, cap: A\to F \f$ be
 		  /// functions on the arcs.
 		  /// This adaptor implements a digraph structure with node set \f$ V \f$
 		  /// and arc set \f$ A_{forward}\cup A_{backward} \f$,
 		  /// where \f$ A_{forward}=\{uv : uv\in A, flow(uv)<cap(uv)\} \f$ and
 		  /// \f$ A_{backward}=\{vu : uv\in A, flow(uv)>0\} \f$, i.e. the so
 		  /// called residual digraph.
 		  /// When the union \f$ A_{forward}\cup A_{backward} \f$ is taken,
 		  /// multiplicities are counted, i.e. the adaptor has exactly
 		  /// \f$ |A_{forward}| + |A_{backward}|\f$ arcs (it may have parallel
 		  /// arcs).
 		  /// This class conforms to the \ref concepts::Digraph "Digraph" concept.
 		  ///
 		  /// Then Residual implements the digraph structure with
 		  /// node-set \f$ V \f$ and arc-set \f$ A_{forward}\cup A_{backward} \f$,
 		  /// where \f$ A_{forward}=\{uv : uv\in A, f(uv)<c(uv)\} \f$ and
 		  /// \f$ A_{backward}=\{vu : uv\in A, f(uv)>0\} \f$, i.e. the so
 		  /// called residual graph.  When we take the union
 		  /// \f$ A_{forward}\cup A_{backward} \f$, multiplicities are counted,
 		  /// i.e.  if an arc is in both \f$ A_{forward} \f$ and
 		  /// \f$ A_{backward} \f$, then in the adaptor it appears in both
-		  /// orientation.
+		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It is implicitly \c const.
 		  /// \tparam _CapacityMap An arc map of some numerical type, which defines
 		  /// the capacities in the flow problem. It is implicitly \c const.
 		  /// The default map type is
 		  /// \ref concepts::Digraph::ArcMap "_Digraph::ArcMap<int>".
 		  /// \tparam _FlowMap An arc map of some numerical type, which defines
 		  /// the flow values in the flow problem.
 		  /// The default map type is \c _CapacityMap.
 		  /// \tparam _Tolerance Tolerance type for handling inexact computation.
 		  /// The default tolerance type depends on the value type of the
 		  /// capacity map.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type is implicitly const.
 		  /// \tparam _CapacityMap An arc map of some numeric type, it defines
 		  /// the capacities in the flow problem. The map is implicitly const.
 		  /// \tparam _FlowMap An arc map of some numeric type, it defines
 		  /// the capacities in the flow problem.
-		  /// \tparam _Tolerance Handler for inexact computation.
+		  /// \note This adaptor is implemented using Undirector and FilterArcs
 		  /// adaptors.
 		  ///
 		  /// \note The \c Node type of this adaptor and the adapted digraph are
 		  /// convertible to each other, moreover the \c Arc type of the adaptor
 		  /// is convertible to the \c Arc type of the adapted digraph.
 		#ifdef DOXYGEN
 		  template<typename _Digraph,
 		           typename _CapacityMap,
 		           typename _FlowMap,
 		           typename _Tolerance>
 		  class Residual
 		#else
 		  template<typename _Digraph,
@@ -2530,2 +2701,3 @@
 		                                       _FlowMap, _Tolerance> > >
 		#endif
+		  {
@@ -2533,4 +2705,7 @@
 		    /// The type of the underlying digraph.
 		    typedef _Digraph Digraph;
 		    /// The type of the capacity map.
 		    typedef _CapacityMap CapacityMap;
 		    /// The type of the flow map.
 		    typedef _FlowMap FlowMap;
@@ -2566,6 +2741,6 @@
-		    /// \brief Constructor of the residual digraph.
 		    /// \brief Constructor
 		    ///
 		    /// Constructor of the residual graph. The parameters are the digraph,
 		    /// the flow map, the capacity map and a tolerance object.
 		    /// Constructor of the residual digraph adaptor. The parameters are the
 		    /// digraph, the capacity map, the flow map, and a tolerance object.
 		    Residual(const Digraph& digraph, const CapacityMap& capacity,
@@ -2583,5 +2758,5 @@
-		    /// \brief Gives back the residual capacity of the arc.
+		    /// \brief Returns the residual capacity of the given arc.
 		    ///
-		    /// Gives back the residual capacity of the arc.
+		    /// Returns the residual capacity of the given arc.
 		    Value residualCapacity(const Arc& a) const {
@@ -2594,7 +2769,7 @@
-		    /// \brief Augment on the given arc in the residual graph.
+		    /// \brief Augment on the given arc in the residual digraph.
 		    ///
 		    /// Augment on the given arc in the residual graph. It increase
 		    /// or decrease the flow on the original arc depend on the direction
-		    /// of the residual arc.
+		    /// Augment on the given arc in the residual digraph. It increases
 		    /// or decreases the flow value on the original arc according to the
 		    /// direction of the residual arc.
 		    void augment(const Arc& a, const Value& v) const {
@@ -2607,5 +2782,6 @@
-		    /// \brief Returns the direction of the arc.
+		    /// \brief Returns \c true if the given residual arc is a forward arc.
 		    ///
-		    /// Returns true when the arc is same oriented as the original arc.
+		    /// Returns \c true if the given residual arc has the same orientation
 		    /// as the original arc, i.e. it is a so called forward arc.
 		    static bool forward(const Arc& a) {
@@ -2614,5 +2790,6 @@
-		    /// \brief Returns the direction of the arc.
+		    /// \brief Returns \c true if the given residual arc is a backward arc.
 		    ///
-		    /// Returns true when the arc is opposite oriented as the original arc.
+		    /// Returns \c true if the given residual arc has the opposite orientation
 		    /// than the original arc, i.e. it is a so called backward arc.
 		    static bool backward(const Arc& a) {
@@ -2621,5 +2798,6 @@
-		    /// \brief Gives back the forward oriented residual arc.
+		    /// \brief Returns the forward oriented residual arc.
 		    ///
-		    /// Gives back the forward oriented residual arc.
+		    /// Returns the forward oriented residual arc related to the given
 		    /// arc of the underlying digraph.
 		    static Arc forward(const typename Digraph::Arc& a) {
@@ -2628,5 +2806,6 @@
-		    /// \brief Gives back the backward oriented residual arc.
+		    /// \brief Returns the backward oriented residual arc.
 		    ///
-		    /// Gives back the backward oriented residual arc.
+		    /// Returns the backward oriented residual arc related to the given
 		    /// arc of the underlying digraph.
 		    static Arc backward(const typename Digraph::Arc& a) {
@@ -2637,4 +2816,5 @@
 		    ///
 		    /// In generic residual graph the residual capacity can be obtained
 		    /// as a map.
 		    /// This map adaptor class can be used for obtaining the residual
 		    /// capacities as an arc map of the residual digraph.
 		    /// Its value type is inherited from the capacity map.
 		    class ResidualCapacity {
@@ -2643,5 +2823,5 @@
 		    public:
-		      /// The Key type
+		      /// The key type of the map
 		      typedef Arc Key;
-		      /// The Value type
+		      /// The value type of the map
 		      typedef typename _CapacityMap::Value Value;
@@ -2651,3 +2831,3 @@
-		      /// \e
+		      /// Returns the value associated with the given residual arc
 		      Value operator[](const Arc& a) const {
@@ -3110,21 +3290,27 @@
 		  ///
-		  /// \brief Split the nodes of a directed graph
+		  /// \brief Adaptor class for splitting the nodes of a digraph.
 		  ///
 		  /// The SplitNodes adaptor splits each node into an in-node and an
 		  /// out-node. Formaly, the adaptor replaces each \f$ u \f$ node in
 		  /// the digraph with two nodes(namely node \f$ u_{in} \f$ and node
 		  /// \f$ u_{out} \f$). If there is a \f$ (v, u) \f$ arc in the
 		  /// original digraph the new target of the arc will be \f$ u_{in} \f$
 		  /// and similarly the source of the original \f$ (u, v) \f$ arc
 		  /// will be \f$ u_{out} \f$.  The adaptor will add for each node in
 		  /// the original digraph an additional arc which connects
-		  /// \f$ (u_{in}, u_{out}) \f$.
+		  /// SplitNodes adaptor can be used for splitting each node into an
 		  /// \e in-node and an \e out-node in a digraph. Formaly, the adaptor
 		  /// replaces each node \f$ u \f$ in the digraph with two nodes,
 		  /// namely node \f$ u_{in} \f$ and node \f$ u_{out} \f$.
 		  /// If there is a \f$ (v, u) \f$ arc in the original digraph, then the
 		  /// new target of the arc will be \f$ u_{in} \f$ and similarly the
 		  /// source of each original \f$ (u, v) \f$ arc will be \f$ u_{out} \f$.
 		  /// The adaptor adds an additional \e bind \e arc from \f$ u_{in} \f$
 		  /// to \f$ u_{out} \f$ for each node \f$ u \f$ of the original digraph.
 		  ///
 		  /// The aim of this class is to run algorithm with node costs if the
 		  /// algorithm can use directly just arc costs. In this case we should use
 		  /// a \c SplitNodes and set the node cost of the graph to the
 		  /// bind arc in the adapted graph.
 		  /// The aim of this class is running an algorithm with respect to node
 		  /// costs or capacities if the algorithm considers only arc costs or
 		  /// capacities directly.
 		  /// In this case you can use \c SplitNodes adaptor, and set the node
 		  /// costs/capacities of the original digraph to the \e bind \e arcs
 		  /// in the adaptor.
 		  ///
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type can be specified to be const.
 		  /// \tparam _Digraph The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It is implicitly \c const.
 		  ///
 		  /// \note The \c Node type of this adaptor is converible to the \c Node
 		  /// type of the adapted digraph.
 		  template <typename _Digraph>
@@ -3142,3 +3328,3 @@
-		    /// \brief Constructor of the adaptor.
 		    /// \brief Constructor
 		    ///
@@ -3149,5 +3335,5 @@
-		    /// \brief Returns true when the node is in-node.
+		    /// \brief Returns \c true if the given node is an in-node.
 		    ///
-		    /// Returns true when the node is in-node.
+		    /// Returns \c true if the given node is an in-node.
 		    static bool inNode(const Node& n) {
@@ -3156,5 +3342,5 @@
-		    /// \brief Returns true when the node is out-node.
+		    /// \brief Returns \c true if the given node is an out-node.
 		    ///
-		    /// Returns true when the node is out-node.
+		    /// Returns \c true if the given node is an out-node.
 		    static bool outNode(const Node& n) {
@@ -3163,5 +3349,6 @@
-		    /// \brief Returns true when the arc is arc in the original digraph.
+		    /// \brief Returns \c true if the given arc is an original arc.
 		    ///
-		    /// Returns true when the arc is arc in the original digraph.
+		    /// Returns \c true if the given arc is one of the arcs in the
 		    /// original digraph.
 		    static bool origArc(const Arc& a) {
@@ -3170,5 +3357,6 @@
-		    /// \brief Returns true when the arc binds an in-node and an out-node.
+		    /// \brief Returns \c true if the given arc is a bind arc.
 		    ///
-		    /// Returns true when the arc binds an in-node and an out-node.
+		    /// Returns \c true if the given arc is a bind arc, i.e. it connects
 		    /// an in-node and an out-node.
 		    static bool bindArc(const Arc& a) {
@@ -3177,5 +3365,5 @@
-		    /// \brief Gives back the in-node created from the \c node.
+		    /// \brief Returns the in-node created from the given original node.
 		    ///
-		    /// Gives back the in-node created from the \c node.
+		    /// Returns the in-node created from the given original node.
 		    static Node inNode(const DigraphNode& n) {
@@ -3184,5 +3372,5 @@
-		    /// \brief Gives back the out-node created from the \c node.
+		    /// \brief Returns the out-node created from the given original node.
 		    ///
-		    /// Gives back the out-node created from the \c node.
+		    /// Returns the out-node created from the given original node.
 		    static Node outNode(const DigraphNode& n) {
@@ -3191,5 +3379,8 @@
-		    /// \brief Gives back the arc binds the two part of the node.
+		    /// \brief Returns the bind arc that corresponds to the given
 		    /// original node.
 		    ///
-		    /// Gives back the arc binds the two part of the node.
+		    /// Returns the bind arc in the adaptor that corresponds to the given
 		    /// original node, i.e. the arc connecting the in-node and out-node
 		    /// of \c n.
 		    static Arc arc(const DigraphNode& n) {
@@ -3198,5 +3389,6 @@
-		    /// \brief Gives back the arc of the original arc.
+		    /// \brief Returns the arc that corresponds to the given original arc.
 		    ///
-		    /// Gives back the arc of the original arc.
+		    /// Returns the arc in the adaptor that corresponds to the given
 		    /// original arc.
 		    static Arc arc(const DigraphArc& a) {
@@ -3205,6 +3397,8 @@
-		    /// \brief NodeMap combined from two original NodeMap
+		    /// \brief Node map combined from two original node maps
 		    ///
 		    /// This class adapt two of the original digraph NodeMap to
 		    /// get a node map on the adapted digraph.
 		    /// This map adaptor class adapts two node maps of the original digraph
 		    /// to get a node map of the split digraph.
 		    /// Its value type is inherited from the first node map type
 		    /// (\c InNodeMap).
 		    template <typename InNodeMap, typename OutNodeMap>
@@ -3213,3 +3407,5 @@
 		      /// The key type of the map
 		      typedef Node Key;
 		      /// The value type of the map
 		      typedef typename InNodeMap::Value Value;
@@ -3222,5 +3418,3 @@
 		      /// \brief Constructor
 		      ///
-		      /// Constructor.
 		      /// Constructor
 		      CombinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map)
@@ -3228,5 +3422,12 @@
 		      /// \brief The subscript operator.
 		      ///
-		      /// The subscript operator.
+		      /// Returns the value associated with the given key.
 		      Value operator[](const Key& key) const {
 		        if (Parent::inNode(key)) {
 		          return _in_map[key];
 		        } else {
 		          return _out_map[key];
+		        }
+		      }
 		      /// Returns a reference to the value associated with the given key.
 		      Value& operator[](const Key& key) {
@@ -3239,16 +3440,3 @@
 		      /// \brief The const subscript operator.
 		      ///
 		      /// The const subscript operator.
 		      Value operator[](const Key& key) const {
 		        if (Parent::inNode(key)) {
 		          return _in_map[key];
 		        } else {
 		          return _out_map[key];
+		        }
+		      }
 		      /// \brief The setter function of the map.
 		      ///
 		      /// The setter function of the map.
 		      /// Sets the value associated with the given key.
 		      void set(const Key& key, const Value& value) {
@@ -3269,5 +3457,5 @@
-		    /// \brief Just gives back a combined node map
+		    /// \brief Returns a combined node map
 		    ///
-		    /// Just gives back a combined node map
+		    /// This function just returns a combined node map.
 		    template <typename InNodeMap, typename OutNodeMap>
@@ -3297,6 +3485,9 @@
-		    /// \brief ArcMap combined from an original ArcMap and a NodeMap
+		    /// \brief Arc map combined from an arc map and a node map of the
 		    /// original digraph.
 		    ///
 		    /// This class adapt an original ArcMap and a NodeMap to get an
 		    /// arc map on the adapted digraph
 		    /// This map adaptor class adapts an arc map and a node map of the
 		    /// original digraph to get an arc map of the split digraph.
 		    /// Its value type is inherited from the original arc map type
 		    /// (\c DigraphArcMap).
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
@@ -3305,3 +3496,5 @@
 		      /// The key type of the map
 		      typedef Arc Key;
 		      /// The value type of the map
 		      typedef typename DigraphArcMap::Value Value;
@@ -3319,5 +3512,3 @@
 		      /// \brief Constructor
 		      ///
-		      /// Constructor.
 		      /// Constructor
 		      CombinedArcMap(DigraphArcMap& arc_map, DigraphNodeMap& node_map)
@@ -3325,5 +3516,21 @@
 		      /// \brief The subscript operator.
 		      ///
-		      /// The subscript operator.
+		      /// Returns the value associated with the given key.
 		      Value operator[](const Key& arc) const {
 		        if (Parent::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		      /// Returns a reference to the value associated with the given key.
 		      Value& operator[](const Key& arc) {
 		        if (Parent::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		      /// Sets the value associated with the given key.
 		      void set(const Arc& arc, const Value& val) {
@@ -3336,24 +3543,2 @@
 		      /// \brief The const subscript operator.
 		      ///
 		      /// The const subscript operator.
 		      Value operator[](const Key& arc) const {
 		        if (Parent::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		      /// \brief The const subscript operator.
 		      ///
 		      /// The const subscript operator.
 		      Value& operator[](const Key& arc) {
 		        if (Parent::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		    private:
@@ -3363,5 +3548,5 @@
-		    /// \brief Just gives back a combined arc map
+		    /// \brief Returns a combined arc map
 		    ///
-		    /// Just gives back a combined arc map
+		    /// This function just returns a combined arc map.
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
@@ -3396,5 +3581,7 @@
-		  /// \brief Just gives back a node splitter
+		  /// \brief Returns a (read-only) SplitNodes adaptor
 		  ///
-		  /// Just gives back a node splitter
+		  /// This function just returns a (read-only) \ref SplitNodes adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates SplitNodes
 		  template<typename Digraph>

0 comments (0 inline)

RhodeCode

Login to your account