lemon-1.1: comparison lemon/graph

equal deleted inserted replaced

-:16827ada2380
+:92f30b941bb1
 #include <lemon/bits/alteration_notifier.h>
 #include <lemon/bits/default_map.h>
 ///\ingroup gutils
 ///\file
-///\brief Digraph utilities.
+///\brief Graph utilities.
 namespace lemon {
 /// \addtogroup gutils
 /// @{
 ///Creates convenience typedefs for the digraph types and iterators
 ///This \c \#define creates convenience typedefs for the following types
 ///of \c Digraph: \c Node,  \c NodeIt, \c Arc, \c ArcIt, \c InArcIt,
-///\c OutArcIt
+///\c OutArcIt, \c BoolNodeMap, \c IntNodeMap, \c DoubleNodeMap,
-///\note If \c G it a template parameter, it should be used in this way.
+///\c BoolArcMap, \c IntArcMap, \c DoubleArcMap.
-///\code
+#define DIGRAPH_TYPEDEFS(Digraph)					\
-///  GRAPH_TYPEDEFS(typename G);
+typedef Digraph::Node Node;						\
-///\endcode
+typedef Digraph::NodeIt NodeIt;					\
-///
+typedef Digraph::Arc Arc;						\
-///\warning There are no typedefs for the digraph maps because of the lack of
+typedef Digraph::ArcIt ArcIt;						\
-///template typedefs in C++.
+typedef Digraph::InArcIt InArcIt;					\
-#define GRAPH_TYPEDEFS(Digraph)				\
+typedef Digraph::OutArcIt OutArcIt
-typedef Digraph::     Node      Node;			\
-typedef Digraph::   NodeIt    NodeIt;			\
-typedef Digraph::   Arc      Arc;			\
-typedef Digraph::   ArcIt    ArcIt;			\
-typedef Digraph:: InArcIt  InArcIt;			\
-typedef Digraph::OutArcIt OutArcIt
 ///Creates convenience typedefs for the graph types and iterators
-///This \c \#define creates the same convenience typedefs as defined by
+///This \c \#define creates the same convenience typedefs as defined
-///\ref GRAPH_TYPEDEFS(Digraph) and three more, namely it creates
+///by \ref DIGRAPH_TYPEDEFS(Graph) and six more, namely it creates
-///\c Edge, \c EdgeIt, \c IncArcIt,
+///\c Edge, \c EdgeIt, \c IncEdgeIt, \c BoolEdgeMap, \c IntEdgeMap,
-///
+///\c DoubleEdgeMap.
-///\note If \c G it a template parameter, it should be used in this way.
+#define GRAPH_TYPEDEFS(Graph)						\
-///\code
+DIGRAPH_TYPEDEFS(Graph);						\
-///  UGRAPH_TYPEDEFS(typename G);
+typedef Graph::Edge Edge;						\
-///\endcode
+typedef Graph::EdgeIt EdgeIt;						\
-///
+typedef Graph::IncEdgeIt IncEdgeIt
-///\warning There are no typedefs for the digraph maps because of the lack of
-///template typedefs in C++.
+/// \brief Function to count the items in the graph.
-#define UGRAPH_TYPEDEFS(Digraph)				\
+///
-GRAPH_TYPEDEFS(Digraph);				\
+/// This function counts the items (nodes, arcs etc) in the graph.
-typedef Digraph:: Edge   Edge;			\
-typedef Digraph:: EdgeIt EdgeIt;			\
-typedef Digraph:: IncArcIt   IncArcIt
-///\brief Creates convenience typedefs for the bipartite digraph
-///types and iterators
-///This \c \#define creates the same convenience typedefs as defined by
-///\ref UGRAPH_TYPEDEFS(Digraph) and two more, namely it creates
-///\c RedIt, \c BlueIt,
-///
-///\note If \c G it a template parameter, it should be used in this way.
-///\code
-///  BPUGRAPH_TYPEDEFS(typename G);
-///\endcode
-///
-///\warning There are no typedefs for the digraph maps because of the lack of
-///template typedefs in C++.
-#define BPUGRAPH_TYPEDEFS(Digraph)            \
-UGRAPH_TYPEDEFS(Digraph);		    \
-typedef Digraph::Red Red;             \
-typedef Digraph::Blue Blue;             \
-typedef Digraph::RedIt RedIt;	    \
-typedef Digraph::BlueIt BlueIt
-/// \brief Function to count the items in the digraph.
-///
-/// This function counts the items (nodes, arcs etc) in the digraph.
 /// The complexity of the function is O(n) because
 /// it iterates on all of the items.
+template <typename Graph, typename Item>
-template <typename Digraph, typename Item>
+inline int countItems(const Graph& g) {
-inline int countItems(const Digraph& g) {
+typedef typename ItemSetTraits<Graph, Item>::ItemIt ItemIt;
-typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
 int num = 0;
 for (ItemIt it(g); it != INVALID; ++it) {
 ++num;
 }
 return num;
 }
 // Node counting:
-namespace _digraph_utils_bits {
+namespace _graph_utils_bits {
-template <typename Digraph, typename Enable = void>
+template <typename Graph, typename Enable = void>
 struct CountNodesSelector {
-static int count(const Digraph &g) {
+static int count(const Graph &g) {
-return countItems<Digraph, typename Digraph::Node>(g);
+return countItems<Graph, typename Graph::Node>(g);
 }
 };
-template <typename Digraph>
+template <typename Graph>
 struct CountNodesSelector<
-Digraph, typename
+Graph, typename
-enable_if<typename Digraph::NodeNumTag, void>::type>
+enable_if<typename Graph::NodeNumTag, void>::type>
 {
-static int count(const Digraph &g) {
+static int count(const Graph &g) {
 return g.nodeNum();
 }
 };
 }
-/// \brief Function to count the nodes in the digraph.
+/// \brief Function to count the nodes in the graph.
 ///
-/// This function counts the nodes in the digraph.
+/// This function counts the nodes in the graph.
 /// The complexity of the function is O(n) but for some
-/// digraph structures it is specialized to run in O(1).
+/// graph structures it is specialized to run in O(1).
 ///
-/// If the digraph contains a \e nodeNum() member function and a
+/// If the graph contains a \e nodeNum() member function and a
 /// \e NodeNumTag tag then this function calls directly the member
 /// function to query the cardinality of the node set.
-template <typename Digraph>
+template <typename Graph>
-inline int countNodes(const Digraph& g) {
+inline int countNodes(const Graph& g) {
-return _digraph_utils_bits::CountNodesSelector<Digraph>::count(g);
+return _graph_utils_bits::CountNodesSelector<Graph>::count(g);
 }
-namespace _digraph_utils_bits {
+// Arc counting:
-template <typename Digraph, typename Enable = void>
+namespace _graph_utils_bits {
-struct CountRedsSelector {
-static int count(const Digraph &g) {
+template <typename Graph, typename Enable = void>
-return countItems<Digraph, typename Digraph::Red>(g);
+struct CountArcsSelector {
+static int count(const Graph &g) {
+return countItems<Graph, typename Graph::Arc>(g);
 }
 };
-template <typename Digraph>
+template <typename Graph>
-struct CountRedsSelector<
+struct CountArcsSelector<
-Digraph, typename
+Graph,
-enable_if<typename Digraph::NodeNumTag, void>::type>
+typename enable_if<typename Graph::ArcNumTag, void>::type>
 {
-static int count(const Digraph &g) {
+static int count(const Graph &g) {
-return g.redNum();
+return g.arcNum();
 }
 };
 }
-/// \brief Function to count the reds in the digraph.
+/// \brief Function to count the arcs in the graph.
 ///
-/// This function counts the reds in the digraph.
+/// This function counts the arcs in the graph.
-/// The complexity of the function is O(an) but for some
+/// The complexity of the function is O(e) but for some
-/// digraph structures it is specialized to run in O(1).
+/// graph structures it is specialized to run in O(1).
 ///
-/// If the digraph contains an \e redNum() member function and a
+/// If the graph contains a \e arcNum() member function and a
-/// \e NodeNumTag tag then this function calls directly the member
+/// \e EdgeNumTag tag then this function calls directly the member
-/// function to query the cardinality of the A-node set.
+/// function to query the cardinality of the arc set.
-template <typename Digraph>
+template <typename Graph>
-inline int countReds(const Digraph& g) {
+inline int countArcs(const Graph& g) {
-return _digraph_utils_bits::CountRedsSelector<Digraph>::count(g);
+return _graph_utils_bits::CountArcsSelector<Graph>::count(g);
 }
-namespace _digraph_utils_bits {
+// Edge counting:
+namespace _graph_utils_bits {
-template <typename Digraph, typename Enable = void>
-struct CountBluesSelector {
+template <typename Graph, typename Enable = void>
-static int count(const Digraph &g) {
+struct CountEdgesSelector {
-return countItems<Digraph, typename Digraph::Blue>(g);
+static int count(const Graph &g) {
+return countItems<Graph, typename Graph::Edge>(g);
 }
 };
-template <typename Digraph>
+template <typename Graph>
-struct CountBluesSelector<
+struct CountEdgesSelector<
-Digraph, typename
+Graph,
-enable_if<typename Digraph::NodeNumTag, void>::type>
+typename enable_if<typename Graph::EdgeNumTag, void>::type>
 {
-static int count(const Digraph &g) {
+static int count(const Graph &g) {
-return g.blueNum();
+return g.edgeNum();
 }
 };
 }
-/// \brief Function to count the blues in the digraph.
+/// \brief Function to count the edges in the graph.
 ///
-/// This function counts the blues in the digraph.
+/// This function counts the edges in the graph.
-/// The complexity of the function is O(bn) but for some
+/// The complexity of the function is O(m) but for some
-/// digraph structures it is specialized to run in O(1).
+/// graph structures it is specialized to run in O(1).
 ///
-/// If the digraph contains a \e blueNum() member function and a
+/// If the graph contains a \e edgeNum() member function and a
-/// \e NodeNumTag tag then this function calls directly the member
+/// \e EdgeNumTag tag then this function calls directly the member
-/// function to query the cardinality of the B-node set.
+/// function to query the cardinality of the edge set.
-template <typename Digraph>
+template <typename Graph>
-inline int countBlues(const Digraph& g) {
+inline int countEdges(const Graph& g) {
-return _digraph_utils_bits::CountBluesSelector<Digraph>::count(g);
+return _graph_utils_bits::CountEdgesSelector<Graph>::count(g);
 }
-// Arc counting:
+template <typename Graph, typename DegIt>
+inline int countNodeDegree(const Graph& _g, const typename Graph::Node& _n) {
-namespace _digraph_utils_bits {
-template <typename Digraph, typename Enable = void>
-struct CountArcsSelector {
-static int count(const Digraph &g) {
-return countItems<Digraph, typename Digraph::Arc>(g);
-}
-};
-template <typename Digraph>
-struct CountArcsSelector<
-Digraph,
-typename enable_if<typename Digraph::ArcNumTag, void>::type>
-{
-static int count(const Digraph &g) {
-return g.arcNum();
-}
-};
-}
-/// \brief Function to count the arcs in the digraph.
-///
-/// This function counts the arcs in the digraph.
-/// The complexity of the function is O(e) but for some
-/// digraph structures it is specialized to run in O(1).
-///
-/// If the digraph contains a \e arcNum() member function and a
-/// \e ArcNumTag tag then this function calls directly the member
-/// function to query the cardinality of the arc set.
-template <typename Digraph>
-inline int countArcs(const Digraph& g) {
-return _digraph_utils_bits::CountArcsSelector<Digraph>::count(g);
-}
-// Undirected arc counting:
-namespace _digraph_utils_bits {
-template <typename Digraph, typename Enable = void>
-struct CountEdgesSelector {
-static int count(const Digraph &g) {
-return countItems<Digraph, typename Digraph::Edge>(g);
-}
-};
-template <typename Digraph>
-struct CountEdgesSelector<
-Digraph,
-typename enable_if<typename Digraph::ArcNumTag, void>::type>
-{
-static int count(const Digraph &g) {
-return g.edgeNum();
-}
-};
-}
-/// \brief Function to count the edges in the digraph.
-///
-/// This function counts the edges in the digraph.
-/// The complexity of the function is O(e) but for some
-/// digraph structures it is specialized to run in O(1).
-///
-/// If the digraph contains a \e edgeNum() member function and a
-/// \e ArcNumTag tag then this function calls directly the member
-/// function to query the cardinality of the edge set.
-template <typename Digraph>
-inline int countEdges(const Digraph& g) {
-return _digraph_utils_bits::CountEdgesSelector<Digraph>::count(g);
-}
-template <typename Digraph, typename DegIt>
-inline int countNodeDegree(const Digraph& _g, const typename Digraph::Node& _n) {
 int num = 0;
 for (DegIt it(_g, _n); it != INVALID; ++it) {
 ++num;
 }
 return num;
 }
 /// \brief Function to count the number of the out-arcs from node \c n.
 ///
 /// This function counts the number of the out-arcs from node \c n
-/// in the digraph.
+/// in the graph.
-template <typename Digraph>
+template <typename Graph>
-inline int countOutArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
+inline int countOutArcs(const Graph& _g,  const typename Graph::Node& _n) {
-return countNodeDegree<Digraph, typename Digraph::OutArcIt>(_g, _n);
+return countNodeDegree<Graph, typename Graph::OutArcIt>(_g, _n);
 }
 /// \brief Function to count the number of the in-arcs to node \c n.
 ///
 /// This function counts the number of the in-arcs to node \c n
-/// in the digraph.
+/// in the graph.
-template <typename Digraph>
+template <typename Graph>
-inline int countInArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
+inline int countInArcs(const Graph& _g,  const typename Graph::Node& _n) {
-return countNodeDegree<Digraph, typename Digraph::InArcIt>(_g, _n);
+return countNodeDegree<Graph, typename Graph::InArcIt>(_g, _n);
 }
-/// \brief Function to count the number of the inc-arcs to node \c n.
+/// \brief Function to count the number of the inc-edges to node \c n.
 ///
-/// This function counts the number of the inc-arcs to node \c n
+/// This function counts the number of the inc-edges to node \c n
-/// in the digraph.
+/// in the graph.
-template <typename Digraph>
+template <typename Graph>
-inline int countIncArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
+inline int countIncEdges(const Graph& _g,  const typename Graph::Node& _n) {
-return countNodeDegree<Digraph, typename Digraph::IncArcIt>(_g, _n);
+return countNodeDegree<Graph, typename Graph::IncEdgeIt>(_g, _n);
 }
-namespace _digraph_utils_bits {
+namespace _graph_utils_bits {
-template <typename Digraph, typename Enable = void>
+template <typename Graph, typename Enable = void>
 struct FindArcSelector {
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
-typedef typename Digraph::Arc Arc;
+typedef typename Graph::Arc Arc;
-static Arc find(const Digraph &g, Node u, Node v, Arc e) {
+static Arc find(const Graph &g, Node u, Node v, Arc e) {
 if (e == INVALID) {
 g.firstOut(e, u);
 } else {
 g.nextOut(e);
 }
 }
 return e;
 }
 };
-template <typename Digraph>
+template <typename Graph>
 struct FindArcSelector<
-Digraph,
+Graph,
-typename enable_if<typename Digraph::FindArcTag, void>::type>
+typename enable_if<typename Graph::FindEdgeTag, void>::type>
 {
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
-typedef typename Digraph::Arc Arc;
+typedef typename Graph::Arc Arc;
-static Arc find(const Digraph &g, Node u, Node v, Arc prev) {
+static Arc find(const Graph &g, Node u, Node v, Arc prev) {
 return g.findArc(u, v, prev);
 }
 };
 }
-/// \brief Finds an arc between two nodes of a digraph.
+/// \brief Finds an arc between two nodes of a graph.
 ///
-/// Finds an arc from node \c u to node \c v in digraph \c g.
+/// Finds an arc from node \c u to node \c v in graph \c g.
 ///
 /// If \c prev is \ref INVALID (this is the default value), then
 /// it finds the first arc from \c u to \c v. Otherwise it looks for
 /// the next arc from \c u to \c v after \c prev.
 /// \return The found arc or \ref INVALID if there is no such an arc.
 ///
 ///\sa ArcLookUp
 ///\sa AllArcLookUp
 ///\sa DynArcLookUp
 ///\sa ConArcIt
-template <typename Digraph>
+template <typename Graph>
-inline typename Digraph::Arc
+inline typename Graph::Arc
-findArc(const Digraph &g, typename Digraph::Node u, typename Digraph::Node v,
+findArc(const Graph &g, typename Graph::Node u, typename Graph::Node v,
-typename Digraph::Arc prev = INVALID) {
+typename Graph::Arc prev = INVALID) {
-return _digraph_utils_bits::FindArcSelector<Digraph>::find(g, u, v, prev);
+return _graph_utils_bits::FindArcSelector<Graph>::find(g, u, v, prev);
 }
 /// \brief Iterator for iterating on arcs connected the same nodes.
 ///
 /// Iterator for iterating on arcs connected the same nodes. It is
 /// higher level interface for the findArc() function. You can
 /// use it the following way:
 ///\code
-/// for (ConArcIt<Digraph> it(g, src, trg); it != INVALID; ++it) {
+/// for (ConArcIt<Graph> it(g, src, trg); it != INVALID; ++it) {
 ///   ...
 /// }
 ///\endcode
 ///
 ///\sa findArc()
 ///\sa ArcLookUp
 ///\sa AllArcLookUp
 ///\sa DynArcLookUp
 ///
 /// \author Balazs Dezso
-template <typename _Digraph>
+template <typename _Graph>
-class ConArcIt : public _Digraph::Arc {
+class ConArcIt : public _Graph::Arc {
 public:
-typedef _Digraph Digraph;
+typedef _Graph Graph;
-typedef typename Digraph::Arc Parent;
+typedef typename Graph::Arc Parent;
-typedef typename Digraph::Arc Arc;
+typedef typename Graph::Arc Arc;
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
 /// \brief Constructor.
 ///
 /// Construct a new ConArcIt iterating on the arcs which
 /// connects the \c u and \c v node.
-ConArcIt(const Digraph& g, Node u, Node v) : digraph(g) {
+ConArcIt(const Graph& g, Node u, Node v) : _graph(g) {
-Parent::operator=(findArc(digraph, u, v));
+Parent::operator=(findArc(_graph, u, v));
 }
 /// \brief Constructor.
 ///
 /// Construct a new ConArcIt which continues the iterating from
 /// the \c e arc.
-ConArcIt(const Digraph& g, Arc e) : Parent(e), digraph(g) {}
+ConArcIt(const Graph& g, Arc a) : Parent(a), _graph(g) {}
 /// \brief Increment operator.
 ///
 /// It increments the iterator and gives back the next arc.
 ConArcIt& operator++() {
-Parent::operator=(findArc(digraph, digraph.source(*this),
+Parent::operator=(findArc(_graph, _graph.source(*this),
-				 digraph.target(*this), *this));
+				_graph.target(*this), *this));
 return *this;
 }
 private:
-const Digraph& digraph;
+const Graph& _graph;
 };
-namespace _digraph_utils_bits {
+namespace _graph_utils_bits {
-template <typename Digraph, typename Enable = void>
+template <typename Graph, typename Enable = void>
 struct FindEdgeSelector {
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
-typedef typename Digraph::Edge Edge;
+typedef typename Graph::Edge Edge;
-static Edge find(const Digraph &g, Node u, Node v, Edge e) {
+static Edge find(const Graph &g, Node u, Node v, Edge e) {
 bool b;
 if (u != v) {
 if (e == INVALID) {
 g.firstInc(e, b, u);
 } else {
 }
 return e;
 }
 };
-template <typename Digraph>
+template <typename Graph>
 struct FindEdgeSelector<
-Digraph,
+Graph,
-typename enable_if<typename Digraph::FindArcTag, void>::type>
+typename enable_if<typename Graph::FindEdgeTag, void>::type>
 {
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
-typedef typename Digraph::Edge Edge;
+typedef typename Graph::Edge Edge;
-static Edge find(const Digraph &g, Node u, Node v, Edge prev) {
+static Edge find(const Graph &g, Node u, Node v, Edge prev) {
 return g.findEdge(u, v, prev);
 }
 };
 }
-/// \brief Finds an edge between two nodes of a digraph.
+/// \brief Finds an edge between two nodes of a graph.
 ///
-/// Finds an edge from node \c u to node \c v in digraph \c g.
+/// Finds an edge from node \c u to node \c v in graph \c g.
-/// If the node \c u and node \c v is equal then each loop arc
+/// If the node \c u and node \c v is equal then each loop edge
-/// will be enumerated.
+/// will be enumerated once.
 ///
 /// If \c prev is \ref INVALID (this is the default value), then
 /// it finds the first arc from \c u to \c v. Otherwise it looks for
 /// the next arc from \c u to \c v after \c prev.
 /// \return The found arc or \ref INVALID if there is no such an arc.
 /// }
 ///\endcode
 ///
 ///\sa ConArcIt
-template <typename Digraph>
+template <typename Graph>
-inline typename Digraph::Edge
+inline typename Graph::Edge
-findEdge(const Digraph &g, typename Digraph::Node u, typename Digraph::Node v,
+findEdge(const Graph &g, typename Graph::Node u, typename Graph::Node v,
-typename Digraph::Edge p = INVALID) {
+typename Graph::Edge p = INVALID) {
-return _digraph_utils_bits::FindEdgeSelector<Digraph>::find(g, u, v, p);
+return _graph_utils_bits::FindEdgeSelector<Graph>::find(g, u, v, p);
 }
 /// \brief Iterator for iterating on edges connected the same nodes.
 ///
 /// Iterator for iterating on edges connected the same nodes. It is
 /// higher level interface for the findEdge() function. You can
 /// use it the following way:
 ///\code
-/// for (ConEdgeIt<Digraph> it(g, src, trg); it != INVALID; ++it) {
+/// for (ConEdgeIt<Graph> it(g, src, trg); it != INVALID; ++it) {
 ///   ...
 /// }
 ///\endcode
 ///
 ///\sa findEdge()
 ///
 /// \author Balazs Dezso
-template <typename _Digraph>
+template <typename _Graph>
-class ConEdgeIt : public _Digraph::Edge {
+class ConEdgeIt : public _Graph::Edge {
 public:
-typedef _Digraph Digraph;
+typedef _Graph Graph;
-typedef typename Digraph::Edge Parent;
+typedef typename Graph::Edge Parent;
-typedef typename Digraph::Edge Edge;
+typedef typename Graph::Edge Edge;
-typedef typename Digraph::Node Node;
+typedef typename Graph::Node Node;
 /// \brief Constructor.
 ///
-/// Construct a new ConEdgeIt iterating on the arcs which
+/// Construct a new ConEdgeIt iterating on the edges which
 /// connects the \c u and \c v node.
-ConEdgeIt(const Digraph& g, Node u, Node v) : digraph(g) {
+ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g) {
-Parent::operator=(findEdge(digraph, u, v));
+Parent::operator=(findEdge(_graph, u, v));
 }
 /// \brief Constructor.
 ///
 /// Construct a new ConEdgeIt which continues the iterating from
-/// the \c e arc.
+/// the \c e edge.
-ConEdgeIt(const Digraph& g, Edge e) : Parent(e), digraph(g) {}
+ConEdgeIt(const Graph& g, Edge e) : Parent(e), _graph(g) {}
 /// \brief Increment operator.
 ///
-/// It increments the iterator and gives back the next arc.
+/// It increments the iterator and gives back the next edge.
 ConEdgeIt& operator++() {
-Parent::operator=(findEdge(digraph, digraph.source(*this),
+Parent::operator=(findEdge(_graph, _graph.source(*this),
-				      digraph.target(*this), *this));
+				 _graph.target(*this), *this));
 return *this;
 }
 private:
-const Digraph& digraph;
+const Graph& _graph;
 };
-/// \brief Copy a map.
+namespace _graph_utils_bits {
-///
-/// This function copies the \c from map to the \c to map. It uses the
-/// given iterator to iterate on the data structure and it uses the \c ref
-/// mapping to convert the from's keys to the to's keys.
-template <typename To, typename From,
-	    typename ItemIt, typename Ref>
-void copyMap(To& to, const From& from,
-	       ItemIt it, const Ref& ref) {
-for (; it != INVALID; ++it) {
-to[ref[it]] = from[it];
-}
-}
-/// \brief Copy the from map to the to map.
-///
-/// Copy the \c from map to the \c to map. It uses the given iterator
-/// to iterate on the data structure.
-template <typename To, typename From, typename ItemIt>
-void copyMap(To& to, const From& from, ItemIt it) {
-for (; it != INVALID; ++it) {
-to[it] = from[it];
-}
-}
-namespace _digraph_utils_bits {
 template <typename Digraph, typename Item, typename RefMap>
 class MapCopyBase {
 public:
 virtual void copy(const Digraph& from, const RefMap& refMap) = 0;
 NodeRefMap& nodeRefMap, EdgeRefMap& edgeRefMap) {
 to.build(from, nodeRefMap, edgeRefMap);
 }
 };
-template <typename BpGraph, typename Enable = void>
-struct BpGraphCopySelector {
-template <typename From, typename RedRefMap,
-typename BlueRefMap, typename EdgeRefMap>
-static void copy(BpGraph &to, const From& from,
-RedRefMap& redRefMap, BlueRefMap& blueRefMap,
-EdgeRefMap& edgeRefMap) {
-for (typename From::RedIt it(from); it != INVALID; ++it) {
-redRefMap[it] = to.addRed();
-}
-for (typename From::BlueIt it(from); it != INVALID; ++it) {
-blueRefMap[it] = to.addBlue();
-}
-for (typename From::EdgeIt it(from); it != INVALID; ++it) {
-edgeRefMap[it] = to.addArc(redRefMap[from.red(it)],
-blueRefMap[from.blue(it)]);
-}
-}
-};
-template <typename BpGraph>
-struct BpGraphCopySelector<
-BpGraph,
-typename enable_if<typename BpGraph::BuildTag, void>::type>
-{
-template <typename From, typename RedRefMap,
-typename BlueRefMap, typename EdgeRefMap>
-static void copy(BpGraph &to, const From& from,
-RedRefMap& redRefMap, BlueRefMap& blueRefMap,
-EdgeRefMap& edgeRefMap) {
-to.build(from, redRefMap, blueRefMap, edgeRefMap);
-}
-};
 }
 /// \brief Class to copy a digraph.
 ///
 /// Class to copy a digraph to another digraph (duplicate a digraph). The
 /// simplest way of using it is through the \c copyDigraph() function.
+///
+/// This class not just make a copy of a graph, but it can create
+/// references and cross references between the nodes and arcs of
+/// the two graphs, it can copy maps for use with the newly created
+/// graph and copy nodes and arcs.
+///
+/// To make a copy from a graph, first an instance of DigraphCopy
+/// should be created, then the data belongs to the graph should
+/// assigned to copy. In the end, the \c run() member should be
+/// called.
+///
+/// The next code copies a graph with several data:
+///\code
+///  DigraphCopy<NewGraph, OrigGraph> dc(new_graph, orig_graph);
+///  // create a reference for the nodes
+///  OrigGraph::NodeMap<NewGraph::Node> nr(orig_graph);
+///  dc.nodeRef(nr);
+///  // create a cross reference (inverse) for the arcs
+///  NewGraph::ArcMap<OrigGraph::Arc> acr(new_graph);
+///  dc.arcCrossRef(acr);
+///  // copy an arc map
+///  OrigGraph::ArcMap<double> oamap(orig_graph);
+///  NewGraph::ArcMap<double> namap(new_graph);
+///  dc.arcMap(namap, oamap);
+///  // copy a node
+///  OrigGraph::Node on;
+///  NewGraph::Node nn;
+///  dc.node(nn, on);
+///  // Executions of copy
+///  dc.run();
+///\endcode
 template <typename To, typename From>
 class DigraphCopy {
 private:
 typedef typename From::Node Node;
 /// \brief Constructor for the DigraphCopy.
 ///
 /// It copies the content of the \c _from digraph into the
 /// \c _to digraph.
-DigraphCopy(To& _to, const From& _from)
+DigraphCopy(To& to, const From& from)
-: from(_from), to(_to) {}
+: _from(from), _to(to) {}
 /// \brief Destructor of the DigraphCopy
 ///
 /// Destructor of the DigraphCopy
 ~DigraphCopy() {
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_node_maps.size()); ++i) {
-delete nodeMapCopies[i];
+delete _node_maps[i];
 }
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
+for (int i = 0; i < int(_arc_maps.size()); ++i) {
-delete arcMapCopies[i];
+delete _arc_maps[i];
 }
 }
 /// \brief Copies the node references into the given map.
 ///
-/// Copies the node references into the given map.
+/// Copies the node references into the given map. The parameter
+/// should be a map, which key type is the Node type of the source
+/// graph, while the value type is the Node type of the
+/// destination graph.
 template <typename NodeRef>
 DigraphCopy& nodeRef(NodeRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node,
-NodeRefMap, NodeRef>(map));
+			   NodeRefMap, NodeRef>(map));
 return *this;
 }
 /// \brief Copies the node cross references into the given map.
 ///
 ///  Copies the node cross references (reverse references) into
-///  the given map.
+///  the given map. The parameter should be a map, which key type
+///  is the Node type of the destination graph, while the value type is
+///  the Node type of the source graph.
 template <typename NodeCrossRef>
 DigraphCopy& nodeCrossRef(NodeCrossRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Node,
-NodeRefMap, NodeCrossRef>(map));
+			   NodeRefMap, NodeCrossRef>(map));
 return *this;
 }
 /// \brief Make copy of the given map.
 ///
 /// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's node type,
+/// The new map's key type is the destination graph's node type,
-/// and the copied map's key type is the from digraph's node
+/// and the copied map's key type is the source graph's node type.
-/// type.
 template <typename ToMap, typename FromMap>
 DigraphCopy& nodeMap(ToMap& tmap, const FromMap& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node,
-NodeRefMap, ToMap, FromMap>(tmap, map));
+			   NodeRefMap, ToMap, FromMap>(tmap, map));
 return *this;
 }
 /// \brief Make a copy of the given node.
 ///
 /// Make a copy of the given node.
 DigraphCopy& node(TNode& tnode, const Node& snode) {
-nodeMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node,
-NodeRefMap, TNode>(tnode, snode));
+			   NodeRefMap, TNode>(tnode, snode));
 return *this;
 }
 /// \brief Copies the arc references into the given map.
 ///
 /// Copies the arc references into the given map.
 template <typename ArcRef>
 DigraphCopy& arcRef(ArcRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc,
-ArcRefMap, ArcRef>(map));
+			  ArcRefMap, ArcRef>(map));
 return *this;
 }
 /// \brief Copies the arc cross references into the given map.
 ///
 ///  Copies the arc cross references (reverse references) into
 ///  the given map.
 template <typename ArcCrossRef>
 DigraphCopy& arcCrossRef(ArcCrossRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Arc,
-ArcRefMap, ArcCrossRef>(map));
+			  ArcRefMap, ArcCrossRef>(map));
 return *this;
 }
 /// \brief Make copy of the given map.
 ///
 /// The new map's key type is the to digraph's arc type,
 /// and the copied map's key type is the from digraph's arc
 /// type.
 template <typename ToMap, typename FromMap>
 DigraphCopy& arcMap(ToMap& tmap, const FromMap& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc,
-ArcRefMap, ToMap, FromMap>(tmap, map));
+			  ArcRefMap, ToMap, FromMap>(tmap, map));
 return *this;
 }
 /// \brief Make a copy of the given arc.
 ///
 /// Make a copy of the given arc.
 DigraphCopy& arc(TArc& tarc, const Arc& sarc) {
-arcMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc,
-ArcRefMap, TArc>(tarc, sarc));
+			  ArcRefMap, TArc>(tarc, sarc));
 return *this;
 }
 /// \brief Executes the copies.
 ///
 /// Executes the copies.
 void run() {
-NodeRefMap nodeRefMap(from);
+NodeRefMap nodeRefMap(_from);
-ArcRefMap arcRefMap(from);
+ArcRefMap arcRefMap(_from);
-_digraph_utils_bits::DigraphCopySelector<To>::
+_graph_utils_bits::DigraphCopySelector<To>::
-copy(to, from, nodeRefMap, arcRefMap);
+copy(_to, _from, nodeRefMap, arcRefMap);
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_node_maps.size()); ++i) {
-nodeMapCopies[i]->copy(from, nodeRefMap);
+_node_maps[i]->copy(_from, nodeRefMap);
 }
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
+for (int i = 0; i < int(_arc_maps.size()); ++i) {
-arcMapCopies[i]->copy(from, arcRefMap);
+_arc_maps[i]->copy(_from, arcRefMap);
 }
 }
 protected:
-const From& from;
+const From& _from;
-To& to;
+To& _to;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
+std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
-nodeMapCopies;
+_node_maps;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
+std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
-arcMapCopies;
+_arc_maps;
 };
 /// \brief Copy a digraph to another digraph.
 ///
-/// Copy a digraph to another digraph.
+/// Copy a digraph to another digraph. The complete usage of the
-/// The usage of the function:
+/// function is detailed in the DigraphCopy class, but a short
-///
+/// example shows a basic work:
 ///\code
 /// copyDigraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run();
 ///\endcode
 ///
 /// After the copy the \c nr map will contain the mapping from the
 template <typename To, typename From>
 DigraphCopy<To, From> copyDigraph(To& to, const From& from) {
 return DigraphCopy<To, From>(to, from);
 }
-/// \brief Class to copy an graph.
+/// \brief Class to copy a graph.
 ///
-/// Class to copy an graph to another digraph (duplicate a digraph).
+/// Class to copy a graph to another graph (duplicate a graph). The
-/// The simplest way of using it is through the \c copyGraph() function.
+/// simplest way of using it is through the \c copyGraph() function.
+///
+/// This class not just make a copy of a graph, but it can create
+/// references and cross references between the nodes, edges and arcs of
+/// the two graphs, it can copy maps for use with the newly created
+/// graph and copy nodes, edges and arcs.
+///
+/// To make a copy from a graph, first an instance of GraphCopy
+/// should be created, then the data belongs to the graph should
+/// assigned to copy. In the end, the \c run() member should be
+/// called.
+///
+/// The next code copies a graph with several data:
+///\code
+///  GraphCopy<NewGraph, OrigGraph> dc(new_graph, orig_graph);
+///  // create a reference for the nodes
+///  OrigGraph::NodeMap<NewGraph::Node> nr(orig_graph);
+///  dc.nodeRef(nr);
+///  // create a cross reference (inverse) for the edges
+///  NewGraph::EdgeMap<OrigGraph::Arc> ecr(new_graph);
+///  dc.edgeCrossRef(ecr);
+///  // copy an arc map
+///  OrigGraph::ArcMap<double> oamap(orig_graph);
+///  NewGraph::ArcMap<double> namap(new_graph);
+///  dc.arcMap(namap, oamap);
+///  // copy a node
+///  OrigGraph::Node on;
+///  NewGraph::Node nn;
+///  dc.node(nn, on);
+///  // Executions of copy
+///  dc.run();
+///\endcode
 template <typename To, typename From>
 class GraphCopy {
 private:
 typedef typename From::Node Node;
 typedef typename From::template NodeMap<TNode> NodeRefMap;
 typedef typename From::template EdgeMap<TEdge> EdgeRefMap;
 struct ArcRefMap {
-ArcRefMap(const To& _to, const From& _from,
+ArcRefMap(const To& to, const From& from,
-const EdgeRefMap& _edge_ref, const NodeRefMap& _node_ref)
+		const EdgeRefMap& edge_ref, const NodeRefMap& node_ref)
-: to(_to), from(_from),
+: _to(to), _from(from),
-edge_ref(_edge_ref), node_ref(_node_ref) {}
+_edge_ref(edge_ref), _node_ref(node_ref) {}
 typedef typename From::Arc Key;
 typedef typename To::Arc Value;
 Value operator[](const Key& key) const {
 bool forward =
-(from.direction(key) ==
+(_from.direction(key) ==
-(node_ref[from.source(static_cast<const Edge&>(key))] ==
+	   (_node_ref[_from.source(key)] == _to.source(_edge_ref[key])));
-to.source(edge_ref[static_cast<const Edge&>(key)])));
+	return _to.direct(_edge_ref[key], forward);
-	return to.direct(edge_ref[key], forward);
 }
-const To& to;
+const To& _to;
-const From& from;
+const From& _from;
-const EdgeRefMap& edge_ref;
+const EdgeRefMap& _edge_ref;
-const NodeRefMap& node_ref;
+const NodeRefMap& _node_ref;
 };
 public:
-/// \brief Constructor for the DigraphCopy.
+/// \brief Constructor for the GraphCopy.
 ///
-/// It copies the content of the \c _from digraph into the
+/// It copies the content of the \c _from graph into the
-/// \c _to digraph.
+/// \c _to graph.
-GraphCopy(To& _to, const From& _from)
+GraphCopy(To& to, const From& from)
-: from(_from), to(_to) {}
+: _from(from), _to(to) {}
-/// \brief Destructor of the DigraphCopy
+/// \brief Destructor of the GraphCopy
 ///
-/// Destructor of the DigraphCopy
+/// Destructor of the GraphCopy
 ~GraphCopy() {
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_node_maps.size()); ++i) {
-delete nodeMapCopies[i];
+delete _node_maps[i];
 }
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
+for (int i = 0; i < int(_arc_maps.size()); ++i) {
-delete arcMapCopies[i];
+delete _arc_maps[i];
 }
-for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_edge_maps.size()); ++i) {
-delete edgeMapCopies[i];
+delete _edge_maps[i];
 }
 }
 /// \brief Copies the node references into the given map.
 ///
 /// Copies the node references into the given map.
 template <typename NodeRef>
 GraphCopy& nodeRef(NodeRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::RefCopy<From, Node,
-NodeRefMap, NodeRef>(map));
+			   NodeRefMap, NodeRef>(map));
 return *this;
 }
 /// \brief Copies the node cross references into the given map.
 ///
 ///  Copies the node cross references (reverse references) into
 ///  the given map.
 template <typename NodeCrossRef>
 GraphCopy& nodeCrossRef(NodeCrossRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Node,
-NodeRefMap, NodeCrossRef>(map));
+			   NodeRefMap, NodeCrossRef>(map));
 return *this;
 }
 /// \brief Make copy of the given map.
 ///
-/// Makes copy of the given map for the newly created digraph.
+/// Makes copy of the given map for the newly created graph.
-/// The new map's key type is the to digraph's node type,
+/// The new map's key type is the to graph's node type,
-/// and the copied map's key type is the from digraph's node
+/// and the copied map's key type is the from graph's node
 /// type.
 template <typename ToMap, typename FromMap>
 GraphCopy& nodeMap(ToMap& tmap, const FromMap& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::MapCopy<From, Node,
-NodeRefMap, ToMap, FromMap>(tmap, map));
+			   NodeRefMap, ToMap, FromMap>(tmap, map));
 return *this;
 }
 /// \brief Make a copy of the given node.
 ///
 /// Make a copy of the given node.
 GraphCopy& node(TNode& tnode, const Node& snode) {
-nodeMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Node,
+_node_maps.push_back(new _graph_utils_bits::ItemCopy<From, Node,
-NodeRefMap, TNode>(tnode, snode));
+			   NodeRefMap, TNode>(tnode, snode));
 return *this;
 }
 /// \brief Copies the arc references into the given map.
 ///
 /// Copies the arc references into the given map.
 template <typename ArcRef>
 GraphCopy& arcRef(ArcRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::RefCopy<From, Arc,
-ArcRefMap, ArcRef>(map));
+			  ArcRefMap, ArcRef>(map));
 return *this;
 }
 /// \brief Copies the arc cross references into the given map.
 ///
 ///  Copies the arc cross references (reverse references) into
 ///  the given map.
 template <typename ArcCrossRef>
 GraphCopy& arcCrossRef(ArcCrossRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::CrossRefCopy<From, Arc,
-ArcRefMap, ArcCrossRef>(map));
+			  ArcRefMap, ArcCrossRef>(map));
 return *this;
 }
 /// \brief Make copy of the given map.
 ///
