LEMON/LEMON-main Changeset - r488:9b9ffe7d9b75

Repositories » LEMON » LEMON-main

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

Changeset - r488:9b9ffe7d9b75

« 481:861a9d

489:2a136d »

r488:9b9ffe7d9b75

Fri, 13 Feb 2009 13:29:28

[Not Reviewed]

0 comments (0 inline)

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

Fixes for MSVC 2008 in grap_adaptors.h and edge_set.h (#194) Several renamings and changes in adaptors and edge sets - Fixing scope usage for MSVC - ResidualDigraph based on SubDigraph instead of FilterArcs - Use initialize() in adaptors and edge sets - Wrap ListDigraph for edge set tests

0 4 0

default

4 files changed with 810 insertions and 821 deletions:

lemon/adaptors.h

616

627

lemon/edge_set.h

188

test/CMakeLists.txt

test/edge_set_test.cc

↑ Collapse diff ↑

lemon/adaptors.h

Show inline comments

@@ -35,25 +35,30 @@
 		#include <algorithm>
 		namespace lemon {
-		  template<typename _Digraph>
+		#ifdef _MSC_VER
 		#define LEMON_SCOPE_FIX(OUTER, NESTED) OUTER::NESTED
 		#else
 		#define LEMON_SCOPE_FIX(OUTER, NESTED) typename OUTER::template NESTED
 		#endif
 		  template<typename DGR>
 		  class DigraphAdaptorBase {
 		  public:
-		    typedef _Digraph Digraph;
+		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase Adaptor;
 		    typedef Digraph ParentDigraph;
 		  protected:
-		    Digraph* _digraph;
+		    DGR* _digraph;
 		    DigraphAdaptorBase() : _digraph(0) { }
-		    void setDigraph(Digraph& digraph) { _digraph = &digraph; }
+		    void initialize(DGR& digraph) { _digraph = &digraph; }
 		  public:
 		    DigraphAdaptorBase(Digraph& digraph) : _digraph(&digraph) { }
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::Arc Arc;
 		    DigraphAdaptorBase(DGR& digraph) : _digraph(&digraph) { }
 		    typedef typename DGR::Node Node;
 		    typedef typename DGR::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); }
@@ -66,15 +71,15 @@
 		    Node source(const Arc& a) const { return _digraph->source(a); }
 		    Node target(const Arc& a) const { return _digraph->target(a); }
-		    typedef NodeNumTagIndicator<Digraph> NodeNumTag;
+		    typedef NodeNumTagIndicator<DGR> NodeNumTag;
 		    int nodeNum() const { return _digraph->nodeNum(); }
-		    typedef ArcNumTagIndicator<Digraph> ArcNumTag;
+		    typedef ArcNumTagIndicator<DGR> ArcNumTag;
 		    int arcNum() const { return _digraph->arcNum(); }
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v, const Arc& prev = INVALID) const {
 		      return _digraph->findArc(u, v, prev);
+		    }
@@ -94,24 +99,24 @@
 		    int maxNodeId() const { return _digraph->maxNodeId(); }
 		    int maxArcId() const { return _digraph->maxArcId(); }
-		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<DGR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Digraph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<DGR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _digraph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public DGR::template NodeMap<V> {
 		    public:
-		      typedef typename Digraph::template NodeMap<_Value> Parent;
+		      typedef typename DGR::template NodeMap<V> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      NodeMap(const Adaptor& adaptor, const _Value& value)
+		      NodeMap(const Adaptor& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) { }
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -125,18 +130,18 @@
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public Digraph::template ArcMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public DGR::template ArcMap<V> {
 		    public:
 		      typedef typename Digraph::template ArcMap<_Value> Parent;
-		      explicit ArcMap(const Adaptor& adaptor)
+		      typedef typename DGR::template ArcMap<V> Parent;
 		      explicit ArcMap(const DigraphAdaptorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      ArcMap(const Adaptor& adaptor, const _Value& value)
+		      ArcMap(const DigraphAdaptorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -152,27 +157,26 @@
 		    };
 		  };
-		  template<typename _Graph>
+		  template<typename GR>
 		  class GraphAdaptorBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef Graph ParentGraph;
 		    typedef GR Graph;
 		  protected:
-		    Graph* _graph;
+		    GR* _graph;
 		    GraphAdaptorBase() : _graph(0) {}
-		    void setGraph(Graph& graph) { _graph = &graph; }
+		    void initialize(GR& graph) { _graph = &graph; }
 		  public:
 		    GraphAdaptorBase(Graph& graph) : _graph(&graph) {}
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::Arc Arc;
-		    typedef typename Graph::Edge Edge;
+		    GraphAdaptorBase(GR& graph) : _graph(&graph) {}
 		    typedef typename GR::Node Node;
 		    typedef typename GR::Arc Arc;
 		    typedef typename GR::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); }
@@ -238,24 +242,24 @@
 		    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;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<GR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
-		    typedef typename ItemSetTraits<Graph, Edge>::ItemNotifier EdgeNotifier;
+		    typedef typename ItemSetTraits<GR, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _graph->notifier(Edge()); }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<Graph>& adapter)
 		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      NodeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      NodeMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -269,15 +273,15 @@
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public Graph::template ArcMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public GR::template ArcMap<V> {
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<Graph>& adapter)
 		      typedef typename GR::template ArcMap<V> Parent;
 		      explicit ArcMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      ArcMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      ArcMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -290,15 +294,15 @@
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public Graph::template EdgeMap<_Value> {
 		    template <typename V>
 		    class EdgeMap : public GR::template EdgeMap<V> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<Graph>& adapter)
 		      typedef typename GR::template EdgeMap<V> Parent;
 		      explicit EdgeMap(const GraphAdaptorBase<GR>& adapter)
 		        : Parent(*adapter._graph) {}
-		      EdgeMap(const GraphAdaptorBase<Graph>& adapter, const _Value& value)
+		      EdgeMap(const GraphAdaptorBase<GR>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
@@ -313,13 +317,13 @@
 		    };
 		  };
 		  template <typename _Digraph>
 		  class ReverseDigraphBase : public DigraphAdaptorBase<_Digraph> {
 		  template <typename DGR>
 		  class ReverseDigraphBase : public DigraphAdaptorBase<DGR> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<_Digraph> Parent;
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase<DGR> Parent;
 		  protected:
 		    ReverseDigraphBase() : Parent() { }
 		  public:
 		    typedef typename Parent::Node Node;
@@ -335,9 +339,9 @@
 		    Node target(const Arc& a) const { return Parent::source(a); }
 		    Arc addArc(const Node& u, const Node& v) { return Parent::addArc(v, u); }
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) const {
 		      return Parent::findArc(v, u, prev);
+		    }
@@ -355,69 +359,67 @@
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c GR template
 		  /// parameter is set to be \c const.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
