lemon-1.1: comparison lemon/adaptors.h

equal deleted inserted replaced

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

changeset 512	7f8560cb9d65
parent 415	4b6112235fad
child 440	88ed40ad0d4f
child 446	d369e885d196