-/// Makes copy of the given map for the newly created digraph.
+/// Makes copy of the given map for the newly created graph.
-/// The new map's key type is the to digraph's arc type,
+/// The new map's key type is the to graph's arc type,
-/// and the copied map's key type is the from digraph's arc
+/// and the copied map's key type is the from graph's arc
 /// type.
 template <typename ToMap, typename FromMap>
 GraphCopy& arcMap(ToMap& tmap, const FromMap& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::MapCopy<From, Arc,
-ArcRefMap, ToMap, FromMap>(tmap, map));
+			  ArcRefMap, ToMap, FromMap>(tmap, map));
 return *this;
 }
 /// \brief Make a copy of the given arc.
 ///
 /// Make a copy of the given arc.
 GraphCopy& arc(TArc& tarc, const Arc& sarc) {
-arcMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Arc,
+_arc_maps.push_back(new _graph_utils_bits::ItemCopy<From, Arc,
-ArcRefMap, TArc>(tarc, sarc));
+			  ArcRefMap, TArc>(tarc, sarc));
 return *this;
 }
 /// \brief Copies the edge references into the given map.
 ///
 /// Copies the edge references into the given map.
 template <typename EdgeRef>
 GraphCopy& edgeRef(EdgeRef& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Edge,
+_edge_maps.push_back(new _graph_utils_bits::RefCopy<From, Edge,
-EdgeRefMap, EdgeRef>(map));
+			   EdgeRefMap, EdgeRef>(map));
 return *this;
 }
 /// \brief Copies the edge cross references into the given map.
 ///
 /// Copies the edge cross references (reverse
 /// references) into the given map.
 template <typename EdgeCrossRef>
 GraphCopy& edgeCrossRef(EdgeCrossRef& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From,
+_edge_maps.push_back(new _graph_utils_bits::CrossRefCopy<From,
-Edge, EdgeRefMap, EdgeCrossRef>(map));
+			   Edge, EdgeRefMap, EdgeCrossRef>(map));
 return *this;
 }
 /// \brief Make copy of the given map.
 ///