-		  template<typename GR>
+		  template<typename DGR>
 		#ifdef DOXYGEN
 		  class ReverseDigraph {
 		#else
 		  class ReverseDigraph :
-		    public DigraphAdaptorExtender<ReverseDigraphBase<GR> > {
+		    public DigraphAdaptorExtender<ReverseDigraphBase<DGR> > {
 		#endif
 		  public:
 		    /// The type of the adapted digraph.
 		    typedef GR Digraph;
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<GR> > Parent;
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorExtender<ReverseDigraphBase<DGR> > Parent;
 		  protected:
 		    ReverseDigraph() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a reverse digraph adaptor for the given digraph.
 		    explicit ReverseDigraph(Digraph& digraph) {
 		      Parent::setDigraph(digraph);
 		    explicit ReverseDigraph(DGR& digraph) {
 		      Parent::initialize(digraph);
+		    }
 		  };
 		  /// \brief Returns a read-only ReverseDigraph adaptor
 		  ///
 		  /// This function just returns a read-only \ref ReverseDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates ReverseDigraph
 		  template<typename GR>
 		  ReverseDigraph<const GR> reverseDigraph(const GR& digraph) {
-		    return ReverseDigraph<const GR>(digraph);
+		  template<typename DGR>
 		  ReverseDigraph<const DGR> reverseDigraph(const DGR& digraph) {
 		    return ReverseDigraph<const DGR>(digraph);
+		  }
 		  template <typename _Digraph, typename _NodeFilterMap,
 		            typename _ArcFilterMap, bool _checked = true>
-		  class SubDigraphBase : public DigraphAdaptorBase<_Digraph> {
+		  template <typename DGR, typename NF, typename AF, bool ch = true>
 		  class SubDigraphBase : public DigraphAdaptorBase<DGR> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _ArcFilterMap ArcFilterMap;
+		    typedef DGR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef AF ArcFilterMap;
 		    typedef SubDigraphBase Adaptor;
-		    typedef DigraphAdaptorBase<_Digraph> Parent;
+		    typedef DigraphAdaptorBase<DGR> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
 		    NF* _node_filter;
 		    AF* _arc_filter;
 		    SubDigraphBase()
 		      : Parent(), _node_filter(0), _arc_filter(0) { }
-		    void setNodeFilterMap(NodeFilterMap& node_filter) {
+		    void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph);
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
 		      _arc_filter = &arc_filter;
+		      _arc_filter = &arc_filter;
+		    }
 		  public:
@@ -486,9 +488,9 @@
 		    typedef False NodeNumTag;
 		    typedef False ArcNumTag;
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& source, const Node& target,
 		                const Arc& prev = INVALID) const {
 		      if (!(*_node_filter)[source] || !(*_node_filter)[target]) {
 		        return INVALID;
@@ -499,81 +501,84 @@
+		      }
 		      return arc;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		  public:
 		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			    LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 			      LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, ch>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Digraph, typename _NodeFilterMap, typename _ArcFilterMap>
 		  class SubDigraphBase<_Digraph, _NodeFilterMap, _ArcFilterMap, false>
-		    : public DigraphAdaptorBase<_Digraph> {
+		  template <typename DGR, typename NF, typename AF>
 		  class SubDigraphBase<DGR, NF, AF, false>
 		    : public DigraphAdaptorBase<DGR> {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _ArcFilterMap ArcFilterMap;
+		    typedef DGR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef AF ArcFilterMap;
 		    typedef SubDigraphBase Adaptor;
 		    typedef DigraphAdaptorBase<Digraph> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter;
 		    ArcFilterMap* _arc_filter;
 		    NF* _node_filter;
 		    AF* _arc_filter;
 		    SubDigraphBase()
 		      : Parent(), _node_filter(0), _arc_filter(0) { }
-		    void setNodeFilterMap(NodeFilterMap& node_filter) {
+		    void initialize(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph);
 		      _node_filter = &node_filter;
+		    }
 		    void setArcFilterMap(ArcFilterMap& arc_filter) {
 		      _arc_filter = &arc_filter;
+		      _arc_filter = &arc_filter;
+		    }
 		  public:
@@ -626,9 +631,9 @@
 		    typedef False NodeNumTag;
 		    typedef False ArcNumTag;
-		    typedef FindArcTagIndicator<Digraph> FindArcTag;
+		    typedef FindArcTagIndicator<DGR> FindArcTag;
 		    Arc findArc(const Node& source, const Node& target,
 		                const Arc& prev = INVALID) const {
 		      if (!(*_node_filter)[source] || !(*_node_filter)[target]) {
 		        return INVALID;
@@ -639,54 +644,56 @@
+		      }
 		      return arc;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		        LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, NodeMap<V>)> Parent;
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubDigraphBase<DGR, NF, AF, false>,
 		          LEMON_SCOPE_FIX(DigraphAdaptorBase<DGR>, ArcMap<V>)> Parent;
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubDigraphBase<DGR, NF, AF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
@@ -707,44 +714,44 @@
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c GR template
 		  /// parameter is set to be \c const.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam NF The type of the node filter map.
 		  /// It must be a \c bool (or convertible) node map of the
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::NodeMap "GR::NodeMap<bool>".
+		  /// \ref concepts::Digraph::NodeMap "DGR::NodeMap<bool>".
 		  /// \tparam AF The type of the arc filter map.
 		  /// It must be \c bool (or convertible) arc map of the
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::ArcMap "GR::ArcMap<bool>".
+		  /// \ref concepts::Digraph::ArcMap "DGR::ArcMap<bool>".
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
 		  ///
 		  /// \see FilterNodes
 		  /// \see FilterArcs
 		#ifdef DOXYGEN
-		  template<typename GR, typename NF, typename AF>
+		  template<typename DGR, typename NF, typename AF>
 		  class SubDigraph {
 		#else
 		  template<typename GR,
 		           typename NF = typename GR::template NodeMap<bool>,
-		           typename AF = typename GR::template ArcMap<bool> >
+		  template<typename DGR,
 		           typename NF = typename DGR::template NodeMap<bool>,
 		           typename AF = typename DGR::template ArcMap<bool> >
 		  class SubDigraph :
-		    public DigraphAdaptorExtender<SubDigraphBase<GR, NF, AF, true> > {
+		    public DigraphAdaptorExtender<SubDigraphBase<DGR, NF, AF, true> > {
 		#endif
 		  public:
 		    /// The type of the adapted digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the node filter map.
 		    typedef NF NodeFilterMap;
 		    /// The type of the arc filter map.
 		    typedef AF ArcFilterMap;
-		    typedef DigraphAdaptorExtender<SubDigraphBase<GR, NF, AF, true> >
+		    typedef DigraphAdaptorExtender<SubDigraphBase<DGR, NF, AF, true> >
 		      Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
@@ -756,13 +763,10 @@
 		    /// \brief Constructor
 		    ///
 		    /// Creates a subdigraph for the given digraph with the
 		    /// given node and arc filter maps.
 		    SubDigraph(Digraph& digraph, NodeFilterMap& node_filter,
 		               ArcFilterMap& arc_filter) {
 		      setDigraph(digraph);
 		      setNodeFilterMap(node_filter);
-		      setArcFilterMap(arc_filter);
+		    SubDigraph(DGR& digraph, NF& node_filter, AF& arc_filter) {
 		      Parent::initialize(digraph, node_filter, arc_filter);
+		    }
 		    /// \brief Sets the status of the given node
 		    ///
@@ -822,64 +826,62 @@
 		  ///
 		  /// This function just returns a read-only \ref SubDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates SubDigraph
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, NF, AF>
 		  subDigraph(const GR& digraph,
 		             NF& node_filter_map, AF& arc_filter_map) {
 		    return SubDigraph<const GR, NF, AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, NF, AF>
 		  subDigraph(const DGR& digraph,
 		             NF& node_filter, AF& arc_filter) {
 		    return SubDigraph<const DGR, NF, AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, const NF, AF>
 		  subDigraph(const GR& digraph,
 		             const NF& node_filter_map, AF& arc_filter_map) {
 		    return SubDigraph<const GR, const NF, AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, const NF, AF>
 		  subDigraph(const DGR& digraph,
 		             const NF& node_filter, AF& arc_filter) {
 		    return SubDigraph<const DGR, const NF, AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, NF, const AF>
 		  subDigraph(const GR& digraph,
 		             NF& node_filter_map, const AF& arc_filter_map) {
 		    return SubDigraph<const GR, NF, const AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, NF, const AF>
 		  subDigraph(const DGR& digraph,
 		             NF& node_filter, const AF& arc_filter) {
 		    return SubDigraph<const DGR, NF, const AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template<typename GR, typename NF, typename AF>
 		  SubDigraph<const GR, const NF, const AF>
 		  subDigraph(const GR& digraph,
 		             const NF& node_filter_map, const AF& arc_filter_map) {
 		    return SubDigraph<const GR, const NF, const AF>
 		      (digraph, node_filter_map, arc_filter_map);
 		  template<typename DGR, typename NF, typename AF>
 		  SubDigraph<const DGR, const NF, const AF>
 		  subDigraph(const DGR& digraph,
 		             const NF& node_filter, const AF& arc_filter) {
 		    return SubDigraph<const DGR, const NF, const AF>
 		      (digraph, node_filter, arc_filter);
+		  }
 		  template <typename _Graph, typename _NodeFilterMap,
 		            typename _EdgeFilterMap, bool _checked = true>
-		  class SubGraphBase : public GraphAdaptorBase<_Graph> {
+		  template <typename GR, typename NF, typename EF, bool ch = true>
 		  class SubGraphBase : public GraphAdaptorBase<GR> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _EdgeFilterMap EdgeFilterMap;
+		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef EF EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
-		    typedef GraphAdaptorBase<_Graph> Parent;
+		    typedef GraphAdaptorBase<GR> Parent;
 		  protected:
 		    NodeFilterMap* _node_filter_map;
 		    EdgeFilterMap* _edge_filter_map;
 		    NF* _node_filter;
 		    EF* _edge_filter;
 		    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;
+		      : Parent(), _node_filter(0), _edge_filter(0) { }
 		    void initialize(GR& graph, NF& node_filter, EF& edge_filter) {
 		      Parent::initialize(graph);
 		      _node_filter = &node_filter;
 		      _edge_filter = &edge_filter;
+		    }
 		  public:
@@ -888,227 +890,229 @@
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]
 		                            || !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[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)]))
 		      while (i!=INVALID && (!(*_edge_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 && (!(*_edge_filter_map)[i]
 		                            || !(*_node_filter_map)[Parent::target(i)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[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);
+		      while (i!=INVALID && !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::source(i)]
 		                            || !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[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)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[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)]))
 		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[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)]))
+		      while (i!=INVALID && (!(*_edge_filter)[i]
 		                            || !(*_node_filter)[Parent::u(i)]
 		                            || !(*_node_filter)[Parent::v(i)]))
 		        Parent::nextInc(i, d);
+		    }
 		    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
-		    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
+		    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter)[n]; }
 		    bool status(const Edge& e) const { return (*_edge_filter)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False ArcNumTag;
 		    typedef False EdgeNumTag;
 		    typedef FindArcTagIndicator<Graph> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) const {
-		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
+		      if (!(*_node_filter)[u] || !(*_node_filter)[v]) {
 		        return INVALID;
+		      }
 		      Arc arc = Parent::findArc(u, v, prev);
-		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
+		      while (arc != INVALID && !(*_edge_filter)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Edge findEdge(const Node& u, const Node& v,
 		                  const Edge& prev = INVALID) const {
-		      if (!(*_node_filter_map)[u] || !(*_node_filter_map)[v]) {
+		      if (!(*_node_filter)[u] || !(*_node_filter)[v]) {
 		        return INVALID;
+		      }
 		      Edge edge = Parent::findEdge(u, v, prev);
-		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
+		      while (edge != INVALID && !(*_edge_filter)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		      NodeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		      ArcMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template EdgeMap<_Value> > {
+		    template <typename V>
 		    class EdgeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		    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) {}
+		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, ch>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		      EdgeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor)
 		        : Parent(adaptor) {}
 		      EdgeMap(const SubGraphBase<GR, NF, EF, ch>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		  };
 		  template <typename _Graph, typename _NodeFilterMap, typename _EdgeFilterMap>
 		  class SubGraphBase<_Graph, _NodeFilterMap, _EdgeFilterMap, false>
-		    : public GraphAdaptorBase<_Graph> {
+		  template <typename GR, typename NF, typename EF>
 		  class SubGraphBase<GR, NF, EF, false>
 		    : public GraphAdaptorBase<GR> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _NodeFilterMap NodeFilterMap;
-		    typedef _EdgeFilterMap EdgeFilterMap;
+		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef EF EdgeFilterMap;
 		    typedef SubGraphBase Adaptor;
-		    typedef GraphAdaptorBase<_Graph> Parent;
+		    typedef GraphAdaptorBase<GR> 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;
 		    NF* _node_filter;
 		    EF* _edge_filter;
 		    SubGraphBase()
 			  : Parent(), _node_filter(0), _edge_filter(0) { }
 		    void initialize(GR& graph, NF& node_filter, EF& edge_filter) {
 		      Parent::initialize(graph);
 		      _node_filter = &node_filter;
 		      _edge_filter = &edge_filter;
+		    }
 		  public:
@@ -1117,67 +1121,67 @@
 		    typedef typename Parent::Edge Edge;
 		    void first(Node& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void first(Arc& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
 		    void first(Edge& i) const {
 		      Parent::first(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[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);
+		      while (i!=INVALID && !(*_edge_filter)[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);
+		      while (i!=INVALID && !(*_edge_filter)[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);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextInc(i, d);
+		    }
 		    void next(Node& i) const {
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_node_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_node_filter)[i]) Parent::next(i);
+		    }
 		    void next(Arc& i) const {
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
 		    void next(Edge& i) const {
 		      Parent::next(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::next(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::next(i);
+		    }
 		    void nextIn(Arc& i) const {
 		      Parent::nextIn(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextIn(i);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextIn(i);
+		    }
 		    void nextOut(Arc& i) const {
 		      Parent::nextOut(i);
-		      while (i!=INVALID && !(*_edge_filter_map)[i]) Parent::nextOut(i);
+		      while (i!=INVALID && !(*_edge_filter)[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);
+		      while (i!=INVALID && !(*_edge_filter)[i]) Parent::nextInc(i, d);
+		    }
 		    void status(const Node& n, bool v) const { _node_filter_map->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter_map->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter_map)[n]; }
-		    bool status(const Edge& e) const { return (*_edge_filter_map)[e]; }
+		    void status(const Node& n, bool v) const { _node_filter->set(n, v); }
 		    void status(const Edge& e, bool v) const { _edge_filter->set(e, v); }
 		    bool status(const Node& n) const { return (*_node_filter)[n]; }
 		    bool status(const Edge& e) const { return (*_edge_filter)[e]; }
 		    typedef False NodeNumTag;
 		    typedef False ArcNumTag;
 		    typedef False EdgeNumTag;
@@ -1185,9 +1189,9 @@
 		    typedef FindArcTagIndicator<Graph> FindArcTag;
 		    Arc findArc(const Node& u, const Node& v,
 		                const Arc& prev = INVALID) const {
 		      Arc arc = Parent::findArc(u, v, prev);
-		      while (arc != INVALID && !(*_edge_filter_map)[arc]) {
+		      while (arc != INVALID && !(*_edge_filter)[arc]) {
 		        arc = Parent::findArc(u, v, arc);
+		      }
 		      return arc;
+		    }
@@ -1195,86 +1199,89 @@
 		    typedef FindEdgeTagIndicator<Graph> FindEdgeTag;
 		    Edge findEdge(const Node& u, const Node& v,
 		                  const Edge& prev = INVALID) const {
 		      Edge edge = Parent::findEdge(u, v, prev);
-		      while (edge != INVALID && !(*_edge_filter_map)[edge]) {
+		      while (edge != INVALID && !(*_edge_filter)[edge]) {
 		        edge = Parent::findEdge(u, v, edge);
+		      }
 		      return edge;
+		    }
 		    template <typename _Value>
 		    class NodeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template NodeMap<_Value> > {
+		    template <typename V>
 		    class NodeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, NodeMap<V>)> Parent;
 		      NodeMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      NodeMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      NodeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public SubMapExtender<Adaptor,
-		      typename Parent::template ArcMap<_Value> > {
+		    template <typename V>
 		    class ArcMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		          LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> {
 		    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) {}
 		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, ArcMap<V>)> Parent;
 		      ArcMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      ArcMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
 		        return operator=<ArcMap>(cmap);
+		      }
 		      template <typename CMap>
 		      ArcMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public SubMapExtender<Adaptor,
-		      typename Parent::template EdgeMap<_Value> > {
+		    template <typename V>
 		    class EdgeMap
 		      : public SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 		        LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> {
 		    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) {}
+		      typedef V Value;
 		      typedef SubMapExtender<SubGraphBase<GR, NF, EF, false>,
 				  LEMON_SCOPE_FIX(GraphAdaptorBase<GR>, EdgeMap<V>)> Parent;
 		      EdgeMap(const SubGraphBase<GR, NF, EF, false>& adaptor)
 		        : Parent(adaptor) {}
 		      EdgeMap(const SubGraphBase<GR, NF, EF, false>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
 		        return operator=<EdgeMap>(cmap);
+		      }
 		      template <typename CMap>
 		      EdgeMap& operator=(const CMap& cmap) {
-		        MapParent::operator=(cmap);
+		        Parent::operator=(cmap);
 		        return *this;
+		      }
 		    };
@@ -1331,9 +1338,9 @@
 		    typedef NF NodeFilterMap;
 		    /// The type of the edge filter map.
 		    typedef EF EdgeFilterMap;
-		    typedef GraphAdaptorExtender< SubGraphBase<GR, NF, EF, true> >
 		    typedef GraphAdaptorExtender<SubGraphBase<GR, NF, EF, true> >
 		      Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Edge Edge;
@@ -1345,13 +1352,10 @@
 		    /// \brief Constructor
 		    ///
 		    /// Creates a subgraph for the given graph with the given node
 		    /// and edge filter maps.
 		    SubGraph(Graph& graph, NodeFilterMap& node_filter_map,
 		             EdgeFilterMap& edge_filter_map) {
 		      setGraph(graph);
 		      setNodeFilterMap(node_filter_map);
-		      setEdgeFilterMap(edge_filter_map);
+		    SubGraph(GR& graph, NF& node_filter, EF& edge_filter) {
 		      initialize(graph, node_filter, edge_filter);
+		    }
 		    /// \brief Sets the status of the given node
 		    ///
@@ -1413,36 +1417,32 @@
 		  /// \ingroup graph_adaptors
 		  /// \relates SubGraph
 		  template<typename GR, typename NF, typename EF>
 		  SubGraph<const GR, NF, EF>
 		  subGraph(const GR& graph,
 		           NF& node_filter_map, EF& edge_filter_map) {
 		  subGraph(const GR& graph, NF& node_filter, EF& edge_filter) {
 		    return SubGraph<const GR, NF, EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
 		  template<typename GR, typename NF, typename EF>
 		  SubGraph<const GR, const NF, EF>
 		  subGraph(const GR& graph,
 		           const NF& node_filter_map, EF& edge_filter_map) {
 		  subGraph(const GR& graph, const NF& node_filter, EF& edge_filter) {
 		    return SubGraph<const GR, const NF, EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
 		  template<typename GR, typename NF, typename EF>
 		  SubGraph<const GR, NF, const EF>
 		  subGraph(const GR& graph,
 		           NF& node_filter_map, const EF& edge_filter_map) {
 		  subGraph(const GR& graph, NF& node_filter, const EF& edge_filter) {
 		    return SubGraph<const GR, NF, const EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
 		  template<typename GR, typename NF, typename EF>
 		  SubGraph<const GR, const NF, const EF>
 		  subGraph(const GR& graph,
 		           const NF& node_filter_map, const EF& edge_filter_map) {
 		  subGraph(const GR& graph, const NF& node_filter, const EF& edge_filter) {
 		    return SubGraph<const GR, const NF, const EF>
-		      (graph, node_filter_map, edge_filter_map);
+		      (graph, node_filter, edge_filter);
+		  }
 		  /// \ingroup graph_adaptors
@@ -1480,40 +1480,37 @@
 		           typename NF = typename GR::template NodeMap<bool>,
 		           typename Enable = void>
 		  class FilterNodes :
 		    public DigraphAdaptorExtender<
-		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, bool>, true> > {
+		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
 		                     true> > {
 		#endif
 		  public:
 		    typedef GR Digraph;
 		    typedef NF NodeFilterMap;
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, bool>, true> >
 		      Parent;
 		      SubDigraphBase<GR, NF, ConstMap<typename GR::Arc, Const<bool, true> >,
 		                     true> > 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);
+		    }
+		    ConstMap<typename Digraph::Arc, Const<bool, true> > const_true_map;
 		    FilterNodes() : const_true_map() {}
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a subgraph for the given digraph or graph with the
 		    /// given node filter map.
 		    FilterNodes(GR& graph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map(true)
 		    FilterNodes(GR& graph, NF& node_filter)
 		      : Parent(), const_true_map()
+		    {
 		      Parent::setDigraph(graph);
 		      Parent::setNodeFilterMap(node_filter);
-		      Parent::setArcFilterMap(const_true_map);
+		      Parent::initialize(graph, node_filter, const_true_map);
+		    }
 		    /// \brief Sets the status of the given node
 		    ///
@@ -1546,32 +1543,29 @@
 		  template<typename GR, typename NF>
 		  class FilterNodes<GR, NF,
 		                    typename enable_if<UndirectedTagIndicator<GR> >::type> :
 		    public GraphAdaptorExtender<
-		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, bool>, true> > {
+		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
 		                   true> > {
 		  public:
 		    typedef GR Graph;
 		    typedef NF NodeFilterMap;
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, bool>, true> >
 		      Parent;
 		      SubGraphBase<GR, NF, ConstMap<typename GR::Edge, Const<bool, true> >,
 		                   true> > 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);
+		    }
+		    ConstMap<typename GR::Edge, Const<bool, true> > const_true_map;
 		    FilterNodes() : 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);
+		    FilterNodes(GR& graph, NodeFilterMap& node_filter) :
 		      Parent(), const_true_map() {
 		      Parent::initialize(graph, node_filter, const_true_map);
+		    }
 		    void status(const Node& n, bool v) const { Parent::status(n, v); }
 		    bool status(const Node& n) const { return Parent::status(n); }
@@ -1587,16 +1581,16 @@
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterNodes
 		  template<typename GR, typename NF>
 		  FilterNodes<const GR, NF>
 		  filterNodes(const GR& graph, NF& node_filter_map) {
 		    return FilterNodes<const GR, NF>(graph, node_filter_map);
 		  filterNodes(const GR& graph, NF& node_filter) {
 		    return FilterNodes<const GR, NF>(graph, node_filter);
+		  }
 		  template<typename GR, typename NF>
 		  FilterNodes<const GR, const NF>
 		  filterNodes(const GR& graph, const NF& node_filter_map) {
 		    return FilterNodes<const GR, const NF>(graph, node_filter_map);
 		  filterNodes(const GR& graph, const NF& node_filter) {
 		    return FilterNodes<const GR, const NF>(graph, node_filter);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
@@ -1611,59 +1605,56 @@
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or arcs, unless the \c GR template
 		  /// parameter is set to be \c const.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  /// \tparam AF The type of the arc filter map.
 		  /// It must be a \c bool (or convertible) arc map of the
 		  /// adapted digraph. The default type is
-		  /// \ref concepts::Digraph::ArcMap "GR::ArcMap<bool>".
+		  /// \ref concepts::Digraph::ArcMap "DGR::ArcMap<bool>".
 		  ///
 		  /// \note The \c Node and \c Arc types of this adaptor and the adapted
 		  /// digraph are convertible to each other.
 		#ifdef DOXYGEN
-		  template<typename GR,
+		  template<typename DGR,
 		           typename AF>
 		  class FilterArcs {
 		#else
 		  template<typename GR,
 		           typename AF = typename GR::template ArcMap<bool> >
 		  template<typename DGR,
 		           typename AF = typename DGR::template ArcMap<bool> >
 		  class FilterArcs :
 		    public DigraphAdaptorExtender<
-		      SubDigraphBase<GR, ConstMap<typename GR::Node, bool>, AF, false> > {
+		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > {
 		#endif
 		  public:
 		    /// The type of the adapted digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the arc filter map.
 		    typedef AF ArcFilterMap;
 		    typedef DigraphAdaptorExtender<
 		      SubDigraphBase<GR, ConstMap<typename GR::Node, bool>, AF, false> >
 		      Parent;
 		      SubDigraphBase<DGR, ConstMap<typename DGR::Node, Const<bool, true> >,
 		                     AF, false> > Parent;
 		    typedef typename Parent::Arc Arc;
 		  protected:
 		    ConstMap<typename Digraph::Node, bool> const_true_map;
 		    FilterArcs() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
+		    ConstMap<typename DGR::Node, Const<bool, true> > const_true_map;
 		    FilterArcs() : const_true_map() {}
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates a subdigraph for the given digraph with the given arc
 		    /// filter map.
 		    FilterArcs(Digraph& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map(true) {
 		      Parent::setDigraph(digraph);
 		      Parent::setNodeFilterMap(const_true_map);
-		      Parent::setArcFilterMap(arc_filter);
+		    FilterArcs(DGR& digraph, ArcFilterMap& arc_filter)
 		      : Parent(), const_true_map() {
 		      Parent::initialize(digraph, const_true_map, arc_filter);
+		    }
 		    /// \brief Sets the status of the given arc
 		    ///
@@ -1697,18 +1688,18 @@
 		  ///
 		  /// This function just returns a read-only \ref FilterArcs adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterArcs
 		  template<typename GR, typename AF>
 		  FilterArcs<const GR, AF>
 		  filterArcs(const GR& digraph, AF& arc_filter_map) {
 		    return FilterArcs<const GR, AF>(digraph, arc_filter_map);
 		  template<typename DGR, typename AF>
 		  FilterArcs<const DGR, AF>
 		  filterArcs(const DGR& digraph, AF& arc_filter) {
 		    return FilterArcs<const DGR, AF>(digraph, arc_filter);
+		  }
 		  template<typename GR, typename AF>
 		  FilterArcs<const GR, const AF>
 		  filterArcs(const GR& digraph, const AF& arc_filter_map) {
 		    return FilterArcs<const GR, const AF>(digraph, arc_filter_map);
 		  template<typename DGR, typename AF>
 		  FilterArcs<const DGR, const AF>
 		  filterArcs(const DGR& digraph, const AF& arc_filter) {
 		    return FilterArcs<const DGR, const AF>(digraph, arc_filter);
+		  }
 		  /// \ingroup graph_adaptors
 		  ///
@@ -1742,24 +1733,25 @@
 		  template<typename GR,
 		           typename EF = typename GR::template EdgeMap<bool> >
 		  class FilterEdges :
 		    public GraphAdaptorExtender<
-		      SubGraphBase<GR, ConstMap<typename GR::Node,bool>, EF, false> > {
+		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true> >,
 		                   EF, false> > {
 		#endif
 		  public:
 		    /// The type of the adapted graph.
 		    typedef GR Graph;
 		    /// The type of the edge filter map.
 		    typedef EF EdgeFilterMap;
 		    typedef GraphAdaptorExtender<
 		      SubGraphBase<GR, ConstMap<typename GR::Node,bool>, EF, false> >
 		      Parent;
 		      SubGraphBase<GR, ConstMap<typename GR::Node, Const<bool, true > >,
 		                   EF, false> > Parent;
 		    typedef typename Parent::Edge Edge;
 		  protected:
-		    ConstMap<typename Graph::Node, bool> const_true_map;
+		    ConstMap<typename GR::Node, Const<bool, true> > const_true_map;
 		    FilterEdges() : const_true_map(true) {
 		      Parent::setNodeFilterMap(const_true_map);
+		    }
@@ -1769,13 +1761,11 @@
 		    /// \brief Constructor
 		    ///
 		    /// Creates a subgraph for the given graph with the given edge
 		    /// filter map.
 		    FilterEdges(Graph& graph, EdgeFilterMap& edge_filter_map) :
 		      Parent(), const_true_map(true) {
 		      Parent::setGraph(graph);
 		      Parent::setNodeFilterMap(const_true_map);
-		      Parent::setEdgeFilterMap(edge_filter_map);
+		    FilterEdges(GR& graph, EF& edge_filter)
 		      : Parent(), const_true_map() {
 		      Parent::initialize(graph, const_true_map, edge_filter);
+		    }
 		    /// \brief Sets the status of the given edge
 		    ///
@@ -1811,23 +1801,23 @@
 		  /// \ingroup graph_adaptors
 		  /// \relates FilterEdges
 		  template<typename GR, typename EF>
 		  FilterEdges<const GR, EF>
 		  filterEdges(const GR& graph, EF& edge_filter_map) {
 		    return FilterEdges<const GR, EF>(graph, edge_filter_map);
 		  filterEdges(const GR& graph, EF& edge_filter) {
 		    return FilterEdges<const GR, EF>(graph, edge_filter);
+		  }
 		  template<typename GR, typename EF>
 		  FilterEdges<const GR, const EF>
 		  filterEdges(const GR& graph, const EF& edge_filter_map) {
 		    return FilterEdges<const GR, const EF>(graph, edge_filter_map);
 		  filterEdges(const GR& graph, const EF& edge_filter) {
 		    return FilterEdges<const GR, const EF>(graph, edge_filter);
+		  }
-		  template <typename _Digraph>
+		  template <typename DGR>
 		  class UndirectorBase {
 		  public:
-		    typedef _Digraph Digraph;
+		    typedef DGR Digraph;
 		    typedef UndirectorBase Adaptor;
 		    typedef True UndirectedTag;
@@ -2061,36 +2051,37 @@
+		    }
 		  private:
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMapBase {
 		    private:
-		      typedef typename Digraph::template ArcMap<_Value> MapImpl;
+		      typedef typename DGR::template ArcMap<V> MapImpl;
 		    public:
 		      typedef typename MapTraits<MapImpl>::ReferenceMapTag ReferenceMapTag;
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef Arc Key;
 		      typedef typename MapTraits<MapImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<MapImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<MapImpl>::ConstReturnValue ConstReference;
 		      typedef typename MapTraits<MapImpl>::ReturnValue Reference;
-		      ArcMapBase(const Adaptor& adaptor) :
+		      ArcMapBase(const UndirectorBase<DGR>& adaptor) :
 		        _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) {
 		      ArcMapBase(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : _forward(*adaptor._digraph, value),
 		          _backward(*adaptor._digraph, value) {}
 		      void set(const Arc& a, const V& value) {
 		        if (direction(a)) {
-		          _forward.set(a, v);
+		          _forward.set(a, value);
 		        } else {
-		          _backward.set(a, v);
+		          _backward.set(a, value);
+		        }
+		      }
 		      ConstReturnValue operator[](const Arc& a) const {
@@ -2116,19 +2107,19 @@
 		    };
 		  public:
 		    template <typename _Value>
 		    class NodeMap : public Digraph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public DGR::template NodeMap<V> {
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template NodeMap<Value> Parent;
 		      explicit NodeMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      typedef typename DGR::template NodeMap<Value> Parent;
 		      explicit NodeMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      NodeMap(const Adaptor& adaptor, const _Value& value)
+		      NodeMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) { }
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -2142,20 +2133,20 @@
+		      }
 		    };
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMap
-		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		      : public SubMapExtender<UndirectorBase<DGR>, ArcMapBase<V> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      explicit ArcMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<V> > Parent;
 		      explicit ArcMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      ArcMap(const Adaptor& adaptor, const Value& value)
+		      ArcMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -2168,19 +2159,19 @@
 		        return *this;
+		      }
 		    };
 		    template <typename _Value>
 		    class EdgeMap : public Digraph::template ArcMap<_Value> {
 		    template <typename V>
 		    class EdgeMap : public Digraph::template ArcMap<V> {
 		    public:
 		      typedef _Value Value;
 		      typedef typename Digraph::template ArcMap<Value> Parent;
 		      explicit EdgeMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      typedef typename Digraph::template ArcMap<V> Parent;
 		      explicit EdgeMap(const UndirectorBase<DGR>& adaptor)
 		        : Parent(*adaptor._digraph) {}
-		      EdgeMap(const Adaptor& adaptor, const Value& value)
+		      EdgeMap(const UndirectorBase<DGR>& adaptor, const V& value)
 		        : Parent(*adaptor._digraph, value) {}
 		    private:
 		      EdgeMap& operator=(const EdgeMap& cmap) {
@@ -2194,21 +2185,21 @@
+		      }
 		    };
-		    typedef typename ItemSetTraits<Digraph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<DGR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _digraph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Digraph, Edge>::ItemNotifier EdgeNotifier;
+		    typedef typename ItemSetTraits<DGR, Edge>::ItemNotifier EdgeNotifier;
 		    EdgeNotifier& notifier(Edge) const { return _digraph->notifier(Edge()); }
 		  protected:
 		    UndirectorBase() : _digraph(0) {}
 		    Digraph* _digraph;
-		    void setDigraph(Digraph& digraph) {
+		    DGR* _digraph;
 		    void initialize(DGR& digraph) {
 		      _digraph = &digraph;
+		    }
 		  };
@@ -2225,9 +2216,9 @@
 		  /// The adapted digraph can also be modified through this adaptor
 		  /// by adding or removing nodes or edges, unless the \c GR template
 		  /// parameter is set to be \c const.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It can also be specified to be \c const.
 		  ///
 		  /// \note The \c Node type of this adaptor and the adapted digraph are
@@ -2235,28 +2226,28 @@
 		  /// and the \c Arc type of the adapted digraph are also convertible to
 		  /// each other.
 		  /// (Thus the \c Arc type of the adaptor is convertible to the \c Arc type
 		  /// of the adapted digraph.)
-		  template<typename GR>
+		  template<typename DGR>
 		#ifdef DOXYGEN
 		  class Undirector {
 		#else
 		  class Undirector :
-		    public GraphAdaptorExtender<UndirectorBase<GR> > {
+		    public GraphAdaptorExtender<UndirectorBase<DGR> > {
 		#endif
 		  public:
 		    /// The type of the adapted digraph.
 		    typedef GR Digraph;
 		    typedef GraphAdaptorExtender<UndirectorBase<GR> > Parent;
 		    typedef DGR Digraph;
 		    typedef GraphAdaptorExtender<UndirectorBase<DGR> > Parent;
 		  protected:
 		    Undirector() { }
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Creates an undirected graph from the given digraph.
 		    Undirector(Digraph& digraph) {
 		      setDigraph(digraph);
 		    Undirector(DGR& digraph) {
 		      initialize(digraph);
+		    }
 		    /// \brief Arc map combined from two original arc maps
 		    ///
@@ -2354,23 +2345,23 @@
 		  ///
 		  /// This function just returns a read-only \ref Undirector adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates Undirector
 		  template<typename GR>
 		  Undirector<const GR> undirector(const GR& digraph) {
-		    return Undirector<const GR>(digraph);
+		  template<typename DGR>
 		  Undirector<const DGR> undirector(const DGR& digraph) {
 		    return Undirector<const DGR>(digraph);
+		  }
-		  template <typename _Graph, typename _DirectionMap>
+		  template <typename GR, typename DM>
 		  class OrienterBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef _DirectionMap DirectionMap;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::Edge Arc;
+		    typedef GR Graph;
 		    typedef DM DirectionMap;
 		    typedef typename GR::Node Node;
 		    typedef typename GR::Edge Arc;
 		    void reverseArc(const Arc& arc) {
 		      _direction->set(arc, !(*_direction)[arc]);
+		    }
@@ -2447,24 +2438,24 @@
 		    int maxNodeId() const { return _graph->maxNodeId(); }
 		    int maxArcId() const { return _graph->maxEdgeId(); }
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const { return _graph->notifier(Node()); }
-		    typedef typename ItemSetTraits<Graph, Arc>::ItemNotifier ArcNotifier;
+		    typedef typename ItemSetTraits<GR, Arc>::ItemNotifier ArcNotifier;
 		    ArcNotifier& notifier(Arc) const { return _graph->notifier(Arc()); }
 		    template <typename _Value>
 		    class NodeMap : public _Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
 		      typedef typename _Graph::template NodeMap<_Value> Parent;
-		      explicit NodeMap(const OrienterBase& adapter)
+		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const OrienterBase<GR, DM>& adapter)
 		        : Parent(*adapter._graph) {}
-		      NodeMap(const OrienterBase& adapter, const _Value& value)
+		      NodeMap(const OrienterBase<GR, DM>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -2478,18 +2469,18 @@
+		      }
 		    };
 		    template <typename _Value>
 		    class ArcMap : public _Graph::template EdgeMap<_Value> {
 		    template <typename V>
 		    class ArcMap : public GR::template EdgeMap<V> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
-		      explicit ArcMap(const OrienterBase& adapter)
+		      typedef typename Graph::template EdgeMap<V> Parent;
 		      explicit ArcMap(const OrienterBase<GR, DM>& adapter)
 		        : Parent(*adapter._graph) { }
-		      ArcMap(const OrienterBase& adapter, const _Value& value)
+		      ArcMap(const OrienterBase<GR, DM>& adapter, const V& value)
 		        : Parent(*adapter._graph, value) { }
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -2506,18 +2497,15 @@
 		  protected:
 		    Graph* _graph;
 		    DirectionMap* _direction;
-		    void setDirectionMap(DirectionMap& direction) {
+		    DM* _direction;
 		    void initialize(GR& graph, DM& direction) {
 		      _graph = &graph;
 		      _direction = &direction;
+		    }
 		    void setGraph(Graph& graph) {
 		      _graph = &graph;
+		    }
 		  };
 		  /// \ingroup graph_adaptors
 		  ///
@@ -2571,11 +2559,10 @@
 		    /// \brief Constructor
 		    ///
 		    /// Constructor of the adaptor.
 		    Orienter(Graph& graph, DirectionMap& direction) {
 		      setGraph(graph);
-		      setDirectionMap(direction);
+		    Orienter(GR& graph, DM& direction) {
 		      Parent::initialize(graph, direction);
+		    }
 		    /// \brief Reverses the given arc
 		    ///
@@ -2593,69 +2580,64 @@
 		  /// \ingroup graph_adaptors
 		  /// \relates Orienter
 		  template<typename GR, typename DM>
 		  Orienter<const GR, DM>
 		  orienter(const GR& graph, DM& direction_map) {
 		    return Orienter<const GR, DM>(graph, direction_map);
 		  orienter(const GR& graph, DM& direction) {
 		    return Orienter<const GR, DM>(graph, direction);
+		  }
 		  template<typename GR, typename DM>
 		  Orienter<const GR, const DM>
 		  orienter(const GR& graph, const DM& direction_map) {
 		    return Orienter<const GR, const DM>(graph, direction_map);
 		  orienter(const GR& graph, const DM& direction) {
 		    return Orienter<const GR, const DM>(graph, direction);
+		  }
 		  namespace _adaptor_bits {
 		    template<typename Digraph,
 		             typename CapacityMap,
 		             typename FlowMap,
 		             typename Tolerance>
 		    template <typename DGR, typename CM, typename FM, typename TL>
 		    class ResForwardFilter {
 		    public:
-		      typedef typename Digraph::Arc Key;
+		      typedef typename DGR::Arc Key;
 		      typedef bool Value;
 		    private:
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
-		      Tolerance _tolerance;
+		      const CM* _capacity;
 		      const FM* _flow;
 		      TL _tolerance;
 		    public:
 		      ResForwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                       const Tolerance& tolerance = Tolerance())
 		      ResForwardFilter(const CM& capacity, const FM& flow,
 		                       const TL& tolerance = TL())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
-		      bool operator[](const typename Digraph::Arc& a) const {
+		      bool operator[](const typename DGR::Arc& a) const {
 		        return _tolerance.positive((*_capacity)[a] - (*_flow)[a]);
+		      }
 		    };
 		    template<typename Digraph,
 		             typename CapacityMap,
 		             typename FlowMap,
 		             typename Tolerance>
 		    template<typename DGR,typename CM, typename FM, typename TL>
 		    class ResBackwardFilter {
 		    public:
-		      typedef typename Digraph::Arc Key;
+		      typedef typename DGR::Arc Key;
 		      typedef bool Value;
 		    private:
 		      const CapacityMap* _capacity;
 		      const FlowMap* _flow;
-		      Tolerance _tolerance;
+		      const CM* _capacity;
 		      const FM* _flow;
 		      TL _tolerance;
 		    public:
 		      ResBackwardFilter(const CapacityMap& capacity, const FlowMap& flow,
 		                        const Tolerance& tolerance = Tolerance())
 		      ResBackwardFilter(const CM& capacity, const FM& flow,
 		                        const TL& tolerance = TL())
 		        : _capacity(&capacity), _flow(&flow), _tolerance(tolerance) { }
-		      bool operator[](const typename Digraph::Arc& a) const {
+		      bool operator[](const typename DGR::Arc& a) const {
 		        return _tolerance.positive((*_flow)[a]);
+		      }
 		    };
@@ -2680,9 +2662,9 @@
 		  /// \f$ |A_{forward}| + |A_{backward}|\f$ arcs (it may have parallel
 		  /// arcs).
 		  /// This class conforms to the \ref concepts::Digraph "Digraph" concept.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It is implicitly \c const.
 		  /// \tparam CM The type of the capacity map.
 		  /// It must be an arc map of some numerical type, which defines
@@ -2702,27 +2684,28 @@
 		  /// \note The \c Node type of this adaptor and the adapted digraph are
 		  /// convertible to each other, moreover the \c Arc type of the adaptor
 		  /// is convertible to the \c Arc type of the adapted digraph.
 		#ifdef DOXYGEN
-		  template<typename GR, typename CM, typename FM, typename TL>
+		  template<typename DGR, typename CM, typename FM, typename TL>
 		  class ResidualDigraph
 		#else
 		  template<typename GR,
 		           typename CM = typename GR::template ArcMap<int>,
 		  template<typename DGR,
 		           typename CM = typename DGR::template ArcMap<int>,
 		           typename FM = CM,
 		           typename TL = Tolerance<typename CM::Value> >
 		  class ResidualDigraph :
 		    public FilterArcs<
 		      Undirector<const GR>,
 		      typename Undirector<const GR>::template CombinedArcMap<
 		        _adaptor_bits::ResForwardFilter<const GR, CM, FM, TL>,
 		        _adaptor_bits::ResBackwardFilter<const GR, CM, FM, TL> > >
 		  class ResidualDigraph
 		    : public SubDigraph<
 		        Undirector<const DGR>,
 		        ConstMap<typename DGR::Node, Const<bool, true> >,
 		        typename Undirector<const DGR>::template CombinedArcMap<
 		          _adaptor_bits::ResForwardFilter<const DGR, CM, FM, TL>,
 		          _adaptor_bits::ResBackwardFilter<const DGR, CM, FM, TL> > >
 		#endif
+		  {
 		  public:
 		    /// The type of the underlying digraph.
-		    typedef GR Digraph;
+		    typedef DGR Digraph;
 		    /// The type of the capacity map.
 		    typedef CM CapacityMap;
 		    /// The type of the flow map.
 		    typedef FM FlowMap;
@@ -2735,23 +2718,26 @@
 		  protected:
 		    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 ConstMap<typename DGR::Node, Const<bool, true> > NodeFilter;
 		    typedef _adaptor_bits::ResForwardFilter<const DGR, CM,
 		                                            FM, TL> ForwardFilter;
 		    typedef _adaptor_bits::ResBackwardFilter<const DGR, CM,
 		                                             FM, TL> BackwardFilter;
 		    typedef typename Undirected::
 		      template CombinedArcMap<ForwardFilter, BackwardFilter> ArcFilter;
-		    typedef FilterArcs<Undirected, ArcFilter> Parent;
+		    typedef SubDigraph<Undirected, NodeFilter, ArcFilter> Parent;
 		    const CapacityMap* _capacity;
 		    FlowMap* _flow;
 		    Undirected _graph;
 		    NodeFilter _node_filter;
 		    ForwardFilter _forward_filter;
 		    BackwardFilter _backward_filter;
 		    ArcFilter _arc_filter;
@@ -2760,17 +2746,17 @@
 		    /// \brief Constructor
 		    ///
 		    /// Constructor of the residual digraph adaptor. The parameters are the
 		    /// digraph, the capacity map, the flow map, and a tolerance object.
 		    ResidualDigraph(const Digraph& digraph, const CapacityMap& capacity,
 		                    FlowMap& flow, const Tolerance& tolerance = Tolerance())
-		      : Parent(), _capacity(&capacity), _flow(&flow), _graph(digraph),
+		    ResidualDigraph(const DGR& digraph, const CM& capacity,
 		                    FM& flow, const TL& tolerance = Tolerance())
 		      : Parent(), _capacity(&capacity), _flow(&flow),
 		        _graph(digraph), _node_filter(),
 		        _forward_filter(capacity, flow, tolerance),
 		        _backward_filter(capacity, flow, tolerance),
 		        _arc_filter(_forward_filter, _backward_filter)
+		    {
 		      Parent::setDigraph(_graph);
 		      Parent::setArcFilterMap(_arc_filter);
 		      Parent::initialize(_graph, _node_filter, _arc_filter);
+		    }
 		    typedef typename Parent::Arc Arc;
@@ -2844,9 +2830,10 @@
 		      /// The value type of the map
 		      typedef typename CapacityMap::Value Value;
 		      /// Constructor
-		      ResidualCapacity(const Adaptor& adaptor) : _adaptor(&adaptor) {}
+		      ResidualCapacity(const ResidualDigraph<DGR, CM, FM, TL>& adaptor)
 		        : _adaptor(&adaptor) {}
 		      /// Returns the value associated with the given residual arc
 		      Value operator[](const Arc& a) const {
 		        return _adaptor->residualCapacity(a);
@@ -2864,28 +2851,28 @@
 		  };
 		  /// \brief Returns a (read-only) Residual adaptor
 		  ///
-		  /// This function just returns a (read-only) \ref Residual adaptor.
+		  /// This function just returns a (read-only) \ref ResidualDigraph adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates Residual
 		  template<typename GR, typename CM, typename FM>
 		  ResidualDigraph<GR, CM, FM>
 		  residualDigraph(const GR& digraph, const CM& capacity_map, FM& flow_map) {
-		    return ResidualDigraph<GR, CM, FM> (digraph, capacity_map, flow_map);
+		  /// \relates ResidualDigraph
 		    template<typename DGR, typename CM, typename FM>
 		  ResidualDigraph<DGR, CM, FM>
 		  residualDigraph(const DGR& digraph, const CM& capacity_map, FM& flow_map) {
 		    return ResidualDigraph<DGR, CM, FM> (digraph, capacity_map, flow_map);
+		  }
-		  template <typename _Digraph>
+		  template <typename DGR>
 		  class SplitNodesBase {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef DigraphAdaptorBase<const _Digraph> Parent;
 		    typedef DGR Digraph;
 		    typedef DigraphAdaptorBase<const DGR> Parent;
 		    typedef SplitNodesBase Adaptor;
 		    typedef typename Digraph::Node DigraphNode;
 		    typedef typename Digraph::Arc DigraphArc;
 		    typedef typename DGR::Node DigraphNode;
 		    typedef typename DGR::Arc DigraphArc;
 		    class Node;
 		    class Arc;
@@ -3147,34 +3134,34 @@
+		    }
 		  private:
-		    template <typename _Value>
+		    template <typename V>
 		    class NodeMapBase
 		      : public MapTraits<typename Parent::template NodeMap<_Value> > {
 		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
 		      : public MapTraits<typename Parent::template NodeMap<V> > {
 		      typedef typename Parent::template NodeMap<V> NodeImpl;
 		    public:
 		      typedef Node Key;
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef typename MapTraits<NodeImpl>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<NodeImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<NodeImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<NodeImpl>::ReturnValue Reference;
 		      typedef typename MapTraits<NodeImpl>::ConstReturnValue ConstReference;
-		      NodeMapBase(const Adaptor& adaptor)
+		      NodeMapBase(const SplitNodesBase<DGR>& adaptor)
 		        : _in_map(*adaptor._digraph), _out_map(*adaptor._digraph) {}
-		      NodeMapBase(const Adaptor& adaptor, const Value& value)
+		      NodeMapBase(const SplitNodesBase<DGR>& adaptor, const V& 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); }
 		      void set(const Node& key, const V& val) {
 		        if (SplitNodesBase<DGR>::inNode(key)) { _in_map.set(key, val); }
 		        else {_out_map.set(key, val); }
+		      }
 		      ReturnValue operator[](const Node& key) {
-		        if (Adaptor::inNode(key)) { return _in_map[key]; }
+		        if (SplitNodesBase<DGR>::inNode(key)) { return _in_map[key]; }
 		        else { return _out_map[key]; }
+		      }
 		      ConstReturnValue operator[](const Node& key) const {
@@ -3185,46 +3172,46 @@
 		    private:
 		      NodeImpl _in_map, _out_map;
 		    };
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMapBase
 		      : public MapTraits<typename Parent::template ArcMap<_Value> > {
 		      typedef typename Parent::template ArcMap<_Value> ArcImpl;
-		      typedef typename Parent::template NodeMap<_Value> NodeImpl;
+		      : public MapTraits<typename Parent::template ArcMap<V> > {
 		      typedef typename Parent::template ArcMap<V> ArcImpl;
 		      typedef typename Parent::template NodeMap<V> NodeImpl;
 		    public:
 		      typedef Arc Key;
-		      typedef _Value Value;
+		      typedef V Value;
 		      typedef typename MapTraits<ArcImpl>::ReferenceMapTag ReferenceMapTag;
 		      typedef typename MapTraits<ArcImpl>::ReturnValue ReturnValue;
 		      typedef typename MapTraits<ArcImpl>::ConstReturnValue ConstReturnValue;
 		      typedef typename MapTraits<ArcImpl>::ReturnValue Reference;
 		      typedef typename MapTraits<ArcImpl>::ConstReturnValue ConstReference;
-		      ArcMapBase(const Adaptor& adaptor)
+		      ArcMapBase(const SplitNodesBase<DGR>& adaptor)
 		        : _arc_map(*adaptor._digraph), _node_map(*adaptor._digraph) {}
-		      ArcMapBase(const Adaptor& adaptor, const Value& value)
+		      ArcMapBase(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : _arc_map(*adaptor._digraph, value),
 		          _node_map(*adaptor._digraph, value) {}
 		      void set(const Arc& key, const Value& val) {
 		        if (Adaptor::origArc(key)) {
 		      void set(const Arc& key, const V& val) {
 		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          _arc_map.set(key._item.first(), val);
 		        } else {
 		          _node_map.set(key._item.second(), val);
+		        }
+		      }
 		      ReturnValue operator[](const Arc& key) {
-		        if (Adaptor::origArc(key)) {
+		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        } else {
 		          return _node_map[key._item.second()];
+		        }
+		      }
 		      ConstReturnValue operator[](const Arc& key) const {
-		        if (Adaptor::origArc(key)) {
+		        if (SplitNodesBase<DGR>::origArc(key)) {
 		          return _arc_map[key._item.first()];
 		        } else {
 		          return _node_map[key._item.second()];
+		        }
@@ -3236,20 +3223,20 @@
 		    };
 		  public:
-		    template <typename _Value>
+		    template <typename V>
 		    class NodeMap
-		      : public SubMapExtender<Adaptor, NodeMapBase<_Value> >
+		      : public SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<V> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, NodeMapBase<Value> > Parent;
 		      NodeMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      typedef SubMapExtender<SplitNodesBase<DGR>, NodeMapBase<Value> > Parent;
 		      NodeMap(const SplitNodesBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      NodeMap(const Adaptor& adaptor, const Value& value)
+		      NodeMap(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      NodeMap& operator=(const NodeMap& cmap) {
@@ -3262,20 +3249,20 @@
 		        return *this;
+		      }
 		    };
-		    template <typename _Value>
+		    template <typename V>
 		    class ArcMap
-		      : public SubMapExtender<Adaptor, ArcMapBase<_Value> >
+		      : public SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<V> >
+		    {
 		    public:
 		      typedef _Value Value;
 		      typedef SubMapExtender<Adaptor, ArcMapBase<Value> > Parent;
 		      ArcMap(const Adaptor& adaptor)
 		      typedef V Value;
 		      typedef SubMapExtender<SplitNodesBase<DGR>, ArcMapBase<Value> > Parent;
 		      ArcMap(const SplitNodesBase<DGR>& adaptor)
 		        : Parent(adaptor) {}
-		      ArcMap(const Adaptor& adaptor, const Value& value)
+		      ArcMap(const SplitNodesBase<DGR>& adaptor, const V& value)
 		        : Parent(adaptor, value) {}
 		    private:
 		      ArcMap& operator=(const ArcMap& cmap) {
@@ -3292,11 +3279,11 @@
 		  protected:
 		    SplitNodesBase() : _digraph(0) {}
 		    Digraph* _digraph;
-		    void setDigraph(Digraph& digraph) {
+		    DGR* _digraph;
 		    void initialize(Digraph& digraph) {
 		      _digraph = &digraph;
+		    }
 		  };
@@ -3321,36 +3308,36 @@
 		  /// In this case you can use \c SplitNodes adaptor, and set the node
 		  /// costs/capacities of the original digraph to the \e bind \e arcs
 		  /// in the adaptor.
 		  ///
-		  /// \tparam GR The type of the adapted digraph.
+		  /// \tparam DGR The type of the adapted digraph.
 		  /// It must conform to the \ref concepts::Digraph "Digraph" concept.
 		  /// It is implicitly \c const.
 		  ///
 		  /// \note The \c Node type of this adaptor is converible to the \c Node
 		  /// type of the adapted digraph.
-		  template <typename GR>
+		  template <typename DGR>
 		#ifdef DOXYGEN
 		  class SplitNodes {
 		#else
 		  class SplitNodes
-		    : public DigraphAdaptorExtender<SplitNodesBase<const GR> > {
+		    : public DigraphAdaptorExtender<SplitNodesBase<const DGR> > {
 		#endif
 		  public:
 		    typedef GR Digraph;
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const GR> > Parent;
 		    typedef typename Digraph::Node DigraphNode;
-		    typedef typename Digraph::Arc DigraphArc;
+		    typedef DGR Digraph;
 		    typedef DigraphAdaptorExtender<SplitNodesBase<const DGR> > Parent;
 		    typedef typename DGR::Node DigraphNode;
 		    typedef typename DGR::Arc DigraphArc;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor of the adaptor.
 		    SplitNodes(const Digraph& g) {
 		      Parent::setDigraph(g);
 		    SplitNodes(const DGR& g) {
 		      Parent::initialize(g);
+		    }
 		    /// \brief Returns \c true if the given node is an in-node.
 		    ///
@@ -3440,27 +3427,27 @@
 		        : _in_map(in_map), _out_map(out_map) {}
 		      /// Returns the value associated with the given key.
 		      Value operator[](const Key& key) const {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          return _in_map[key];
 		        } else {
 		          return _out_map[key];
+		        }
+		      }
 		      /// Returns a reference to the value associated with the given key.
 		      Value& operator[](const Key& key) {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          return _in_map[key];
 		        } else {
 		          return _out_map[key];
+		        }
+		      }
 		      /// Sets the value associated with the given key.
 		      void set(const Key& key, const Value& value) {
-		        if (Parent::inNode(key)) {
+		        if (SplitNodesBase<const DGR>::inNode(key)) {
 		          _in_map.set(key, value);
 		        } else {
 		          _out_map.set(key, value);
+		        }
@@ -3529,27 +3516,27 @@
 		        : _arc_map(arc_map), _node_map(node_map) {}
 		      /// Returns the value associated with the given key.
 		      Value operator[](const Key& arc) const {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		      /// Returns a reference to the value associated with the given key.
 		      Value& operator[](const Key& arc) {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          return _arc_map[arc];
 		        } else {
 		          return _node_map[arc];
+		        }
+		      }
 		      /// Sets the value associated with the given key.
 		      void set(const Arc& arc, const Value& val) {
-		        if (Parent::origArc(arc)) {
+		        if (SplitNodesBase<const DGR>::origArc(arc)) {
 		          _arc_map.set(arc, val);
 		        } else {
 		          _node_map.set(arc, val);
+		        }
@@ -3593,13 +3580,15 @@
 		  ///
 		  /// This function just returns a (read-only) \ref SplitNodes adaptor.
 		  /// \ingroup graph_adaptors
 		  /// \relates SplitNodes
 		  template<typename GR>
 		  SplitNodes<GR>
 		  splitNodes(const GR& digraph) {
 		    return SplitNodes<GR>(digraph);
 		  template<typename DGR>
 		  SplitNodes<DGR>
 		  splitNodes(const DGR& digraph) {
 		    return SplitNodes<DGR>(digraph);
+		  }
 		#undef LEMON_SCOPE_FIX
 		} //namespace lemon
 		#endif //LEMON_ADAPTORS_H

lemon/edge_set.h

Show inline comments

@@ -28,27 +28,27 @@
 		///
 		/// Graphs which use another graph's node-set as own.
 		namespace lemon {
-		  template <typename _Graph>
+		  template <typename GR>
 		  class ListArcSetBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::NodeIt NodeIt;
+		    typedef GR Graph;
 		    typedef typename GR::Node Node;
 		    typedef typename GR::NodeIt NodeIt;
 		  protected:
 		    struct NodeT {
 		      int first_out, first_in;
 		      NodeT() : first_out(-1), first_in(-1) {}
 		    };
-		    typedef typename ItemSetTraits<Graph, Node>::
+		    typedef typename ItemSetTraits<GR, Node>::
 		    template Map<NodeT>::Type NodesImplBase;
-		    NodesImplBase* nodes;
+		    NodesImplBase* _nodes;
 		    struct ArcT {
 		      Node source, target;
 		      int next_out, next_in;
@@ -60,19 +60,19 @@
 		    int first_arc;
 		    int first_free_arc;
-		    const Graph* graph;
+		    const GR* _graph;
 		    void initalize(const Graph& _graph, NodesImplBase& _nodes) {
 		      graph = &_graph;
-		      nodes = &_nodes;
+		    void initalize(const GR& graph, NodesImplBase& nodes) {
 		      _graph = &graph;
 		      _nodes = &nodes;
+		    }
 		  public:
 		    class Arc {
-		      friend class ListArcSetBase<Graph>;
+		      friend class ListArcSetBase<GR>;
 		    protected:
 		      Arc(int _id) : id(_id) {}
 		      int id;
 		    public:
@@ -93,18 +93,18 @@
 		      } else {
 		        n = first_free_arc;
 		        first_free_arc = arcs[first_free_arc].next_in;
+		      }
 		      arcs[n].next_in = (*nodes)[v].first_in;
 		      if ((*nodes)[v].first_in != -1) {
-		        arcs[(*nodes)[v].first_in].prev_in = n;
+		      arcs[n].next_in = (*_nodes)[v].first_in;
 		      if ((*_nodes)[v].first_in != -1) {
 		        arcs[(*_nodes)[v].first_in].prev_in = n;
+		      }
 		      (*nodes)[v].first_in = n;
 		      arcs[n].next_out = (*nodes)[u].first_out;
 		      if ((*nodes)[u].first_out != -1) {
 		        arcs[(*nodes)[u].first_out].prev_out = n;
 		      (*_nodes)[v].first_in = n;
 		      arcs[n].next_out = (*_nodes)[u].first_out;
 		      if ((*_nodes)[u].first_out != -1) {
 		        arcs[(*_nodes)[u].first_out].prev_out = n;
+		      }
-		      (*nodes)[u].first_out = n;
+		      (*_nodes)[u].first_out = n;
 		      arcs[n].source = u;
 		      arcs[n].target = v;
 		      return Arc(n);
+		    }
@@ -113,18 +113,18 @@
 		      int n = arc.id;
 		      if (arcs[n].prev_in != -1) {
 		        arcs[arcs[n].prev_in].next_in = arcs[n].next_in;
 		      } else {
-		        (*nodes)[arcs[n].target].first_in = arcs[n].next_in;
+		        (*_nodes)[arcs[n].target].first_in = arcs[n].next_in;
+		      }
 		      if (arcs[n].next_in != -1) {
 		        arcs[arcs[n].next_in].prev_in = arcs[n].prev_in;
+		      }
 		      if (arcs[n].prev_out != -1) {
 		        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
 		      } else {
-		        (*nodes)[arcs[n].source].first_out = arcs[n].next_out;
+		        (*_nodes)[arcs[n].source].first_out = arcs[n].next_out;
+		      }
 		      if (arcs[n].next_out != -1) {
 		        arcs[arcs[n].next_out].prev_out = arcs[n].prev_out;
+		      }
@@ -133,91 +133,91 @@
 		    void clear() {
 		      Node node;
 		      for (first(node); node != INVALID; next(node)) {
 		        (*nodes)[node].first_in = -1;
 		        (*nodes)[node].first_out = -1;
 		        (*_nodes)[node].first_in = -1;
 		        (*_nodes)[node].first_out = -1;
+		      }
 		      arcs.clear();
 		      first_arc = -1;
 		      first_free_arc = -1;
+		    }
 		    void first(Node& node) const {
-		      graph->first(node);
+		      _graph->first(node);
+		    }
 		    void next(Node& node) const {
-		      graph->next(node);
+		      _graph->next(node);
+		    }
 		    void first(Arc& arc) const {
 		      Node node;
 		      first(node);
-		      while (node != INVALID && (*nodes)[node].first_in == -1) {
+		      while (node != INVALID && (*_nodes)[node].first_in == -1) {
 		        next(node);
+		      }
-		      arc.id = (node == INVALID) ? -1 : (*nodes)[node].first_in;
+		      arc.id = (node == INVALID) ? -1 : (*_nodes)[node].first_in;
+		    }
 		    void next(Arc& arc) const {
 		      if (arcs[arc.id].next_in != -1) {
 		        arc.id = arcs[arc.id].next_in;
 		      } else {
 		        Node node = arcs[arc.id].target;
 		        next(node);
-		        while (node != INVALID && (*nodes)[node].first_in == -1) {
+		        while (node != INVALID && (*_nodes)[node].first_in == -1) {
 		          next(node);
+		        }
-		        arc.id = (node == INVALID) ? -1 : (*nodes)[node].first_in;
+		        arc.id = (node == INVALID) ? -1 : (*_nodes)[node].first_in;
+		      }
+		    }
 		    void firstOut(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_out;
+		      arc.id = (*_nodes)[node].first_out;
+		    }
 		    void nextOut(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_out;
+		    }
 		    void firstIn(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_in;
+		      arc.id = (*_nodes)[node].first_in;
+		    }
 		    void nextIn(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_in;
+		    }
-		    int id(const Node& node) const { return graph->id(node); }
+		    int id(const Node& node) const { return _graph->id(node); }
 		    int id(const Arc& arc) const { return arc.id; }
-		    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
+		    Node nodeFromId(int ix) const { return _graph->nodeFromId(ix); }
 		    Arc arcFromId(int ix) const { return Arc(ix); }
-		    int maxNodeId() const { return graph->maxNodeId(); };
+		    int maxNodeId() const { return _graph->maxNodeId(); };
 		    int maxArcId() const { return arcs.size() - 1; }
 		    Node source(const Arc& arc) const { return arcs[arc.id].source;}
 		    Node target(const Arc& arc) const { return arcs[arc.id].target;}
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const {
-		      return graph->notifier(Node());
+		      return _graph->notifier(Node());
+		    }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
-		      typedef typename _Graph::template NodeMap<_Value> Parent;
+		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const ListArcSetBase<Graph>& arcset)
 		        : Parent(*arcset.graph) {}
 		      explicit NodeMap(const ListArcSetBase<GR>& arcset)
 		        : Parent(*arcset._graph) {}
 		      NodeMap(const ListArcSetBase<Graph>& arcset, const _Value& value)
 		        : Parent(*arcset.graph, value) {}
 		      NodeMap(const ListArcSetBase<GR>& arcset, const V& value)
 		        : Parent(*arcset._graph, value) {}
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
@@ -249,26 +249,26 @@
 		  /// one arc can be erased in constant time. It also makes possible,
 		  /// that node can be removed from the underlying graph, in this case
 		  /// all arcs incident to the given node is erased from the arc set.
 		  ///
-		  /// \param _Graph The type of the graph which shares its node set with
+		  /// \param GR The type of the graph which shares its node set with
 		  /// this class. Its interface must conform to the
 		  /// \ref concepts::Digraph "Digraph" or \ref concepts::Graph "Graph"
 		  /// concept.
 		  ///
 		  /// This class is fully conform to the \ref concepts::Digraph
 		  /// "Digraph" concept.
 		  template <typename _Graph>
 		  class ListArcSet : public ArcSetExtender<ListArcSetBase<_Graph> > {
 		  template <typename GR>
 		  class ListArcSet : public ArcSetExtender<ListArcSetBase<GR> > {
 		  public:
-		    typedef ArcSetExtender<ListArcSetBase<_Graph> > Parent;
+		    typedef ArcSetExtender<ListArcSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
-		    typedef _Graph Graph;
+		    typedef GR Graph;
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -294,9 +294,9 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
-		      NodesImpl(const Graph& graph, ListArcSet& arcset)
+		      NodesImpl(const GR& graph, ListArcSet& arcset)
 		        : Parent(graph), _arcset(arcset) {}
 		      virtual ~NodesImpl() {}
@@ -320,17 +320,17 @@
 		    private:
 		      ListArcSet& _arcset;
 		    };
-		    NodesImpl nodes;
+		    NodesImpl _nodes;
 		  public:
 		    /// \brief Constructor of the ArcSet.
 		    ///
 		    /// Constructor of the ArcSet.
 		    ListArcSet(const Graph& graph) : nodes(graph, *this) {
 		      Parent::initalize(graph, nodes);
 		    ListArcSet(const GR& graph) : _nodes(graph, *this) {
 		      Parent::initalize(graph, _nodes);
+		    }
 		    /// \brief Add a new arc to the digraph.
 		    ///
@@ -349,27 +349,27 @@
+		    }
 		  };
-		  template <typename _Graph>
+		  template <typename GR>
 		  class ListEdgeSetBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::NodeIt NodeIt;
+		    typedef GR Graph;
 		    typedef typename GR::Node Node;
 		    typedef typename GR::NodeIt NodeIt;
 		  protected:
 		    struct NodeT {
 		      int first_out;
 		      NodeT() : first_out(-1) {}
 		    };
-		    typedef typename ItemSetTraits<Graph, Node>::
+		    typedef typename ItemSetTraits<GR, Node>::
 		    template Map<NodeT>::Type NodesImplBase;
-		    NodesImplBase* nodes;
+		    NodesImplBase* _nodes;
 		    struct ArcT {
 		      Node target;
 		      int prev_out, next_out;
@@ -380,13 +380,13 @@
 		    int first_arc;
 		    int first_free_arc;
-		    const Graph* graph;
+		    const GR* _graph;
 		    void initalize(const Graph& _graph, NodesImplBase& _nodes) {
 		      graph = &_graph;
-		      nodes = &_nodes;
+		    void initalize(const GR& graph, NodesImplBase& nodes) {
 		      _graph = &graph;
 		      _nodes = &nodes;
+		    }
 		  public:
@@ -436,20 +436,20 @@
 		      arcs[n].target = u;
 		      arcs[n | 1].target = v;
 		      arcs[n].next_out = (*nodes)[v].first_out;
 		      if ((*nodes)[v].first_out != -1) {
-		        arcs[(*nodes)[v].first_out].prev_out = n;
+		      arcs[n].next_out = (*_nodes)[v].first_out;
 		      if ((*_nodes)[v].first_out != -1) {
 		        arcs[(*_nodes)[v].first_out].prev_out = n;
+		      }
-		      (*nodes)[v].first_out = n;
+		      (*_nodes)[v].first_out = n;
 		      arcs[n].prev_out = -1;
 		      if ((*nodes)[u].first_out != -1) {
 		        arcs[(*nodes)[u].first_out].prev_out = (n | 1);
 		      if ((*_nodes)[u].first_out != -1) {
 		        arcs[(*_nodes)[u].first_out].prev_out = (n | 1);
+		      }
 		      arcs[n | 1].next_out = (*nodes)[u].first_out;
 		      (*nodes)[u].first_out = (n | 1);
 		      arcs[n | 1].next_out = (*_nodes)[u].first_out;
 		      (*_nodes)[u].first_out = (n | 1);
 		      arcs[n | 1].prev_out = -1;
 		      return Edge(n / 2);
+		    }
@@ -463,9 +463,9 @@
 		      if (arcs[n].prev_out != -1) {
 		        arcs[arcs[n].prev_out].next_out = arcs[n].next_out;
 		      } else {
-		        (*nodes)[arcs[n | 1].target].first_out = arcs[n].next_out;
+		        (*_nodes)[arcs[n | 1].target].first_out = arcs[n].next_out;
+		      }
 		      if (arcs[n | 1].next_out != -1) {
 		        arcs[arcs[n | 1].next_out].prev_out = arcs[n | 1].prev_out;
@@ -473,9 +473,9 @@
 		      if (arcs[n | 1].prev_out != -1) {
 		        arcs[arcs[n | 1].prev_out].next_out = arcs[n | 1].next_out;
 		      } else {
-		        (*nodes)[arcs[n].target].first_out = arcs[n | 1].next_out;
+		        (*_nodes)[arcs[n].target].first_out = arcs[n | 1].next_out;
+		      }
 		      arcs[n].next_out = first_free_arc;
 		      first_free_arc = n;
@@ -484,50 +484,50 @@
 		    void clear() {
 		      Node node;
 		      for (first(node); node != INVALID; next(node)) {
-		        (*nodes)[node].first_out = -1;
+		        (*_nodes)[node].first_out = -1;
+		      }
 		      arcs.clear();
 		      first_arc = -1;
 		      first_free_arc = -1;
+		    }
 		    void first(Node& node) const {
-		      graph->first(node);
+		      _graph->first(node);
+		    }
 		    void next(Node& node) const {
-		      graph->next(node);
+		      _graph->next(node);
+		    }
 		    void first(Arc& arc) const {
 		      Node node;
 		      first(node);
-		      while (node != INVALID && (*nodes)[node].first_out == -1) {
+		      while (node != INVALID && (*_nodes)[node].first_out == -1) {
 		        next(node);
+		      }
-		      arc.id = (node == INVALID) ? -1 : (*nodes)[node].first_out;
+		      arc.id = (node == INVALID) ? -1 : (*_nodes)[node].first_out;
+		    }
 		    void next(Arc& arc) const {
 		      if (arcs[arc.id].next_out != -1) {
 		        arc.id = arcs[arc.id].next_out;
 		      } else {
 		        Node node = arcs[arc.id ^ 1].target;
 		        next(node);
-		        while(node != INVALID && (*nodes)[node].first_out == -1) {
+		        while(node != INVALID && (*_nodes)[node].first_out == -1) {
 		          next(node);
+		        }
-		        arc.id = (node == INVALID) ? -1 : (*nodes)[node].first_out;
+		        arc.id = (node == INVALID) ? -1 : (*_nodes)[node].first_out;
+		      }
+		    }
 		    void first(Edge& edge) const {
 		      Node node;
 		      first(node);
 		      while (node != INVALID) {
-		        edge.id = (*nodes)[node].first_out;
+		        edge.id = (*_nodes)[node].first_out;
 		        while ((edge.id & 1) != 1) {
 		          edge.id = arcs[edge.id].next_out;
+		        }
 		        if (edge.id != -1) {
@@ -550,9 +550,9 @@
 		        return;
+		      }
 		      next(node);
 		      while (node != INVALID) {
-		        edge.id = (*nodes)[node].first_out;
+		        edge.id = (*_nodes)[node].first_out;
 		        while ((edge.id & 1) != 1) {
 		          edge.id = arcs[edge.id].next_out;
+		        }
 		        if (edge.id != -1) {
@@ -564,17 +564,17 @@
 		      edge.id = -1;
+		    }
 		    void firstOut(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_out;
+		      arc.id = (*_nodes)[node].first_out;
+		    }
 		    void nextOut(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_out;
+		    }
 		    void firstIn(Arc& arc, const Node& node) const {
-		      arc.id = (((*nodes)[node].first_out) ^ 1);
+		      arc.id = (((*_nodes)[node].first_out) ^ 1);
 		      if (arc.id == -2) arc.id = -1;
+		    }
 		    void nextIn(Arc& arc) const {
@@ -582,9 +582,9 @@
 		      if (arc.id == -2) arc.id = -1;
+		    }
 		    void firstInc(Edge &arc, bool& dir, const Node& node) const {
-		      int de = (*nodes)[node].first_out;
+		      int de = (*_nodes)[node].first_out;
 		      if (de != -1 ) {
 		        arc.id = de / 2;
 		        dir = ((de & 1) == 1);
 		      } else {
@@ -610,17 +610,17 @@
 		    static Arc direct(Edge edge, bool dir) {
 		      return Arc(edge.id * 2 + (dir ? 1 : 0));
+		    }
-		    int id(const Node& node) const { return graph->id(node); }
+		    int id(const Node& node) const { return _graph->id(node); }
 		    static int id(Arc e) { return e.id; }
 		    static int id(Edge e) { return e.id; }
-		    Node nodeFromId(int id) const { return graph->nodeFromId(id); }
+		    Node nodeFromId(int id) const { return _graph->nodeFromId(id); }
 		    static Arc arcFromId(int id) { return Arc(id);}
 		    static Edge edgeFromId(int id) { return Edge(id);}
-		    int maxNodeId() const { return graph->maxNodeId(); };
+		    int maxNodeId() const { return _graph->maxNodeId(); };
 		    int maxEdgeId() const { return arcs.size() / 2 - 1; }
 		    int maxArcId() const { return arcs.size()-1; }
 		    Node source(Arc e) const { return arcs[e.id ^ 1].target; }
@@ -628,25 +628,25 @@
 		    Node u(Edge e) const { return arcs[2 * e.id].target; }
 		    Node v(Edge e) const { return arcs[2 * e.id + 1].target; }
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const {
-		      return graph->notifier(Node());
+		      return _graph->notifier(Node());
+		    }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
-		      typedef typename _Graph::template NodeMap<_Value> Parent;
+		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const ListEdgeSetBase<Graph>& arcset)
 		        : Parent(*arcset.graph) {}
 		      explicit NodeMap(const ListEdgeSetBase<GR>& arcset)
 		        : Parent(*arcset._graph) {}
 		      NodeMap(const ListEdgeSetBase<Graph>& arcset, const _Value& value)
 		        : Parent(*arcset.graph, value) {}
 		      NodeMap(const ListEdgeSetBase<GR>& arcset, const V& value)
 		        : Parent(*arcset._graph, value) {}
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
@@ -678,27 +678,27 @@
 		  /// erased in constant time. It also makes possible, that node can
 		  /// be removed from the underlying graph, in this case all edges
 		  /// incident to the given node is erased from the arc set.
 		  ///
-		  /// \param _Graph The type of the graph which shares its node set
+		  /// \param GR The type of the graph which shares its node set
 		  /// with this class. Its interface must conform to the
 		  /// \ref concepts::Digraph "Digraph" or \ref concepts::Graph "Graph"
 		  /// concept.
 		  ///
 		  /// This class is fully conform to the \ref concepts::Graph "Graph"
 		  /// concept.
 		  template <typename _Graph>
 		  class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<_Graph> > {
 		  template <typename GR>
 		  class ListEdgeSet : public EdgeSetExtender<ListEdgeSetBase<GR> > {
 		  public:
-		    typedef EdgeSetExtender<ListEdgeSetBase<_Graph> > Parent;
+		    typedef EdgeSetExtender<ListEdgeSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
-		    typedef _Graph Graph;
+		    typedef GR Graph;
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -719,9 +719,9 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
-		      NodesImpl(const Graph& graph, ListEdgeSet& arcset)
+		      NodesImpl(const GR& graph, ListEdgeSet& arcset)
 		        : Parent(graph), _arcset(arcset) {}
 		      virtual ~NodesImpl() {}
@@ -745,17 +745,17 @@
 		    private:
 		      ListEdgeSet& _arcset;
 		    };
-		    NodesImpl nodes;
+		    NodesImpl _nodes;
 		  public:
 		    /// \brief Constructor of the EdgeSet.
 		    ///
 		    /// Constructor of the EdgeSet.
 		    ListEdgeSet(const Graph& graph) : nodes(graph, *this) {
 		      Parent::initalize(graph, nodes);
 		    ListEdgeSet(const GR& graph) : _nodes(graph, *this) {
 		      Parent::initalize(graph, _nodes);
+		    }
 		    /// \brief Add a new edge to the graph.
 		    ///
@@ -774,13 +774,13 @@
+		    }
 		  };
-		  template <typename _Graph>
+		  template <typename GR>
 		  class SmartArcSetBase {
 		  public:
-		    typedef _Graph Graph;
+		    typedef GR Graph;
 		    typedef typename Graph::Node Node;
 		    typedef typename Graph::NodeIt NodeIt;
 		  protected:
@@ -789,12 +789,12 @@
 		      int first_out, first_in;
 		      NodeT() : first_out(-1), first_in(-1) {}
 		    };
-		    typedef typename ItemSetTraits<Graph, Node>::
+		    typedef typename ItemSetTraits<GR, Node>::
 		    template Map<NodeT>::Type NodesImplBase;
-		    NodesImplBase* nodes;
+		    NodesImplBase* _nodes;
 		    struct ArcT {
 		      Node source, target;
 		      int next_out, next_in;
@@ -802,19 +802,19 @@
 		    };
 		    std::vector<ArcT> arcs;
-		    const Graph* graph;
+		    const GR* _graph;
 		    void initalize(const Graph& _graph, NodesImplBase& _nodes) {
 		      graph = &_graph;
-		      nodes = &_nodes;
+		    void initalize(const GR& graph, NodesImplBase& nodes) {
 		      _graph = &graph;
 		      _nodes = &nodes;
+		    }
 		  public:
 		    class Arc {
-		      friend class SmartArcSetBase<Graph>;
+		      friend class SmartArcSetBase<GR>;
 		    protected:
 		      Arc(int _id) : id(_id) {}
 		      int id;
 		    public:
@@ -829,32 +829,32 @@
 		    Arc addArc(const Node& u, const Node& v) {
 		      int n = arcs.size();
 		      arcs.push_back(ArcT());
 		      arcs[n].next_in = (*nodes)[v].first_in;
 		      (*nodes)[v].first_in = n;
 		      arcs[n].next_out = (*nodes)[u].first_out;
 		      (*nodes)[u].first_out = n;
 		      arcs[n].next_in = (*_nodes)[v].first_in;
 		      (*_nodes)[v].first_in = n;
 		      arcs[n].next_out = (*_nodes)[u].first_out;
 		      (*_nodes)[u].first_out = n;
 		      arcs[n].source = u;
 		      arcs[n].target = v;
 		      return Arc(n);
+		    }
 		    void clear() {
 		      Node node;
 		      for (first(node); node != INVALID; next(node)) {
 		        (*nodes)[node].first_in = -1;
 		        (*nodes)[node].first_out = -1;
 		        (*_nodes)[node].first_in = -1;
 		        (*_nodes)[node].first_out = -1;
+		      }
 		      arcs.clear();
+		    }
 		    void first(Node& node) const {
-		      graph->first(node);
+		      _graph->first(node);
+		    }
 		    void next(Node& node) const {
-		      graph->next(node);
+		      _graph->next(node);
+		    }
 		    void first(Arc& arc) const {
 		      arc.id = arcs.size() - 1;
@@ -864,52 +864,52 @@
 		      --arc.id;
+		    }
 		    void firstOut(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_out;
+		      arc.id = (*_nodes)[node].first_out;
+		    }
 		    void nextOut(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_out;
+		    }
 		    void firstIn(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_in;
+		      arc.id = (*_nodes)[node].first_in;
+		    }
 		    void nextIn(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_in;
+		    }
-		    int id(const Node& node) const { return graph->id(node); }
+		    int id(const Node& node) const { return _graph->id(node); }
 		    int id(const Arc& arc) const { return arc.id; }
-		    Node nodeFromId(int ix) const { return graph->nodeFromId(ix); }
+		    Node nodeFromId(int ix) const { return _graph->nodeFromId(ix); }
 		    Arc arcFromId(int ix) const { return Arc(ix); }
-		    int maxNodeId() const { return graph->maxNodeId(); };
+		    int maxNodeId() const { return _graph->maxNodeId(); };
 		    int maxArcId() const { return arcs.size() - 1; }
 		    Node source(const Arc& arc) const { return arcs[arc.id].source;}
 		    Node target(const Arc& arc) const { return arcs[arc.id].target;}
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const {
-		      return graph->notifier(Node());
+		      return _graph->notifier(Node());
+		    }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
-		      typedef typename _Graph::template NodeMap<_Value> Parent;
+		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const SmartArcSetBase<Graph>& arcset)
 		        : Parent(*arcset.graph) { }
 		      explicit NodeMap(const SmartArcSetBase<GR>& arcset)
 		        : Parent(*arcset._graph) { }
 		      NodeMap(const SmartArcSetBase<Graph>& arcset, const _Value& value)
 		        : Parent(*arcset.graph, value) { }
 		      NodeMap(const SmartArcSetBase<GR>& arcset, const V& value)
 		        : Parent(*arcset._graph, value) { }
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
@@ -936,9 +936,9 @@
 		  /// objects of the original graph can be used directly with this
 		  /// class. The node handling functions (id handling, observing, and
 		  /// iterators) works equivalently as in the original graph.
 		  ///
-		  /// \param _Graph The type of the graph which shares its node set with
+		  /// \param GR The type of the graph which shares its node set with
 		  /// this class. Its interface must conform to the
 		  /// \ref concepts::Digraph "Digraph" or \ref concepts::Graph "Graph"
 		  /// concept.
 		  ///
@@ -953,19 +953,19 @@
 		  /// validity can be checked with the \c valid() member function.
 		  ///
 		  /// This class is fully conform to the \ref concepts::Digraph
 		  /// "Digraph" concept.
 		  template <typename _Graph>
 		  class SmartArcSet : public ArcSetExtender<SmartArcSetBase<_Graph> > {
 		  template <typename GR>
 		  class SmartArcSet : public ArcSetExtender<SmartArcSetBase<GR> > {
 		  public:
-		    typedef ArcSetExtender<SmartArcSetBase<_Graph> > Parent;
+		    typedef ArcSetExtender<SmartArcSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
-		    typedef _Graph Graph;
+		    typedef GR Graph;
 		  protected:
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -985,9 +985,9 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
-		      NodesImpl(const Graph& graph, SmartArcSet& arcset)
+		      NodesImpl(const GR& graph, SmartArcSet& arcset)
 		        : Parent(graph), _arcset(arcset) {}
 		      virtual ~NodesImpl() {}
@@ -1025,17 +1025,17 @@
 		    private:
 		      SmartArcSet& _arcset;
 		    };
-		    NodesImpl nodes;
+		    NodesImpl _nodes;
 		  public:
 		    /// \brief Constructor of the ArcSet.
 		    ///
 		    /// Constructor of the ArcSet.
 		    SmartArcSet(const Graph& graph) : nodes(graph, *this) {
 		      Parent::initalize(graph, nodes);
 		    SmartArcSet(const GR& graph) : _nodes(graph, *this) {
 		      Parent::initalize(graph, _nodes);
+		    }
 		    /// \brief Add a new arc to the digraph.
 		    ///
@@ -1051,33 +1051,33 @@
 		    /// This functions gives back false if the ArcSet is
 		    /// invalidated. It occurs when a node in the underlying graph is
 		    /// erased and it is not isolated in the ArcSet.
 		    bool valid() const {
-		      return nodes.attached();
+		      return _nodes.attached();
+		    }
 		  };
-		  template <typename _Graph>
+		  template <typename GR>
 		  class SmartEdgeSetBase {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Node Node;
-		    typedef typename Graph::NodeIt NodeIt;
+		    typedef GR Graph;
 		    typedef typename GR::Node Node;
 		    typedef typename GR::NodeIt NodeIt;
 		  protected:
 		    struct NodeT {
 		      int first_out;
 		      NodeT() : first_out(-1) {}
 		    };
-		    typedef typename ItemSetTraits<Graph, Node>::
+		    typedef typename ItemSetTraits<GR, Node>::
 		    template Map<NodeT>::Type NodesImplBase;
-		    NodesImplBase* nodes;
+		    NodesImplBase* _nodes;
 		    struct ArcT {
 		      Node target;
 		      int next_out;
@@ -1085,13 +1085,13 @@
 		    };
 		    std::vector<ArcT> arcs;
-		    const Graph* graph;
+		    const GR* _graph;
 		    void initalize(const Graph& _graph, NodesImplBase& _nodes) {
 		      graph = &_graph;
-		      nodes = &_nodes;
+		    void initalize(const GR& graph, NodesImplBase& nodes) {
 		      _graph = &graph;
 		      _nodes = &nodes;
+		    }
 		  public:
@@ -1134,31 +1134,31 @@
 		      arcs[n].target = u;
 		      arcs[n | 1].target = v;
 		      arcs[n].next_out = (*nodes)[v].first_out;
 		      (*nodes)[v].first_out = n;
 		      arcs[n].next_out = (*_nodes)[v].first_out;
 		      (*_nodes)[v].first_out = n;
 		      arcs[n | 1].next_out = (*nodes)[u].first_out;
 		      (*nodes)[u].first_out = (n | 1);
 		      arcs[n | 1].next_out = (*_nodes)[u].first_out;
 		      (*_nodes)[u].first_out = (n | 1);
 		      return Edge(n / 2);
+		    }
 		    void clear() {
 		      Node node;
 		      for (first(node); node != INVALID; next(node)) {
-		        (*nodes)[node].first_out = -1;
+		        (*_nodes)[node].first_out = -1;
+		      }
 		      arcs.clear();
+		    }
 		    void first(Node& node) const {
-		      graph->first(node);
+		      _graph->first(node);
+		    }
 		    void next(Node& node) const {
-		      graph->next(node);
+		      _graph->next(node);
+		    }
 		    void first(Arc& arc) const {
 		      arc.id = arcs.size() - 1;
@@ -1176,17 +1176,17 @@
 		      --arc.id;
+		    }
 		    void firstOut(Arc& arc, const Node& node) const {
-		      arc.id = (*nodes)[node].first_out;
+		      arc.id = (*_nodes)[node].first_out;
+		    }
 		    void nextOut(Arc& arc) const {
 		      arc.id = arcs[arc.id].next_out;
+		    }
 		    void firstIn(Arc& arc, const Node& node) const {
-		      arc.id = (((*nodes)[node].first_out) ^ 1);
+		      arc.id = (((*_nodes)[node].first_out) ^ 1);
 		      if (arc.id == -2) arc.id = -1;
+		    }
 		    void nextIn(Arc& arc) const {
@@ -1194,9 +1194,9 @@
 		      if (arc.id == -2) arc.id = -1;
+		    }
 		    void firstInc(Edge &arc, bool& dir, const Node& node) const {
-		      int de = (*nodes)[node].first_out;
+		      int de = (*_nodes)[node].first_out;
 		      if (de != -1 ) {
 		        arc.id = de / 2;
 		        dir = ((de & 1) == 1);
 		      } else {
@@ -1222,17 +1222,17 @@
 		    static Arc direct(Edge edge, bool dir) {
 		      return Arc(edge.id * 2 + (dir ? 1 : 0));
+		    }
-		    int id(Node node) const { return graph->id(node); }
+		    int id(Node node) const { return _graph->id(node); }
 		    static int id(Arc arc) { return arc.id; }
 		    static int id(Edge arc) { return arc.id; }
-		    Node nodeFromId(int id) const { return graph->nodeFromId(id); }
+		    Node nodeFromId(int id) const { return _graph->nodeFromId(id); }
 		    static Arc arcFromId(int id) { return Arc(id); }
 		    static Edge edgeFromId(int id) { return Edge(id);}
-		    int maxNodeId() const { return graph->maxNodeId(); };
+		    int maxNodeId() const { return _graph->maxNodeId(); };
 		    int maxArcId() const { return arcs.size() - 1; }
 		    int maxEdgeId() const { return arcs.size() / 2 - 1; }
 		    Node source(Arc e) const { return arcs[e.id ^ 1].target; }
@@ -1240,25 +1240,25 @@
 		    Node u(Edge e) const { return arcs[2 * e.id].target; }
 		    Node v(Edge e) const { return arcs[2 * e.id + 1].target; }
-		    typedef typename ItemSetTraits<Graph, Node>::ItemNotifier NodeNotifier;
+		    typedef typename ItemSetTraits<GR, Node>::ItemNotifier NodeNotifier;
 		    NodeNotifier& notifier(Node) const {
-		      return graph->notifier(Node());
+		      return _graph->notifier(Node());
+		    }
 		    template <typename _Value>
 		    class NodeMap : public Graph::template NodeMap<_Value> {
 		    template <typename V>
 		    class NodeMap : public GR::template NodeMap<V> {
 		    public:
-		      typedef typename _Graph::template NodeMap<_Value> Parent;
+		      typedef typename GR::template NodeMap<V> Parent;
 		      explicit NodeMap(const SmartEdgeSetBase<Graph>& arcset)
 		        : Parent(*arcset.graph) { }
 		      explicit NodeMap(const SmartEdgeSetBase<GR>& arcset)
 		        : Parent(*arcset._graph) { }
 		      NodeMap(const SmartEdgeSetBase<Graph>& arcset, const _Value& value)
 		        : Parent(*arcset.graph, value) { }
 		      NodeMap(const SmartEdgeSetBase<GR>& arcset, const V& value)
 		        : Parent(*arcset._graph, value) { }
 		      NodeMap& operator=(const NodeMap& cmap) {
 		        return operator=<NodeMap>(cmap);
+		      }
@@ -1284,9 +1284,9 @@
 		  /// the original graph can be used directly with this class. The
 		  /// node handling functions (id handling, observing, and iterators)
 		  /// works equivalently as in the original graph.
 		  ///
-		  /// \param _Graph The type of the graph which shares its node set
+		  /// \param GR The type of the graph which shares its node set
 		  /// with this class. Its interface must conform to the
 		  /// \ref concepts::Digraph "Digraph" or \ref concepts::Graph "Graph"
 		  ///  concept.
 		  ///
@@ -1301,20 +1301,20 @@
 		  /// be checked with the \c valid() member function.
 		  ///
 		  /// This class is fully conform to the \ref concepts::Graph
 		  /// "Graph" concept.
 		  template <typename _Graph>
 		  class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<_Graph> > {
 		  template <typename GR>
 		  class SmartEdgeSet : public EdgeSetExtender<SmartEdgeSetBase<GR> > {
 		  public:
-		    typedef EdgeSetExtender<SmartEdgeSetBase<_Graph> > Parent;
+		    typedef EdgeSetExtender<SmartEdgeSetBase<GR> > Parent;
 		    typedef typename Parent::Node Node;
 		    typedef typename Parent::Arc Arc;
 		    typedef typename Parent::Edge Edge;
-		    typedef _Graph Graph;
+		    typedef GR Graph;
 		  protected:
 		    typedef typename Parent::NodesImplBase NodesImplBase;
@@ -1333,9 +1333,9 @@
 		    class NodesImpl : public NodesImplBase {
 		    public:
 		      typedef NodesImplBase Parent;
-		      NodesImpl(const Graph& graph, SmartEdgeSet& arcset)
+		      NodesImpl(const GR& graph, SmartEdgeSet& arcset)
 		        : Parent(graph), _arcset(arcset) {}
 		      virtual ~NodesImpl() {}
@@ -1373,17 +1373,17 @@
 		    private:
 		      SmartEdgeSet& _arcset;
 		    };
-		    NodesImpl nodes;
+		    NodesImpl _nodes;
 		  public:
 		    /// \brief Constructor of the EdgeSet.
 		    ///
 		    /// Constructor of the EdgeSet.
 		    SmartEdgeSet(const Graph& graph) : nodes(graph, *this) {
 		      Parent::initalize(graph, nodes);
 		    SmartEdgeSet(const GR& graph) : _nodes(graph, *this) {
 		      Parent::initalize(graph, _nodes);
+		    }
 		    /// \brief Add a new edge to the graph.
 		    ///
@@ -1399,9 +1399,9 @@
 		    /// This functions gives back false if the EdgeSet is
 		    /// invalidated. It occurs when a node in the underlying graph is
 		    /// erased and it is not isolated in the EdgeSet.
 		    bool valid() const {
-		      return nodes.attached();
+		      return _nodes.attached();
+		    }
 		  };

test/CMakeLists.txt

Show inline comments

@@ -9,17 +9,17 @@
 		LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)
 		SET(TESTS
-		#   adaptors_test
 		  adaptors_test
 		  bfs_test
 		  circulation_test
 		  counter_test
 		  dfs_test
 		  digraph_test
 		  dijkstra_test
 		  dim_test
-		#   edge_set_test
 		  edge_set_test
 		  error_test
 		  graph_copy_test
 		  graph_test
 		  graph_utils_test

test/edge_set_test.cc

Show inline comments

@@ -32,9 +32,9 @@
 		using namespace lemon;
 		void checkSmartArcSet() {
-		  checkConcept<concepts::Digraph, SmartArcSet<concepts::Digraph> >();
+		  checkConcept<concepts::Digraph, SmartArcSet<ListDigraph> >();
 		  typedef ListDigraph Digraph;
 		  typedef SmartArcSet<Digraph> ArcSet;
@@ -98,9 +98,9 @@
 		  check(!arc_set.valid(), "Wrong validity");
+		}
 		void checkListArcSet() {
-		  checkConcept<concepts::Digraph, SmartArcSet<concepts::Digraph> >();
+		  checkConcept<concepts::Digraph, SmartArcSet<ListDigraph> >();
 		  typedef ListDigraph Digraph;
 		  typedef ListArcSet<Digraph> ArcSet;
@@ -178,9 +178,9 @@
 		  checkGraphConArcList(arc_set, 2);
+		}
 		void checkSmartEdgeSet() {
-		  checkConcept<concepts::Digraph, SmartEdgeSet<concepts::Digraph> >();
+		  checkConcept<concepts::Digraph, SmartEdgeSet<ListDigraph> >();
 		  typedef ListDigraph Digraph;
 		  typedef SmartEdgeSet<Digraph> EdgeSet;
@@ -262,9 +262,9 @@
 		  check(!edge_set.valid(), "Wrong validity");
+		}
 		void checkListEdgeSet() {
-		  checkConcept<concepts::Digraph, ListEdgeSet<concepts::Digraph> >();
+		  checkConcept<concepts::Digraph, ListEdgeSet<ListDigraph> >();
 		  typedef ListDigraph Digraph;
 		  typedef ListEdgeSet<Digraph> EdgeSet;

0 comments (0 inline)

RhodeCode

Login to your account