LEMON/LEMON-main Changeset - r416:76287c8caa26

Repositories » LEMON » LEMON-main

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

Changeset - r416:76287c8caa26

« 415:4b6112

417:6ff53a »

r416:76287c8caa26

Sun, 30 Nov 2008 19:18:32

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Reorganication of graph adaptors and doc improvements (#67) - Moving to one file, lemon/adaptors.h - Renamings - Doc cleanings

2 5 1

default

8 files changed with 2163 insertions and 2494 deletions:

doc/groups.dox

lemon/Makefile.am

lemon/adaptors.h

1888

1088

lemon/bits/graph_adaptor_extender.h

129

lemon/bits/variant.h

test/graph_adaptor_test.cc

lemon/graph_adaptor.h

1164

↑ Collapse diff ↑

doc/groups.dox

Show inline comments

@@ -57,12 +57,85 @@
 		with any graph structure.
 		<b>See also:</b> \ref graph_concepts "Graph Structure Concepts".
 		*/
 		/**
 		@defgroup graph_adaptors Adaptor Classes for graphs
 		@ingroup graphs
 		\brief This group contains several 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
 		adaptors. While the previous notions are more or less clear, the
 		latter one needs further explanation. Graph adaptors are graph classes
 		which serve for considering graph structures in different ways.
 		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
 		\code
 		template <typename Digraph>
 		int algorithm(const Digraph&);
 		\endcode
 		is needed to run on the reverse oriented graph.  It may be expensive
 		(in time or in memory usage) to copy \c g with the reversed
 		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
 		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
 		considering a new orientation, then an adaptor is worthwhile to use.
 		To come back to the reverse oriented graph, in this situation
 		\code
 		template<typename Digraph> class ReverseDigraph;
 		\endcode
 		template class can be used. The code looks as follows
 		\code
 		ListDigraph g;
 		ReverseDigraph<ListGraph> 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
 		graph adaptors, complex algorithms can be implemented easily.
 		In flow, circulation and bipartite matching problems, the residual
 		graph is of particular importance. Combining an adaptor implementing
 		this, shortest path algorithms and minimum mean cycle algorithms,
 		a range of weighted and cardinality optimization algorithms can be
 		obtained. For other examples, the interested user is referred to the
 		detailed documentation of particular adaptors.
 		The behavior of graph adaptors can be very different. Some of them keep
 		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.
 		But for a residual graph, this operation has no sense.
 		Let us stand one more example here to simplify your work.
 		RevGraphAdaptor has constructor
 		\code
 		ReverseDigraph(Digraph& digraph);
 		\endcode
 		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>.
 		\code
 		int algorithm1(const ListDigraph& g) {
 		  RevGraphAdaptor<const ListDigraph> rg(g);
 		  return algorithm2(rg);
+		}
 		\endcode
 		*/
 		/**
 		@defgroup semi_adaptors Semi-Adaptor Classes for Graphs
 		@ingroup graphs
 		\brief Graph types between real graphs and graph adaptors.
 		This group describes some graph types between real graphs and graph adaptors.
 		These classes wrap graphs to give new functionality as the adaptors do it.

lemon/Makefile.am

Show inline comments

@@ -13,12 +13,13 @@
 		        lemon/random.cc
 		#lemon_libemon_la_CXXFLAGS = $(GLPK_CFLAGS) $(CPLEX_CFLAGS) $(SOPLEX_CXXFLAGS) $(AM_CXXFLAGS)
 		#lemon_libemon_la_LDFLAGS = $(GLPK_LIBS) $(CPLEX_LIBS) $(SOPLEX_LIBS)
 		lemon_HEADERS += \
 			lemon/adaptors.h \
 		        lemon/arg_parser.h \
 			lemon/assert.h \
 		        lemon/bfs.h \
 		        lemon/bin_heap.h \
 		        lemon/color.h \
 			lemon/concept_check.h \

lemon/adaptors.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -13,28 +13,26 @@
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_DIGRAPH_ADAPTOR_H
 		#define LEMON_DIGRAPH_ADAPTOR_H
 		///\ingroup graph_adaptors
 		///\file
 		///\brief Several digraph adaptors.
 		#ifndef LEMON_ADAPTORS_H
 		#define LEMON_ADAPTORS_H
 		/// \ingroup graph_adaptors
 		/// \file
 		/// \brief Several graph adaptors
 		///
-		///This file contains several useful digraph adaptor classes.
+		/// This file contains several useful adaptors for digraphs and graphs.
 		#include <lemon/core.h>
 		#include <lemon/maps.h>
 		#include <lemon/bits/variant.h>
 		#include <lemon/bits/base_extender.h>
 		#include <lemon/bits/graph_adaptor_extender.h>
 		#include <lemon/bits/graph_extender.h>
 		#include <lemon/tolerance.h>
 		#include <algorithm>
 		namespace lemon {
@@ -52,13 +50,13 @@
 		  public:
 		    DigraphAdaptorBase(Digraph& digraph) : _digraph(&digraph) { }
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::Arc Arc;
 		    void first(Node& i) const { _digraph->first(i); }
 		    void first(Arc& i) const { _digraph->first(i); }
 		    void firstIn(Arc& i, const Node& n) const { _digraph->firstIn(i, n); }
 		    void firstOut(Arc& i, const Node& n ) const { _digraph->firstOut(i, n); }
 		    void next(Node& i) const { _digraph->next(i); }
@@ -68,80 +66,80 @@
 		    Node source(const Arc& a) const { return _digraph->source(a); }
 		    Node target(const Arc& a) const { return _digraph->target(a); }
 		    typedef NodeNumTagIndicator<Digraph> NodeNumTag;
 		    int nodeNum() const { return _digraph->nodeNum(); }
 		    typedef EdgeNumTagIndicator<Digraph> EdgeNumTag;
 		    int arcNum() const { return _digraph->arcNum(); }
 		    typedef FindEdgeTagIndicator<Digraph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v, const Arc& prev = INVALID) {
 		      return _digraph->findArc(u, v, prev);
+		    }
 		    Node addNode() { return _digraph->addNode(); }
 		    Arc addArc(const Node& u, const Node& v) { return _digraph->addArc(u, v); }
 		    void erase(const Node& n) const { _digraph->erase(n); }
 		    void erase(const Arc& a) const { _digraph->erase(a); }
 		    void clear() const { _digraph->clear(); }
 		    int id(const Node& n) const { return _digraph->id(n); }
 		    int id(const Arc& a) const { return _digraph->id(a); }
 		    Node nodeFromId(int ix) const { return _digraph->nodeFromId(ix); }
 		    Arc arcFromId(int ix) const { return _digraph->arcFromId(ix); }
 		    int maxNodeId() const { return _digraph->maxNodeId(); }
 		    int maxArcId() const { return _digraph->maxArcId(); }
 		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
-		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
 		    typedef typename ItemSetTraits<Digraph, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _digraph->notifier(Arc()); }
 		    ArcNotifier& notifier(Arc) const { return _digraph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    public:
 		      typedef typename Digraph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 			: Parent(*adaptor._digraph) {}
 		      explicit NodeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      NodeMap(const Adaptor& adaptor, const _Value& value)
-			: Parent(*adaptor._digraph, value) { }
+		        : Parent(*adaptor._digraph, value) { }
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public Digraph::template ArcMap<_Value> {
 		    public:
 		      typedef typename Digraph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const Adaptor& adaptor)
-			: Parent(*adaptor._digraph) {}
 		      explicit ArcMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      ArcMap(const Adaptor& adaptor, const _Value& value)
-			: Parent(*adaptor._digraph, value) {}
+		        : Parent(*adaptor._digraph, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
@@ -152,20 +150,174 @@
+		      }
 		    };
 		  };
 		  template<typename _Graph>
 		  class GraphAdaptorBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef Graph ParentGraph;
 		  protected:
 		    Graph* _graph;
 		    GraphAdaptorBase() : _graph(0) {}
 		    void setGraph(Graph& graph) { _graph = &graph; }
 		  public:
 		    GraphAdaptorBase(Graph& graph) : _graph(&graph) {}
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Arc Arc;
 		    typedef typename Graph::Edge Edge;
 		    void first(Node& i) const { _graph->first(i); }
 		    void first(Arc& i) const { _graph->first(i); }
 		    void first(Edge& i) const { _graph->first(i); }
 		    void firstIn(Arc& i, const Node& n) const { _graph->firstIn(i, n); }
 		    void firstOut(Arc& i, const Node& n ) const { _graph->firstOut(i, n); }
 		    void firstInc(Edge &i, bool &d, const Node &n) const {
 		      _graph->firstInc(i, d, n);
+		    }
 		    void next(Node& i) const { _graph->next(i); }
 		    void next(Arc& i) const { _graph->next(i); }
 		    void next(Edge& i) const { _graph->next(i); }
 		    void nextIn(Arc& i) const { _graph->nextIn(i); }
 		    void nextOut(Arc& i) const { _graph->nextOut(i); }
 		    void nextInc(Edge &i, bool &d) const { _graph->nextInc(i, d); }
 		    Node u(const Edge& e) const { return _graph->u(e); }
 		    Node v(const Edge& e) const { return _graph->v(e); }
 		    Node source(const Arc& a) const { return _graph->source(a); }
 		    Node target(const Arc& a) const { return _graph->target(a); }
 		    typedef NodeNumTagIndicator<Graph> NodeNumTag;
 		    int nodeNum() const { return _graph->nodeNum(); }
 		    typedef EdgeNumTagIndicator<Graph> EdgeNumTag;
 		    int arcNum() const { return _graph->arcNum(); }
 		    int edgeNum() const { return _graph->edgeNum(); }
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v, const Arc& prev = INVALID) {
 		      return _graph->findArc(u, v, prev);
+		    }
 		    Edge findEdge(const Node& u, const Node& v, const Edge& prev = INVALID) {
 		      return _graph->findEdge(u, v, prev);
+		    }
 		    Node addNode() { return _graph->addNode(); }
 		    Edge addEdge(const Node& u, const Node& v) { return _graph->addEdge(u, v); }
 		    void erase(const Node& i) { _graph->erase(i); }
 		    void erase(const Edge& i) { _graph->erase(i); }
 		    void clear() { _graph->clear(); }
 		    bool direction(const Arc& a) const { return _graph->direction(a); }
 		    Arc direct(const Edge& e, bool d) const { return _graph->direct(e, d); }
 		    int id(const Node& v) const { return _graph->id(v); }
 		    int id(const Arc& a) const { return _graph->id(a); }
 		    int id(const Edge& e) const { return _graph->id(e); }
 		    Node nodeFromId(int ix) const { return _graph->nodeFromId(ix); }
 		    Arc arcFromId(int ix) const { return _graph->arcFromId(ix); }
 		    Edge edgeFromId(int ix) const { return _graph->edgeFromId(ix); }
 		    int maxNodeId() const { return _graph->maxNodeId(); }
 		    int maxArcId() const { return _graph->maxArcId(); }
 		    int maxEdgeId() const { return _graph->maxEdgeId(); }
 		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
 		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _graph->notifier(Edge()); }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<Graph>& adapter)
 		        : Parent(*adapter._graph) {}
 		      NodeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public Graph::template ArcMap<_Value> {
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<Graph>& adapter)
 		        : Parent(*adapter._graph) {}
 		      ArcMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public Graph::template EdgeMap<_Value> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<Graph>& adapter)
 		        : Parent(*adapter._graph) {}
 		      EdgeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Digraph>
-		  class RevDigraphAdaptorBase : public DigraphAdaptorBase<_Digraph> {
+		  class ReverseDigraphBase : public DigraphAdaptorBase<_Digraph> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<_Digraph> Parent;
 		  protected:
-		    RevDigraphAdaptorBase() : Parent() { }
+		    ReverseDigraphBase() : Parent() { }
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    void firstIn(Arc& a, const Node& n) const { Parent::firstOut(a, n); }
 		    void firstOut(Arc& a, const Node& n ) const { Parent::firstIn(a, n); }
@@ -173,110 +325,73 @@
 		    void nextIn(Arc& a) const { Parent::nextOut(a); }
 		    void nextOut(Arc& a) const { Parent::nextIn(a); }
 		    Node source(const Arc& a) const { return Parent::target(a); }
 		    Node target(const Arc& a) const { return Parent::source(a); }
 		    Arc addArc(const Node& u, const Node& v) { return Parent::addArc(v, u); }
 		    typedef FindEdgeTagIndicator<Digraph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 				const Arc& prev = INVALID) {
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) {
 		      return Parent::findArc(v, u, prev);
+		    }
 		  };
-		  ///\ingroup graph_adaptors
 		  /// \ingroup graph_adaptors
 		  ///
 		  ///\brief A digraph adaptor which reverses the orientation of the arcs.
+		  /// \brief A digraph adaptor which reverses the orientation of the arcs.
 		  ///
 		  /// If \c g is defined as
 		  ///\code
 		  /// ListDigraph dg;
 		  ///\endcode
 		  /// then
 		  ///\code
 		  /// RevDigraphAdaptor<ListDigraph> dga(dg);
 		  ///\endcode
 		  /// implements the digraph obtained from \c dg by
 		  /// reversing the orientation of its arcs.
 		  /// ReverseDigraph reverses the arcs in the adapted digraph. The
 		  /// SubDigraph is conform to the \ref concepts::Digraph
 		  /// "Digraph concept".
 		  ///
 		  /// A good example of using RevDigraphAdaptor is to decide whether
 		  /// the directed graph is strongly connected or not. The digraph is
 		  /// strongly connected iff each node is reachable from one node and
 		  /// this node is reachable from the others. Instead of this
 		  /// condition we use a slightly different, from one node each node
 		  /// is reachable both in the digraph and the reversed digraph. Now
 		  /// this condition can be checked with the Dfs algorithm and the
 		  /// RevDigraphAdaptor class.
 		  ///
 		  /// The implementation:
 		  ///\code
 		  /// bool stronglyConnected(const Digraph& digraph) {
 		  ///   if (NodeIt(digraph) == INVALID) return true;
 		  ///   Dfs<Digraph> dfs(digraph);
 		  ///   dfs.run(NodeIt(digraph));
 		  ///   for (NodeIt it(digraph); it != INVALID; ++it) {
 		  ///     if (!dfs.reached(it)) {
 		  ///       return false;
 		  ///     }
 		  ///   }
 		  ///   typedef RevDigraphAdaptor<const Digraph> RDigraph;
 		  ///   RDigraph rdigraph(digraph);
 		  ///   DfsVisit<RDigraph> rdfs(rdigraph);
 		  ///   rdfs.run(NodeIt(digraph));
 		  ///   for (NodeIt it(digraph); it != INVALID; ++it) {
 		  ///     if (!rdfs.reached(it)) {
 		  ///       return false;
 		  ///     }
 		  ///   }
 		  ///   return true;
 		  /// }
 		  ///\endcode
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type can be specified to be const.
 		  template<typename _Digraph>
 		  class RevDigraphAdaptor :
 		    public DigraphAdaptorExtender<RevDigraphAdaptorBase<_Digraph> > {
 		  class ReverseDigraph :
 		    public DigraphAdaptorExtender<ReverseDigraphBase<_Digraph> > {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorExtender<
-		      RevDigraphAdaptorBase<_Digraph> > Parent;
+		      ReverseDigraphBase<_Digraph> > Parent;
 		  protected:
-		    RevDigraphAdaptor() { }
+		    ReverseDigraph() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a reverse graph adaptor for the given digraph
 		    explicit RevDigraphAdaptor(Digraph& digraph) {
-		      Parent::setDigraph(digraph);
+		    /// Creates a reverse digraph adaptor for the given digraph
 		    explicit ReverseDigraph(Digraph& digraph) {
 		      Parent::setDigraph(digraph);
+		    }
 		  };
 		  /// \brief Just gives back a reverse digraph adaptor
 		  ///
 		  /// Just gives back a reverse digraph adaptor
 		  template<typename Digraph>
 		  RevDigraphAdaptor<const Digraph>
 		  revDigraphAdaptor(const Digraph& digraph) {
-		    return RevDigraphAdaptor<const Digraph>(digraph);
+		  ReverseDigraph<const Digraph> reverseDigraph(const Digraph& digraph) {
 		    return ReverseDigraph<const Digraph>(digraph);
+		  }
 		  template <typename _Digraph, typename _NodeFilterMap,
 			    typename _ArcFilterMap, bool checked = true>
-		  class SubDigraphAdaptorBase : public DigraphAdaptorBase<_Digraph> {
+		  template <typename _Digraph, typename _NodeFilterMap,
 		            typename _ArcFilterMap, bool _checked = true>
 		  class SubDigraphBase : public DigraphAdaptorBase<_Digraph> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef _ArcFilterMap ArcFilterMap;
-		    typedef SubDigraphAdaptorBase Adaptor;
+		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<_Digraph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
-		    SubDigraphAdaptorBase()
+		    SubDigraphBase()
 		      : Parent(), _node_filter(0), _arc_filter(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter) {
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
@@ -285,58 +400,64 @@
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    void first(Node& i) const {
 		      Parent::first(i);
-		      while (i != INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i != INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::source(i)]
-			     || !(*_node_filter)[Parent::target(i)])) Parent::next(i);
+		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::source(i)]
 		                              || !(*_node_filter)[Parent::target(i)]))
 		        Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::source(i)])) Parent::nextIn(i);
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::source(i)]))
 		        Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::target(i)])) Parent::nextOut(i);
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::target(i)]))
 		        Parent::nextOut(i);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
-		      while (i != INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i != INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::source(i)]
-			     || !(*_node_filter)[Parent::target(i)])) Parent::next(i);
+		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::source(i)]
 		                              || !(*_node_filter)[Parent::target(i)]))
 		        Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::source(i)])) Parent::nextIn(i);
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::source(i)]))
 		        Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 			     || !(*_node_filter)[Parent::target(i)])) Parent::nextOut(i);
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i != INVALID && (!(*_arc_filter)[i]
 		                              || !(*_node_filter)[Parent::target(i)]))
 		        Parent::nextOut(i);
+		    }
 		    void hide(const Node& n) const { _node_filter->set(n, false); }
 		    void hide(const Arc& a) const { _arc_filter->set(a, false); }
 		    void unHide(const Node& n) const { _node_filter->set(n, true); }
@@ -346,90 +467,90 @@
 		    bool hidden(const Arc& a) const { return !(*_arc_filter)[a]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Digraph> FindEdgeTag;
 		    Arc findArc(const Node& source, const Node& target,
 				const Arc& prev = INVALID) {
 		    Arc findArc(const Node& source, const Node& target,
 		                const Arc& prev = INVALID) {
 		      if (!(*_node_filter)[source] || !(*_node_filter)[target]) {
 		        return INVALID;
+		      }
 		      Arc arc = Parent::findArc(source, target, prev);
 		      while (arc != INVALID && !(*_arc_filter)[arc]) {
 		        arc = Parent::findArc(source, target, arc);
+		      }
 		      return arc;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template NodeMap<_Value> > {
 		    class NodeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
-			return operator=<NodeMap>(cmap);
+		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 			typename Parent::template ArcMap<_Value> > {
 		    class ArcMap : public SubMapExtender<Adaptor,
 		      typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Digraph, typename _NodeFilterMap, typename _ArcFilterMap>
-		  class SubDigraphAdaptorBase<_Digraph, _NodeFilterMap, _ArcFilterMap, false>
+		  class SubDigraphBase<_Digraph, _NodeFilterMap, _ArcFilterMap, false>
 		    : public DigraphAdaptorBase<_Digraph> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef _ArcFilterMap ArcFilterMap;
-		    typedef SubDigraphAdaptorBase Adaptor;
+		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<Digraph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
-		    SubDigraphAdaptorBase()
+		    SubDigraphBase()
 		      : Parent(), _node_filter(0), _arc_filter(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter) {
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
@@ -438,48 +559,48 @@
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    void first(Node& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::next(i);
+		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextIn(i);
+		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextOut(i);
+		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextOut(i);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::next(i);
+		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextIn(i);
+		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
-		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextOut(i);
+		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i!=INVALID && !(*_arc_filter)[i]) Parent::nextOut(i);
+		    }
 		    void hide(const Node& n) const { _node_filter->set(n, false); }
 		    void hide(const Arc& e) const { _arc_filter->set(e, false); }
 		    void unHide(const Node& n) const { _node_filter->set(n, true); }
@@ -489,177 +610,158 @@
 		    bool hidden(const Arc& e) const { return !(*_arc_filter)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Digraph> FindEdgeTag;
 		    Arc findArc(const Node& source, const Node& target,
 				  const Arc& prev = INVALID) {
 		    Arc findArc(const Node& source, const Node& target,
 		                const Arc& prev = INVALID) {
 		      if (!(*_node_filter)[source] || !(*_node_filter)[target]) {
 		        return INVALID;
+		      }
 		      Arc arc = Parent::findArc(source, target, prev);
 		      while (arc != INVALID && !(*_arc_filter)[arc]) {
 		        arc = Parent::findArc(source, target, arc);
+		      }
 		      return arc;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template NodeMap<_Value> > {
 		    class NodeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
-			return operator=<NodeMap>(cmap);
+		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 			typename Parent::template ArcMap<_Value> > {
 		    class ArcMap : public SubMapExtender<Adaptor,
 		      typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief A digraph adaptor for hiding nodes and arcs from a digraph.
 		  ///
 		  /// SubDigraphAdaptor shows the digraph with filtered node-set and
 		  /// arc-set. If the \c checked parameter is true then it filters the arc-set
 		  /// respect to the source and target.
 		  ///
 		  /// If the \c checked template parameter is false then the
 		  /// node-iterator cares only the filter on the node-set, and the
 		  /// arc-iterator cares only the filter on the arc-set.  Therefore
 		  /// the arc-map have to filter all arcs which's source or target is
 		  /// filtered by the node-filter.
 		  ///\code
 		  /// typedef ListDigraph Digraph;
 		  /// DIGRAPH_TYPEDEFS(Digraph);
 		  /// Digraph g;
 		  /// Node u=g.addNode(); //node of id 0
 		  /// Node v=g.addNode(); //node of id 1
 		  /// Arc a=g.addArc(u, v); //arc of id 0
 		  /// Arc f=g.addArc(v, u); //arc of id 1
 		  /// BoolNodeMap nm(g, true);
 		  /// nm.set(u, false);
 		  /// BoolArcMap am(g, true);
 		  /// am.set(a, false);
 		  /// typedef SubDigraphAdaptor<Digraph, BoolNodeMap, BoolArcMap> SubDGA;
 		  /// SubDGA ga(g, nm, am);
 		  /// for (SubDGA::NodeIt n(ga); n!=INVALID; ++n)
 		  ///   std::cout << g.id(n) << std::endl;
 		  /// for (SubDGA::ArcIt a(ga); a!=INVALID; ++a)
 		  ///   std::cout << g.id(a) << std::endl;
 		  ///\endcode
 		  /// The output of the above code is the following.
 		  ///\code
 		  /// 1
 		  /// 1
 		  ///\endcode
 		  /// Note that \c n is of type \c SubDGA::NodeIt, but it can be converted to
 		  /// \c Digraph::Node that is why \c g.id(n) can be applied.
 		  ///
 		  /// For other examples see also the documentation of
 		  /// NodeSubDigraphAdaptor and ArcSubDigraphAdaptor.
 		  template<typename _Digraph,
 			   typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
 			   typename _ArcFilterMap = typename _Digraph::template ArcMap<bool>,
 			   bool checked = true>
 		  class SubDigraphAdaptor :
 		    public DigraphAdaptorExtender<
-		    SubDigraphAdaptorBase<_Digraph, _NodeFilterMap, _ArcFilterMap, checked> > {
+		  /// \brief An adaptor 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
 		  /// 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.
 		  ///
 		  /// \see FilterNodes
 		  /// \see FilterArcs
 		  template<typename _Digraph,
 		           typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
 		           typename _ArcFilterMap = typename _Digraph::template ArcMap<bool>,
 		           bool _checked = true>
 		  class SubDigraph
 		    : public DigraphAdaptorExtender<
 		      SubDigraphBase<_Digraph, _NodeFilterMap, _ArcFilterMap, _checked> > {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef _ArcFilterMap ArcFilterMap;
 		    typedef DigraphAdaptorExtender<
-		      SubDigraphAdaptorBase<Digraph, NodeFilterMap, ArcFilterMap, checked> >
+		      SubDigraphBase<Digraph, NodeFilterMap, ArcFilterMap, _checked> >
 		    Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		  protected:
-		    SubDigraphAdaptor() { }
+		    SubDigraph() { }
 		  public:
 		    /// \brief Constructor
 		    ///
-		    /// Creates a sub-digraph-adaptor for the given digraph with
+		    /// Creates a subdigraph for the given digraph with
 		    /// given node and arc map filters.
 		    SubDigraphAdaptor(Digraph& digraph, NodeFilterMap& node_filter,
 				      ArcFilterMap& arc_filter) {
 		    SubDigraph(Digraph& digraph, NodeFilterMap& node_filter,
 		               ArcFilterMap& arc_filter) {
 		      setDigraph(digraph);
 		      setNodeFilterMap(node_filter);
 		      setArcFilterMap(arc_filter);
+		    }
 		    /// \brief Hides the node of the graph
 		    ///
 		    /// 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
 		    /// 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.
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    /// \brief Hides the arc of the graph
 		    ///
-		    /// This function hides \c a in the digraph, i.e. the iteration
 		    /// 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.
 		    void hide(const Arc& a) const { Parent::hide(a); }
 		    /// \brief Unhides the node of the graph
 		    ///
 		    /// 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
 		    /// 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
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    /// \brief Unhides the arc of the graph
 		    ///
 		    /// 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
 		    /// 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
 		    void unHide(const Arc& a) const { Parent::unHide(a); }
 		    /// \brief Returns true if \c n is hidden.
 		    ///
 		    /// Returns true if \c n is hidden.
@@ -671,370 +773,928 @@
 		    /// Returns true if \c a is hidden.
 		    ///
 		    bool hidden(const Arc& a) const { return Parent::hidden(a); }
 		  };
-		  /// \brief Just gives back a sub-digraph-adaptor
+		  /// \brief Just gives back a subdigraph
 		  ///
-		  /// Just gives back a sub-digraph-adaptor
+		  /// Just gives back a subdigraph
 		  template<typename Digraph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubDigraphAdaptor<const Digraph, NodeFilterMap, ArcFilterMap>
 		  subDigraphAdaptor(const Digraph& digraph,
 				    NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraphAdaptor<const Digraph, NodeFilterMap, ArcFilterMap>
 		  SubDigraph<const Digraph, NodeFilterMap, ArcFilterMap>
 		  subDigraph(const Digraph& digraph, NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraph<const Digraph, NodeFilterMap, ArcFilterMap>
 		      (digraph, nfm, afm);
+		  }
 		  template<typename Digraph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubDigraphAdaptor<const Digraph, const NodeFilterMap, ArcFilterMap>
 		  subDigraphAdaptor(const Digraph& digraph,
 		                   NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraphAdaptor<const Digraph, const NodeFilterMap, ArcFilterMap>
 		  SubDigraph<const Digraph, const NodeFilterMap, ArcFilterMap>
 		  subDigraph(const Digraph& digraph,
 		             const NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraph<const Digraph, const NodeFilterMap, ArcFilterMap>
 		      (digraph, nfm, afm);
+		  }
 		  template<typename Digraph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubDigraphAdaptor<const Digraph, NodeFilterMap, const ArcFilterMap>
 		  subDigraphAdaptor(const Digraph& digraph,
 		                   NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraphAdaptor<const Digraph, NodeFilterMap, const ArcFilterMap>
 		  SubDigraph<const Digraph, NodeFilterMap, const ArcFilterMap>
 		  subDigraph(const Digraph& digraph,
 		             NodeFilterMap& nfm, const ArcFilterMap& afm) {
 		    return SubDigraph<const Digraph, NodeFilterMap, const ArcFilterMap>
 		      (digraph, nfm, afm);
+		  }
 		  template<typename Digraph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubDigraphAdaptor<const Digraph, const NodeFilterMap, const ArcFilterMap>
 		  subDigraphAdaptor(const Digraph& digraph,
 		                   NodeFilterMap& nfm, ArcFilterMap& afm) {
 		    return SubDigraphAdaptor<const Digraph, const NodeFilterMap,
 		  SubDigraph<const Digraph, const NodeFilterMap, const ArcFilterMap>
 		  subDigraph(const Digraph& digraph,
 		             const NodeFilterMap& nfm, const ArcFilterMap& afm) {
 		    return SubDigraph<const Digraph, const NodeFilterMap,
 		      const ArcFilterMap>(digraph, nfm, afm);
+		  }
 		  ///\ingroup graph_adaptors
 		  template <typename _Graph, typename NodeFilterMap,
 		            typename EdgeFilterMap, bool _checked = true>
 		  class SubGraphBase : public GraphAdaptorBase<_Graph> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    SubGraphBase()
 		      : Parent(), _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
 		      _edge_filter_map=&edge_filter_map;
+		    }
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		        Parent::next(i);
+		    }
 		    void first(Edge& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
 		                            || !(*_node_filter_map)[Parent::v(i)]))
 		        Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]))
 		        Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		        Parent::nextOut(i);
+		    }
 		    void firstInc(Edge& i, bool& d, const Node& n) const {
 		      Parent::firstInc(i, d, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
 		                            || !(*_node_filter_map)[Parent::v(i)]))
 		        Parent::nextInc(i, d);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		        Parent::next(i);
+		    }
 		    void next(Edge& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
 		                            || !(*_node_filter_map)[Parent::v(i)]))
 		        Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::source(i)]))
 		        Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		        Parent::nextOut(i);
+		    }
 		    void nextInc(Edge& i, bool& d) const {
 		      Parent::nextInc(i, d);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::u(i)]
 		                            || !(*_node_filter_map)[Parent::v(i)]))
 		        Parent::nextInc(i, d);
+		    }
 		    void hide(const Node& n) const { _node_filter_map->set(n, false); }
 		    void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
 		    void unHide(const Node& n) const { _node_filter_map->set(n, true); }
 		    void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
 		    bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
 		    bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) {
 		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
 		        return INVALID;
+		      }
 		      Arc arc = Parent::findArc(u, v, prev);
 		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    Edge findEdge(const Node& u, const Node& v,
 		                  const Edge& prev = INVALID) {
 		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
 		        return INVALID;
+		      }
 		      Edge edge = Parent::findEdge(u, v, prev);
 		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 		      typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template EdgeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Graph, typename NodeFilterMap, typename EdgeFilterMap>
 		  class SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap, false>
 		    : public GraphAdaptorBase<_Graph> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef SubGraphBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    SubGraphBase() : Parent(),
 		                     _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
 		      _edge_filter_map=&edge_filter_map;
+		    }
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Edge& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		    }
 		    void firstInc(Edge& i, bool& d, const Node& n) const {
 		      Parent::firstInc(i, d, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Edge& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		    }
 		    void nextInc(Edge& i, bool& d) const {
 		      Parent::nextInc(i, d);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		    }
 		    void hide(const Node& n) const { _node_filter_map->set(n, false); }
 		    void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
 		    void unHide(const Node& n) const { _node_filter_map->set(n, true); }
 		    void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
 		    bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
 		    bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) {
 		      Arc arc = Parent::findArc(u, v, prev);
 		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    Edge findEdge(const Node& u, const Node& v,
 		                  const Edge& prev = INVALID) {
 		      Edge edge = Parent::findEdge(u, v, prev);
 		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 		      typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
 		      typename Parent::template EdgeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 		        : MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const _Value& value)
 		        : MapParent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
-		  ///\brief An adaptor for hiding nodes from a digraph.
+		  /// \brief A graph adaptor for hiding nodes and edges in an
 		  /// undirected graph.
 		  ///
 		  ///An adaptor for hiding nodes from a digraph.  This adaptor
 		  ///specializes SubDigraphAdaptor in the way that only the node-set
 		  ///can be filtered. In usual case the checked parameter is true, we
 		  ///get the induced subgraph. But if the checked parameter is false
 		  ///then we can filter only isolated nodes.
 		  template<typename _Digraph,
 			   typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
 			   bool checked = true>
 		  class NodeSubDigraphAdaptor :
 		    public SubDigraphAdaptor<_Digraph, _NodeFilterMap,
-					     ConstMap<typename _Digraph::Arc, bool>, checked> {
+		  /// 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
 		  /// 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.
 		  ///
 		  /// \see FilterNodes
 		  /// \see FilterEdges
 		  template<typename _Graph, typename NodeFilterMap,
 		           typename EdgeFilterMap, bool _checked = true>
 		  class SubGraph
 		    : public GraphAdaptorExtender<
 		      SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap, _checked> > {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef SubDigraphAdaptor<Digraph, NodeFilterMap,
 					      ConstMap<typename Digraph::Arc, bool>, checked>
-		    Parent;
+		    typedef _Graph Graph;
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<_Graph, NodeFilterMap, EdgeFilterMap> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Edge Edge;
 		  protected:
 		    ConstMap<typename Digraph::Arc, bool> const_true_map;
 		    NodeSubDigraphAdaptor() : const_true_map(true) {
 		      Parent::setArcFilterMap(const_true_map);
+		    }
 		    SubGraph() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a node-sub-digraph-adaptor for the given digraph with
 		    /// given node map filter.
 		    NodeSubDigraphAdaptor(Digraph& _digraph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map(true) {
 		      Parent::setDigraph(_digraph);
 		      Parent::setNodeFilterMap(node_filter);
-		      Parent::setArcFilterMap(const_true_map);
+		    /// Creates a subgraph for the given graph with given node and
 		    /// edge map filters.
 		    SubGraph(Graph& _graph, NodeFilterMap& node_filter_map,
 		             EdgeFilterMap& edge_filter_map) {
 		      setGraph(_graph);
 		      setNodeFilterMap(node_filter_map);
 		      setEdgeFilterMap(edge_filter_map);
+		    }
 		    /// \brief Hides the node of the graph
 		    ///
 		    /// 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
 		    /// 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.
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    /// \brief Hides the edge of the graph
 		    ///
 		    /// 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.
 		    void hide(const Edge& e) const { Parent::hide(e); }
 		    /// \brief Unhides the node of the graph
 		    ///
 		    /// 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
 		    /// 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
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    /// \brief Unhides the edge of the graph
 		    ///
 		    /// 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
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
 		    /// \brief Returns true if \c n is hidden.
 		    ///
 		    /// Returns true if \c n 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.
 		    ///
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
 		  };
 		  /// \brief Just gives back a  node-sub-digraph adaptor
 		  /// \brief Just gives back a subgraph
 		  ///
-		  /// Just gives back a node-sub-digraph adaptor
+		  /// Just gives back a subgraph
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraph<const Graph, NodeFilterMap, ArcFilterMap>
 		  subGraph(const Graph& graph, NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraph<const Graph, NodeFilterMap, ArcFilterMap>(graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraph<const Graph, const NodeFilterMap, ArcFilterMap>
 		  subGraph(const Graph& graph,
 		           const NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraph<const Graph, const NodeFilterMap, ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraph<const Graph, NodeFilterMap, const ArcFilterMap>
 		  subGraph(const Graph& graph,
 		           NodeFilterMap& nfm, const ArcFilterMap& efm) {
 		    return SubGraph<const Graph, NodeFilterMap, const ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraph<const Graph, const NodeFilterMap, const ArcFilterMap>
 		  subGraph(const Graph& graph,
 		           const NodeFilterMap& nfm, const ArcFilterMap& efm) {
 		    return SubGraph<const Graph, const NodeFilterMap, const ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief An adaptor for hiding nodes from 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.
 		  ///
 		  /// \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.
 		#ifdef DOXYGEN
 		  template<typename _Digraph,
 		           typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
 		           bool _checked = true>
 		#else
 		  template<typename _Digraph,
 		           typename _NodeFilterMap = typename _Digraph::template NodeMap<bool>,
 		           bool _checked = true,
 		           typename Enable = void>
 		#endif
 		  class FilterNodes
 		    : public SubDigraph<_Digraph, _NodeFilterMap,
 		                        ConstMap<typename _Digraph::Arc, bool>, _checked> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef SubDigraph<Digraph, NodeFilterMap,
 		                       ConstMap<typename Digraph::Arc, bool>, _checked>
 		    Parent;
 		    typedef typename Parent::Node Node;
 		  protected:
 		    ConstMap<typename Digraph::Arc, bool> const_true_map;
 		    FilterNodes() : const_true_map(true) {
 		      Parent::setArcFilterMap(const_true_map);
+		    }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates an adaptor for the given digraph or graph with
 		    /// given node filter map.
 		    FilterNodes(Digraph& _digraph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map(true) {
 		      Parent::setDigraph(_digraph);
 		      Parent::setNodeFilterMap(node_filter);
 		      Parent::setArcFilterMap(const_true_map);
+		    }
 		    /// \brief Hides the node of the graph
 		    ///
 		    /// 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.
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    /// \brief Unhides the node of the graph
 		    ///
 		    /// 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
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    /// \brief Returns true if \c n is hidden.
 		    ///
 		    /// Returns true if \c n is hidden.
 		    ///
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		  };
 		  template<typename _Graph, typename _NodeFilterMap, bool _checked>
 		  class FilterNodes<_Graph, _NodeFilterMap, _checked,
 		                    typename enable_if<UndirectedTagIndicator<_Graph> >::type>
 		    : public SubGraph<_Graph, _NodeFilterMap,
 		                      ConstMap<typename _Graph::Edge, bool>, _checked> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef SubGraph<Graph, NodeFilterMap,
 		                     ConstMap<typename Graph::Edge, bool> > Parent;
 		    typedef typename Parent::Node Node;
 		  protected:
 		    ConstMap<typename Graph::Edge, bool> const_true_map;
 		    FilterNodes() : const_true_map(true) {
 		      Parent::setEdgeFilterMap(const_true_map);
+		    }
 		  public:
 		    FilterNodes(Graph& _graph, NodeFilterMap& node_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(_graph);
 		      Parent::setNodeFilterMap(node_filter_map);
 		      Parent::setEdgeFilterMap(const_true_map);
+		    }
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		  };
 		  /// \brief Just gives back a FilterNodes adaptor
 		  ///
 		  /// Just gives back a FilterNodes adaptor
 		  template<typename Digraph, typename NodeFilterMap>
 		  NodeSubDigraphAdaptor<const Digraph, NodeFilterMap>
 		  nodeSubDigraphAdaptor(const Digraph& digraph, NodeFilterMap& nfm) {
-		    return NodeSubDigraphAdaptor<const Digraph, NodeFilterMap>(digraph, nfm);
+		  FilterNodes<const Digraph, NodeFilterMap>
 		  filterNodes(const Digraph& digraph, NodeFilterMap& nfm) {
 		    return FilterNodes<const Digraph, NodeFilterMap>(digraph, nfm);
+		  }
 		  template<typename Digraph, typename NodeFilterMap>
 		  NodeSubDigraphAdaptor<const Digraph, const NodeFilterMap>
 		  nodeSubDigraphAdaptor(const Digraph& digraph, const NodeFilterMap& nfm) {
 		    return NodeSubDigraphAdaptor<const Digraph, const NodeFilterMap>
 		      (digraph, nfm);
 		  FilterNodes<const Digraph, const NodeFilterMap>
 		  filterNodes(const Digraph& digraph, const NodeFilterMap& nfm) {
 		    return FilterNodes<const Digraph, const NodeFilterMap>(digraph, nfm);
+		  }
 		  ///\ingroup graph_adaptors
+		  /// \ingroup graph_adaptors
 		  ///
 		  ///\brief An adaptor for hiding arcs from a digraph.
+		  /// \brief An adaptor for hiding arcs from a digraph.
 		  ///
 		  ///An adaptor for hiding arcs from a digraph. This adaptor
 		  ///specializes SubDigraphAdaptor in the way that only the arc-set
 		  ///can be filtered. The usefulness of this adaptor is demonstrated
 		  ///in the problem of searching a maximum number of arc-disjoint
 		  ///shortest paths between two nodes \c s and \c t. Shortest here
 		  ///means being shortest with respect to non-negative
 		  ///arc-lengths. Note that the comprehension of the presented
 		  ///solution need's some elementary knowledge from combinatorial
-		  ///optimization.
+		  /// 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".
 		  ///
 		  ///If a single shortest path is to be searched between \c s and \c
 		  ///t, then this can be done easily by applying the Dijkstra
 		  ///algorithm. What happens, if a maximum number of arc-disjoint
 		  ///shortest paths is to be computed. It can be proved that an arc
 		  ///can be in a shortest path if and only if it is tight with respect
 		  ///to the potential function computed by Dijkstra.  Moreover, any
 		  ///path containing only such arcs is a shortest one.  Thus we have
 		  ///to compute a maximum number of arc-disjoint paths between \c s
 		  ///and \c t in the digraph which has arc-set all the tight arcs. The
 		  ///computation will be demonstrated on the following digraph, which
 		  ///is read from the dimacs file \c sub_digraph_adaptor_demo.dim.
 		  ///The full source code is available in \ref
 		  ///sub_digraph_adaptor_demo.cc.  If you are interested in more demo
 		  ///programs, you can use \ref dim_to_dot.cc to generate .dot files
 		  ///from dimacs files.  The .dot file of the following figure was
 		  ///generated by the demo program \ref dim_to_dot.cc.
 		  ///
 		  ///\dot
 		  ///digraph lemon_dot_example {
 		  ///node [ shape=ellipse, fontname=Helvetica, fontsize=10 ];
 		  ///n0 [ label="0 (s)" ];
 		  ///n1 [ label="1" ];
 		  ///n2 [ label="2" ];
 		  ///n3 [ label="3" ];
 		  ///n4 [ label="4" ];
 		  ///n5 [ label="5" ];
 		  ///n6 [ label="6 (t)" ];
 		  ///arc [ shape=ellipse, fontname=Helvetica, fontsize=10 ];
 		  ///n5 ->  n6 [ label="9, length:4" ];
 		  ///n4 ->  n6 [ label="8, length:2" ];
 		  ///n3 ->  n5 [ label="7, length:1" ];
 		  ///n2 ->  n5 [ label="6, length:3" ];
 		  ///n2 ->  n6 [ label="5, length:5" ];
 		  ///n2 ->  n4 [ label="4, length:2" ];
 		  ///n1 ->  n4 [ label="3, length:3" ];
 		  ///n0 ->  n3 [ label="2, length:1" ];
 		  ///n0 ->  n2 [ label="1, length:2" ];
 		  ///n0 ->  n1 [ label="0, length:3" ];
 		  ///}
 		  ///\enddot
 		  ///
 		  ///\code
 		  ///Digraph g;
 		  ///Node s, t;
 		  ///LengthMap length(g);
 		  ///
 		  ///readDimacs(std::cin, g, length, s, t);
 		  ///
 		  ///cout << "arcs with lengths (of form id, source--length->target): " << endl;
 		  ///for(ArcIt e(g); e!=INVALID; ++e)
 		  ///  cout << g.id(e) << ", " << g.id(g.source(e)) << "--"
 		  ///       << length[e] << "->" << g.id(g.target(e)) << endl;
 		  ///
 		  ///cout << "s: " << g.id(s) << " t: " << g.id(t) << endl;
 		  ///\endcode
 		  ///Next, the potential function is computed with Dijkstra.
 		  ///\code
 		  ///typedef Dijkstra<Digraph, LengthMap> Dijkstra;
 		  ///Dijkstra dijkstra(g, length);
 		  ///dijkstra.run(s);
 		  ///\endcode
 		  ///Next, we consrtruct a map which filters the arc-set to the tight arcs.
 		  ///\code
 		  ///typedef TightArcFilterMap<Digraph, const Dijkstra::DistMap, LengthMap>
 		  ///  TightArcFilter;
 		  ///TightArcFilter tight_arc_filter(g, dijkstra.distMap(), length);
 		  ///
 		  ///typedef ArcSubDigraphAdaptor<Digraph, TightArcFilter> SubGA;
 		  ///SubGA ga(g, tight_arc_filter);
 		  ///\endcode
 		  ///Then, the maximum nimber of arc-disjoint \c s-\c t paths are computed
 		  ///with a max flow algorithm Preflow.
 		  ///\code
 		  ///ConstMap<Arc, int> const_1_map(1);
 		  ///Digraph::ArcMap<int> flow(g, 0);
 		  ///
 		  ///Preflow<SubGA, ConstMap<Arc, int>, Digraph::ArcMap<int> >
 		  ///  preflow(ga, const_1_map, s, t);
 		  ///preflow.run();
 		  ///\endcode
 		  ///Last, the output is:
 		  ///\code
 		  ///cout << "maximum number of arc-disjoint shortest path: "
 		  ///     << preflow.flowValue() << endl;
 		  ///cout << "arcs of the maximum number of arc-disjoint shortest s-t paths: "
 		  ///     << endl;
 		  ///for(ArcIt e(g); e!=INVALID; ++e)
 		  ///  if (preflow.flow(e))
 		  ///    cout << " " << g.id(g.source(e)) << "--"
 		  ///         << length[e] << "->" << g.id(g.target(e)) << endl;
 		  ///\endcode
 		  ///The program has the following (expected :-)) output:
 		  ///\code
 		  ///arcs with lengths (of form id, source--length->target):
 		  /// 9, 5--4->6
 		  /// 8, 4--2->6
 		  /// 7, 3--1->5
 		  /// 6, 2--3->5
 		  /// 5, 2--5->6
 		  /// 4, 2--2->4
 		  /// 3, 1--3->4
 		  /// 2, 0--1->3
 		  /// 1, 0--2->2
 		  /// 0, 0--3->1
 		  ///s: 0 t: 6
 		  ///maximum number of arc-disjoint shortest path: 2
 		  ///arcs of the maximum number of arc-disjoint shortest s-t paths:
 		  /// 9, 5--4->6
 		  /// 8, 4--2->6
 		  /// 7, 3--1->5
 		  /// 4, 2--2->4
 		  /// 2, 0--1->3
 		  /// 1, 0--2->2
 		  ///\endcode
 		  /// \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>
 		  class ArcSubDigraphAdaptor :
 		    public SubDigraphAdaptor<_Digraph, ConstMap<typename _Digraph::Node, bool>,
-					     _ArcFilterMap, false> {
+		  class FilterArcs :
 		    public SubDigraph<_Digraph, ConstMap<typename _Digraph::Node, bool>,
 		                      _ArcFilterMap, false> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _ArcFilterMap ArcFilterMap;
 		    typedef SubDigraphAdaptor<Digraph, ConstMap<typename Digraph::Node, bool>,
 					      ArcFilterMap, false> Parent;
 		    typedef SubDigraph<Digraph, ConstMap<typename Digraph::Node, bool>,
 		                       ArcFilterMap, false> Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    ConstMap<typename Digraph::Node, bool> const_true_map;
-		    ArcSubDigraphAdaptor() : const_true_map(true) {
+		    FilterArcs() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
 		  public:
 		    /// \brief Constructor
 		    ///
-		    /// Creates a arc-sub-digraph-adaptor for the given digraph with
+		    /// Creates a FilterArcs adaptor for the given graph with
 		    /// given arc map filter.
 		    ArcSubDigraphAdaptor(Digraph& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map(true) {
 		    FilterArcs(Digraph& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map(true) {
 		      Parent::setDigraph(digraph);
 		      Parent::setNodeFilterMap(const_true_map);
 		      Parent::setArcFilterMap(arc_filter);
+		    }
 		    /// \brief Hides the arc of the graph
 		    ///
-		    /// This function hides \c a in the digraph, i.e. the iteration
+		    /// 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.
+		    /// to be false in the corresponding arc map.
 		    void hide(const Arc& a) const { Parent::hide(a); }
 		    /// \brief Unhides the arc of the graph
 		    ///
 		    /// 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
 		    /// 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
 		    void unHide(const Arc& a) const { Parent::unHide(a); }
 		    /// \brief Returns true if \c a is hidden.
 		    ///
 		    /// Returns true if \c a is hidden.
 		    ///
 		    bool hidden(const Arc& a) const { return Parent::hidden(a); }
 		  };
-		  /// \brief Just gives back an arc-sub-digraph adaptor
+		  /// \brief Just gives back an FilterArcs adaptor
 		  ///
-		  /// Just gives back an arc-sub-digraph adaptor
+		  /// Just gives back an FilterArcs adaptor
 		  template<typename Digraph, typename ArcFilterMap>
 		  ArcSubDigraphAdaptor<const Digraph, ArcFilterMap>
 		  arcSubDigraphAdaptor(const Digraph& digraph, ArcFilterMap& afm) {
-		    return ArcSubDigraphAdaptor<const Digraph, ArcFilterMap>(digraph, afm);
+		  FilterArcs<const Digraph, ArcFilterMap>
 		  filterArcs(const Digraph& digraph, ArcFilterMap& afm) {
 		    return FilterArcs<const Digraph, ArcFilterMap>(digraph, afm);
+		  }
 		  template<typename Digraph, typename ArcFilterMap>
 		  ArcSubDigraphAdaptor<const Digraph, const ArcFilterMap>
 		  arcSubDigraphAdaptor(const Digraph& digraph, const ArcFilterMap& afm) {
 		    return ArcSubDigraphAdaptor<const Digraph, const ArcFilterMap>
 		      (digraph, afm);
 		  FilterArcs<const Digraph, const ArcFilterMap>
 		  filterArcs(const Digraph& digraph, const ArcFilterMap& afm) {
 		    return FilterArcs<const Digraph, const ArcFilterMap>(digraph, afm);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief An adaptor for hiding edges from 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".
 		  ///
 		  /// \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>
 		  class FilterEdges :
 		    public SubGraph<_Graph, ConstMap<typename _Graph::Node,bool>,
 		                    _EdgeFilterMap, false> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _EdgeFilterMap EdgeFilterMap;
 		    typedef SubGraph<Graph, ConstMap<typename Graph::Node,bool>,
 		                     EdgeFilterMap, false> Parent;
 		    typedef typename Parent::Edge Edge;
 		  protected:
 		    ConstMap<typename Graph::Node, bool> const_true_map;
 		    FilterEdges() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a FilterEdges adaptor for the given graph with
 		    /// given edge map filters.
 		    FilterEdges(Graph& _graph, EdgeFilterMap& edge_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(_graph);
 		      Parent::setNodeFilterMap(const_true_map);
 		      Parent::setEdgeFilterMap(edge_filter_map);
+		    }
 		    /// \brief Hides the edge of the graph
 		    ///
 		    /// 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.
 		    void hide(const Edge& e) const { Parent::hide(e); }
 		    /// \brief Unhides the edge of the graph
 		    ///
 		    /// 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
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
 		    /// \brief Returns true if \c e is hidden.
 		    ///
 		    /// Returns true if \c e is hidden.
 		    ///
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
 		  };
 		  /// \brief Just gives back a FilterEdges adaptor
 		  ///
 		  /// Just gives back a FilterEdges adaptor
 		  template<typename Graph, typename EdgeFilterMap>
 		  FilterEdges<const Graph, EdgeFilterMap>
 		  filterEdges(const Graph& graph, EdgeFilterMap& efm) {
 		    return FilterEdges<const Graph, EdgeFilterMap>(graph, efm);
+		  }
 		  template<typename Graph, typename EdgeFilterMap>
 		  FilterEdges<const Graph, const EdgeFilterMap>
 		  filterEdges(const Graph& graph, const EdgeFilterMap& efm) {
 		    return FilterEdges<const Graph, const EdgeFilterMap>(graph, efm);
+		  }
 		  template <typename _Digraph>
-		  class UndirDigraphAdaptorBase {
+		  class UndirectorBase {
 		  public:
 		    typedef _Digraph Digraph;
-		    typedef UndirDigraphAdaptorBase Adaptor;
+		    typedef UndirectorBase Adaptor;
 		    typedef True UndirectedTag;
 		    typedef typename Digraph::Arc Edge;
 		    typedef typename Digraph::Node Node;
 		    class Arc : public Edge {
-		      friend class UndirDigraphAdaptorBase;
+		      friend class UndirectorBase;
 		    protected:
 		      bool _forward;
 		      Arc(const Edge& edge, bool forward) :
 		        Edge(edge), _forward(forward) {}
 		    public:
 		      Arc() {}
 		      Arc(Invalid) : Edge(INVALID), _forward(true) {}
 		      bool operator==(const Arc &other) const {
 			return _forward == other._forward &&
 			  static_cast<const Edge&>(*this) == static_cast<const Edge&>(other);
 		        return _forward == other._forward &&
 		          static_cast<const Edge&>(*this) == static_cast<const Edge&>(other);
+		      }
 		      bool operator!=(const Arc &other) const {
 			return _forward != other._forward ||
 			  static_cast<const Edge&>(*this) != static_cast<const Edge&>(other);
 		        return _forward != other._forward ||
 		          static_cast<const Edge&>(*this) != static_cast<const Edge&>(other);
+		      }
 		      bool operator<(const Arc &other) const {
 			return _forward < other._forward ||
 			  (_forward == other._forward &&
-			   static_cast<const Edge&>(*this) < static_cast<const Edge&>(other));
+		        return _forward < other._forward ||
 		          (_forward == other._forward &&
 		           static_cast<const Edge&>(*this) < static_cast<const Edge&>(other));
+		      }
 		    };
 		    void first(Node& n) const {
@@ -1049,16 +1709,16 @@
 		      _digraph->first(a);
 		      a._forward = true;
+		    }
 		    void next(Arc& a) const {
 		      if (a._forward) {
-			a._forward = false;
+		        a._forward = false;
 		      } else {
 			_digraph->next(a);
 			a._forward = true;
 		        _digraph->next(a);
 		        a._forward = true;
+		      }
+		    }
 		    void first(Edge& e) const {
 		      _digraph->first(e);
+		    }
@@ -1067,52 +1727,52 @@
 		      _digraph->next(e);
+		    }
 		    void firstOut(Arc& a, const Node& n) const {
 		      _digraph->firstIn(a, n);
 		      if( static_cast<const Edge&>(a) != INVALID ) {
-			a._forward = false;
+		        a._forward = false;
 		      } else {
 			_digraph->firstOut(a, n);
 			a._forward = true;
 		        _digraph->firstOut(a, n);
 		        a._forward = true;
+		      }
+		    }
 		    void nextOut(Arc &a) const {
 		      if (!a._forward) {
 			Node n = _digraph->target(a);
 			_digraph->nextIn(a);
 			if (static_cast<const Edge&>(a) == INVALID ) {
 			  _digraph->firstOut(a, n);
 			  a._forward = true;
+			}
 		        Node n = _digraph->target(a);
 		        _digraph->nextIn(a);
 		        if (static_cast<const Edge&>(a) == INVALID ) {
 		          _digraph->firstOut(a, n);
 		          a._forward = true;
+		        }
+		      }
 		      else {
-			_digraph->nextOut(a);
+		        _digraph->nextOut(a);
+		      }
+		    }
 		    void firstIn(Arc &a, const Node &n) const {
 		      _digraph->firstOut(a, n);
 		      if (static_cast<const Edge&>(a) != INVALID ) {
-			a._forward = false;
+		        a._forward = false;
 		      } else {
 			_digraph->firstIn(a, n);
 			a._forward = true;
 		        _digraph->firstIn(a, n);
 		        a._forward = true;
+		      }
+		    }
 		    void nextIn(Arc &a) const {
 		      if (!a._forward) {
 			Node n = _digraph->source(a);
 			_digraph->nextOut(a);
 			if( static_cast<const Edge&>(a) == INVALID ) {
 			  _digraph->firstIn(a, n);
 			  a._forward = true;
+			}
 		        Node n = _digraph->source(a);
 		        _digraph->nextOut(a);
 		        if( static_cast<const Edge&>(a) == INVALID ) {
 		          _digraph->firstIn(a, n);
 		          a._forward = true;
+		        }
+		      }
 		      else {
-			_digraph->nextIn(a);
+		        _digraph->nextIn(a);
+		      }
+		    }
 		    void firstInc(Edge &e, bool &d, const Node &n) const {
 		      d = true;
 		      _digraph->firstOut(e, n);
@@ -1120,19 +1780,19 @@
 		      d = false;
 		      _digraph->firstIn(e, n);
+		    }
 		    void nextInc(Edge &e, bool &d) const {
 		      if (d) {
 			Node s = _digraph->source(e);
 			_digraph->nextOut(e);
 			if (e != INVALID) return;
 			d = false;
-			_digraph->firstIn(e, s);
+		        Node s = _digraph->source(e);
 		        _digraph->nextOut(e);
 		        if (e != INVALID) return;
 		        d = false;
 		        _digraph->firstIn(e, s);
 		      } else {
-			_digraph->nextIn(e);
+		        _digraph->nextIn(e);
+		      }
+		    }
 		    Node u(const Edge& e) const {
 		      return _digraph->source(e);
+		    }
@@ -1172,42 +1832,42 @@
 		    int maxNodeId() const { return _digraph->maxNodeId(); }
 		    int maxArcId() const { return (_digraph->maxArcId() << 1) | 1; }
 		    int maxEdgeId() const { return _digraph->maxArcId(); }
 		    Node addNode() { return _digraph->addNode(); }
 		    Edge addEdge(const Node& u, const Node& v) {
 		      return _digraph->addArc(u, v);
 		    Edge addEdge(const Node& u, const Node& v) {
 		      return _digraph->addArc(u, v);
+		    }
 		    void erase(const Node& i) { _digraph->erase(i); }
 		    void erase(const Edge& i) { _digraph->erase(i); }
 		    void clear() { _digraph->clear(); }
 		    typedef NodeNumTagIndicator<Digraph> NodeNumTag;
 		    int nodeNum() const { return 2 * _digraph->arcNum(); }
 		    typedef EdgeNumTagIndicator<Digraph> EdgeNumTag;
 		    int arcNum() const { return 2 * _digraph->arcNum(); }
 		    int edgeNum() const { return _digraph->arcNum(); }
 		    typedef FindEdgeTagIndicator<Digraph> FindEdgeTag;
 		    Arc findArc(Node s, Node t, Arc p = INVALID) const {
 		      if (p == INVALID) {
 			Edge arc = _digraph->findArc(s, t);
 			if (arc != INVALID) return direct(arc, true);
 			arc = _digraph->findArc(t, s);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = _digraph->findArc(s, t);
 		        if (arc != INVALID) return direct(arc, true);
 		        arc = _digraph->findArc(t, s);
 		        if (arc != INVALID) return direct(arc, false);
 		      } else if (direction(p)) {
 			Edge arc = _digraph->findArc(s, t, p);
 			if (arc != INVALID) return direct(arc, true);
 			arc = _digraph->findArc(t, s);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = _digraph->findArc(s, t, p);
 		        if (arc != INVALID) return direct(arc, true);
 		        arc = _digraph->findArc(t, s);
 		        if (arc != INVALID) return direct(arc, false);
 		      } else {
 			Edge arc = _digraph->findArc(t, s, p);
 			if (arc != INVALID) return direct(arc, false);
 		        Edge arc = _digraph->findArc(t, s, p);
 		        if (arc != INVALID) return direct(arc, false);
+		      }
 		      return INVALID;
+		    }
 		    Edge findEdge(Node s, Node t, Edge p = INVALID) const {
 		      if (s != t) {
@@ -1217,142 +1877,142 @@
 		          arc = _digraph->findArc(t, s);
 		          if (arc != INVALID) return arc;
 		        } else if (_digraph->s(p) == s) {
 		          Edge arc = _digraph->findArc(s, t, p);
 		          if (arc != INVALID) return arc;
 		          arc = _digraph->findArc(t, s);
-		          if (arc != INVALID) return arc;
 		          if (arc != INVALID) return arc;
 		        } else {
 		          Edge arc = _digraph->findArc(t, s, p);
-		          if (arc != INVALID) return arc;
 		          if (arc != INVALID) return arc;
+		        }
 		      } else {
 		        return _digraph->findArc(s, t, p);
+		      }
 		      return INVALID;
+		    }
 		  private:
 		    template <typename _Value>
 		    class ArcMapBase {
 		    private:
 		      typedef typename Digraph::template ArcMap<_Value> MapImpl;
 		    public:
 		      typedef typename MapTraits<MapImpl>::ReferenceMapTag ReferenceMapTag;
 		      typedef _Value Value;
 		      typedef Arc Key;
 		      ArcMapBase(const Adaptor& adaptor) :
 			_forward(*adaptor._digraph), _backward(*adaptor._digraph) {}
-		      ArcMapBase(const Adaptor& adaptor, const Value& v)
+		        _forward(*adaptor._digraph), _backward(*adaptor._digraph) {}
 		      ArcMapBase(const Adaptor& adaptor, const Value& v)
 		        : _forward(*adaptor._digraph, v), _backward(*adaptor._digraph, v) {}
 		      void set(const Arc& a, const Value& v) {
 			if (direction(a)) {
 			  _forward.set(a, v);
 		        } else {
 			  _backward.set(a, v);
+		        }
+		      }
 		      typename MapTraits<MapImpl>::ConstReturnValue
 		      operator[](const Arc& a) const {
 			if (direction(a)) {
 			  return _forward[a];
 			} else {
-			  return _backward[a];
 		      void set(const Arc& a, const Value& v) {
 		        if (direction(a)) {
 		          _forward.set(a, v);
 		        } else {
 		          _backward.set(a, v);
+		        }
+		      }
 		      typename MapTraits<MapImpl>::ReturnValue
 		      operator[](const Arc& a) {
 			if (direction(a)) {
 			  return _forward[a];
 			} else {
 			  return _backward[a];
 		      typename MapTraits<MapImpl>::ConstReturnValue
 		      operator[](const Arc& a) const {
 		        if (direction(a)) {
 		          return _forward[a];
 		        } else {
 		          return _backward[a];
+		        }
+		      }
 		      typename MapTraits<MapImpl>::ReturnValue
 		      operator[](const Arc& a) {
 		        if (direction(a)) {
 		          return _forward[a];
 		        } else {
 		          return _backward[a];
+		        }
+		      }
 		    protected:
-		      MapImpl _forward, _backward;
 		      MapImpl _forward, _backward;
 		    };
 		  public:
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template NodeMap<Value> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 			: Parent(*adaptor._digraph) {}
 		      explicit NodeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      NodeMap(const Adaptor& adaptor, const _Value& value)
-			: Parent(*adaptor._digraph, value) { }
+		        : Parent(*adaptor._digraph, value) { }
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      ArcMap(const Adaptor& adaptor)
 			: Parent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: Parent(adaptor, value) {}
 		      ArcMap(const Adaptor& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public Digraph::template ArcMap<_Value> {
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template ArcMap<Value> Parent;
 		      explicit EdgeMap(const Adaptor& adaptor)
-			: Parent(*adaptor._digraph) {}
 		      explicit EdgeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
 		      EdgeMap(const Adaptor& adaptor, const Value& value)
-			: Parent(*adaptor._digraph, value) {}
+		        : Parent(*adaptor._digraph, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
@@ -1362,444 +2022,631 @@
 		        return *this;
+		      }
 		    };
 		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
-		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
 		  protected:
-		    UndirDigraphAdaptorBase() : _digraph(0) {}
+		    UndirectorBase() : _digraph(0) {}
 		    Digraph* _digraph;
 		    void setDigraph(Digraph& digraph) {
 		      _digraph = &digraph;
+		    }
 		  };
 		  ///\ingroup graph_adaptors
+		  /// \ingroup graph_adaptors
 		  ///
-		  /// \brief A graph is made from a directed digraph by an adaptor
+		  /// \brief Undirect the graph
 		  ///
 		  /// This adaptor makes an undirected graph from a directed
 		  /// graph. All arc of the underlying digraph will be showed in the
 		  /// adaptor as an edge. Let's see an informal example about using
-		  /// this adaptor.
+		  /// 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".
 		  ///
 		  /// There is a network of the streets of a town. Of course there are
 		  /// some one-way street in the town hence the network is a directed
 		  /// one. There is a crazy driver who go oppositely in the one-way
 		  /// street without moral sense. Of course he can pass this streets
 		  /// slower than the regular way, in fact his speed is half of the
 		  /// normal speed. How long should he drive to get from a source
 		  /// point to the target? Let see the example code which calculate it:
 		  ///
 		  /// \todo BadCode, SimpleMap does no exists
 		  ///\code
 		  /// typedef UndirDigraphAdaptor<Digraph> Graph;
 		  /// Graph graph(digraph);
 		  ///
 		  /// typedef SimpleMap<LengthMap> FLengthMap;
 		  /// FLengthMap flength(length);
 		  ///
 		  /// typedef ScaleMap<LengthMap> RLengthMap;
 		  /// RLengthMap rlength(length, 2.0);
 		  ///
 		  /// typedef Graph::CombinedArcMap<FLengthMap, RLengthMap > ULengthMap;
 		  /// ULengthMap ulength(flength, rlength);
 		  ///
 		  /// Dijkstra<Graph, ULengthMap> dijkstra(graph, ulength);
 		  /// std::cout << "Driving time : " << dijkstra.run(src, trg) << std::endl;
 		  ///\endcode
 		  ///
 		  /// The combined arc map makes the length map for the undirected
 		  /// graph. It is created from a forward and reverse map. The forward
 		  /// map is created from the original length map with a SimpleMap
 		  /// adaptor which just makes a read-write map from the reference map
 		  /// i.e. it forgets that it can be return reference to values. The
 		  /// reverse map is just the scaled original map with the ScaleMap
 		  /// adaptor. The combination solves that passing the reverse way
 		  /// takes double time than the original. To get the driving time we
-		  /// run the dijkstra algorithm on the graph.
+		  /// \tparam _Digraph It must be conform to the \ref
 		  /// concepts::Digraph "Digraph concept". The type can be specified
 		  /// to const.
 		  template<typename _Digraph>
 		  class UndirDigraphAdaptor
 		    : public GraphAdaptorExtender<UndirDigraphAdaptorBase<_Digraph> > {
 		  class Undirector
 		    : public GraphAdaptorExtender<UndirectorBase<_Digraph> > {
 		  public:
 		    typedef _Digraph Digraph;
-		    typedef GraphAdaptorExtender<UndirDigraphAdaptorBase<Digraph> > Parent;
+		    typedef GraphAdaptorExtender<UndirectorBase<Digraph> > Parent;
 		  protected:
-		    UndirDigraphAdaptor() { }
+		    Undirector() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Constructor
 		    UndirDigraphAdaptor(_Digraph& _digraph) {
-		      setDigraph(_digraph);
+		    /// Creates a undirected graph from the given digraph
 		    Undirector(_Digraph& digraph) {
 		      setDigraph(digraph);
+		    }
 		    /// \brief ArcMap combined from two original ArcMap
 		    ///
 		    /// This class adapts two original digraph ArcMap to
-		    /// get an arc map on the adaptor.
+		    /// get an arc map on the undirected graph.
 		    template <typename _ForwardMap, typename _BackwardMap>
 		    class CombinedArcMap {
 		    public:
 		      typedef _ForwardMap ForwardMap;
 		      typedef _BackwardMap BackwardMap;
 		      typedef typename MapTraits<ForwardMap>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename ForwardMap::Value Value;
 		      typedef typename Parent::Arc Key;
-		      /// \brief Constructor
 		      /// \brief Constructor
 		      ///
 		      /// Constructor
 		      CombinedArcMap() : _forward(0), _backward(0) {}
 		      /// \brief Constructor
 		      ///
 		      /// Constructor
-		      CombinedArcMap(ForwardMap& forward, BackwardMap& backward)
+		      /// Constructor
 		      CombinedArcMap(ForwardMap& forward, BackwardMap& backward)
 		        : _forward(&forward), _backward(&backward) {}
 		      /// \brief Sets the value associated with a key.
 		      ///
 		      /// Sets the value associated with a key.
 		      void set(const Key& e, const Value& a) {
 			if (Parent::direction(e)) {
 			  _forward->set(e, a);
 		        } else {
 			  _backward->set(e, a);
+		        }
 		      void set(const Key& e, const Value& a) {
 		        if (Parent::direction(e)) {
 		          _forward->set(e, a);
 		        } else {
 		          _backward->set(e, a);
+		        }
+		      }
 		      /// \brief Returns the value associated with a key.
 		      ///
 		      /// Returns the value associated with a key.
 		      typename MapTraits<ForwardMap>::ConstReturnValue
 		      operator[](const Key& e) const {
 			if (Parent::direction(e)) {
 			  return (*_forward)[e];
 			} else {
 			  return (*_backward)[e];
 		      typename MapTraits<ForwardMap>::ConstReturnValue
 		      operator[](const Key& e) const {
 		        if (Parent::direction(e)) {
 		          return (*_forward)[e];
 		        } else {
 		          return (*_backward)[e];
+		        }
+		      }
 		      /// \brief Returns the value associated with a key.
 		      ///
 		      /// Returns the value associated with a key.
 		      typename MapTraits<ForwardMap>::ReturnValue
 		      operator[](const Key& e) {
 			if (Parent::direction(e)) {
 			  return (*_forward)[e];
 			} else {
 			  return (*_backward)[e];
 		      typename MapTraits<ForwardMap>::ReturnValue
 		      operator[](const Key& e) {
 		        if (Parent::direction(e)) {
 		          return (*_forward)[e];
 		        } else {
 		          return (*_backward)[e];
+		        }
+		      }
 		      /// \brief Sets the forward map
 		      ///
 		      /// Sets the forward map
 		      void setForwardMap(ForwardMap& forward) {
-		        _forward = &forward;
+		    protected:
 		      ForwardMap* _forward;
 		      BackwardMap* _backward;
 		    };
 		    /// \brief Just gives back a combined arc map
 		    ///
 		    /// Just gives back a combined arc map
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<ForwardMap, BackwardMap>
 		    combinedArcMap(ForwardMap& forward, BackwardMap& backward) {
 		      return CombinedArcMap<ForwardMap, BackwardMap>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<const ForwardMap, BackwardMap>
 		    combinedArcMap(const ForwardMap& forward, BackwardMap& backward) {
 		      return CombinedArcMap<const ForwardMap,
 		        BackwardMap>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<ForwardMap, const BackwardMap>
 		    combinedArcMap(ForwardMap& forward, const BackwardMap& backward) {
 		      return CombinedArcMap<ForwardMap,
 		        const BackwardMap>(forward, backward);
+		    }
 		    template <typename ForwardMap, typename BackwardMap>
 		    static CombinedArcMap<const ForwardMap, const BackwardMap>
 		    combinedArcMap(const ForwardMap& forward, const BackwardMap& backward) {
 		      return CombinedArcMap<const ForwardMap,
 		        const BackwardMap>(forward, backward);
+		    }
 		  };
 		  /// \brief Just gives back an undirected view of the given digraph
 		  ///
 		  /// Just gives back an undirected view of the given digraph
 		  template<typename Digraph>
 		  Undirector<const Digraph>
 		  undirector(const Digraph& digraph) {
 		    return Undirector<const Digraph>(digraph);
+		  }
 		  template <typename _Graph, typename _DirectionMap>
 		  class OrienterBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _DirectionMap DirectionMap;
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Edge Arc;
 		    void reverseArc(const Arc& arc) {
 		      _direction->set(arc, !(*_direction)[arc]);
+		    }
 		    void first(Node& i) const { _graph->first(i); }
 		    void first(Arc& i) const { _graph->first(i); }
 		    void firstIn(Arc& i, const Node& n) const {
 		      bool d;
 		      _graph->firstInc(i, d, n);
 		      while (i != INVALID && d == (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void firstOut(Arc& i, const Node& n ) const {
 		      bool d;
 		      _graph->firstInc(i, d, n);
 		      while (i != INVALID && d != (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void next(Node& i) const { _graph->next(i); }
 		    void next(Arc& i) const { _graph->next(i); }
 		    void nextIn(Arc& i) const {
 		      bool d = !(*_direction)[i];
 		      _graph->nextInc(i, d);
 		      while (i != INVALID && d == (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void nextOut(Arc& i) const {
 		      bool d = (*_direction)[i];
 		      _graph->nextInc(i, d);
 		      while (i != INVALID && d != (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    Node source(const Arc& e) const {
 		      return (*_direction)[e] ? _graph->u(e) : _graph->v(e);
+		    }
 		    Node target(const Arc& e) const {
 		      return (*_direction)[e] ? _graph->v(e) : _graph->u(e);
+		    }
 		    typedef NodeNumTagIndicator<Graph> NodeNumTag;
 		    int nodeNum() const { return _graph->nodeNum(); }
 		    typedef EdgeNumTagIndicator<Graph> EdgeNumTag;
 		    int arcNum() const { return _graph->edgeNum(); }
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) {
 		      Arc arc = prev;
 		      bool d = arc == INVALID ? true : (*_direction)[arc];
 		      if (d) {
 		        arc = _graph->findEdge(u, v, arc);
 		        while (arc != INVALID && !(*_direction)[arc]) {
 		          _graph->findEdge(u, v, arc);
+		        }
 		        if (arc != INVALID) return arc;
+		      }
 		      /// \brief Sets the backward map
 		      ///
 		      /// Sets the backward map
 		      void setBackwardMap(BackwardMap& backward) {
 		        _backward = &backward;
 		      _graph->findEdge(v, u, arc);
 		      while (arc != INVALID && (*_direction)[arc]) {
 		        _graph->findEdge(u, v, arc);
+		      }
 		    protected:
 		      ForwardMap* _forward;
-		      BackwardMap* _backward;
+		      return arc;
+		    }
 		    Node addNode() {
 		      return Node(_graph->addNode());
+		    }
 		    Arc addArc(const Node& u, const Node& v) {
 		      Arc arc = _graph->addArc(u, v);
 		      _direction->set(arc, _graph->source(arc) == u);
 		      return arc;
+		    }
 		    void erase(const Node& i) { _graph->erase(i); }
 		    void erase(const Arc& i) { _graph->erase(i); }
 		    void clear() { _graph->clear(); }
 		    int id(const Node& v) const { return _graph->id(v); }
 		    int id(const Arc& e) const { return _graph->id(e); }
 		    Node nodeFromId(int idx) const { return _graph->nodeFromId(idx); }
 		    Arc arcFromId(int idx) const { return _graph->edgeFromId(idx); }
 		    int maxNodeId() const { return _graph->maxNodeId(); }
 		    int maxArcId() const { return _graph->maxEdgeId(); }
 		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
 		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public _Graph::template NodeMap<_Value> {
 		    public:
 		      typedef typename _Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const OrienterBase& adapter)
 		        : Parent(*adapter._graph) {}
 		      NodeMap(const OrienterBase& adapter, const _Value& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public _Graph::template EdgeMap<_Value> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit ArcMap(const OrienterBase& adapter)
 		        : Parent(*adapter._graph) { }
 		      ArcMap(const OrienterBase& adapter, const _Value& value)
 		        : Parent(*adapter._graph, value) { }
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  protected:
 		    Graph* _graph;
 		    DirectionMap* _direction;
 		    void setDirectionMap(DirectionMap& direction) {
 		      _direction = &direction;
+		    }
 		    void setGraph(Graph& graph) {
 		      _graph = &graph;
+		    }
 		  };
-		  /// \brief Just gives back an undir digraph adaptor
+		  /// \ingroup graph_adaptors
 		  ///
 		  /// Just gives back an undir digraph adaptor
 		  template<typename Digraph>
 		  UndirDigraphAdaptor<const Digraph>
 		  undirDigraphAdaptor(const Digraph& digraph) {
-		    return UndirDigraphAdaptor<const Digraph>(digraph);
+		  /// \brief Orients the edges of the 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".
 		  ///
 		  /// \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.
 		  ///
 		  /// \sa orienter
 		  template<typename _Graph,
 		           typename DirectionMap = typename _Graph::template EdgeMap<bool> >
 		  class Orienter :
 		    public DigraphAdaptorExtender<OrienterBase<_Graph, DirectionMap> > {
 		  public:
 		    typedef _Graph Graph;
 		    typedef DigraphAdaptorExtender<
 		      OrienterBase<_Graph, DirectionMap> > Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    Orienter() { }
 		  public:
 		    /// \brief Constructor of the adaptor
 		    ///
 		    /// Constructor of the adaptor
 		    Orienter(Graph& graph, DirectionMap& direction) {
 		      setGraph(graph);
 		      setDirectionMap(direction);
+		    }
 		    /// \brief Reverse arc
 		    ///
 		    /// It reverse the given arc. It simply negate the direction in the map.
 		    void reverseArc(const Arc& a) {
 		      Parent::reverseArc(a);
+		    }
 		  };
 		  /// \brief Just gives back a Orienter
 		  ///
 		  /// Just gives back a Orienter
 		  template<typename Graph, typename DirectionMap>
 		  Orienter<const Graph, DirectionMap>
 		  orienter(const Graph& graph, DirectionMap& dm) {
 		    return Orienter<const Graph, DirectionMap>(graph, dm);
+		  }
 		  template<typename _Digraph,
 			   typename _CapacityMap = typename _Digraph::template ArcMap<int>,
-			   typename _FlowMap = _CapacityMap,
+		  template<typename Graph, typename DirectionMap>
 		  Orienter<const Graph, const DirectionMap>
 		  orienter(const Graph& graph, const DirectionMap& dm) {
 		    return Orienter<const Graph, const DirectionMap>(graph, dm);
+		  }
 		  namespace _adaptor_bits {
 		    template<typename _Digraph,
 		             typename _CapacityMap = typename _Digraph::template ArcMap<int>,
 		             typename _FlowMap = _CapacityMap,
 		             typename _Tolerance = Tolerance<typename _CapacityMap::Value> >
 		    class ResForwardFilter {
 		    public:
 		      typedef _Digraph Digraph;
 		      typedef _CapacityMap CapacityMap;
 		      typedef _FlowMap FlowMap;
 		      typedef _Tolerance Tolerance;
 		      typedef typename Digraph::Arc Key;
 		      typedef bool Value;
 		    private:
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
 		      Tolerance _tolerance;
 		    public:
 		      ResForwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                       const Tolerance& tolerance = Tolerance())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
 		      bool operator[](const typename Digraph::Arc& a) const {
 		        return _tolerance.positive((*_capacity)[a] - (*_flow)[a]);
+		      }
 		    };
 		    template<typename _Digraph,
 		             typename _CapacityMap = typename _Digraph::template ArcMap<int>,
 		             typename _FlowMap = _CapacityMap,
 		             typename _Tolerance = Tolerance<typename _CapacityMap::Value> >
 		    class ResBackwardFilter {
 		    public:
 		      typedef _Digraph Digraph;
 		      typedef _CapacityMap CapacityMap;
 		      typedef _FlowMap FlowMap;
 		      typedef _Tolerance Tolerance;
 		      typedef typename Digraph::Arc Key;
 		      typedef bool Value;
 		    private:
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
 		      Tolerance _tolerance;
 		    public:
 		      ResBackwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                        const Tolerance& tolerance = Tolerance())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
 		      bool operator[](const typename Digraph::Arc& a) const {
 		        return _tolerance.positive((*_flow)[a]);
+		      }
 		    };
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief An adaptor for composing the residual graph 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.
 		  ///
 		  /// 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 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.
 		  template<typename _Digraph,
 		           typename _CapacityMap = typename _Digraph::template ArcMap<int>,
 		           typename _FlowMap = _CapacityMap,
 		           typename _Tolerance = Tolerance<typename _CapacityMap::Value> >
-		  class ResForwardFilter {
+		  class Residual :
 		    public FilterArcs<
 		    Undirector<const _Digraph>,
 		    typename Undirector<const _Digraph>::template CombinedArcMap<
 		      _adaptor_bits::ResForwardFilter<const _Digraph, _CapacityMap,
 		                                      _FlowMap, _Tolerance>,
 		      _adaptor_bits::ResBackwardFilter<const _Digraph, _CapacityMap,
 		                                       _FlowMap, _Tolerance> > >
+		  {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _CapacityMap CapacityMap;
 		    typedef _FlowMap FlowMap;
 		    typedef _Tolerance Tolerance;
 		    typedef typename Digraph::Arc Key;
 		    typedef bool Value;
 		  private:
 		    const CapacityMap* _capacity;
 		    const FlowMap* _flow;
 		    Tolerance _tolerance;
 		  public:
 		    ResForwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                     const Tolerance& tolerance = Tolerance())
 		      : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
 		    ResForwardFilter(const Tolerance& tolerance = Tolerance())
 		      : _capacity(0), _flow(0), _tolerance(tolerance)  { }
 		    void setCapacity(const CapacityMap& capacity) { _capacity = &capacity; }
 		    void setFlow(const FlowMap& flow) { _flow = &flow; }
 		    bool operator[](const typename Digraph::Arc& a) const {
 		      return _tolerance.positive((*_capacity)[a] - (*_flow)[a]);
+		    }
 		  };
 		  template<typename _Digraph,
 			   typename _CapacityMap = typename _Digraph::template ArcMap<int>,
 			   typename _FlowMap = _CapacityMap,
 		           typename _Tolerance = Tolerance<typename _CapacityMap::Value> >
 		  class ResBackwardFilter {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _CapacityMap CapacityMap;
 		    typedef _FlowMap FlowMap;
 		    typedef _Tolerance Tolerance;
 		    typedef typename Digraph::Arc Key;
 		    typedef bool Value;
 		  private:
 		    const CapacityMap* _capacity;
 		    const FlowMap* _flow;
 		    Tolerance _tolerance;
 		  public:
 		    ResBackwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                      const Tolerance& tolerance = Tolerance())
 		      : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
 		    ResBackwardFilter(const Tolerance& tolerance = Tolerance())
 		      : _capacity(0), _flow(0), _tolerance(tolerance) { }
 		    void setCapacity(const CapacityMap& capacity) { _capacity = &capacity; }
 		    void setFlow(const FlowMap& flow) { _flow = &flow; }
 		    bool operator[](const typename Digraph::Arc& a) const {
 		      return _tolerance.positive((*_flow)[a]);
+		    }
 		  };
 		  ///\ingroup graph_adaptors
 		  ///
 		  ///\brief An adaptor for composing the residual graph 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 digraph
 		  ///and let \f$ F \f$ be a number type. Let moreover \f$ f,c:A\to F
 		  ///\f$, be functions on the arc-set.
 		  ///
 		  ///In the appications of ResDigraphAdaptor, \f$ f \f$ usually stands
 		  ///for a flow and \f$ c \f$ for a capacity function.  Suppose that a
 		  ///graph instance \c g of type \c ListDigraph implements \f$ G \f$.
 		  ///
 		  ///\code
 		  ///  ListDigraph g;
 		  ///\endcode
 		  ///
 		  ///Then ResDigraphAdaptor 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$, multilicities 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 twice. The
 		  /// following code shows how such an instance can be constructed.
 		  ///
 		  ///\code
 		  ///  typedef ListDigraph Digraph;
 		  ///  IntArcMap f(g), c(g);
 		  ///  ResDigraphAdaptor<Digraph, int, IntArcMap, IntArcMap> ga(g);
 		  ///\endcode
 		  template<typename _Digraph,
 			   typename _CapacityMap = typename _Digraph::template ArcMap<int>,
 			   typename _FlowMap = _CapacityMap,
 		           typename _Tolerance = Tolerance<typename _CapacityMap::Value> >
 		  class ResDigraphAdaptor :
 		    public ArcSubDigraphAdaptor<
 		    UndirDigraphAdaptor<const _Digraph>,
 		    typename UndirDigraphAdaptor<const _Digraph>::template CombinedArcMap<
 		      ResForwardFilter<const _Digraph, _CapacityMap, _FlowMap>,
 		      ResBackwardFilter<const _Digraph, _CapacityMap, _FlowMap> > > {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _CapacityMap CapacityMap;
 		    typedef _FlowMap FlowMap;
 		    typedef _Tolerance Tolerance;
 		    typedef typename CapacityMap::Value Value;
-		    typedef ResDigraphAdaptor Adaptor;
+		    typedef Residual Adaptor;
 		  protected:
 		    typedef UndirDigraphAdaptor<const Digraph> UndirDigraph;
 		    typedef ResForwardFilter<const Digraph, CapacityMap, FlowMap>
 		    ForwardFilter;
 		    typedef ResBackwardFilter<const Digraph, CapacityMap, FlowMap>
 		    BackwardFilter;
-		    typedef typename UndirDigraph::
+		    typedef Undirector<const Digraph> Undirected;
 		    typedef _adaptor_bits::ResForwardFilter<const Digraph, CapacityMap,
 		                                            FlowMap, Tolerance> ForwardFilter;
 		    typedef _adaptor_bits::ResBackwardFilter<const Digraph, CapacityMap,
 		                                             FlowMap, Tolerance> BackwardFilter;
 		    typedef typename Undirected::
 		    template CombinedArcMap<ForwardFilter, BackwardFilter> ArcFilter;
-		    typedef ArcSubDigraphAdaptor<UndirDigraph, ArcFilter> Parent;
+		    typedef FilterArcs<Undirected, ArcFilter> Parent;
 		    const CapacityMap* _capacity;
 		    FlowMap* _flow;
-		    UndirDigraph _graph;
+		    Undirected _graph;
 		    ForwardFilter _forward_filter;
 		    BackwardFilter _backward_filter;
 		    ArcFilter _arc_filter;
 		    void setCapacityMap(const CapacityMap& capacity) {
 		      _capacity = &capacity;
 		      _forward_filter.setCapacity(capacity);
 		      _backward_filter.setCapacity(capacity);
+		    }
 		    void setFlowMap(FlowMap& flow) {
 		      _flow = &flow;
 		      _forward_filter.setFlow(flow);
 		      _backward_filter.setFlow(flow);
+		    }
 		  public:
 		    /// \brief Constructor of the residual digraph.
 		    ///
-		    /// Constructor of the residual graph. The parameters are the digraph type,
 		    /// Constructor of the residual graph. The parameters are the digraph,
 		    /// the flow map, the capacity map and a tolerance object.
 		    ResDigraphAdaptor(const Digraph& digraph, const CapacityMap& capacity,
 		                    FlowMap& flow, const Tolerance& tolerance = Tolerance())
 		    Residual(const Digraph& digraph, const CapacityMap& capacity,
 		             FlowMap& flow, const Tolerance& tolerance = Tolerance())
 		      : Parent(), _capacity(&capacity), _flow(&flow), _graph(digraph),
-		        _forward_filter(capacity, flow, tolerance),
 		        _forward_filter(capacity, flow, tolerance),
 		        _backward_filter(capacity, flow, tolerance),
 		        _arc_filter(_forward_filter, _backward_filter)
+		    {
 		      Parent::setDigraph(_graph);
 		      Parent::setArcFilterMap(_arc_filter);
+		    }
 		    typedef typename Parent::Arc Arc;
 		    /// \brief Gives back the residual capacity of the arc.
 		    ///
 		    /// Gives back the residual capacity of the arc.
 		    Value rescap(const Arc& arc) const {
 		      if (UndirDigraph::direction(arc)) {
-		        return (*_capacity)[arc] - (*_flow)[arc];
+		    Value residualCapacity(const Arc& a) const {
 		      if (Undirected::direction(a)) {
 		        return (*_capacity)[a] - (*_flow)[a];
 		      } else {
-		        return (*_flow)[arc];
+		        return (*_flow)[a];
+		      }
+		    }
-		    /// \brief Augment on the given arc in the residual digraph.
+		    }
 		    /// \brief Augment on the given arc in the residual graph.
 		    ///
-		    /// Augment on the given arc in the residual digraph. It increase
+		    /// 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.
 		    void augment(const Arc& e, const Value& a) const {
 		      if (UndirDigraph::direction(e)) {
 		        _flow->set(e, (*_flow)[e] + a);
 		      } else {
-		        _flow->set(e, (*_flow)[e] - a);
+		    void augment(const Arc& a, const Value& v) const {
 		      if (Undirected::direction(a)) {
 		        _flow->set(a, (*_flow)[a] + v);
 		      } else {
 		        _flow->set(a, (*_flow)[a] - v);
+		      }
+		    }
 		    /// \brief Returns the direction of the arc.
 		    ///
 		    /// Returns true when the arc is same oriented as the original arc.
 		    static bool forward(const Arc& e) {
 		      return UndirDigraph::direction(e);
 		    static bool forward(const Arc& a) {
 		      return Undirected::direction(a);
+		    }
 		    /// \brief Returns the direction of the arc.
 		    ///
 		    /// Returns true when the arc is opposite oriented as the original arc.
 		    static bool backward(const Arc& e) {
 		      return !UndirDigraph::direction(e);
 		    static bool backward(const Arc& a) {
 		      return !Undirected::direction(a);
+		    }
 		    /// \brief Gives back the forward oriented residual arc.
 		    ///
 		    /// Gives back the forward oriented residual arc.
 		    static Arc forward(const typename Digraph::Arc& e) {
 		      return UndirDigraph::direct(e, true);
 		    static Arc forward(const typename Digraph::Arc& a) {
 		      return Undirected::direct(a, true);
+		    }
 		    /// \brief Gives back the backward oriented residual arc.
 		    ///
 		    /// Gives back the backward oriented residual arc.
 		    static Arc backward(const typename Digraph::Arc& e) {
 		      return UndirDigraph::direct(e, false);
 		    static Arc backward(const typename Digraph::Arc& a) {
 		      return Undirected::direct(a, false);
+		    }
 		    /// \brief Residual capacity map.
 		    ///
 		    /// In generic residual digraphs the residual capacity can be obtained
 		    /// as a map.
-		    class ResCap {
+		    /// In generic residual graph the residual capacity can be obtained
 		    /// as a map.
 		    class ResidualCapacity {
 		    protected:
 		      const Adaptor* _adaptor;
 		    public:
 		      /// The Key type
 		      typedef Arc Key;
 		      /// The Value type
 		      typedef typename _CapacityMap::Value Value;
 		      ResCap(const Adaptor& adaptor) : _adaptor(&adaptor) {}
 		      Value operator[](const Arc& e) const {
 		        return _adaptor->rescap(e);
 		      /// Constructor
 		      ResidualCapacity(const Adaptor& adaptor) : _adaptor(&adaptor) {}
 		      /// \e
 		      Value operator[](const Arc& a) const {
 		        return _adaptor->residualCapacity(a);
+		      }
 		    };
 		  };
 		  template <typename _Digraph>
-		  class SplitDigraphAdaptorBase {
+		  class SplitNodesBase {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<const _Digraph> Parent;
-		    typedef SplitDigraphAdaptorBase Adaptor;
+		    typedef SplitNodesBase Adaptor;
 		    typedef typename Digraph::Node DigraphNode;
 		    typedef typename Digraph::Arc DigraphArc;
 		    class Node;
 		    class Arc;
@@ -1807,50 +2654,50 @@
 		  private:
 		    template <typename T> class NodeMapBase;
 		    template <typename T> class ArcMapBase;
 		  public:
 		    class Node : public DigraphNode {
-		      friend class SplitDigraphAdaptorBase;
+		      friend class SplitNodesBase;
 		      template <typename T> friend class NodeMapBase;
 		    private:
 		      bool _in;
 		      Node(DigraphNode node, bool in)
 			: DigraphNode(node), _in(in) {}
 		        : DigraphNode(node), _in(in) {}
 		    public:
 		      Node() {}
 		      Node(Invalid) : DigraphNode(INVALID), _in(true) {}
 		      bool operator==(const Node& node) const {
-			return DigraphNode::operator==(node) && _in == node._in;
+		        return DigraphNode::operator==(node) && _in == node._in;
+		      }
 		      bool operator!=(const Node& node) const {
-			return !(*this == node);
+		        return !(*this == node);
+		      }
 		      bool operator<(const Node& node) const {
 			return DigraphNode::operator<(node) ||
 			  (DigraphNode::operator==(node) && _in < node._in);
 		        return DigraphNode::operator<(node) ||
 		          (DigraphNode::operator==(node) && _in < node._in);
+		      }
 		    };
 		    class Arc {
-		      friend class SplitDigraphAdaptorBase;
+		      friend class SplitNodesBase;
 		      template <typename T> friend class ArcMapBase;
 		    private:
 		      typedef BiVariant<DigraphArc, DigraphNode> ArcImpl;
 		      explicit Arc(const DigraphArc& arc) : _item(arc) {}
 		      explicit Arc(const DigraphNode& node) : _item(node) {}
 		      ArcImpl _item;
 		    public:
 		      Arc() {}
 		      Arc(Invalid) : _item(DigraphArc(INVALID)) {}
@@ -1863,17 +2710,17 @@
 		          if (arc._item.secondState()) {
 		            return _item.second() == arc._item.second();
+		          }
+		        }
 		        return false;
+		      }
 		      bool operator!=(const Arc& arc) const {
-			return !(*this == arc);
+		        return !(*this == arc);
+		      }
 		      bool operator<(const Arc& arc) const {
 		        if (_item.firstState()) {
 		          if (arc._item.firstState()) {
 		            return _item.first() < arc._item.first();
+		          }
 		          return false;
@@ -1894,87 +2741,87 @@
 		      _digraph->first(n);
 		      n._in = true;
+		    }
 		    void next(Node& n) const {
 		      if (n._in) {
-			n._in = false;
+		        n._in = false;
 		      } else {
 			n._in = true;
 			_digraph->next(n);
 		        n._in = true;
 		        _digraph->next(n);
+		      }
+		    }
 		    void first(Arc& e) const {
 		      e._item.setSecond();
 		      _digraph->first(e._item.second());
 		      if (e._item.second() == INVALID) {
 		        e._item.setFirst();
-			_digraph->first(e._item.first());
+		        _digraph->first(e._item.first());
+		      }
+		    }
 		    void next(Arc& e) const {
 		      if (e._item.secondState()) {
-			_digraph->next(e._item.second());
+		        _digraph->next(e._item.second());
 		        if (e._item.second() == INVALID) {
 		          e._item.setFirst();
 		          _digraph->first(e._item.first());
+		        }
 		      } else {
 			_digraph->next(e._item.first());
+		      }
 		        _digraph->next(e._item.first());
+		      }
+		    }
 		    void firstOut(Arc& e, const Node& n) const {
 		      if (n._in) {
 		        e._item.setSecond(n);
 		      } else {
 		        e._item.setFirst();
-			_digraph->firstOut(e._item.first(), n);
+		        _digraph->firstOut(e._item.first(), n);
+		      }
+		    }
 		    void nextOut(Arc& e) const {
 		      if (!e._item.firstState()) {
-			e._item.setFirst(INVALID);
+		        e._item.setFirst(INVALID);
 		      } else {
 			_digraph->nextOut(e._item.first());
+		      }
 		        _digraph->nextOut(e._item.first());
+		      }
+		    }
 		    void firstIn(Arc& e, const Node& n) const {
 		      if (!n._in) {
-		        e._item.setSecond(n);
 		        e._item.setSecond(n);
 		      } else {
 		        e._item.setFirst();
-			_digraph->firstIn(e._item.first(), n);
+		        _digraph->firstIn(e._item.first(), n);
+		      }
+		    }
 		    void nextIn(Arc& e) const {
 		      if (!e._item.firstState()) {
-			e._item.setFirst(INVALID);
+		        e._item.setFirst(INVALID);
 		      } else {
-			_digraph->nextIn(e._item.first());
+		        _digraph->nextIn(e._item.first());
+		      }
+		    }
 		    Node source(const Arc& e) const {
 		      if (e._item.firstState()) {
-			return Node(_digraph->source(e._item.first()), false);
+		        return Node(_digraph->source(e._item.first()), false);
 		      } else {
-			return Node(e._item.second(), true);
+		        return Node(e._item.second(), true);
+		      }
+		    }
 		    Node target(const Arc& e) const {
 		      if (e._item.firstState()) {
-			return Node(_digraph->target(e._item.first()), true);
+		        return Node(_digraph->target(e._item.first()), true);
 		      } else {
-			return Node(e._item.second(), false);
+		        return Node(e._item.second(), false);
+		      }
+		    }
 		    int id(const Node& n) const {
 		      return (_digraph->id(n) << 1) | (n._in ? 0 : 1);
+		    }
@@ -1997,13 +2844,13 @@
 		        return Arc(_digraph->arcFromId(ix >> 1));
 		      } else {
 		        return Arc(_digraph->nodeFromId(ix >> 1));
+		      }
+		    }
 		    int maxArcId() const {
-		      return std::max(_digraph->maxNodeId() << 1,
 		      return std::max(_digraph->maxNodeId() << 1,
 		                      (_digraph->maxArcId() << 1) | 1);
+		    }
 		    static bool inNode(const Node& n) {
 		      return n._in;
+		    }
@@ -2045,17 +2892,17 @@
 		    typedef True EdgeNumTag;
 		    int arcNum() const {
 		      return countArcs(*_digraph) + countNodes(*_digraph);
+		    }
 		    typedef True FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 				const Arc& prev = INVALID) const {
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) const {
 		      if (inNode(u)) {
 		        if (outNode(v)) {
-		          if (static_cast<const DigraphNode&>(u) ==
 		          if (static_cast<const DigraphNode&>(u) ==
 		              static_cast<const DigraphNode&>(v) && prev == INVALID) {
 		            return Arc(u);
+		          }
+		        }
 		      } else {
 		        if (inNode(v)) {
@@ -2063,83 +2910,83 @@
+		        }
+		      }
 		      return INVALID;
+		    }
 		  private:
 		    template <typename _Value>
-		    class NodeMapBase
 		    class NodeMapBase
 		      : public MapTraits<typename Parent::template NodeMap<_Value> > {
 		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
 		    public:
 		      typedef Node Key;
 		      typedef _Value Value;
 		      NodeMapBase(const Adaptor& adaptor)
 			: _in_map(*adaptor._digraph), _out_map(*adaptor._digraph) {}
 		      NodeMapBase(const Adaptor& adaptor, const Value& value)
 			: _in_map(*adaptor._digraph, value),
 			  _out_map(*adaptor._digraph, value) {}
 		      NodeMapBase(const Adaptor& adaptor)
 		        : _in_map(*adaptor._digraph), _out_map(*adaptor._digraph) {}
 		      NodeMapBase(const Adaptor& adaptor, const Value& value)
 		        : _in_map(*adaptor._digraph, value),
 		          _out_map(*adaptor._digraph, value) {}
 		      void set(const Node& key, const Value& val) {
 			if (Adaptor::inNode(key)) { _in_map.set(key, val); }
 			else {_out_map.set(key, val); }
 		        if (Adaptor::inNode(key)) { _in_map.set(key, val); }
 		        else {_out_map.set(key, val); }
+		      }
 		      typename MapTraits<NodeImpl>::ReturnValue
 		      typename MapTraits<NodeImpl>::ReturnValue
 		      operator[](const Node& key) {
 			if (Adaptor::inNode(key)) { return _in_map[key]; }
 			else { return _out_map[key]; }
 		        if (Adaptor::inNode(key)) { return _in_map[key]; }
 		        else { return _out_map[key]; }
+		      }
 		      typename MapTraits<NodeImpl>::ConstReturnValue
 		      operator[](const Node& key) const {
 			if (Adaptor::inNode(key)) { return _in_map[key]; }
 			else { return _out_map[key]; }
 		        if (Adaptor::inNode(key)) { return _in_map[key]; }
 		        else { return _out_map[key]; }
+		      }
 		    private:
 		      NodeImpl _in_map, _out_map;
 		    };
 		    template <typename _Value>
-		    class ArcMapBase
 		    class ArcMapBase
 		      : public MapTraits<typename Parent::template ArcMap<_Value> > {
 		      typedef typename Parent::template ArcMap<_Value> ArcImpl;
 		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
 		    public:
 		      typedef Arc Key;
 		      typedef _Value Value;
 		      ArcMapBase(const Adaptor& adaptor)
 			: _arc_map(*adaptor._digraph), _node_map(*adaptor._digraph) {}
 		      ArcMapBase(const Adaptor& adaptor, const Value& value)
 			: _arc_map(*adaptor._digraph, value),
-			  _node_map(*adaptor._digraph, value) {}
+		      ArcMapBase(const Adaptor& adaptor)
 		        : _arc_map(*adaptor._digraph), _node_map(*adaptor._digraph) {}
 		      ArcMapBase(const Adaptor& adaptor, const Value& value)
 		        : _arc_map(*adaptor._digraph, value),
 		          _node_map(*adaptor._digraph, value) {}
 		      void set(const Arc& key, const Value& val) {
 			if (Adaptor::origArc(key)) {
 		          _arc_map.set(key._item.first(), val);
 		        if (Adaptor::origArc(key)) {
 		          _arc_map.set(key._item.first(), val);
 		        } else {
-		          _node_map.set(key._item.second(), val);
 		          _node_map.set(key._item.second(), val);
+		        }
+		      }
 		      typename MapTraits<ArcImpl>::ReturnValue
 		      operator[](const Arc& key) {
-			if (Adaptor::origArc(key)) {
+		        if (Adaptor::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        } else {
 		          return _node_map[key._item.second()];
+		        }
+		      }
 		      typename MapTraits<ArcImpl>::ConstReturnValue
 		      operator[](const Arc& key) const {
-			if (Adaptor::origArc(key)) {
+		        if (Adaptor::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        } else {
 		          return _node_map[key._item.second()];
+		        }
+		      }
@@ -2148,159 +2995,113 @@
 		      NodeImpl _node_map;
 		    };
 		  public:
 		    template <typename _Value>
 		    class NodeMap
 		      : public SubMapExtender<Adaptor, NodeMapBase<_Value> >
 		    class NodeMap
 		      : public SubMapExtender<Adaptor, NodeMapBase<_Value> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, NodeMapBase<Value> > Parent;
 		      NodeMap(const Adaptor& adaptor)
 			: Parent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 			: Parent(adaptor, value) {}
 		      NodeMap(const Adaptor& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
-			return operator=<NodeMap>(cmap);
+		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
 		    class ArcMap
 		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      ArcMap(const Adaptor& adaptor)
 			: Parent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: Parent(adaptor, value) {}
 		      ArcMap(const Adaptor& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
-			return operator=<ArcMap>(cmap);
+		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
-			return *this;
+		        return *this;
+		      }
 		    };
 		  protected:
-		    SplitDigraphAdaptorBase() : _digraph(0) {}
+		    SplitNodesBase() : _digraph(0) {}
 		    Digraph* _digraph;
 		    void setDigraph(Digraph& digraph) {
 		      _digraph = &digraph;
+		    }
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief Split digraph adaptor class
 		  ///
 		  /// This is an digraph adaptor which splits all node into an in-node
 		  /// and an out-node. Formaly, the adaptor replaces each \f$ u \f$
 		  /// node in the digraph with two node, \f$ u_{in} \f$ node and
 		  /// \f$ u_{out} \f$ node. If there is an \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 will connect
 		  /// \brief Split the nodes of a directed graph
 		  ///
 		  /// 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$.
 		  ///
-		  /// The aim of this class is to run algorithm with node costs if the
 		  /// 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 SplitDigraphAdaptor and set the node cost of the digraph to the
 		  /// bind arc in the adapted digraph.
 		  ///
 		  /// For example a maximum flow algorithm can compute how many arc
 		  /// disjoint paths are in the digraph. But we would like to know how
 		  /// many node disjoint paths are in the digraph. First we have to
 		  /// adapt the digraph with the \c SplitDigraphAdaptor. Then run the flow
 		  /// algorithm on the adapted digraph. The bottleneck of the flow will
 		  /// be the bind arcs which bounds the flow with the count of the
 		  /// node disjoint paths.
 		  /// a \c SplitNodes and set the node cost of the graph to the
 		  /// bind arc in the adapted graph.
 		  ///
 		  ///\code
 		  ///
 		  /// typedef SplitDigraphAdaptor<SmartDigraph> SDigraph;
 		  ///
 		  /// SDigraph sdigraph(digraph);
 		  ///
 		  /// typedef ConstMap<SDigraph::Arc, int> SCapacity;
 		  /// SCapacity scapacity(1);
 		  ///
 		  /// SDigraph::ArcMap<int> sflow(sdigraph);
 		  ///
 		  /// Preflow<SDigraph, SCapacity>
 		  ///   spreflow(sdigraph, scapacity,
 		  ///            SDigraph::outNode(source), SDigraph::inNode(target));
 		  ///
 		  /// spreflow.run();
 		  ///
 		  ///\endcode
 		  ///
 		  /// The result of the mamixum flow on the original digraph
 		  /// shows the next figure:
 		  ///
 		  /// \image html arc_disjoint.png
 		  /// \image latex arc_disjoint.eps "Arc disjoint paths" width=\textwidth
 		  ///
 		  /// And the maximum flow on the adapted digraph:
 		  ///
 		  /// \image html node_disjoint.png
 		  /// \image latex node_disjoint.eps "Node disjoint paths" width=\textwidth
 		  ///
 		  /// The second solution contains just 3 disjoint paths while the first 4.
 		  /// The full code can be found in the \ref disjoint_paths_demo.cc demo file.
 		  ///
 		  /// This digraph adaptor is fully conform to the
 		  /// \ref concepts::Digraph "Digraph" concept and
 		  /// contains some additional member functions and types. The
 		  /// documentation of some member functions may be found just in the
 		  /// SplitDigraphAdaptorBase class.
 		  ///
 		  /// \sa SplitDigraphAdaptorBase
 		  /// \tparam _Digraph It must be conform to the \ref concepts::Digraph
 		  /// "Digraph concept". The type can be specified to be const.
 		  template <typename _Digraph>
 		  class SplitDigraphAdaptor
 		    : public DigraphAdaptorExtender<SplitDigraphAdaptorBase<_Digraph> > {
 		  class SplitNodes
 		    : public DigraphAdaptorExtender<SplitNodesBase<_Digraph> > {
 		  public:
 		    typedef _Digraph Digraph;
-		    typedef DigraphAdaptorExtender<SplitDigraphAdaptorBase<Digraph> > Parent;
+		    typedef DigraphAdaptorExtender<SplitNodesBase<Digraph> > Parent;
 		    typedef typename Digraph::Node DigraphNode;
 		    typedef typename Digraph::Arc DigraphArc;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    /// \brief Constructor of the adaptor.
 		    ///
 		    /// Constructor of the adaptor.
-		    SplitDigraphAdaptor(Digraph& g) {
+		    SplitNodes(Digraph& g) {
 		      Parent::setDigraph(g);
+		    }
 		    /// \brief Returns true when the node is in-node.
 		    ///
 		    /// Returns true when the node is in-node.
@@ -2341,20 +3142,20 @@
 		    /// Gives back the out-node created from the \c node.
 		    static Node outNode(const DigraphNode& n) {
 		      return Parent::outNode(n);
+		    }
 		    /// \brief Gives back the arc binds the two part of the node.
-		    ///
 		    ///
 		    /// Gives back the arc binds the two part of the node.
 		    static Arc arc(const DigraphNode& n) {
 		      return Parent::arc(n);
+		    }
 		    /// \brief Gives back the arc of the original arc.
-		    ///
 		    ///
 		    /// Gives back the arc of the original arc.
 		    static Arc arc(const DigraphArc& a) {
 		      return Parent::arc(a);
+		    }
 		    /// \brief NodeMap combined from two original NodeMap
@@ -2368,180 +3169,179 @@
 		      typedef Node Key;
 		      typedef typename InNodeMap::Value Value;
 		      /// \brief Constructor
 		      ///
 		      /// Constructor.
 		      CombinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map)
 			: _in_map(in_map), _out_map(out_map) {}
 		      CombinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map)
 		        : _in_map(in_map), _out_map(out_map) {}
 		      /// \brief The subscript operator.
 		      ///
 		      /// The subscript operator.
 		      Value& operator[](const Key& key) {
 			if (Parent::inNode(key)) {
 			  return _in_map[key];
 			} else {
 			  return _out_map[key];
+			}
+		        if (Parent::inNode(key)) {
 		          return _in_map[key];
 		        } else {
 		          return _out_map[key];
+		        }
+		      }
 		      /// \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];
+			}
+		        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.
 		      void set(const Key& key, const Value& value) {
 			if (Parent::inNode(key)) {
 			  _in_map.set(key, value);
 			} else {
 			  _out_map.set(key, value);
+			}
+		        if (Parent::inNode(key)) {
 		          _in_map.set(key, value);
 		        } else {
 		          _out_map.set(key, value);
+		        }
+		      }
 		    private:
 		      InNodeMap& _in_map;
 		      OutNodeMap& _out_map;
 		    };
 		    /// \brief Just gives back a combined node map.
 		    ///
-		    /// Just gives back a combined node map.
+		    /// \brief Just gives back a combined node map
 		    ///
 		    /// Just gives back a combined node map
 		    template <typename InNodeMap, typename OutNodeMap>
-		    static CombinedNodeMap<InNodeMap, OutNodeMap>
 		    static CombinedNodeMap<InNodeMap, OutNodeMap>
 		    combinedNodeMap(InNodeMap& in_map, OutNodeMap& out_map) {
 		      return CombinedNodeMap<InNodeMap, OutNodeMap>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
-		    static CombinedNodeMap<const InNodeMap, OutNodeMap>
 		    static CombinedNodeMap<const InNodeMap, OutNodeMap>
 		    combinedNodeMap(const InNodeMap& in_map, OutNodeMap& out_map) {
 		      return CombinedNodeMap<const InNodeMap, OutNodeMap>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
-		    static CombinedNodeMap<InNodeMap, const OutNodeMap>
 		    static CombinedNodeMap<InNodeMap, const OutNodeMap>
 		    combinedNodeMap(InNodeMap& in_map, const OutNodeMap& out_map) {
 		      return CombinedNodeMap<InNodeMap, const OutNodeMap>(in_map, out_map);
+		    }
 		    template <typename InNodeMap, typename OutNodeMap>
-		    static CombinedNodeMap<const InNodeMap, const OutNodeMap>
 		    static CombinedNodeMap<const InNodeMap, const OutNodeMap>
 		    combinedNodeMap(const InNodeMap& in_map, const OutNodeMap& out_map) {
-		      return CombinedNodeMap<const InNodeMap,
 		      return CombinedNodeMap<const InNodeMap,
 		        const OutNodeMap>(in_map, out_map);
+		    }
 		    /// \brief ArcMap combined from an original ArcMap and NodeMap
+		    /// \brief ArcMap combined from an original ArcMap and a NodeMap
 		    ///
 		    /// This class adapt an original digraph ArcMap and NodeMap to
 		    /// get an arc map on the adapted digraph.
 		    /// This class adapt an original ArcMap and a NodeMap to get an
 		    /// arc map on the adapted digraph
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
 		    class CombinedArcMap {
 		    public:
 		      typedef Arc Key;
 		      typedef typename DigraphArcMap::Value Value;
 		      /// \brief Constructor
 		      ///
 		      /// Constructor.
 		      CombinedArcMap(DigraphArcMap& arc_map, DigraphNodeMap& node_map)
 			: _arc_map(arc_map), _node_map(node_map) {}
 		      CombinedArcMap(DigraphArcMap& arc_map, DigraphNodeMap& node_map)
 		        : _arc_map(arc_map), _node_map(node_map) {}
 		      /// \brief The subscript operator.
 		      ///
 		      /// The subscript operator.
 		      void set(const Arc& arc, const Value& val) {
 			if (Parent::origArc(arc)) {
 			  _arc_map.set(arc, val);
 			} else {
 			  _node_map.set(arc, val);
+			}
+		        if (Parent::origArc(arc)) {
 		          _arc_map.set(arc, val);
 		        } else {
 		          _node_map.set(arc, val);
+		        }
+		      }
 		      /// \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];
+			}
+		      }
 		        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];
+			}
+		      }
+		        if (Parent::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		    private:
 		      DigraphArcMap& _arc_map;
 		      DigraphNodeMap& _node_map;
 		    };
 		    /// \brief Just gives back a combined arc map.
 		    ///
 		    /// Just gives back a combined arc map.
 		    /// \brief Just gives back a combined arc map
 		    ///
 		    /// Just gives back a combined arc map
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
-		    static CombinedArcMap<DigraphArcMap, DigraphNodeMap>
 		    static CombinedArcMap<DigraphArcMap, DigraphNodeMap>
 		    combinedArcMap(DigraphArcMap& arc_map, DigraphNodeMap& node_map) {
 		      return CombinedArcMap<DigraphArcMap, DigraphNodeMap>(arc_map, node_map);
+		    }
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
-		    static CombinedArcMap<const DigraphArcMap, DigraphNodeMap>
 		    static CombinedArcMap<const DigraphArcMap, DigraphNodeMap>
 		    combinedArcMap(const DigraphArcMap& arc_map, DigraphNodeMap& node_map) {
-		      return CombinedArcMap<const DigraphArcMap,
 		      return CombinedArcMap<const DigraphArcMap,
 		        DigraphNodeMap>(arc_map, node_map);
+		    }
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
-		    static CombinedArcMap<DigraphArcMap, const DigraphNodeMap>
 		    static CombinedArcMap<DigraphArcMap, const DigraphNodeMap>
 		    combinedArcMap(DigraphArcMap& arc_map, const DigraphNodeMap& node_map) {
-		      return CombinedArcMap<DigraphArcMap,
 		      return CombinedArcMap<DigraphArcMap,
 		        const DigraphNodeMap>(arc_map, node_map);
+		    }
 		    template <typename DigraphArcMap, typename DigraphNodeMap>
 		    static CombinedArcMap<const DigraphArcMap, const DigraphNodeMap>
 		    combinedArcMap(const DigraphArcMap& arc_map,
 		                    const DigraphNodeMap& node_map) {
 		      return CombinedArcMap<const DigraphArcMap,
 		    static CombinedArcMap<const DigraphArcMap, const DigraphNodeMap>
 		    combinedArcMap(const DigraphArcMap& arc_map,
 		                   const DigraphNodeMap& node_map) {
 		      return CombinedArcMap<const DigraphArcMap,
 		        const DigraphNodeMap>(arc_map, node_map);
+		    }
 		  };
-		  /// \brief Just gives back a split digraph adaptor
+		  /// \brief Just gives back a node splitter
 		  ///
-		  /// Just gives back a split digraph adaptor
+		  /// Just gives back a node splitter
 		  template<typename Digraph>
 		  SplitDigraphAdaptor<Digraph>
 		  splitDigraphAdaptor(const Digraph& digraph) {
-		    return SplitDigraphAdaptor<Digraph>(digraph);
+		  SplitNodes<Digraph>
 		  splitNodes(const Digraph& digraph) {
 		    return SplitNodes<Digraph>(digraph);
+		  }
 		} //namespace lemon
 		#endif //LEMON_DIGRAPH_ADAPTOR_H
 		#endif //LEMON_ADAPTORS_H

lemon/bits/graph_adaptor_extender.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -21,21 +21,14 @@
 		#include <lemon/core.h>
 		#include <lemon/error.h>
 		#include <lemon/bits/default_map.h>
 		///\ingroup digraphbits
 		///\file
 		///\brief Extenders for the digraph adaptor types
 		namespace lemon {
 		  /// \ingroup digraphbits
 		  ///
 		  /// \brief Extender for the DigraphAdaptors
 		  template <typename _Digraph>
 		  class DigraphAdaptorExtender : public _Digraph {
 		  public:
 		    typedef _Digraph Parent;
 		    typedef _Digraph Digraph;
@@ -61,159 +54,145 @@
 		    Arc fromId(int id, Arc) const {
 		      return Parent::arcFromId(id);
+		    }
 		    Node oppositeNode(const Node &n, const Arc &e) const {
 		      if (n == Parent::source(e))
-			return Parent::target(e);
+		        return Parent::target(e);
 		      else if(n==Parent::target(e))
-			return Parent::source(e);
+		        return Parent::source(e);
 		      else
-			return INVALID;
+		        return INVALID;
+		    }
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Adaptor* _adaptor;
 		    public:
 		      NodeIt() {}
 		      NodeIt(Invalid i) : Node(i) { }
 		      explicit NodeIt(const Adaptor& adaptor) : _adaptor(&adaptor) {
-			_adaptor->first(static_cast<Node&>(*this));
+		        _adaptor->first(static_cast<Node&>(*this));
+		      }
 		      NodeIt(const Adaptor& adaptor, const Node& node)
 			: Node(node), _adaptor(&adaptor) {}
 		      NodeIt(const Adaptor& adaptor, const Node& node)
 		        : Node(node), _adaptor(&adaptor) {}
 		      NodeIt& operator++() {
 			_adaptor->next(*this);
-			return *this;
+		      NodeIt& operator++() {
 		        _adaptor->next(*this);
 		        return *this;
+		      }
 		    };
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      ArcIt() { }
 		      ArcIt(Invalid i) : Arc(i) { }
 		      explicit ArcIt(const Adaptor& adaptor) : _adaptor(&adaptor) {
-			_adaptor->first(static_cast<Arc&>(*this));
+		        _adaptor->first(static_cast<Arc&>(*this));
+		      }
 		      ArcIt(const Adaptor& adaptor, const Arc& e) :
 			Arc(e), _adaptor(&adaptor) { }
 		      ArcIt(const Adaptor& adaptor, const Arc& e) :
 		        Arc(e), _adaptor(&adaptor) { }
 		      ArcIt& operator++() {
 			_adaptor->next(*this);
-			return *this;
+		      ArcIt& operator++() {
 		        _adaptor->next(*this);
 		        return *this;
+		      }
 		    };
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      OutArcIt() { }
 		      OutArcIt(Invalid i) : Arc(i) { }
 		      OutArcIt(const Adaptor& adaptor, const Node& node)
 			: _adaptor(&adaptor) {
-			_adaptor->firstOut(*this, node);
+		      OutArcIt(const Adaptor& adaptor, const Node& node)
 		        : _adaptor(&adaptor) {
 		        _adaptor->firstOut(*this, node);
+		      }
 		      OutArcIt(const Adaptor& adaptor, const Arc& arc)
 			: Arc(arc), _adaptor(&adaptor) {}
 		      OutArcIt(const Adaptor& adaptor, const Arc& arc)
 		        : Arc(arc), _adaptor(&adaptor) {}
 		      OutArcIt& operator++() {
 			_adaptor->nextOut(*this);
-			return *this;
+		      OutArcIt& operator++() {
 		        _adaptor->nextOut(*this);
 		        return *this;
+		      }
 		    };
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      InArcIt() { }
 		      InArcIt(Invalid i) : Arc(i) { }
 		      InArcIt(const Adaptor& adaptor, const Node& node)
 			: _adaptor(&adaptor) {
-			_adaptor->firstIn(*this, node);
+		      InArcIt(const Adaptor& adaptor, const Node& node)
 		        : _adaptor(&adaptor) {
 		        _adaptor->firstIn(*this, node);
+		      }
 		      InArcIt(const Adaptor& adaptor, const Arc& arc) :
 			Arc(arc), _adaptor(&adaptor) {}
 		      InArcIt(const Adaptor& adaptor, const Arc& arc) :
 		        Arc(arc), _adaptor(&adaptor) {}
 		      InArcIt& operator++() {
 			_adaptor->nextIn(*this);
-			return *this;
+		      InArcIt& operator++() {
 		        _adaptor->nextIn(*this);
 		        return *this;
+		      }
 		    };
 		    /// \brief Base node of the iterator
 		    ///
 		    /// Returns the base node (ie. the source in this case) of the iterator
 		    Node baseNode(const OutArcIt &e) const {
 		      return Parent::source(e);
+		    }
 		    /// \brief Running node of the iterator
 		    ///
 		    /// Returns the running node (ie. the target in this case) of the
 		    /// iterator
 		    Node runningNode(const OutArcIt &e) const {
 		      return Parent::target(e);
+		    }
 		    /// \brief Base node of the iterator
 		    ///
 		    /// Returns the base node (ie. the target in this case) of the iterator
 		    Node baseNode(const InArcIt &e) const {
 		      return Parent::target(e);
+		    }
 		    /// \brief Running node of the iterator
 		    ///
 		    /// Returns the running node (ie. the source in this case) of the
 		    /// iterator
 		    Node runningNode(const InArcIt &e) const {
 		      return Parent::source(e);
+		    }
 		  };
 		  /// \ingroup digraphbits
 		  ///
 		  /// \brief Extender for the GraphAdaptors
-		  template <typename _Graph>
 		  template <typename _Graph>
 		  class GraphAdaptorExtender : public _Graph {
 		  public:
 		    typedef _Graph Parent;
 		    typedef _Graph Graph;
 		    typedef GraphAdaptorExtender Adaptor;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
-		    // Graph extension
 		    // Graph extension
 		    int maxId(Node) const {
 		      return Parent::maxNodeId();
+		    }
 		    int maxId(Arc) const {
@@ -235,206 +214,186 @@
 		    Edge fromId(int id, Edge) const {
 		      return Parent::edgeFromId(id);
+		    }
 		    Node oppositeNode(const Node &n, const Edge &e) const {
 		      if( n == Parent::u(e))
-			return Parent::v(e);
+		        return Parent::v(e);
 		      else if( n == Parent::v(e))
-			return Parent::u(e);
+		        return Parent::u(e);
 		      else
-			return INVALID;
+		        return INVALID;
+		    }
 		    Arc oppositeArc(const Arc &a) const {
 		      return Parent::direct(a, !Parent::direction(a));
+		    }
 		    using Parent::direct;
 		    Arc direct(const Edge &e, const Node &s) const {
 		      return Parent::direct(e, Parent::u(e) == s);
+		    }
-		    class NodeIt : public Node {
 		    class NodeIt : public Node {
 		      const Adaptor* _adaptor;
 		    public:
 		      NodeIt() {}
 		      NodeIt(Invalid i) : Node(i) { }
 		      explicit NodeIt(const Adaptor& adaptor) : _adaptor(&adaptor) {
-			_adaptor->first(static_cast<Node&>(*this));
+		        _adaptor->first(static_cast<Node&>(*this));
+		      }
 		      NodeIt(const Adaptor& adaptor, const Node& node)
 			: Node(node), _adaptor(&adaptor) {}
 		      NodeIt(const Adaptor& adaptor, const Node& node)
 		        : Node(node), _adaptor(&adaptor) {}
 		      NodeIt& operator++() {
 			_adaptor->next(*this);
-			return *this;
+		      NodeIt& operator++() {
 		        _adaptor->next(*this);
 		        return *this;
+		      }
 		    };
-		    class ArcIt : public Arc {
 		    class ArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      ArcIt() { }
 		      ArcIt(Invalid i) : Arc(i) { }
 		      explicit ArcIt(const Adaptor& adaptor) : _adaptor(&adaptor) {
-			_adaptor->first(static_cast<Arc&>(*this));
+		        _adaptor->first(static_cast<Arc&>(*this));
+		      }
 		      ArcIt(const Adaptor& adaptor, const Arc& e) :
 			Arc(e), _adaptor(&adaptor) { }
 		      ArcIt(const Adaptor& adaptor, const Arc& e) :
 		        Arc(e), _adaptor(&adaptor) { }
 		      ArcIt& operator++() {
 			_adaptor->next(*this);
-			return *this;
+		      ArcIt& operator++() {
 		        _adaptor->next(*this);
 		        return *this;
+		      }
 		    };
-		    class OutArcIt : public Arc {
 		    class OutArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      OutArcIt() { }
 		      OutArcIt(Invalid i) : Arc(i) { }
 		      OutArcIt(const Adaptor& adaptor, const Node& node)
 			: _adaptor(&adaptor) {
-			_adaptor->firstOut(*this, node);
+		      OutArcIt(const Adaptor& adaptor, const Node& node)
 		        : _adaptor(&adaptor) {
 		        _adaptor->firstOut(*this, node);
+		      }
 		      OutArcIt(const Adaptor& adaptor, const Arc& arc)
 			: Arc(arc), _adaptor(&adaptor) {}
 		      OutArcIt(const Adaptor& adaptor, const Arc& arc)
 		        : Arc(arc), _adaptor(&adaptor) {}
 		      OutArcIt& operator++() {
 			_adaptor->nextOut(*this);
-			return *this;
+		      OutArcIt& operator++() {
 		        _adaptor->nextOut(*this);
 		        return *this;
+		      }
 		    };
-		    class InArcIt : public Arc {
 		    class InArcIt : public Arc {
 		      const Adaptor* _adaptor;
 		    public:
 		      InArcIt() { }
 		      InArcIt(Invalid i) : Arc(i) { }
 		      InArcIt(const Adaptor& adaptor, const Node& node)
 			: _adaptor(&adaptor) {
-			_adaptor->firstIn(*this, node);
+		      InArcIt(const Adaptor& adaptor, const Node& node)
 		        : _adaptor(&adaptor) {
 		        _adaptor->firstIn(*this, node);
+		      }
 		      InArcIt(const Adaptor& adaptor, const Arc& arc) :
 			Arc(arc), _adaptor(&adaptor) {}
 		      InArcIt(const Adaptor& adaptor, const Arc& arc) :
 		        Arc(arc), _adaptor(&adaptor) {}
 		      InArcIt& operator++() {
 			_adaptor->nextIn(*this);
-			return *this;
+		      InArcIt& operator++() {
 		        _adaptor->nextIn(*this);
 		        return *this;
+		      }
 		    };
-		    class EdgeIt : public Parent::Edge {
 		    class EdgeIt : public Parent::Edge {
 		      const Adaptor* _adaptor;
 		    public:
 		      EdgeIt() { }
 		      EdgeIt(Invalid i) : Edge(i) { }
 		      explicit EdgeIt(const Adaptor& adaptor) : _adaptor(&adaptor) {
-			_adaptor->first(static_cast<Edge&>(*this));
+		        _adaptor->first(static_cast<Edge&>(*this));
+		      }
 		      EdgeIt(const Adaptor& adaptor, const Edge& e) :
 			Edge(e), _adaptor(&adaptor) { }
 		      EdgeIt(const Adaptor& adaptor, const Edge& e) :
 		        Edge(e), _adaptor(&adaptor) { }
 		      EdgeIt& operator++() {
 			_adaptor->next(*this);
-			return *this;
+		      EdgeIt& operator++() {
 		        _adaptor->next(*this);
 		        return *this;
+		      }
 		    };
-		    class IncEdgeIt : public Edge {
 		    class IncEdgeIt : public Edge {
 		      friend class GraphAdaptorExtender;
 		      const Adaptor* _adaptor;
 		      bool direction;
 		    public:
 		      IncEdgeIt() { }
 		      IncEdgeIt(Invalid i) : Edge(i), direction(false) { }
 		      IncEdgeIt(const Adaptor& adaptor, const Node &n) : _adaptor(&adaptor) {
-			_adaptor->firstInc(static_cast<Edge&>(*this), direction, n);
+		        _adaptor->firstInc(static_cast<Edge&>(*this), direction, n);
+		      }
 		      IncEdgeIt(const Adaptor& adaptor, const Edge &e, const Node &n)
 			: _adaptor(&adaptor), Edge(e) {
 			direction = (_adaptor->u(e) == n);
 		        : _adaptor(&adaptor), Edge(e) {
 		        direction = (_adaptor->u(e) == n);
+		      }
 		      IncEdgeIt& operator++() {
 			_adaptor->nextInc(*this, direction);
 			return *this;
 		        _adaptor->nextInc(*this, direction);
 		        return *this;
+		      }
 		    };
 		    /// \brief Base node of the iterator
 		    ///
 		    /// Returns the base node (ie. the source in this case) of the iterator
 		    Node baseNode(const OutArcIt &a) const {
 		      return Parent::source(a);
+		    }
 		    /// \brief Running node of the iterator
 		    ///
 		    /// Returns the running node (ie. the target in this case) of the
 		    /// iterator
 		    Node runningNode(const OutArcIt &a) const {
 		      return Parent::target(a);
+		    }
 		    /// \brief Base node of the iterator
 		    ///
 		    /// Returns the base node (ie. the target in this case) of the iterator
 		    Node baseNode(const InArcIt &a) const {
 		      return Parent::target(a);
+		    }
 		    /// \brief Running node of the iterator
 		    ///
 		    /// Returns the running node (ie. the source in this case) of the
 		    /// iterator
 		    Node runningNode(const InArcIt &a) const {
 		      return Parent::source(a);
+		    }
 		    /// Base node of the iterator
 		    ///
 		    /// Returns the base node of the iterator
 		    Node baseNode(const IncEdgeIt &e) const {
 		      return e.direction ? Parent::u(e) : Parent::v(e);
+		    }
 		    /// Running node of the iterator
 		    ///
 		    /// Returns the running node of the iterator
 		    Node runningNode(const IncEdgeIt &e) const {
 		      return e.direction ? Parent::v(e) : Parent::u(e);
+		    }
 		  };

lemon/bits/variant.h

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -24,13 +24,13 @@
 		/// \file
 		/// \brief Variant types
 		namespace lemon {
 		  namespace _variant_bits {
 		    template <int left, int right>
 		    struct CTMax {
 		      static const int value = left < right ? right : left;
 		    };
+		  }
@@ -83,15 +83,15 @@
 		    /// \brief Copy constructor
 		    ///
 		    /// Copy constructor
 		    BiVariant(const BiVariant& bivariant) {
 		      flag = bivariant.flag;
 		      if (flag) {
-		        new(reinterpret_cast<First*>(data)) First(bivariant.first());
 		        new(reinterpret_cast<First*>(data)) First(bivariant.first());
 		      } else {
-		        new(reinterpret_cast<Second*>(data)) Second(bivariant.second());
 		        new(reinterpret_cast<Second*>(data)) Second(bivariant.second());
+		      }
+		    }
 		    /// \brief Destrcutor
 		    ///
 		    /// Destructor
@@ -103,46 +103,46 @@
 		    ///
 		    /// This function sets the variant to the default value of the \c
 		    /// First type.
 		    BiVariant& setFirst() {
 		      destroy();
 		      flag = true;
-		      new(reinterpret_cast<First*>(data)) First();
 		      new(reinterpret_cast<First*>(data)) First();
 		      return *this;
+		    }
 		    /// \brief Set to the given value of the \c First type.
 		    ///
 		    /// This function sets the variant to the given value of the \c
 		    /// First type.
 		    BiVariant& setFirst(const First& f) {
 		      destroy();
 		      flag = true;
-		      new(reinterpret_cast<First*>(data)) First(f);
 		      new(reinterpret_cast<First*>(data)) First(f);
 		      return *this;
+		    }
 		    /// \brief Set to the default value of the \c Second type.
 		    ///
 		    /// This function sets the variant to the default value of the \c
 		    /// Second type.
 		    BiVariant& setSecond() {
 		      destroy();
 		      flag = false;
-		      new(reinterpret_cast<Second*>(data)) Second();
 		      new(reinterpret_cast<Second*>(data)) Second();
 		      return *this;
+		    }
 		    /// \brief Set to the given value of the \c Second type.
 		    ///
 		    /// This function sets the variant to the given value of the \c
 		    /// Second type.
 		    BiVariant& setSecond(const Second& s) {
 		      destroy();
 		      flag = false;
-		      new(reinterpret_cast<Second*>(data)) Second(s);
 		      new(reinterpret_cast<Second*>(data)) Second(s);
 		      return *this;
+		    }
 		    /// \brief Operator form of the \c setFirst()
 		    BiVariant& operator=(const First& f) {
 		      return setFirst(f);
@@ -156,15 +156,15 @@
 		    /// \brief Assign operator
 		    BiVariant& operator=(const BiVariant& bivariant) {
 		      if (this == &bivariant) return *this;
 		      destroy();
 		      flag = bivariant.flag;
 		      if (flag) {
-		        new(reinterpret_cast<First*>(data)) First(bivariant.first());
 		        new(reinterpret_cast<First*>(data)) First(bivariant.first());
 		      } else {
-		        new(reinterpret_cast<Second*>(data)) Second(bivariant.second());
 		        new(reinterpret_cast<Second*>(data)) Second(bivariant.second());
+		      }
 		      return *this;
+		    }
 		    /// \brief Reference to the value
 		    ///
@@ -228,19 +228,19 @@
 		      if (flag) {
 		        reinterpret_cast<First*>(data)->~First();
 		      } else {
 		        reinterpret_cast<Second*>(data)->~Second();
+		      }
+		    }
 		    char data[_variant_bits::CTMax<sizeof(First), sizeof(Second)>::value];
 		    bool flag;
 		  };
 		  namespace _variant_bits {
 		    template <int _idx, typename _TypeMap>
 		    struct Memory {
 		      typedef typename _TypeMap::template Map<_idx>::Type Current;
 		      static void destroy(int index, char* place) {
@@ -273,20 +273,20 @@
 		        LEMON_DEBUG(false, "Variant wrong index.");
+		      }
 		    };
 		    template <int _idx, typename _TypeMap>
 		    struct Size {
 		      static const int value =
 		      CTMax<sizeof(typename _TypeMap::template Map<_idx>::Type),
 		      static const int value =
 		      CTMax<sizeof(typename _TypeMap::template Map<_idx>::Type),
 		            Size<_idx - 1, _TypeMap>::value>::value;
 		    };
 		    template <typename _TypeMap>
 		    struct Size<0, _TypeMap> {
-		      static const int value =
 		      static const int value =
 		      sizeof(typename _TypeMap::template Map<0>::Type);
 		    };
+		  }
 		  /// \brief Variant type
@@ -298,13 +298,13 @@
 		  /// variant and it cares for the proper construction and
 		  /// destruction.
 		  ///
 		  /// \param _num The number of the types which can be stored in the
 		  /// variant type.
 		  /// \param _TypeMap This class describes the types of the Variant. The
-		  /// _TypeMap::Map<index>::Type should be a valid type for each index
 		  /// _TypeMap::Map<index>::Type should be a valid type for each index
 		  /// in the range {0, 1, ..., _num - 1}. The \c VariantTypeMap is helper
 		  /// class to define such type mappings up to 10 types.
 		  ///
 		  /// And the usage of the class:
 		  ///\code
 		  /// typedef Variant<3, VariantTypeMap<int, std::string, double> > MyVariant;
@@ -334,13 +334,13 @@
 		    /// \brief Constructor
 		    ///
 		    /// This constructor initalizes to the default value of the \c type
 		    /// with 0 index.
 		    Variant() {
 		      flag = 0;
-		      new(reinterpret_cast<typename TypeMap::template Map<0>::Type*>(data))
 		      new(reinterpret_cast<typename TypeMap::template Map<0>::Type*>(data))
 		        typename TypeMap::template Map<0>::Type();
+		    }
 		    /// \brief Copy constructor
 		    ///
@@ -375,59 +375,59 @@
 		    /// This function sets the variant to the default value of the
 		    /// type with \c _idx index.
 		    template <int _idx>
 		    Variant& set() {
 		      _variant_bits::Memory<num - 1, TypeMap>::destroy(flag, data);
 		      flag = _idx;
-		      new(reinterpret_cast<typename TypeMap::template Map<_idx>::Type*>(data))
 		      new(reinterpret_cast<typename TypeMap::template Map<_idx>::Type*>(data))
 		        typename TypeMap::template Map<_idx>::Type();
 		      return *this;
+		    }
 		    /// \brief Set to the given value of the type with \c _idx index.
 		    ///
 		    /// This function sets the variant to the given value of the type
 		    /// with \c _idx index.
 		    template <int _idx>
 		    Variant& set(const typename _TypeMap::template Map<_idx>::Type& init) {
 		      _variant_bits::Memory<num - 1, TypeMap>::destroy(flag, data);
 		      flag = _idx;
-		      new(reinterpret_cast<typename TypeMap::template Map<_idx>::Type*>(data))
 		      new(reinterpret_cast<typename TypeMap::template Map<_idx>::Type*>(data))
 		        typename TypeMap::template Map<_idx>::Type(init);
 		      return *this;
+		    }
 		    /// \brief Gets the current value of the type with \c _idx index.
 		    ///
 		    /// Gets the current value of the type with \c _idx index.
 		    template <int _idx>
 		    const typename TypeMap::template Map<_idx>::Type& get() const {
 		      LEMON_DEBUG(_idx == flag, "Variant wrong index");
 		      return *reinterpret_cast<const typename TypeMap::
-		        template Map<_idx>::Type*>(data);
 		        template Map<_idx>::Type*>(data);
+		    }
 		    /// \brief Gets the current value of the type with \c _idx index.
 		    ///
 		    /// Gets the current value of the type with \c _idx index.
 		    template <int _idx>
 		    typename _TypeMap::template Map<_idx>::Type& get() {
 		      LEMON_DEBUG(_idx == flag, "Variant wrong index");
 		      return *reinterpret_cast<typename TypeMap::template Map<_idx>::Type*>
-		        (data);
 		        (data);
+		    }
 		    /// \brief Returns the current state of the variant.
 		    ///
 		    /// Returns the current state of the variant.
 		    int state() const {
 		      return flag;
+		    }
 		  private:
 		    char data[_variant_bits::Size<num - 1, TypeMap>::value];
 		    int flag;
 		  };
 		  namespace _variant_bits {
@@ -439,20 +439,20 @@
 		    template <typename _List>
 		    struct Get<0, _List> {
 		      typedef typename _List::Type Type;
 		    };
 		    struct List {};
 		    template <typename _Type, typename _List>
 		    struct Insert {
 		      typedef _List Next;
 		      typedef _Type Type;
 		    };
-		    template <int _idx, typename _T0, typename _T1, typename _T2,
 		    template <int _idx, typename _T0, typename _T1, typename _T2,
 		              typename _T3, typename _T5, typename _T4, typename _T6,
 		              typename _T7, typename _T8, typename _T9>
 		    struct Mapper {
 		      typedef List L10;
 		      typedef Insert<_T9, L10> L9;
 		      typedef Insert<_T8, L9> L8;
@@ -463,32 +463,32 @@
 		      typedef Insert<_T3, L4> L3;
 		      typedef Insert<_T2, L3> L2;
 		      typedef Insert<_T1, L2> L1;
 		      typedef Insert<_T0, L1> L0;
 		      typedef typename Get<_idx, L0>::Type Type;
 		    };
+		  }
 		  /// \brief Helper class for Variant
 		  ///
 		  /// Helper class to define type mappings for Variant. This class
 		  /// converts the template parameters to be mappable by integer.
 		  /// \see Variant
 		  template <
-		    typename _T0,
 		    typename _T0,
 		    typename _T1 = void, typename _T2 = void, typename _T3 = void,
 		    typename _T5 = void, typename _T4 = void, typename _T6 = void,
 		    typename _T7 = void, typename _T8 = void, typename _T9 = void>
 		  struct VariantTypeMap {
 		    template <int _idx>
 		    struct Map {
 		      typedef typename _variant_bits::
 		      Mapper<_idx, _T0, _T1, _T2, _T3, _T4, _T5, _T6, _T7, _T8, _T9>::Type
 		      Type;
 		    };
 		  };
+		}
 		#endif

test/graph_adaptor_test.cc

Show inline comments

 		/* -*- C++ -*-
+		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
@@ -22,41 +22,40 @@
 		#include<lemon/list_graph.h>
 		#include<lemon/smart_graph.h>
 		#include<lemon/concepts/digraph.h>
 		#include<lemon/concepts/graph.h>
 		#include<lemon/digraph_adaptor.h>
 		#include<lemon/graph_adaptor.h>
 		#include<lemon/adaptors.h>
 		#include <limits>
 		#include <lemon/bfs.h>
 		#include <lemon/path.h>
 		#include"test/test_tools.h"
 		#include"test/graph_test.h"
 		using namespace lemon;
 		void checkRevDigraphAdaptor() {
 		  checkConcept<concepts::Digraph, RevDigraphAdaptor<concepts::Digraph> >();
 		void checkReverseDigraph() {
 		  checkConcept<concepts::Digraph, ReverseDigraph<concepts::Digraph> >();
 		  typedef ListDigraph Digraph;
-		  typedef RevDigraphAdaptor<Digraph> Adaptor;
+		  typedef ReverseDigraph<Digraph> Adaptor;
 		  Digraph digraph;
 		  Adaptor adaptor(digraph);
 		  Digraph::Node n1 = digraph.addNode();
 		  Digraph::Node n2 = digraph.addNode();
 		  Digraph::Node n3 = digraph.addNode();
 		  Digraph::Arc a1 = digraph.addArc(n1, n2);
 		  Digraph::Arc a2 = digraph.addArc(n1, n3);
 		  Digraph::Arc a3 = digraph.addArc(n2, n3);
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 3);
 		  checkGraphConArcList(adaptor, 3);
 		  checkGraphOutArcList(adaptor, n1, 0);
 		  checkGraphOutArcList(adaptor, n2, 1);
@@ -75,22 +74,22 @@
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    check(adaptor.source(a) == digraph.target(a), "Wrong reverse");
 		    check(adaptor.target(a) == digraph.source(a), "Wrong reverse");
+		  }
+		}
 		void checkSubDigraphAdaptor() {
 		  checkConcept<concepts::Digraph,
-		    SubDigraphAdaptor<concepts::Digraph,
+		void checkSubDigraph() {
 		  checkConcept<concepts::Digraph,
 		    SubDigraph<concepts::Digraph,
 		    concepts::Digraph::NodeMap<bool>,
 		    concepts::Digraph::ArcMap<bool> > >();
 		  typedef ListDigraph Digraph;
 		  typedef Digraph::NodeMap<bool> NodeFilter;
 		  typedef Digraph::ArcMap<bool> ArcFilter;
-		  typedef SubDigraphAdaptor<Digraph, NodeFilter, ArcFilter> Adaptor;
+		  typedef SubDigraph<Digraph, NodeFilter, ArcFilter> Adaptor;
 		  Digraph digraph;
 		  NodeFilter node_filter(digraph);
 		  ArcFilter arc_filter(digraph);
 		  Adaptor adaptor(digraph, node_filter, arc_filter);
@@ -120,13 +119,13 @@
 		  checkNodeIds(adaptor);
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
-		  arc_filter[a2] = false;
 		  arc_filter[a2] = false;
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 2);
 		  checkGraphConArcList(adaptor, 2);
 		  checkGraphOutArcList(adaptor, n1, 1);
@@ -140,13 +139,13 @@
 		  checkNodeIds(adaptor);
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
-		  node_filter[n1] = false;
 		  node_filter[n1] = false;
 		  checkGraphNodeList(adaptor, 2);
 		  checkGraphArcList(adaptor, 1);
 		  checkGraphConArcList(adaptor, 1);
 		  checkGraphOutArcList(adaptor, n2, 1);
@@ -172,20 +171,20 @@
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
+		}
 		void checkNodeSubDigraphAdaptor() {
 		  checkConcept<concepts::Digraph,
-		    NodeSubDigraphAdaptor<concepts::Digraph,
+		void checkFilterNodes1() {
 		  checkConcept<concepts::Digraph,
 		    FilterNodes<concepts::Digraph,
 		      concepts::Digraph::NodeMap<bool> > >();
 		  typedef ListDigraph Digraph;
 		  typedef Digraph::NodeMap<bool> NodeFilter;
-		  typedef NodeSubDigraphAdaptor<Digraph, NodeFilter> Adaptor;
+		  typedef FilterNodes<Digraph, NodeFilter> Adaptor;
 		  Digraph digraph;
 		  NodeFilter node_filter(digraph);
 		  Adaptor adaptor(digraph, node_filter);
 		  Digraph::Node n1 = digraph.addNode();
@@ -213,13 +212,13 @@
 		  checkNodeIds(adaptor);
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
-		  node_filter[n1] = false;
 		  node_filter[n1] = false;
 		  checkGraphNodeList(adaptor, 2);
 		  checkGraphArcList(adaptor, 1);
 		  checkGraphConArcList(adaptor, 1);
 		  checkGraphOutArcList(adaptor, n2, 1);
@@ -244,20 +243,20 @@
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
+		}
 		void checkArcSubDigraphAdaptor() {
 		  checkConcept<concepts::Digraph,
-		    ArcSubDigraphAdaptor<concepts::Digraph,
+		void checkFilterArcs() {
 		  checkConcept<concepts::Digraph,
 		    FilterArcs<concepts::Digraph,
 		    concepts::Digraph::ArcMap<bool> > >();
 		  typedef ListDigraph Digraph;
 		  typedef Digraph::ArcMap<bool> ArcFilter;
-		  typedef ArcSubDigraphAdaptor<Digraph, ArcFilter> Adaptor;
+		  typedef FilterArcs<Digraph, ArcFilter> Adaptor;
 		  Digraph digraph;
 		  ArcFilter arc_filter(digraph);
 		  Adaptor adaptor(digraph, arc_filter);
 		  Digraph::Node n1 = digraph.addNode();
@@ -285,13 +284,13 @@
 		  checkNodeIds(adaptor);
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
-		  arc_filter[a2] = false;
 		  arc_filter[a2] = false;
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 2);
 		  checkGraphConArcList(adaptor, 2);
 		  checkGraphOutArcList(adaptor, n1, 1);
@@ -318,29 +317,29 @@
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
+		}
 		void checkUndirDigraphAdaptor() {
 		  checkConcept<concepts::Graph, UndirDigraphAdaptor<concepts::Digraph> >();
 		void checkUndirector() {
 		  checkConcept<concepts::Graph, Undirector<concepts::Digraph> >();
 		  typedef ListDigraph Digraph;
-		  typedef UndirDigraphAdaptor<Digraph> Adaptor;
+		  typedef Undirector<Digraph> Adaptor;
 		  Digraph digraph;
 		  Adaptor adaptor(digraph);
 		  Digraph::Node n1 = digraph.addNode();
 		  Digraph::Node n2 = digraph.addNode();
 		  Digraph::Node n3 = digraph.addNode();
 		  Digraph::Arc a1 = digraph.addArc(n1, n2);
 		  Digraph::Arc a2 = digraph.addArc(n1, n3);
 		  Digraph::Arc a3 = digraph.addArc(n2, n3);
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphEdgeList(adaptor, 3);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphConEdgeList(adaptor, 3);
@@ -368,21 +367,21 @@
 		    check(adaptor.u(e) == digraph.source(e), "Wrong undir");
 		    check(adaptor.v(e) == digraph.target(e), "Wrong undir");
+		  }
+		}
 		void checkResDigraphAdaptor() {
 		  checkConcept<concepts::Digraph,
 		    ResDigraphAdaptor<concepts::Digraph,
 		    concepts::Digraph::ArcMap<int>,
 		void checkResidual() {
 		  checkConcept<concepts::Digraph,
 		    Residual<concepts::Digraph,
 		    concepts::Digraph::ArcMap<int>,
 		    concepts::Digraph::ArcMap<int> > >();
 		  typedef ListDigraph Digraph;
 		  typedef Digraph::ArcMap<int> IntArcMap;
-		  typedef ResDigraphAdaptor<Digraph, IntArcMap> Adaptor;
+		  typedef Residual<Digraph, IntArcMap> Adaptor;
 		  Digraph digraph;
 		  IntArcMap capacity(digraph), flow(digraph);
 		  Adaptor adaptor(digraph, capacity, flow);
 		  Digraph::Node n1 = digraph.addNode();
@@ -404,13 +403,13 @@
 		  capacity[a5] = 6;
 		  capacity[a6] = 10;
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    flow[a] = 0;
+		  }
 		  checkGraphNodeList(adaptor, 4);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphOutArcList(adaptor, n1, 3);
 		  checkGraphOutArcList(adaptor, n2, 2);
@@ -422,13 +421,13 @@
 		  checkGraphInArcList(adaptor, n3, 2);
 		  checkGraphInArcList(adaptor, n4, 3);
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    flow[a] = capacity[a] / 2;
+		  }
 		  checkGraphNodeList(adaptor, 4);
 		  checkGraphArcList(adaptor, 12);
 		  checkGraphConArcList(adaptor, 12);
 		  checkGraphOutArcList(adaptor, n1, 3);
 		  checkGraphOutArcList(adaptor, n2, 3);
@@ -446,13 +445,13 @@
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    flow[a] = capacity[a];
+		  }
 		  checkGraphNodeList(adaptor, 4);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphOutArcList(adaptor, n1, 0);
 		  checkGraphOutArcList(adaptor, n2, 1);
@@ -467,52 +466,53 @@
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    flow[a] = 0;
+		  }
 		  int flow_value = 0;
 		  while (true) {
 		    Bfs<Adaptor> bfs(adaptor);
 		    bfs.run(n1, n4);
 		    if (!bfs.reached(n4)) break;
 		    Path<Adaptor> p = bfs.path(n4);
 		    int min = std::numeric_limits<int>::max();
 		    for (Path<Adaptor>::ArcIt a(p); a != INVALID; ++a) {
-		      if (adaptor.rescap(a) < min) min = adaptor.rescap(a);
+		      if (adaptor.residualCapacity(a) < min)
 		        min = adaptor.residualCapacity(a);
+		    }
 		    for (Path<Adaptor>::ArcIt a(p); a != INVALID; ++a) {
 		      adaptor.augment(a, min);
+		    }
 		    flow_value += min;
+		  }
 		  check(flow_value == 18, "Wrong flow with res graph adaptor");
+		}
 		void checkSplitDigraphAdaptor() {
 		  checkConcept<concepts::Digraph, SplitDigraphAdaptor<concepts::Digraph> >();
 		void checkSplitNodes() {
 		  checkConcept<concepts::Digraph, SplitNodes<concepts::Digraph> >();
 		  typedef ListDigraph Digraph;
-		  typedef SplitDigraphAdaptor<Digraph> Adaptor;
+		  typedef SplitNodes<Digraph> Adaptor;
 		  Digraph digraph;
 		  Adaptor adaptor(digraph);
 		  Digraph::Node n1 = digraph.addNode();
 		  Digraph::Node n2 = digraph.addNode();
 		  Digraph::Node n3 = digraph.addNode();
 		  Digraph::Arc a1 = digraph.addArc(n1, n2);
 		  Digraph::Arc a2 = digraph.addArc(n1, n3);
 		  Digraph::Arc a3 = digraph.addArc(n2, n3);
 		  checkGraphNodeList(adaptor, 6);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphOutArcList(adaptor, adaptor.inNode(n1), 1);
 		  checkGraphOutArcList(adaptor, adaptor.outNode(n1), 2);
@@ -527,41 +527,41 @@
 		  checkGraphInArcList(adaptor, adaptor.outNode(n2), 1);
 		  checkGraphInArcList(adaptor, adaptor.inNode(n3), 2);
 		  checkGraphInArcList(adaptor, adaptor.outNode(n3), 1);
 		  checkNodeIds(adaptor);
 		  checkArcIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  for (Adaptor::ArcIt a(adaptor); a != INVALID; ++a) {
 		    if (adaptor.origArc(a)) {
 		      Digraph::Arc oa = a;
 		      check(adaptor.source(a) == adaptor.outNode(digraph.source(oa)),
 			    "Wrong split");
 		      check(adaptor.target(a) == adaptor.inNode(digraph.target(oa)),
 			    "Wrong split");
 		      check(adaptor.source(a) == adaptor.outNode(digraph.source(oa)),
 		            "Wrong split");
 		      check(adaptor.target(a) == adaptor.inNode(digraph.target(oa)),
 		            "Wrong split");
 		    } else {
 		      Digraph::Node on = a;
 		      check(adaptor.source(a) == adaptor.inNode(on), "Wrong split");
 		      check(adaptor.target(a) == adaptor.outNode(on), "Wrong split");
+		    }
+		  }
+		}
 		void checkSubGraphAdaptor() {
 		  checkConcept<concepts::Graph,
-		    SubGraphAdaptor<concepts::Graph,
+		void checkSubGraph() {
 		  checkConcept<concepts::Graph,
 		    SubGraph<concepts::Graph,
 		    concepts::Graph::NodeMap<bool>,
 		    concepts::Graph::EdgeMap<bool> > >();
 		  typedef ListGraph Graph;
 		  typedef Graph::NodeMap<bool> NodeFilter;
 		  typedef Graph::EdgeMap<bool> EdgeFilter;
-		  typedef SubGraphAdaptor<Graph, NodeFilter, EdgeFilter> Adaptor;
+		  typedef SubGraph<Graph, NodeFilter, EdgeFilter> Adaptor;
 		  Graph graph;
 		  NodeFilter node_filter(graph);
 		  EdgeFilter edge_filter(graph);
 		  Adaptor adaptor(graph, node_filter, edge_filter);
@@ -604,13 +604,13 @@
 		  checkEdgeIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
-		  edge_filter[e2] = false;
 		  edge_filter[e2] = false;
 		  checkGraphNodeList(adaptor, 4);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphEdgeList(adaptor, 3);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphConEdgeList(adaptor, 3);
@@ -635,13 +635,13 @@
 		  checkEdgeIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
-		  node_filter[n1] = false;
 		  node_filter[n1] = false;
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 4);
 		  checkGraphEdgeList(adaptor, 2);
 		  checkGraphConArcList(adaptor, 4);
 		  checkGraphConEdgeList(adaptor, 2);
@@ -681,20 +681,20 @@
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
+		}
 		void checkNodeSubGraphAdaptor() {
 		  checkConcept<concepts::Graph,
-		    NodeSubGraphAdaptor<concepts::Graph,
+		void checkFilterNodes2() {
 		  checkConcept<concepts::Graph,
 		    FilterNodes<concepts::Graph,
 		      concepts::Graph::NodeMap<bool> > >();
 		  typedef ListGraph Graph;
 		  typedef Graph::NodeMap<bool> NodeFilter;
-		  typedef NodeSubGraphAdaptor<Graph, NodeFilter> Adaptor;
+		  typedef FilterNodes<Graph, NodeFilter> Adaptor;
 		  Graph graph;
 		  NodeFilter node_filter(graph);
 		  Adaptor adaptor(graph, node_filter);
 		  Graph::Node n1 = graph.addNode();
@@ -735,13 +735,13 @@
 		  checkEdgeIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
-		  node_filter[n1] = false;
 		  node_filter[n1] = false;
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 4);
 		  checkGraphEdgeList(adaptor, 2);
 		  checkGraphConArcList(adaptor, 4);
 		  checkGraphConEdgeList(adaptor, 2);
@@ -780,20 +780,20 @@
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
+		}
 		void checkEdgeSubGraphAdaptor() {
 		  checkConcept<concepts::Graph,
-		    EdgeSubGraphAdaptor<concepts::Graph,
+		void checkFilterEdges() {
 		  checkConcept<concepts::Graph,
 		    FilterEdges<concepts::Graph,
 		    concepts::Graph::EdgeMap<bool> > >();
 		  typedef ListGraph Graph;
 		  typedef Graph::EdgeMap<bool> EdgeFilter;
-		  typedef EdgeSubGraphAdaptor<Graph, EdgeFilter> Adaptor;
+		  typedef FilterEdges<Graph, EdgeFilter> Adaptor;
 		  Graph graph;
 		  EdgeFilter edge_filter(graph);
 		  Adaptor adaptor(graph, edge_filter);
 		  Graph::Node n1 = graph.addNode();
@@ -834,13 +834,13 @@
 		  checkEdgeIds(adaptor);
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
-		  edge_filter[e2] = false;
 		  edge_filter[e2] = false;
 		  checkGraphNodeList(adaptor, 4);
 		  checkGraphArcList(adaptor, 6);
 		  checkGraphEdgeList(adaptor, 3);
 		  checkGraphConArcList(adaptor, 6);
 		  checkGraphConEdgeList(adaptor, 3);
@@ -882,67 +882,67 @@
 		  checkGraphNodeMap(adaptor);
 		  checkGraphArcMap(adaptor);
 		  checkGraphEdgeMap(adaptor);
+		}
 		void checkDirGraphAdaptor() {
 		  checkConcept<concepts::Digraph,
-		    DirGraphAdaptor<concepts::Graph, concepts::Graph::EdgeMap<bool> > >();
+		void checkOrienter() {
 		  checkConcept<concepts::Digraph,
 		    Orienter<concepts::Graph, concepts::Graph::EdgeMap<bool> > >();
 		  typedef ListGraph Graph;
 		  typedef ListGraph::EdgeMap<bool> DirMap;
-		  typedef DirGraphAdaptor<Graph> Adaptor;
+		  typedef Orienter<Graph> Adaptor;
 		  Graph graph;
 		  DirMap dir(graph, true);
 		  Adaptor adaptor(graph, dir);
 		  Graph::Node n1 = graph.addNode();
 		  Graph::Node n2 = graph.addNode();
 		  Graph::Node n3 = graph.addNode();
 		  Graph::Edge e1 = graph.addEdge(n1, n2);
 		  Graph::Edge e2 = graph.addEdge(n1, n3);
 		  Graph::Edge e3 = graph.addEdge(n2, n3);
 		  checkGraphNodeList(adaptor, 3);
 		  checkGraphArcList(adaptor, 3);
 		  checkGraphConArcList(adaptor, 3);
+		  {
 		    dir[e1] = true;
 		    Adaptor::Node u = adaptor.source(e1);
 		    Adaptor::Node v = adaptor.target(e1);
 		    dir[e1] = false;
 		    check (u == adaptor.target(e1), "Wrong dir");
 		    check (v == adaptor.source(e1), "Wrong dir");
 		    check ((u == n1 && v == n2) || (u == n2 && v == n1), "Wrong dir");
 		    dir[e1] = n1 == u;
+		  }
+		  {
 		    dir[e2] = true;
 		    Adaptor::Node u = adaptor.source(e2);
 		    Adaptor::Node v = adaptor.target(e2);
 		    dir[e2] = false;
 		    check (u == adaptor.target(e2), "Wrong dir");
 		    check (v == adaptor.source(e2), "Wrong dir");
 		    check ((u == n1 && v == n3) || (u == n3 && v == n1), "Wrong dir");
 		    dir[e2] = n3 == u;
+		  }
+		  {
 		    dir[e3] = true;
 		    Adaptor::Node u = adaptor.source(e3);
 		    Adaptor::Node v = adaptor.target(e3);
 		    dir[e3] = false;
 		    check (u == adaptor.target(e3), "Wrong dir");
 		    check (v == adaptor.source(e3), "Wrong dir");
 		    check ((u == n2 && v == n3) || (u == n3 && v == n2), "Wrong dir");
 		    dir[e3] = n2 == u;
@@ -964,21 +964,21 @@
+		}
 		int main(int, const char **) {
 		  checkRevDigraphAdaptor();
 		  checkSubDigraphAdaptor();
 		  checkNodeSubDigraphAdaptor();
 		  checkArcSubDigraphAdaptor();
 		  checkUndirDigraphAdaptor();
 		  checkResDigraphAdaptor();
-		  checkSplitDigraphAdaptor();
+		  checkReverseDigraph();
 		  checkSubDigraph();
 		  checkFilterNodes1();
 		  checkFilterArcs();
 		  checkUndirector();
 		  checkResidual();
 		  checkSplitNodes();
 		  checkSubGraphAdaptor();
 		  checkNodeSubGraphAdaptor();
 		  checkEdgeSubGraphAdaptor();
 		  checkDirGraphAdaptor();
 		  checkSubGraph();
 		  checkFilterNodes2();
 		  checkFilterEdges();
 		  checkOrienter();
 		  return 0;
+		}

lemon/graph_adaptor.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_GRAPH_ADAPTOR_H
 		#define LEMON_GRAPH_ADAPTOR_H
 		///\ingroup graph_adaptors
 		///\file
 		///\brief Several graph adaptors.
 		///
 		///This file contains several useful undirected graph adaptor classes.
 		#include <lemon/core.h>
 		#include <lemon/maps.h>
 		#include <lemon/bits/graph_adaptor_extender.h>
 		namespace lemon {
 		  template<typename _Graph>
 		  class GraphAdaptorBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef Graph ParentGraph;
 		  protected:
 		    Graph* _graph;
 		    GraphAdaptorBase() : _graph(0) {}
 		    void setGraph(Graph& graph) { _graph = &graph; }
 		  public:
 		    GraphAdaptorBase(Graph& graph) : _graph(&graph) {}
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Arc Arc;
 		    typedef typename Graph::Edge Edge;
 		    void first(Node& i) const { _graph->first(i); }
 		    void first(Arc& i) const { _graph->first(i); }
 		    void first(Edge& i) const { _graph->first(i); }
 		    void firstIn(Arc& i, const Node& n) const { _graph->firstIn(i, n); }
 		    void firstOut(Arc& i, const Node& n ) const { _graph->firstOut(i, n); }
 		    void firstInc(Edge &i, bool &d, const Node &n) const {
 		      _graph->firstInc(i, d, n);
+		    }
 		    void next(Node& i) const { _graph->next(i); }
 		    void next(Arc& i) const { _graph->next(i); }
 		    void next(Edge& i) const { _graph->next(i); }
 		    void nextIn(Arc& i) const { _graph->nextIn(i); }
 		    void nextOut(Arc& i) const { _graph->nextOut(i); }
 		    void nextInc(Edge &i, bool &d) const { _graph->nextInc(i, d); }
 		    Node u(const Edge& e) const { return _graph->u(e); }
 		    Node v(const Edge& e) const { return _graph->v(e); }
 		    Node source(const Arc& a) const { return _graph->source(a); }
 		    Node target(const Arc& a) const { return _graph->target(a); }
 		    typedef NodeNumTagIndicator<Graph> NodeNumTag;
 		    int nodeNum() const { return _graph->nodeNum(); }
 		    typedef EdgeNumTagIndicator<Graph> EdgeNumTag;
 		    int arcNum() const { return _graph->arcNum(); }
 		    int edgeNum() const { return _graph->edgeNum(); }
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v, const Arc& prev = INVALID) {
 		      return _graph->findArc(u, v, prev);
+		    }
 		    Edge findEdge(const Node& u, const Node& v, const Edge& prev = INVALID) {
 		      return _graph->findEdge(u, v, prev);
+		    }
 		    Node addNode() { return _graph->addNode(); }
 		    Edge addEdge(const Node& u, const Node& v) { return _graph->addEdge(u, v); }
 		    void erase(const Node& i) { _graph->erase(i); }
 		    void erase(const Edge& i) { _graph->erase(i); }
 		    void clear() { _graph->clear(); }
 		    bool direction(const Arc& a) const { return _graph->direction(a); }
 		    Arc direct(const Edge& e, bool d) const { return _graph->direct(e, d); }
 		    int id(const Node& v) const { return _graph->id(v); }
 		    int id(const Arc& a) const { return _graph->id(a); }
 		    int id(const Edge& e) const { return _graph->id(e); }
 		    Node nodeFromId(int ix) const { return _graph->nodeFromId(ix); }
 		    Arc arcFromId(int ix) const { return _graph->arcFromId(ix); }
 		    Edge edgeFromId(int ix) const { return _graph->edgeFromId(ix); }
 		    int maxNodeId() const { return _graph->maxNodeId(); }
 		    int maxArcId() const { return _graph->maxArcId(); }
 		    int maxEdgeId() const { return _graph->maxEdgeId(); }
 		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
 		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _graph->notifier(Edge()); }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<Graph>& adapter)
 			: Parent(*adapter._graph) {}
 		      NodeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 			: Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 			return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public Graph::template ArcMap<_Value> {
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<Graph>& adapter)
 			: Parent(*adapter._graph) {}
 		      ArcMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 			: Parent(*adapter._graph, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 			return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public Graph::template EdgeMap<_Value> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<Graph>& adapter)
 			: Parent(*adapter._graph) {}
 		      EdgeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
 			: Parent(*adapter._graph, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 			return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Graph, typename NodeFilterMap,
 			    typename EdgeFilterMap, bool checked = true>
 		  class SubGraphAdaptorBase : public GraphAdaptorBase<_Graph> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef SubGraphAdaptorBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    SubGraphAdaptorBase()
 		      : Parent(), _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
 		      _edge_filter_map=&edge_filter_map;
+		    }
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::source(i)]
 			     || !(*_node_filter_map)[Parent::target(i)])) Parent::next(i);
+		    }
 		    void first(Edge& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::u(i)]
 			     || !(*_node_filter_map)[Parent::v(i)])) Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::source(i)])) Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::target(i)])) Parent::nextOut(i);
+		    }
 		    void firstInc(Edge& i, bool& d, const Node& n) const {
 		      Parent::firstInc(i, d, n);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		            || !(*_node_filter_map)[Parent::u(i)]
 		            || !(*_node_filter_map)[Parent::v(i)])) Parent::nextInc(i, d);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::source(i)]
 			     || !(*_node_filter_map)[Parent::target(i)])) Parent::next(i);
+		    }
 		    void next(Edge& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::u(i)]
 			     || !(*_node_filter_map)[Parent::v(i)])) Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::source(i)])) Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 			     || !(*_node_filter_map)[Parent::target(i)])) Parent::nextOut(i);
+		    }
 		    void nextInc(Edge& i, bool& d) const {
 		      Parent::nextInc(i, d);
 		      while (i!=INVALID && (!(*_edge_filter_map)[i]
 		            || !(*_node_filter_map)[Parent::u(i)]
 		            || !(*_node_filter_map)[Parent::v(i)])) Parent::nextInc(i, d);
+		    }
 		    void hide(const Node& n) const { _node_filter_map->set(n, false); }
 		    void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
 		    void unHide(const Node& n) const { _node_filter_map->set(n, true); }
 		    void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
 		    bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
 		    bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 				  const Arc& prev = INVALID) {
 		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
 		        return INVALID;
+		      }
 		      Arc arc = Parent::findArc(u, v, prev);
 		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    Edge findEdge(const Node& u, const Node& v,
 				  const Edge& prev = INVALID) {
 		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
 		        return INVALID;
+		      }
 		      Edge edge = Parent::findEdge(u, v, prev);
 		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 			return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 			typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 			return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template EdgeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 			return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		  };
 		  template <typename _Graph, typename NodeFilterMap, typename EdgeFilterMap>
 		  class SubGraphAdaptorBase<_Graph, NodeFilterMap, EdgeFilterMap, false>
 		    : public GraphAdaptorBase<_Graph> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef SubGraphAdaptorBase Adaptor;
 		    typedef GraphAdaptorBase<_Graph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    SubGraphAdaptorBase() : Parent(),
 					    _node_filter_map(0), _edge_filter_map(0) { }
 		    void setNodeFilterMap(NodeFilterMap& node_filter_map) {
 		      _node_filter_map=&node_filter_map;
+		    }
 		    void setEdgeFilterMap(EdgeFilterMap& edge_filter_map) {
 		      _edge_filter_map=&edge_filter_map;
+		    }
 		  public:
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void first(Edge& i) const {
 		      Parent::first(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void firstIn(Arc& i, const Node& n) const {
 		      Parent::firstIn(i, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		    }
 		    void firstOut(Arc& i, const Node& n) const {
 		      Parent::firstOut(i, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		    }
 		    void firstInc(Edge& i, bool& d, const Node& n) const {
 		      Parent::firstInc(i, d, n);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void next(Edge& i) const {
 		      Parent::next(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		    }
 		    void nextInc(Edge& i, bool& d) const {
 		      Parent::nextInc(i, d);
 		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextInc(i, d);
+		    }
 		    void hide(const Node& n) const { _node_filter_map->set(n, false); }
 		    void hide(const Edge& e) const { _edge_filter_map->set(e, false); }
 		    void unHide(const Node& n) const { _node_filter_map->set(n, true); }
 		    void unHide(const Edge& e) const { _edge_filter_map->set(e, true); }
 		    bool hidden(const Node& n) const { return !(*_node_filter_map)[n]; }
 		    bool hidden(const Edge& e) const { return !(*_edge_filter_map)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 				  const Arc& prev = INVALID) {
 		      Arc arc = Parent::findArc(u, v, prev);
 		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    Edge findEdge(const Node& u, const Node& v,
 				  const Edge& prev = INVALID) {
 		      Edge edge = Parent::findEdge(u, v, prev);
 		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template NodeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template NodeMap<Value> > MapParent;
 		      NodeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      NodeMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 			return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
 			typename Parent::template ArcMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template ArcMap<Value> > MapParent;
 		      ArcMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      ArcMap(const Adaptor& adaptor, const Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 			return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
 		        typename Parent::template EdgeMap<_Value> > {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, typename Parent::
 		                             template EdgeMap<Value> > MapParent;
 		      EdgeMap(const Adaptor& adaptor)
 			: MapParent(adaptor) {}
 		      EdgeMap(const Adaptor& adaptor, const _Value& value)
 			: MapParent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 			return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
 		        MapParent::operator=(cmap);
 			return *this;
+		      }
 		    };
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief A graph adaptor for hiding nodes and edges from an
 		  /// undirected graph.
 		  ///
 		  /// SubGraphAdaptor shows the graph with filtered node-set and
 		  /// edge-set. If the \c checked parameter is true then it filters
 		  /// the edge-set to do not get invalid edges which incident node is
 		  /// filtered.
 		  ///
 		  /// If the \c checked template parameter is false then we have to
 		  /// note that the node-iterator cares only the filter on the
 		  /// node-set, and the edge-iterator cares only the filter on the
 		  /// edge-set.  This way the edge-map should filter all arcs which
 		  /// has filtered end node.
 		  template<typename _Graph, typename NodeFilterMap,
 			   typename EdgeFilterMap, bool checked = true>
 		  class SubGraphAdaptor :
 		    public GraphAdaptorExtender<
 		    SubGraphAdaptorBase<_Graph, NodeFilterMap, EdgeFilterMap, checked> > {
 		  public:
 		    typedef _Graph Graph;
 		    typedef GraphAdaptorExtender<
 		      SubGraphAdaptorBase<_Graph, NodeFilterMap, EdgeFilterMap> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Edge Edge;
 		  protected:
 		    SubGraphAdaptor() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a sub-graph-adaptor for the given graph with
 		    /// given node and edge map filters.
 		    SubGraphAdaptor(Graph& _graph, NodeFilterMap& node_filter_map,
 				    EdgeFilterMap& edge_filter_map) {
 		      setGraph(_graph);
 		      setNodeFilterMap(node_filter_map);
 		      setEdgeFilterMap(edge_filter_map);
+		    }
 		    /// \brief Hides the node of the graph
 		    ///
 		    /// 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.
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    /// \brief Hides the edge of the graph
 		    ///
 		    /// This function hides \c e in the digraph, 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.
 		    void hide(const Edge& e) const { Parent::hide(e); }
 		    /// \brief Unhides the node of the graph
 		    ///
 		    /// 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
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    /// \brief Unhides the edge of the graph
 		    ///
 		    /// 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
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
 		    /// \brief Returns true if \c n is hidden.
 		    ///
 		    /// Returns true if \c n 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.
 		    ///
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
 		  };
 		  /// \brief Just gives back a sub-graph adaptor
 		  ///
 		  /// Just gives back a sub-graph adaptor
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraphAdaptor<const Graph, NodeFilterMap, ArcFilterMap>
 		  subGraphAdaptor(const Graph& graph,
 		                   NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraphAdaptor<const Graph, NodeFilterMap, ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraphAdaptor<const Graph, const NodeFilterMap, ArcFilterMap>
 		  subGraphAdaptor(const Graph& graph,
 		                   NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraphAdaptor<const Graph, const NodeFilterMap, ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraphAdaptor<const Graph, NodeFilterMap, const ArcFilterMap>
 		  subGraphAdaptor(const Graph& graph,
 		                   NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraphAdaptor<const Graph, NodeFilterMap, const ArcFilterMap>
 		      (graph, nfm, efm);
+		  }
 		  template<typename Graph, typename NodeFilterMap, typename ArcFilterMap>
 		  SubGraphAdaptor<const Graph, const NodeFilterMap, const ArcFilterMap>
 		  subGraphAdaptor(const Graph& graph,
 		                   NodeFilterMap& nfm, ArcFilterMap& efm) {
 		    return SubGraphAdaptor<const Graph, const NodeFilterMap,
 		      const ArcFilterMap>(graph, nfm, efm);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief An adaptor for hiding nodes from an graph.
 		  ///
 		  /// An adaptor for hiding nodes from an graph.  This
 		  /// adaptor specializes SubGraphAdaptor in the way that only the
 		  /// node-set can be filtered. In usual case the checked parameter is
 		  /// true, we get the induced subgraph. But if the checked parameter
 		  /// is false then we can filter only isolated nodes.
 		  template<typename _Graph, typename _NodeFilterMap, bool checked = true>
 		  class NodeSubGraphAdaptor :
 		    public SubGraphAdaptor<_Graph, _NodeFilterMap,
 					   ConstMap<typename _Graph::Edge, bool>, checked> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
 		    typedef SubGraphAdaptor<Graph, NodeFilterMap,
 					    ConstMap<typename Graph::Edge, bool> > Parent;
 		    typedef typename Parent::Node Node;
 		  protected:
 		    ConstMap<typename Graph::Edge, bool> const_true_map;
 		    NodeSubGraphAdaptor() : const_true_map(true) {
 		      Parent::setEdgeFilterMap(const_true_map);
+		    }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a node-sub-graph-adaptor for the given graph with
 		    /// given node map filters.
 		    NodeSubGraphAdaptor(Graph& _graph, NodeFilterMap& node_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(_graph);
 		      Parent::setNodeFilterMap(node_filter_map);
 		      Parent::setEdgeFilterMap(const_true_map);
+		    }
 		    /// \brief Hides the node of the graph
 		    ///
 		    /// 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.
 		    void hide(const Node& n) const { Parent::hide(n); }
 		    /// \brief Unhides the node of the graph
 		    ///
 		    /// 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
 		    void unHide(const Node& n) const { Parent::unHide(n); }
 		    /// \brief Returns true if \c n is hidden.
 		    ///
 		    /// Returns true if \c n is hidden.
 		    ///
 		    bool hidden(const Node& n) const { return Parent::hidden(n); }
 		  };
 		  /// \brief Just gives back a node-sub-graph adaptor
 		  ///
 		  /// Just gives back a node-sub-graph adaptor
 		  template<typename Graph, typename NodeFilterMap>
 		  NodeSubGraphAdaptor<const Graph, NodeFilterMap>
 		  nodeSubGraphAdaptor(const Graph& graph, NodeFilterMap& nfm) {
 		    return NodeSubGraphAdaptor<const Graph, NodeFilterMap>(graph, nfm);
+		  }
 		  template<typename Graph, typename NodeFilterMap>
 		  NodeSubGraphAdaptor<const Graph, const NodeFilterMap>
 		  nodeSubGraphAdaptor(const Graph& graph, const NodeFilterMap& nfm) {
 		    return NodeSubGraphAdaptor<const Graph, const NodeFilterMap>(graph, nfm);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief An adaptor for hiding edges from an graph.
 		  ///
 		  /// \warning Graph adaptors are in even more experimental state
 		  /// than the other parts of the lib. Use them at you own risk.
 		  ///
 		  /// An adaptor for hiding edges from an graph.
 		  /// This adaptor specializes SubGraphAdaptor in the way that
 		  /// only the arc-set
 		  /// can be filtered.
 		  template<typename _Graph, typename _EdgeFilterMap>
 		  class EdgeSubGraphAdaptor :
 		    public SubGraphAdaptor<_Graph, ConstMap<typename _Graph::Node,bool>,
 		                           _EdgeFilterMap, false> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _EdgeFilterMap EdgeFilterMap;
 		    typedef SubGraphAdaptor<Graph, ConstMap<typename Graph::Node,bool>,
 					    EdgeFilterMap, false> Parent;
 		    typedef typename Parent::Edge Edge;
 		  protected:
 		    ConstMap<typename Graph::Node, bool> const_true_map;
 		    EdgeSubGraphAdaptor() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a edge-sub-graph-adaptor for the given graph with
 		    /// given node map filters.
 		    EdgeSubGraphAdaptor(Graph& _graph, EdgeFilterMap& edge_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(_graph);
 		      Parent::setNodeFilterMap(const_true_map);
 		      Parent::setEdgeFilterMap(edge_filter_map);
+		    }
 		    /// \brief Hides the edge of the graph
 		    ///
 		    /// This function hides \c e in the digraph, 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.
 		    void hide(const Edge& e) const { Parent::hide(e); }
 		    /// \brief Unhides the edge of the graph
 		    ///
 		    /// 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
 		    void unHide(const Edge& e) const { Parent::unHide(e); }
 		    /// \brief Returns true if \c e is hidden.
 		    ///
 		    /// Returns true if \c e is hidden.
 		    ///
 		    bool hidden(const Edge& e) const { return Parent::hidden(e); }
 		  };
 		  /// \brief Just gives back an edge-sub-graph adaptor
 		  ///
 		  /// Just gives back an edge-sub-graph adaptor
 		  template<typename Graph, typename EdgeFilterMap>
 		  EdgeSubGraphAdaptor<const Graph, EdgeFilterMap>
 		  edgeSubGraphAdaptor(const Graph& graph, EdgeFilterMap& efm) {
 		    return EdgeSubGraphAdaptor<const Graph, EdgeFilterMap>(graph, efm);
+		  }
 		  template<typename Graph, typename EdgeFilterMap>
 		  EdgeSubGraphAdaptor<const Graph, const EdgeFilterMap>
 		  edgeSubGraphAdaptor(const Graph& graph, const EdgeFilterMap& efm) {
 		    return EdgeSubGraphAdaptor<const Graph, const EdgeFilterMap>(graph, efm);
+		  }
 		  template <typename _Graph, typename _DirectionMap>
 		  class DirGraphAdaptorBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _DirectionMap DirectionMap;
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Edge Arc;
 		    /// \brief Reverse arc
 		    ///
 		    /// It reverse the given arc. It simply negate the direction in the map.
 		    void reverseArc(const Arc& arc) {
 		      _direction->set(arc, !(*_direction)[arc]);
+		    }
 		    void first(Node& i) const { _graph->first(i); }
 		    void first(Arc& i) const { _graph->first(i); }
 		    void firstIn(Arc& i, const Node& n) const {
 		      bool d;
 		      _graph->firstInc(i, d, n);
 		      while (i != INVALID && d == (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void firstOut(Arc& i, const Node& n ) const {
 		      bool d;
 		      _graph->firstInc(i, d, n);
 		      while (i != INVALID && d != (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void next(Node& i) const { _graph->next(i); }
 		    void next(Arc& i) const { _graph->next(i); }
 		    void nextIn(Arc& i) const {
 		      bool d = !(*_direction)[i];
 		      _graph->nextInc(i, d);
 		      while (i != INVALID && d == (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    void nextOut(Arc& i) const {
 		      bool d = (*_direction)[i];
 		      _graph->nextInc(i, d);
 		      while (i != INVALID && d != (*_direction)[i]) _graph->nextInc(i, d);
+		    }
 		    Node source(const Arc& e) const {
 		      return (*_direction)[e] ? _graph->u(e) : _graph->v(e);
+		    }
 		    Node target(const Arc& e) const {
 		      return (*_direction)[e] ? _graph->v(e) : _graph->u(e);
+		    }
 		    typedef NodeNumTagIndicator<Graph> NodeNumTag;
 		    int nodeNum() const { return _graph->nodeNum(); }
 		    typedef EdgeNumTagIndicator<Graph> EdgeNumTag;
 		    int arcNum() const { return _graph->edgeNum(); }
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Arc findArc(const Node& u, const Node& v,
 				  const Arc& prev = INVALID) {
 		      Arc arc = prev;
 		      bool d = arc == INVALID ? true : (*_direction)[arc];
 		      if (d) {
 		        arc = _graph->findEdge(u, v, arc);
 		        while (arc != INVALID && !(*_direction)[arc]) {
 		          _graph->findEdge(u, v, arc);
+		        }
 		        if (arc != INVALID) return arc;
+		      }
 		      _graph->findEdge(v, u, arc);
 		      while (arc != INVALID && (*_direction)[arc]) {
 		        _graph->findEdge(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    Node addNode() {
 		      return Node(_graph->addNode());
+		    }
 		    Arc addArc(const Node& u, const Node& v) {
 		      Arc arc = _graph->addArc(u, v);
 		      _direction->set(arc, _graph->source(arc) == u);
 		      return arc;
+		    }
 		    void erase(const Node& i) { _graph->erase(i); }
 		    void erase(const Arc& i) { _graph->erase(i); }
 		    void clear() { _graph->clear(); }
 		    int id(const Node& v) const { return _graph->id(v); }
 		    int id(const Arc& e) const { return _graph->id(e); }
 		    Node nodeFromId(int idx) const { return _graph->nodeFromId(idx); }
 		    Arc arcFromId(int idx) const { return _graph->edgeFromId(idx); }
 		    int maxNodeId() const { return _graph->maxNodeId(); }
 		    int maxArcId() const { return _graph->maxEdgeId(); }
 		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
 		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public _Graph::template NodeMap<_Value> {
 		    public:
 		      typedef typename _Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const DirGraphAdaptorBase& adapter)
 			: Parent(*adapter._graph) {}
 		      NodeMap(const DirGraphAdaptorBase& adapter, const _Value& value)
 			: Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public _Graph::template EdgeMap<_Value> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit ArcMap(const DirGraphAdaptorBase& adapter)
 			: Parent(*adapter._graph) { }
 		      ArcMap(const DirGraphAdaptorBase& adapter, const _Value& value)
 			: Parent(*adapter._graph, value) { }
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
 		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  protected:
 		    Graph* _graph;
 		    DirectionMap* _direction;
 		    void setDirectionMap(DirectionMap& direction) {
 		      _direction = &direction;
+		    }
 		    void setGraph(Graph& graph) {
 		      _graph = &graph;
+		    }
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
 		  /// \brief A directed graph is made from an graph by an adaptor
 		  ///
 		  /// This adaptor gives a direction for each edge in the undirected
 		  /// graph. The direction of the arcs stored in the
 		  /// DirectionMap. This map is a bool map on the edges. If
 		  /// the edge is mapped to true then the direction of the directed
 		  /// arc will be the same as the default direction of the edge. The
 		  /// arcs can be easily reverted by the \ref
 		  /// DirGraphAdaptorBase::reverseArc "reverseArc()" member in the
 		  /// adaptor.
 		  ///
 		  /// It can be used to solve orientation problems on directed graphs.
 		  /// For example how can we orient an graph to get the minimum
 		  /// number of strongly connected components. If we orient the arcs with
 		  /// the dfs algorithm out from the source then we will get such an
 		  /// orientation.
 		  ///
 		  /// We use the \ref DfsVisitor "visitor" interface of the
 		  /// \ref DfsVisit "dfs" algorithm:
 		  ///\code
 		  /// template <typename DirMap>
 		  /// class OrientVisitor : public DfsVisitor<Graph> {
 		  /// public:
 		  ///
 		  ///   OrientVisitor(const Graph& graph, DirMap& dirMap)
 		  ///     : _graph(graph), _dirMap(dirMap), _processed(graph, false) {}
 		  ///
 		  ///   void discover(const Arc& arc) {
 		  ///     _processed.set(arc, true);
 		  ///     _dirMap.set(arc, _graph.direction(arc));
 		  ///   }
 		  ///
 		  ///   void examine(const Arc& arc) {
 		  ///     if (_processed[arc]) return;
 		  ///     _processed.set(arc, true);
 		  ///     _dirMap.set(arc, _graph.direction(arc));
 		  ///   }
 		  ///
 		  /// private:
 		  ///   const Graph& _graph;
 		  ///   DirMap& _dirMap;
 		  ///   Graph::EdgeMap<bool> _processed;
 		  /// };
 		  ///\endcode
 		  ///
 		  /// And now we can use the orientation:
 		  ///\code
 		  /// Graph::EdgeMap<bool> dmap(graph);
 		  ///
 		  /// typedef OrientVisitor<Graph::EdgeMap<bool> > Visitor;
 		  /// Visitor visitor(graph, dmap);
 		  ///
 		  /// DfsVisit<Graph, Visitor> dfs(graph, visitor);
 		  ///
 		  /// dfs.run();
 		  ///
 		  /// typedef DirGraphAdaptor<Graph> DGraph;
 		  /// DGraph dgraph(graph, dmap);
 		  ///
 		  /// LEMON_ASSERT(countStronglyConnectedComponents(dgraph) ==
 		  ///              countBiArcConnectedComponents(graph), "Wrong Orientation");
 		  ///\endcode
 		  ///
 		  /// The number of the bi-connected components is a lower bound for
 		  /// the number of the strongly connected components in the directed
 		  /// graph because if we contract the bi-connected components to
 		  /// nodes we will get a tree therefore we cannot orient arcs in
 		  /// both direction between bi-connected components. In the other way
 		  /// the algorithm will orient one component to be strongly
 		  /// connected. The two relations proof that the assertion will
 		  /// be always true and the found solution is optimal.
 		  ///
 		  /// \sa DirGraphAdaptorBase
 		  /// \sa dirGraphAdaptor
 		  template<typename _Graph,
 		           typename DirectionMap = typename _Graph::template EdgeMap<bool> >
 		  class DirGraphAdaptor :
 		    public DigraphAdaptorExtender<DirGraphAdaptorBase<_Graph, DirectionMap> > {
 		  public:
 		    typedef _Graph Graph;
 		    typedef DigraphAdaptorExtender<
 		      DirGraphAdaptorBase<_Graph, DirectionMap> > Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    DirGraphAdaptor() { }
 		  public:
 		    /// \brief Constructor of the adaptor
 		    ///
 		    /// Constructor of the adaptor
 		    DirGraphAdaptor(Graph& graph, DirectionMap& direction) {
 		      setGraph(graph);
 		      setDirectionMap(direction);
+		    }
 		    /// \brief Reverse arc
 		    ///
 		    /// It reverse the given arc. It simply negate the direction in the map.
 		    void reverseArc(const Arc& a) {
 		      Parent::reverseArc(a);
+		    }
 		  };
 		  /// \brief Just gives back a DirGraphAdaptor
 		  ///
 		  /// Just gives back a DirGraphAdaptor
 		  template<typename Graph, typename DirectionMap>
 		  DirGraphAdaptor<const Graph, DirectionMap>
 		  dirGraphAdaptor(const Graph& graph, DirectionMap& dm) {
 		    return DirGraphAdaptor<const Graph, DirectionMap>(graph, dm);
+		  }
 		  template<typename Graph, typename DirectionMap>
 		  DirGraphAdaptor<const Graph, const DirectionMap>
 		  dirGraphAdaptor(const Graph& graph, const DirectionMap& dm) {
 		    return DirGraphAdaptor<const Graph, const DirectionMap>(graph, dm);
+		  }
+		}
 		#endif

0 comments (0 inline)

RhodeCode

Login to your account