-/// Makes copy of the given map for the newly created digraph.
+/// Makes copy of the given map for the newly created graph.
-/// The new map's key type is the to digraph's edge type,
+/// The new map's key type is the to graph's edge type,
-/// and the copied map's key type is the from digraph's edge
+/// and the copied map's key type is the from graph's edge
 /// type.
 template <typename ToMap, typename FromMap>
 GraphCopy& edgeMap(ToMap& tmap, const FromMap& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Edge,
+_edge_maps.push_back(new _graph_utils_bits::MapCopy<From, Edge,
-EdgeRefMap, ToMap, FromMap>(tmap, map));
+			   EdgeRefMap, ToMap, FromMap>(tmap, map));
 return *this;
 }
 /// \brief Make a copy of the given edge.
 ///
 /// Make a copy of the given edge.
 GraphCopy& edge(TEdge& tedge, const Edge& sedge) {
-edgeMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Edge,
+_edge_maps.push_back(new _graph_utils_bits::ItemCopy<From, Edge,
-EdgeRefMap, TEdge>(tedge, sedge));
+			   EdgeRefMap, TEdge>(tedge, sedge));
 return *this;
 }
 /// \brief Executes the copies.
 ///
 /// Executes the copies.
 void run() {
-NodeRefMap nodeRefMap(from);
+NodeRefMap nodeRefMap(_from);
-EdgeRefMap edgeRefMap(from);
+EdgeRefMap edgeRefMap(_from);
-ArcRefMap arcRefMap(to, from, edgeRefMap, nodeRefMap);
+ArcRefMap arcRefMap(_to, _from, edgeRefMap, nodeRefMap);
-_digraph_utils_bits::GraphCopySelector<To>::
+_graph_utils_bits::GraphCopySelector<To>::
-copy(to, from, nodeRefMap, edgeRefMap);
+copy(_to, _from, nodeRefMap, edgeRefMap);
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_node_maps.size()); ++i) {
-nodeMapCopies[i]->copy(from, nodeRefMap);
+_node_maps[i]->copy(_from, nodeRefMap);
 }
-for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
+for (int i = 0; i < int(_edge_maps.size()); ++i) {
-edgeMapCopies[i]->copy(from, edgeRefMap);
+_edge_maps[i]->copy(_from, edgeRefMap);
 }
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
+for (int i = 0; i < int(_arc_maps.size()); ++i) {
-arcMapCopies[i]->copy(from, arcRefMap);
+_arc_maps[i]->copy(_from, arcRefMap);
 }
 }
 private:
-const From& from;
+const From& _from;
-To& to;
+To& _to;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
+std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
-nodeMapCopies;
+_node_maps;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
+std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
-arcMapCopies;
+_arc_maps;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* >
+std::vector<_graph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* >
-edgeMapCopies;
+_edge_maps;
 };
-/// \brief Copy an graph to another digraph.
+/// \brief Copy a graph to another graph.
 ///
-/// Copy an graph to another digraph.
+/// Copy a graph to another graph. The complete usage of the
-/// The usage of the function:
+/// function is detailed in the GraphCopy class, but a short
-///
+/// example shows a basic work:
 ///\code
 /// copyGraph(trg, src).nodeRef(nr).arcCrossRef(ecr).run();
 ///\endcode
 ///
 /// After the copy the \c nr map will contain the mapping from the
-/// nodes of the \c from digraph to the nodes of the \c to digraph and
+/// nodes of the \c from graph to the nodes of the \c to graph and
-/// \c ecr will contain the mapping from the arcs of the \c to digraph
+/// \c ecr will contain the mapping from the arcs of the \c to graph
-/// to the arcs of the \c from digraph.
+/// to the arcs of the \c from graph.
 ///
 /// \see GraphCopy
 template <typename To, typename From>
 GraphCopy<To, From>
 copyGraph(To& to, const From& from) {
 return GraphCopy<To, From>(to, from);
 }
-/// \brief Class to copy a bipartite digraph.
-///
-/// Class to copy a bipartite digraph to another digraph
-/// (duplicate a digraph).  The simplest way of using it is through
-/// the \c copyBpGraph() function.
-template <typename To, typename From>
-class BpGraphCopy {
-private:
-typedef typename From::Node Node;
-typedef typename From::Red Red;
-typedef typename From::Blue Blue;
-typedef typename From::NodeIt NodeIt;
-typedef typename From::Arc Arc;
-typedef typename From::ArcIt ArcIt;
-typedef typename From::Edge Edge;
-typedef typename From::EdgeIt EdgeIt;
-typedef typename To::Node TNode;
-typedef typename To::Arc TArc;
-typedef typename To::Edge TEdge;
-typedef typename From::template RedMap<TNode> RedRefMap;
-typedef typename From::template BlueMap<TNode> BlueRefMap;
-typedef typename From::template EdgeMap<TEdge> EdgeRefMap;
-struct NodeRefMap {
-NodeRefMap(const From& _from, const RedRefMap& _red_ref,
-const BlueRefMap& _blue_ref)
-: from(_from), red_ref(_red_ref), blue_ref(_blue_ref) {}
-typedef typename From::Node Key;
-typedef typename To::Node Value;
-Value operator[](const Key& key) const {
-	return from.red(key) ? red_ref[key] : blue_ref[key];
-}
-const From& from;
-const RedRefMap& red_ref;
-const BlueRefMap& blue_ref;
-};
-struct ArcRefMap {
-ArcRefMap(const To& _to, const From& _from,
-const EdgeRefMap& _edge_ref, const NodeRefMap& _node_ref)
-: to(_to), from(_from),
-edge_ref(_edge_ref), node_ref(_node_ref) {}
-typedef typename From::Arc Key;
-typedef typename To::Arc Value;
-Value operator[](const Key& key) const {
-bool forward =
-(from.direction(key) ==
-(node_ref[from.source(static_cast<const Edge&>(key))] ==
-to.source(edge_ref[static_cast<const Edge&>(key)])));
-	return to.direct(edge_ref[key], forward);
-}
-const To& to;
-const From& from;
-const EdgeRefMap& edge_ref;
-const NodeRefMap& node_ref;
-};
-public:
-/// \brief Constructor for the DigraphCopy.
-///
-/// It copies the content of the \c _from digraph into the
-/// \c _to digraph.
-BpGraphCopy(To& _to, const From& _from)
-: from(_from), to(_to) {}
-/// \brief Destructor of the DigraphCopy
-///
-/// Destructor of the DigraphCopy
-~BpGraphCopy() {
-for (int i = 0; i < int(redMapCopies.size()); ++i) {
-delete redMapCopies[i];
-}
-for (int i = 0; i < int(blueMapCopies.size()); ++i) {
-delete blueMapCopies[i];
-}
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
-delete nodeMapCopies[i];
-}
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
-delete arcMapCopies[i];
-}
-for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
-delete edgeMapCopies[i];
-}
-}
-/// \brief Copies the A-node references into the given map.
-///
-/// Copies the A-node references into the given map.
-template <typename RedRef>
-BpGraphCopy& redRef(RedRef& map) {
-redMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Red,
-RedRefMap, RedRef>(map));
-return *this;
-}
-/// \brief Copies the A-node cross references into the given map.
-///
-/// Copies the A-node cross references (reverse references) into
-/// the given map.
-template <typename RedCrossRef>
-BpGraphCopy& redCrossRef(RedCrossRef& map) {
-redMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From,
-Red, RedRefMap, RedCrossRef>(map));
-return *this;
-}
-/// \brief Make copy of the given A-node map.
-///
-/// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's node type,
-/// and the copied map's key type is the from digraph's node
-/// type.
-template <typename ToMap, typename FromMap>
-BpGraphCopy& redMap(ToMap& tmap, const FromMap& map) {
-redMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Red,
-RedRefMap, ToMap, FromMap>(tmap, map));
-return *this;
-}
-/// \brief Copies the B-node references into the given map.
-///
-/// Copies the B-node references into the given map.
-template <typename BlueRef>
-BpGraphCopy& blueRef(BlueRef& map) {
-blueMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Blue,
-BlueRefMap, BlueRef>(map));
-return *this;
-}
-/// \brief Copies the B-node cross references into the given map.
-///
-///  Copies the B-node cross references (reverse references) into
-///  the given map.
-template <typename BlueCrossRef>
-BpGraphCopy& blueCrossRef(BlueCrossRef& map) {
-blueMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From,
-Blue, BlueRefMap, BlueCrossRef>(map));
-return *this;
-}
-/// \brief Make copy of the given B-node map.
-///
-/// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's node type,
-/// and the copied map's key type is the from digraph's node
-/// type.
-template <typename ToMap, typename FromMap>
-BpGraphCopy& blueMap(ToMap& tmap, const FromMap& map) {
-blueMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Blue,
-BlueRefMap, ToMap, FromMap>(tmap, map));
-return *this;
-}
-/// \brief Copies the node references into the given map.
-///
-/// Copies the node references into the given map.
-template <typename NodeRef>
-BpGraphCopy& nodeRef(NodeRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Node,
-NodeRefMap, NodeRef>(map));
-return *this;
-}
-/// \brief Copies the node cross references into the given map.
-///
-///  Copies the node cross references (reverse references) into
-///  the given map.
-template <typename NodeCrossRef>
-BpGraphCopy& nodeCrossRef(NodeCrossRef& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Node,
-NodeRefMap, NodeCrossRef>(map));
-return *this;
-}
-/// \brief Make copy of the given map.
-///
-/// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's node type,
-/// and the copied map's key type is the from digraph's node
-/// type.
-template <typename ToMap, typename FromMap>
-BpGraphCopy& nodeMap(ToMap& tmap, const FromMap& map) {
-nodeMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Node,
-NodeRefMap, ToMap, FromMap>(tmap, map));
-return *this;
-}
-/// \brief Make a copy of the given node.
-///
-/// Make a copy of the given node.
-BpGraphCopy& node(TNode& tnode, const Node& snode) {
-nodeMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Node,
-NodeRefMap, TNode>(tnode, snode));
-return *this;
-}
-/// \brief Copies the arc references into the given map.
-///
-/// Copies the arc references into the given map.
-template <typename ArcRef>
-BpGraphCopy& arcRef(ArcRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Arc,
-ArcRefMap, ArcRef>(map));
-return *this;
-}
-/// \brief Copies the arc cross references into the given map.
-///
-///  Copies the arc cross references (reverse references) into
-///  the given map.
-template <typename ArcCrossRef>
-BpGraphCopy& arcCrossRef(ArcCrossRef& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From, Arc,
-ArcRefMap, ArcCrossRef>(map));
-return *this;
-}
-/// \brief Make copy of the given map.
-///
-/// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's arc type,
-/// and the copied map's key type is the from digraph's arc
-/// type.
-template <typename ToMap, typename FromMap>
-BpGraphCopy& arcMap(ToMap& tmap, const FromMap& map) {
-arcMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Arc,
-ArcRefMap, ToMap, FromMap>(tmap, map));
-return *this;
-}
-/// \brief Make a copy of the given arc.
-///
-/// Make a copy of the given arc.
-BpGraphCopy& arc(TArc& tarc, const Arc& sarc) {
-arcMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Arc,
-ArcRefMap, TArc>(tarc, sarc));
-return *this;
-}
-/// \brief Copies the edge references into the given map.
-///
-/// Copies the edge references into the given map.
-template <typename EdgeRef>
-BpGraphCopy& edgeRef(EdgeRef& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::RefCopy<From, Edge,
-EdgeRefMap, EdgeRef>(map));
-return *this;
-}
-/// \brief Copies the edge cross references into the given map.
-///
-/// Copies the edge cross references (reverse
-/// references) into the given map.
-template <typename EdgeCrossRef>
-BpGraphCopy& edgeCrossRef(EdgeCrossRef& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::CrossRefCopy<From,
-Edge, EdgeRefMap, EdgeCrossRef>(map));
-return *this;
-}
-/// \brief Make copy of the given map.
-///
-/// Makes copy of the given map for the newly created digraph.
-/// The new map's key type is the to digraph's edge type,
-/// and the copied map's key type is the from digraph's edge
-/// type.
-template <typename ToMap, typename FromMap>
-BpGraphCopy& edgeMap(ToMap& tmap, const FromMap& map) {
-edgeMapCopies.push_back(new _digraph_utils_bits::MapCopy<From, Edge,
-EdgeRefMap, ToMap, FromMap>(tmap, map));
-return *this;
-}
-/// \brief Make a copy of the given edge.
-///
-/// Make a copy of the given edge.
-BpGraphCopy& edge(TEdge& tedge, const Edge& sedge) {
-edgeMapCopies.push_back(new _digraph_utils_bits::ItemCopy<From, Edge,
-EdgeRefMap, TEdge>(tedge, sedge));
-return *this;
-}
-/// \brief Executes the copies.
-///
-/// Executes the copies.
-void run() {
-RedRefMap redRefMap(from);
-BlueRefMap blueRefMap(from);
-NodeRefMap nodeRefMap(from, redRefMap, blueRefMap);
-EdgeRefMap edgeRefMap(from);
-ArcRefMap arcRefMap(to, from, edgeRefMap, nodeRefMap);
-_digraph_utils_bits::BpGraphCopySelector<To>::
-copy(to, from, redRefMap, blueRefMap, edgeRefMap);
-for (int i = 0; i < int(redMapCopies.size()); ++i) {
-redMapCopies[i]->copy(from, redRefMap);
-}
-for (int i = 0; i < int(blueMapCopies.size()); ++i) {
-blueMapCopies[i]->copy(from, blueRefMap);
-}
-for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
-nodeMapCopies[i]->copy(from, nodeRefMap);
-}
-for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
-edgeMapCopies[i]->copy(from, edgeRefMap);
-}
-for (int i = 0; i < int(arcMapCopies.size()); ++i) {
-arcMapCopies[i]->copy(from, arcRefMap);
-}
-}
-private:
-const From& from;
-To& to;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Red, RedRefMap>* >
-redMapCopies;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Blue, BlueRefMap>* >
-blueMapCopies;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
-nodeMapCopies;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
-arcMapCopies;
-std::vector<_digraph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* >
-edgeMapCopies;
-};
-/// \brief Copy a bipartite digraph to another digraph.
-///
-/// Copy a bipartite digraph to another digraph.
-/// The usage of the function:
-///
-///\code
-/// copyBpGraph(trg, src).redRef(anr).arcCrossRef(ecr).run();
-///\endcode
-///
-/// After the copy the \c nr map will contain the mapping from the
-/// nodes of the \c from digraph to the nodes of the \c to digraph and
-/// \c ecr will contain the mapping from the arcs of the \c to digraph
-/// to the arcs of the \c from digraph.
-///
-/// \see BpGraphCopy
-template <typename To, typename From>
-BpGraphCopy<To, From>
-copyBpGraph(To& to, const From& from) {
-return BpGraphCopy<To, From>(to, from);
-}
 /// @}
-/// \addtogroup digraph_maps
+/// \addtogroup graph_maps
 /// @{
-/// Provides an immutable and unique id for each item in the digraph.
+/// Provides an immutable and unique id for each item in the graph.
 /// The IdMap class provides a unique and immutable id for each item of the
-/// same type (e.g. node) in the digraph. This id is <ul><li>\b unique:
+/// same type (e.g. node) in the graph. This id is <ul><li>\b unique:
 /// different items (nodes) get different ids <li>\b immutable: the id of an
 /// item (node) does not change (even if you delete other nodes).  </ul>
 /// Through this map you get access (i.e. can read) the inner id values of
-/// the items stored in the digraph. This map can be inverted with its member
+/// the items stored in the graph. This map can be inverted with its member
-/// class \c InverseMap.
+/// class \c InverseMap or with the \c operator() member.
 ///
-template <typename _Digraph, typename _Item>
+template <typename _Graph, typename _Item>
 class IdMap {
 public:
-typedef _Digraph Digraph;
+typedef _Graph Graph;
 typedef int Value;
 typedef _Item Item;
 typedef _Item Key;
 /// \brief Constructor.
 ///
 /// Constructor of the map.
-explicit IdMap(const Digraph& _digraph) : digraph(&_digraph) {}
+explicit IdMap(const Graph& graph) : _graph(&graph) {}
 /// \brief Gives back the \e id of the item.
 ///
 /// Gives back the immutable and unique \e id of the item.
-int operator[](const Item& item) const { return digraph->id(item);}
+int operator[](const Item& item) const { return _graph->id(item);}
 /// \brief Gives back the item by its id.
 ///
 /// Gives back the item by its id.
-Item operator()(int id) { return digraph->fromId(id, Item()); }
+Item operator()(int id) { return _graph->fromId(id, Item()); }
 private:
-const Digraph* digraph;
+const Graph* _graph;
 public:
 /// \brief The class represents the inverse of its owner (IdMap).
 ///
 public:
 /// \brief Constructor.
 ///
 /// Constructor for creating an id-to-item map.
-explicit InverseMap(const Digraph& _digraph) : digraph(&_digraph) {}
+explicit InverseMap(const Graph& graph) : _graph(&graph) {}
 /// \brief Constructor.
 ///
 /// Constructor for creating an id-to-item map.
-explicit InverseMap(const IdMap& idMap) : digraph(idMap.digraph) {}
+explicit InverseMap(const IdMap& map) : _graph(map._graph) {}
 /// \brief Gives back the given item from its id.
 ///
 /// Gives back the given item from its id.
 ///
-Item operator[](int id) const { return digraph->fromId(id, Item());}
+Item operator[](int id) const { return _graph->fromId(id, Item());}
 private:
-const Digraph* digraph;
+const Graph* _graph;
 };
 /// \brief Gives back the inverse of the map.
 ///
 /// Gives back the inverse of the IdMap.
-InverseMap inverse() const { return InverseMap(*digraph);}
+InverseMap inverse() const { return InverseMap(*_graph);}
 };
-/// \brief General invertable digraph-map type.
+/// \brief General invertable graph-map type.
-/// This type provides simple invertable digraph-maps.
+/// This type provides simple invertable graph-maps.
 /// The InvertableMap wraps an arbitrary ReadWriteMap
 /// and if a key is set to a new value then store it
 /// in the inverse map.
 ///
 /// The values of the map can be accessed
 /// with stl compatible forward iterator.
 ///
-/// \param _Digraph The digraph type.
+/// \param _Graph The graph type.
-/// \param _Item The item type of the digraph.
+/// \param _Item The item type of the graph.
 /// \param _Value The value type of the map.
 ///
 /// \see IterableValueMap
-template <typename _Digraph, typename _Item, typename _Value>
+template <typename _Graph, typename _Item, typename _Value>
-class InvertableMap : protected DefaultMap<_Digraph, _Item, _Value> {
+class InvertableMap : protected DefaultMap<_Graph, _Item, _Value> {
 private:
-typedef DefaultMap<_Digraph, _Item, _Value> Map;
+typedef DefaultMap<_Graph, _Item, _Value> Map;
-typedef _Digraph Digraph;
+typedef _Graph Graph;
 typedef std::map<_Value, _Item> Container;
-Container invMap;
+Container _inv_map;
 public:
 /// The key type of InvertableMap (Node, Arc, Edge).
 typedef typename Map::Key Key;
 /// \brief Constructor.
 ///
-/// Construct a new InvertableMap for the digraph.
+/// Construct a new InvertableMap for the graph.
 ///
-explicit InvertableMap(const Digraph& digraph) : Map(digraph) {}
+explicit InvertableMap(const Graph& graph) : Map(graph) {}
 /// \brief Forward iterator for values.
 ///
 /// This iterator is an stl compatible forward
 /// iterator on the values of the map. The values can
 /// Returns an stl compatible iterator to the
 /// first value of the map. The values of the
 /// map can be accessed in the [beginValue, endValue)
 /// range.
 ValueIterator beginValue() const {
-return ValueIterator(invMap.begin());
+return ValueIterator(_inv_map.begin());
 }
 /// \brief Returns an iterator after the last value.
 ///
 /// Returns an stl compatible iterator after the
 /// last value of the map. The values of the
 /// map can be accessed in the [beginValue, endValue)
 /// range.
 ValueIterator endValue() const {
-return ValueIterator(invMap.end());
+return ValueIterator(_inv_map.end());
 }
 /// \brief The setter function of the map.
 ///
 /// Sets the mapped value.
 void set(const Key& key, const Value& val) {
 Value oldval = Map::operator[](key);
-typename Container::iterator it = invMap.find(oldval);
+typename Container::iterator it = _inv_map.find(oldval);
-if (it != invMap.end() && it->second == key) {
+if (it != _inv_map.end() && it->second == key) {
-	invMap.erase(it);
+	_inv_map.erase(it);
 }
-invMap.insert(make_pair(val, key));
+_inv_map.insert(make_pair(val, key));
 Map::set(key, val);
 }
 /// \brief The getter function of the map.
 ///
 /// \brief Gives back the item by its value.
 ///
 /// Gives back the item by its value.
 Key operator()(const Value& key) const {
-typename Container::const_iterator it = invMap.find(key);
+typename Container::const_iterator it = _inv_map.find(key);
-return it != invMap.end() ? it->second : INVALID;
+return it != _inv_map.end() ? it->second : INVALID;
 }
 protected:
 /// \brief Erase the key from the map.
 ///
 /// Erase the key to the map. It is called by the
 /// \c AlterationNotifier.
 virtual void erase(const Key& key) {
 Value val = Map::operator[](key);
-typename Container::iterator it = invMap.find(val);
+typename Container::iterator it = _inv_map.find(val);
-if (it != invMap.end() && it->second == key) {
+if (it != _inv_map.end() && it->second == key) {
-	invMap.erase(it);
+	_inv_map.erase(it);
 }
 Map::erase(key);
 }
 /// \brief Erase more keys from the map.
 /// Erase more keys from the map. It is called by the
 /// \c AlterationNotifier.
 virtual void erase(const std::vector<Key>& keys) {
 for (int i = 0; i < int(keys.size()); ++i) {
 	Value val = Map::operator[](keys[i]);
-	typename Container::iterator it = invMap.find(val);
+	typename Container::iterator it = _inv_map.find(val);
-	if (it != invMap.end() && it->second == keys[i]) {
+	if (it != _inv_map.end() && it->second == keys[i]) {
-	  invMap.erase(it);
+	  _inv_map.erase(it);
 	}
 }
 Map::erase(keys);
 }
 /// \brief Clear the keys from the map and inverse map.
 ///
 /// Clear the keys from the map and inverse map. It is called by the
 /// \c AlterationNotifier.
 virtual void clear() {
-invMap.clear();
+_inv_map.clear();
 Map::clear();
 }
 public:
 class InverseMap {
 public:
 /// \brief Constructor of the InverseMap.
 ///
 /// Constructor of the InverseMap.
-explicit InverseMap(const InvertableMap& _inverted)
+explicit InverseMap(const InvertableMap& inverted)
-: inverted(_inverted) {}
+: _inverted(inverted) {}
 /// The value type of the InverseMap.
 typedef typename InvertableMap::Key Value;
 /// The key type of the InverseMap.
 typedef typename InvertableMap::Value Key;
 /// \brief Subscript operator.
 ///
 /// Subscript operator. It gives back always the item
 /// what was last assigned to the value.
 Value operator[](const Key& key) const {
-	return inverted(key);
+	return _inverted(key);
 }
 private:
-const InvertableMap& inverted;
+const InvertableMap& _inverted;
 };
 /// \brief It gives back the just readable inverse map.
 ///
 /// It gives back the just readable inverse map.
 };
 /// \brief Provides a mutable, continuous and unique descriptor for each
-/// item in the digraph.
+/// item in the graph.
 ///
 /// The DescriptorMap class provides a unique and continuous (but mutable)
 /// descriptor (id) for each item of the same type (e.g. node) in the
-/// digraph. This id is <ul><li>\b unique: different items (nodes) get
+/// graph. This id is <ul><li>\b unique: different items (nodes) get
 /// different ids <li>\b continuous: the range of the ids is the set of
 /// integers between 0 and \c n-1, where \c n is the number of the items of
 /// this type (e.g. nodes) (so the id of a node can change if you delete an
 /// other node, i.e. this id is mutable).  </ul> This map can be inverted
-/// with its member class \c InverseMap.
+/// with its member class \c InverseMap, or with the \c operator() member.
 ///
-/// \param _Digraph The digraph class the \c DescriptorMap belongs to.
+/// \param _Graph The graph class the \c DescriptorMap belongs to.
 /// \param _Item The Item is the Key of the Map. It may be Node, Arc or
 /// Edge.
-template <typename _Digraph, typename _Item>
+template <typename _Graph, typename _Item>
-class DescriptorMap : protected DefaultMap<_Digraph, _Item, int> {
+class DescriptorMap : protected DefaultMap<_Graph, _Item, int> {
 typedef _Item Item;
-typedef DefaultMap<_Digraph, _Item, int> Map;
+typedef DefaultMap<_Graph, _Item, int> Map;
 public:
-/// The digraph class of DescriptorMap.
+/// The graph class of DescriptorMap.
-typedef _Digraph Digraph;
+typedef _Graph Graph;
 /// The key type of DescriptorMap (Node, Arc, Edge).
 typedef typename Map::Key Key;
 /// The value type of DescriptorMap.
 typedef typename Map::Value Value;
 /// \brief Constructor.
 ///
 /// Constructor for descriptor map.
-explicit DescriptorMap(const Digraph& _digraph) : Map(_digraph) {
+explicit DescriptorMap(const Graph& _graph) : Map(_graph) {
 Item it;
 const typename Map::Notifier* nf = Map::notifier();
 for (nf->first(it); it != INVALID; nf->next(it)) {
-	Map::set(it, invMap.size());
+	Map::set(it, _inv_map.size());
-	invMap.push_back(it);
+	_inv_map.push_back(it);
 }
 }
 protected:
 ///
 /// Add a new key to the map. It is called by the
 /// \c AlterationNotifier.
 virtual void add(const Item& item) {
 Map::add(item);
-Map::set(item, invMap.size());
+Map::set(item, _inv_map.size());
-invMap.push_back(item);
+_inv_map.push_back(item);
 }
 /// \brief Add more new keys to the map.
 ///
 /// Add more new keys to the map. It is called by the
 /// \c AlterationNotifier.
 virtual void add(const std::vector<Item>& items) {
 Map::add(items);
 for (int i = 0; i < int(items.size()); ++i) {
-	Map::set(items[i], invMap.size());
+	Map::set(items[i], _inv_map.size());
-	invMap.push_back(items[i]);
+	_inv_map.push_back(items[i]);
 }
 }
 /// \brief Erase the key from the map.
 ///
 /// Erase the key from the map. It is called by the
 /// \c AlterationNotifier.
 virtual void erase(const Item& item) {
-Map::set(invMap.back(), Map::operator[](item));
+Map::set(_inv_map.back(), Map::operator[](item));
-invMap[Map::operator[](item)] = invMap.back();
+_inv_map[Map::operator[](item)] = _inv_map.back();
-invMap.pop_back();
+_inv_map.pop_back();
 Map::erase(item);
 }
 /// \brief Erase more keys from the map.
 ///
 /// Erase more keys from the map. It is called by the
 /// \c AlterationNotifier.
 virtual void erase(const std::vector<Item>& items) {
 for (int i = 0; i < int(items.size()); ++i) {
-	Map::set(invMap.back(), Map::operator[](items[i]));
+	Map::set(_inv_map.back(), Map::operator[](items[i]));
-	invMap[Map::operator[](items[i])] = invMap.back();
+	_inv_map[Map::operator[](items[i])] = _inv_map.back();
-	invMap.pop_back();
+	_inv_map.pop_back();
 }
 Map::erase(items);
 }
 /// \brief Build the unique map.
 virtual void build() {
 Map::build();
 Item it;
 const typename Map::Notifier* nf = Map::notifier();
 for (nf->first(it); it != INVALID; nf->next(it)) {
-	Map::set(it, invMap.size());
+	Map::set(it, _inv_map.size());
-	invMap.push_back(it);
+	_inv_map.push_back(it);
 }
 }
 /// \brief Clear the keys from the map.
 ///
 /// Clear the keys from the map. It is called by the
 /// \c AlterationNotifier.
 virtual void clear() {
-invMap.clear();
+_inv_map.clear();
 Map::clear();
 }
 public:
 /// \brief Returns the maximal value plus one.
 ///
 /// Returns the maximal value plus one in the map.
 unsigned int size() const {
-return invMap.size();
+return _inv_map.size();
 }
 /// \brief Swaps the position of the two items in the map.
 ///
 /// Swaps the position of the two items in the map.
 void swap(const Item& p, const Item& q) {
 int pi = Map::operator[](p);
 int qi = Map::operator[](q);
 Map::set(p, qi);
-invMap[qi] = p;
+_inv_map[qi] = p;
 Map::set(q, pi);
-invMap[pi] = q;
+_inv_map[pi] = q;
 }
 /// \brief Gives back the \e descriptor of the item.
 ///
 /// Gives back the mutable and unique \e descriptor of the map.
 /// \brief Gives back the item by its descriptor.
 ///
 /// Gives back th item by its descriptor.
 Item operator()(int id) const {
-return invMap[id];
+return _inv_map[id];
 }
 private:
 typedef std::vector<Item> Container;
-Container invMap;
+Container _inv_map;
 public:
 /// \brief The inverse map type of DescriptorMap.
 ///
 /// The inverse map type of DescriptorMap.
 class InverseMap {
 public:
 /// \brief Constructor of the InverseMap.
 ///
 /// Constructor of the InverseMap.
-explicit InverseMap(const DescriptorMap& _inverted)
+explicit InverseMap(const DescriptorMap& inverted)
-	: inverted(_inverted) {}
+	: _inverted(inverted) {}
 /// The value type of the InverseMap.
 typedef typename DescriptorMap::Key Value;
 /// The key type of the InverseMap.
 /// \brief Subscript operator.
 ///
 /// Subscript operator. It gives back the item
 /// that the descriptor belongs to currently.
 Value operator[](const Key& key) const {
-	return inverted(key);
+	return _inverted(key);
 }
 /// \brief Size of the map.
 ///
 /// Returns the size of the map.
 unsigned int size() const {
-	return inverted.size();
+	return _inverted.size();
 }
 private:
-const DescriptorMap& inverted;
+const DescriptorMap& _inverted;
 };
 /// \brief Gives back the inverse of the map.
 ///
 /// Gives back the inverse of the map.
 /// \brief Constructor
 ///
 /// Constructor
 /// \param _digraph The digraph that the map belongs to.
-explicit SourceMap(const Digraph& _digraph) : digraph(_digraph) {}
+explicit SourceMap(const Digraph& digraph) : _digraph(digraph) {}
 /// \brief The subscript operator.
 ///
 /// The subscript operator.
 /// \param arc The arc
 /// \return The source of the arc
 Value operator[](const Key& arc) const {
-return digraph.source(arc);
+return _digraph.source(arc);
 }
 private:
-const Digraph& digraph;
+const Digraph& _digraph;
 };
 /// \brief Returns a \ref SourceMap class.
 ///
 /// This function just returns an \ref SourceMap class.
 /// \brief Constructor
 ///
 /// Constructor
 /// \param _digraph The digraph that the map belongs to.
-explicit TargetMap(const Digraph& _digraph) : digraph(_digraph) {}
+explicit TargetMap(const Digraph& digraph) : _digraph(digraph) {}
 /// \brief The subscript operator.
 ///
 /// The subscript operator.
 /// \param e The arc
 /// \return The target of the arc
 Value operator[](const Key& e) const {
-return digraph.target(e);
+return _digraph.target(e);
 }
 private:
-const Digraph& digraph;
+const Digraph& _digraph;
 };
 /// \brief Returns a \ref TargetMap class.
 ///
 /// This function just returns a \ref TargetMap class.
 /// \brief Returns the "forward" directed arc view of an edge.
 ///
 /// Returns the "forward" directed arc view of an edge.
 /// \see BackwardMap
 /// \author Balazs Dezso
-template <typename Digraph>
+template <typename Graph>
 class ForwardMap {
 public:
-typedef typename Digraph::Arc Value;
+typedef typename Graph::Arc Value;
-typedef typename Digraph::Edge Key;
+typedef typename Graph::Edge Key;
 /// \brief Constructor
 ///
 /// Constructor
-/// \param _digraph The digraph that the map belongs to.
+/// \param _graph The graph that the map belongs to.
-explicit ForwardMap(const Digraph& _digraph) : digraph(_digraph) {}
+explicit ForwardMap(const Graph& graph) : _graph(graph) {}
 /// \brief The subscript operator.
 ///
 /// The subscript operator.
 /// \param key An edge
 /// \return The "forward" directed arc view of edge
 Value operator[](const Key& key) const {
-return digraph.direct(key, true);
+return _graph.direct(key, true);
 }
 private:
-const Digraph& digraph;
+const Graph& _graph;
 };
 /// \brief Returns a \ref ForwardMap class.
 ///
 /// This function just returns an \ref ForwardMap class.
 /// \relates ForwardMap
-template <typename Digraph>
+template <typename Graph>
-inline ForwardMap<Digraph> forwardMap(const Digraph& digraph) {
+inline ForwardMap<Graph> forwardMap(const Graph& graph) {
-return ForwardMap<Digraph>(digraph);
+return ForwardMap<Graph>(graph);
 }
 /// \brief Returns the "backward" directed arc view of an edge.
 ///
 /// Returns the "backward" directed arc view of an edge.
 /// \see ForwardMap
 /// \author Balazs Dezso
-template <typename Digraph>
+template <typename Graph>
 class BackwardMap {
 public:
-typedef typename Digraph::Arc Value;
+typedef typename Graph::Arc Value;
-typedef typename Digraph::Edge Key;
+typedef typename Graph::Edge Key;
 /// \brief Constructor
 ///
 /// Constructor
-/// \param _digraph The digraph that the map belongs to.
+/// \param _graph The graph that the map belongs to.
-explicit BackwardMap(const Digraph& _digraph) : digraph(_digraph) {}
+explicit BackwardMap(const Graph& graph) : _graph(graph) {}
 /// \brief The subscript operator.
 ///
 /// The subscript operator.
 /// \param key An edge
 /// \return The "backward" directed arc view of edge
 Value operator[](const Key& key) const {
-return digraph.direct(key, false);
+return _graph.direct(key, false);
 }
 private:
-const Digraph& digraph;
+const Graph& _graph;
 };
 /// \brief Returns a \ref BackwardMap class
 /// This function just returns a \ref BackwardMap class.
 /// \relates BackwardMap
-template <typename Digraph>
+template <typename Graph>
-inline BackwardMap<Digraph> backwardMap(const Digraph& digraph) {
+inline BackwardMap<Graph> backwardMap(const Graph& graph) {
-return BackwardMap<Digraph>(digraph);
+return BackwardMap<Graph>(graph);
 }
 /// \brief Potential difference map
 ///
 /// If there is an potential map on the nodes then we
 typedef typename NodeMap::Value Value;
 /// \brief Constructor
 ///
 /// Contructor of the map
-explicit PotentialDifferenceMap(const Digraph& _digraph,
+explicit PotentialDifferenceMap(const Digraph& digraph,
-const NodeMap& _potential)
+const NodeMap& potential)
-: digraph(_digraph), potential(_potential) {}
+: _digraph(digraph), _potential(potential) {}
 /// \brief Const subscription operator
 ///
 /// Const subscription operator
 Value operator[](const Key& arc) const {
-return potential[digraph.target(arc)] - potential[digraph.source(arc)];
+return _potential[_digraph.target(arc)] -
+	_potential[_digraph.source(arc)];
 }
 private:
-const Digraph& digraph;
+const Digraph& _digraph;
-const NodeMap& potential;
+const NodeMap& _potential;
 };
 /// \brief Returns a PotentialDifferenceMap.
 ///
 /// This function just returns a PotentialDifferenceMap.
 typedef _Digraph Digraph;
 typedef int Value;
 typedef typename Digraph::Node Key;
-typedef typename ItemSetTraits<_Digraph, typename _Digraph::Arc>
+typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
 ::ItemNotifier::ObserverBase Parent;
 private:
-class AutoNodeMap : public DefaultMap<_Digraph, Key, int> {
+class AutoNodeMap : public DefaultMap<Digraph, Key, int> {
 public:
-typedef DefaultMap<_Digraph, Key, int> Parent;
+typedef DefaultMap<Digraph, Key, int> Parent;
-typedef typename Parent::Digraph Digraph;
 AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 virtual void add(const Key& key) {
 	Parent::add(key);
 public:
 /// \brief Constructor.
 ///
 /// Constructor for creating in-degree map.
-explicit InDegMap(const Digraph& _digraph) : digraph(_digraph), deg(_digraph) {
+explicit InDegMap(const Digraph& digraph)
-Parent::attach(digraph.notifier(typename _Digraph::Arc()));
+: _digraph(digraph), _deg(digraph) {
+Parent::attach(_digraph.notifier(typename Digraph::Arc()));
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = countInArcs(digraph, it);
+	_deg[it] = countInArcs(_digraph, it);
 }
 }
 /// Gives back the in-degree of a Node.
 int operator[](const Key& key) const {
-return deg[key];
+return _deg[key];
 }
 protected:
 typedef typename Digraph::Arc Arc;
 virtual void add(const Arc& arc) {
-++deg[digraph.target(arc)];
+++_deg[_digraph.target(arc)];
 }
 virtual void add(const std::vector<Arc>& arcs) {
 for (int i = 0; i < int(arcs.size()); ++i) {
-++deg[digraph.target(arcs[i])];
+++_deg[_digraph.target(arcs[i])];
 }
 }
 virtual void erase(const Arc& arc) {
---deg[digraph.target(arc)];
+--_deg[_digraph.target(arc)];
 }
 virtual void erase(const std::vector<Arc>& arcs) {
 for (int i = 0; i < int(arcs.size()); ++i) {
---deg[digraph.target(arcs[i])];
+--_deg[_digraph.target(arcs[i])];
 }
 }
 virtual void build() {
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = countInArcs(digraph, it);
+	_deg[it] = countInArcs(_digraph, it);
 }
 }
 virtual void clear() {
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = 0;
+	_deg[it] = 0;
 }
 }
 private:
-const _Digraph& digraph;
+const Digraph& _digraph;
-AutoNodeMap deg;
+AutoNodeMap _deg;
 };
 /// \brief Map of the node out-degrees.
 ///
 /// This map returns the out-degree of a node. Once it is constructed,
 class OutDegMap
 : protected ItemSetTraits<_Digraph, typename _Digraph::Arc>
 ::ItemNotifier::ObserverBase {
 public:
-typedef typename ItemSetTraits<_Digraph, typename _Digraph::Arc>
-::ItemNotifier::ObserverBase Parent;
 typedef _Digraph Digraph;
 typedef int Value;
 typedef typename Digraph::Node Key;
+typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
+::ItemNotifier::ObserverBase Parent;
 private:
-class AutoNodeMap : public DefaultMap<_Digraph, Key, int> {
+class AutoNodeMap : public DefaultMap<Digraph, Key, int> {
 public:
-typedef DefaultMap<_Digraph, Key, int> Parent;
+typedef DefaultMap<Digraph, Key, int> Parent;
-typedef typename Parent::Digraph Digraph;
 AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 virtual void add(const Key& key) {
 	Parent::add(key);
 public:
 /// \brief Constructor.
 ///
 /// Constructor for creating out-degree map.
-explicit OutDegMap(const Digraph& _digraph) : digraph(_digraph), deg(_digraph) {
+explicit OutDegMap(const Digraph& digraph)
-Parent::attach(digraph.notifier(typename _Digraph::Arc()));
+: _digraph(digraph), _deg(digraph) {
+Parent::attach(_digraph.notifier(typename Digraph::Arc()));
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = countOutArcs(digraph, it);
+	_deg[it] = countOutArcs(_digraph, it);
 }
 }
 /// Gives back the out-degree of a Node.
 int operator[](const Key& key) const {
-return deg[key];
+return _deg[key];
 }
 protected:
 typedef typename Digraph::Arc Arc;
 virtual void add(const Arc& arc) {
-++deg[digraph.source(arc)];
+++_deg[_digraph.source(arc)];
 }
 virtual void add(const std::vector<Arc>& arcs) {
 for (int i = 0; i < int(arcs.size()); ++i) {
-++deg[digraph.source(arcs[i])];
+++_deg[_digraph.source(arcs[i])];
 }
 }
 virtual void erase(const Arc& arc) {
---deg[digraph.source(arc)];
+--_deg[_digraph.source(arc)];
 }
 virtual void erase(const std::vector<Arc>& arcs) {
 for (int i = 0; i < int(arcs.size()); ++i) {
---deg[digraph.source(arcs[i])];
+--_deg[_digraph.source(arcs[i])];
 }
 }
 virtual void build() {
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = countOutArcs(digraph, it);
+	_deg[it] = countOutArcs(_digraph, it);
 }
 }
 virtual void clear() {
-for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
+for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
-	deg[it] = 0;
+	_deg[it] = 0;
 }
 }
 private:
-const _Digraph& digraph;
+const Digraph& _digraph;
-AutoNodeMap deg;
+AutoNodeMap _deg;
 };
 ///Dynamic arc look up between given endpoints.
 ///
 ///It is possible to find \e all parallel arcs between two nodes with
 ///the \c findFirst() and \c findNext() members.
 ///
 ///See the \ref ArcLookUp and \ref AllArcLookUp classes if your
-///digraph do not changed so frequently.
+///digraph is not changed so frequently.
 ///
 ///This class uses a self-adjusting binary search tree, Sleator's
 ///and Tarjan's Splay tree for guarantee the logarithmic amortized
 ///time bound for arc lookups. This class also guarantees the
 ///optimal time bound in a constant factor for any distribution of
 {
 public:
 typedef typename ItemSetTraits<G, typename G::Arc>
 ::ItemNotifier::ObserverBase Parent;
-GRAPH_TYPEDEFS(typename G);
+DIGRAPH_TYPEDEFS(typename G);
 typedef G Digraph;
 protected:
 class AutoNodeMap : public DefaultMap<G, Node, Arc> {
 ///\param t The target node
 ///\return An arc from \c s to \c t if there exists,
 ///\ref INVALID otherwise.
 Arc operator()(Node s, Node t) const
 {
-Arc e = _head[s];
+Arc a = _head[s];
 while (true) {
-	if (_g.target(e) == t) {
+	if (_g.target(a) == t) {
-	  const_cast<DynArcLookUp&>(*this).splay(e);
+	  const_cast<DynArcLookUp&>(*this).splay(a);
-	  return e;
+	  return a;
-	} else if (t < _g.target(e)) {
+	} else if (t < _g.target(a)) {
-	  if (_left[e] == INVALID) {
+	  if (_left[a] == INVALID) {
-	    const_cast<DynArcLookUp&>(*this).splay(e);
+	    const_cast<DynArcLookUp&>(*this).splay(a);
 	    return INVALID;
 	  } else {
-	    e = _left[e];
+	    a = _left[a];
 	  }
 	} else  {
-	  if (_right[e] == INVALID) {
+	  if (_right[a] == INVALID) {
-	    const_cast<DynArcLookUp&>(*this).splay(e);
+	    const_cast<DynArcLookUp&>(*this).splay(a);
 	    return INVALID;
 	  } else {
-	    e = _right[e];
+	    a = _right[a];
 	  }
 	}
 }
 }
 ///\param t The target node
 ///\return An arc from \c s to \c t if there exists, \ref INVALID
 /// otherwise.
 Arc findFirst(Node s, Node t) const
 {
-Arc e = _head[s];
+Arc a = _head[s];
 Arc r = INVALID;
 while (true) {
-	if (_g.target(e) < t) {
+	if (_g.target(a) < t) {
-	  if (_right[e] == INVALID) {
+	  if (_right[a] == INVALID) {
-	    const_cast<DynArcLookUp&>(*this).splay(e);
+	    const_cast<DynArcLookUp&>(*this).splay(a);
 	    return r;
 	  } else {
-	    e = _right[e];
+	    a = _right[a];
 	  }
 	} else {
-	  if (_g.target(e) == t) {
+	  if (_g.target(a) == t) {
-	    r = e;
+	    r = a;
 	  }
-	  if (_left[e] == INVALID) {
+	  if (_left[a] == INVALID) {
-	    const_cast<DynArcLookUp&>(*this).splay(e);
+	    const_cast<DynArcLookUp&>(*this).splay(a);
 	    return r;
 	  } else {
-	    e = _left[e];
+	    a = _left[a];
 	  }
 	}
 }
 }
 /// otherwise.
 ///\note If \c e is not the result of the previous \c findFirst()
 ///operation then the amorized time bound can not be guaranteed.
 #ifdef DOXYGEN
-Arc findNext(Node s, Node t, Arc e) const
+Arc findNext(Node s, Node t, Arc a) const
 #else
-Arc findNext(Node, Node t, Arc e) const
+Arc findNext(Node, Node t, Arc a) const
 #endif
 {
-if (_right[e] != INVALID) {
+if (_right[a] != INVALID) {
-	e = _right[e];
+	a = _right[a];
-	while (_left[e] != INVALID) {
+	while (_left[a] != INVALID) {
-	  e = _left[e];
+	  a = _left[a];
 	}
-	const_cast<DynArcLookUp&>(*this).splay(e);
+	const_cast<DynArcLookUp&>(*this).splay(a);
 } else {
-	while (_parent[e] != INVALID && _right[_parent[e]] ==  e) {
+	while (_parent[a] != INVALID && _right[_parent[a]] ==  a) {
-	  e = _parent[e];
+	  a = _parent[a];
 	}
-	if (_parent[e] == INVALID) {
+	if (_parent[a] == INVALID) {
 	  return INVALID;
 	} else {
-	  e = _parent[e];
+	  a = _parent[a];
-	  const_cast<DynArcLookUp&>(*this).splay(e);
+	  const_cast<DynArcLookUp&>(*this).splay(a);
 	}
 }
-if (_g.target(e) == t) return e;
+if (_g.target(a) == t) return a;
 else return INVALID;
 }
 };
 ///\sa AllArcLookUp
 template<class G>
 class ArcLookUp
 {
 public:
-GRAPH_TYPEDEFS(typename G);
+DIGRAPH_TYPEDEFS(typename G);
 typedef G Digraph;
 protected:
 const Digraph &_g;
 typename Digraph::template NodeMap<Arc> _head;
 using ArcLookUp<G>::_g;
 using ArcLookUp<G>::_right;
 using ArcLookUp<G>::_left;
 using ArcLookUp<G>::_head;
-GRAPH_TYPEDEFS(typename G);
+DIGRAPH_TYPEDEFS(typename G);
 typedef G Digraph;
 typename Digraph::template ArcMap<Arc> _next;
 Arc refreshNext(Arc head,Arc next=INVALID)

changeset 139	701c529ba737
parent 100	4f754b4cf82b
child 140	356930927a71