LEMON/LEMON-official Changeset - r139:701c529ba737

Repositories » LEMON » LEMON-official

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

Changeset - r139:701c529ba737

« 138:a0f755

140:356930 »

r139:701c529ba737

Tue, 22 Apr 2008 15:04:00

[Not Reviewed]

0 comments (0 inline)

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

Renamings in the graph_utils.h + graph_utils_test added

0 6 2

default

8 files changed with 776 insertions and 1013 deletions:

test/graph_utils_test.cc

141

test/graph_utils_test.h

lemon/bits/traits.h

lemon/graph_utils.h

540

1004

lemon/lgf_reader.h

lemon/lgf_writer.h

lemon/smart_graph.h

test/Makefile.am

↑ Collapse diff ↑

test/graph_utils_test.cc

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#include <iostream>
 		#include <vector>
 		#include <lemon/graph_utils.h>
 		#include <lemon/list_graph.h>
 		#include <lemon/smart_graph.h>
 		#include "test_tools.h"
 		#include "graph_utils_test.h"
 		using namespace lemon;
 		template <class Graph>
 		void checkSnapDeg()
+		{
 		  Graph g;
 		  typename Graph::Node n1=g.addNode();
 		  typename Graph::Node n2=g.addNode();
 		  InDegMap<Graph> ind(g);
 		  g.addArc(n1,n2);
 		  typename Graph::Snapshot snap(g);
 		  OutDegMap<Graph> outd(g);
 		  check(ind[n1]==0 && ind[n2]==1, "Wrong InDegMap value.");
 		  check(outd[n1]==1 && outd[n2]==0, "Wrong OutDegMap value.");
 		  g.addArc(n1,n2);
 		  g.addArc(n2,n1);
 		  check(ind[n1]==1 && ind[n2]==2, "Wrong InDegMap value.");
 		  check(outd[n1]==2 && outd[n2]==1, "Wrong OutDegMap value.");
 		  snap.restore();
 		  check(ind[n1]==0 && ind[n2]==1, "Wrong InDegMap value.");
 		  check(outd[n1]==1 && outd[n2]==0, "Wrong OutDegMap value.");
+		}
 		int main() {
 		  ///\file
 		  { // checking list graph
 		    checkDigraphCounters<ListDigraph>();
 		    checkFindArc<ListDigraph>();
+		  }
 		  { // checking smart graph
 		    checkDigraphCounters<SmartDigraph>();
 		    checkFindArc<SmartDigraph>();
+		  }
+		  {
 		    int num = 5;
 		    SmartDigraph fg;
 		    std::vector<SmartDigraph::Node> nodes;
 		    for (int i = 0; i < num; ++i) {
 		      nodes.push_back(fg.addNode());
+		    }
 		    for (int i = 0; i < num * num; ++i) {
 		      fg.addArc(nodes[i / num], nodes[i % num]);
+		    }
 		    check(countNodes(fg) == num, "FullGraph: wrong node number.");
 		    check(countArcs(fg) == num*num, "FullGraph: wrong arc number.");
 		    for (SmartDigraph::NodeIt src(fg); src != INVALID; ++src) {
 		      for (SmartDigraph::NodeIt trg(fg); trg != INVALID; ++trg) {
 			ConArcIt<SmartDigraph> con(fg, src, trg);
 			check(con != INVALID, "There is no connecting arc.");
 			check(fg.source(con) == src, "Wrong source.");
 			check(fg.target(con) == trg, "Wrong target.");
 			check(++con == INVALID, "There is more connecting arc.");
+		      }
+		    }
 		    AllArcLookUp<SmartDigraph> el(fg);
 		    for (SmartDigraph::NodeIt src(fg); src != INVALID; ++src) {
 		      for (SmartDigraph::NodeIt trg(fg); trg != INVALID; ++trg) {
 			SmartDigraph::Arc con = el(src, trg);
 			check(con != INVALID, "There is no connecting arc.");
 			check(fg.source(con) == src, "Wrong source.");
 			check(fg.target(con) == trg, "Wrong target.");
 			check(el(src,trg,con) == INVALID, "There is more connecting arc.");
+		      }
+		    }
+		  }
 		  //check In/OutDegMap (and Snapshot feature)
 		  checkSnapDeg<ListDigraph>();
 		  checkSnapDeg<SmartDigraph>();
+		  {
 		    const int nodeNum = 10;
 		    const int arcNum = 100;
 		    ListDigraph digraph;
 		    InDegMap<ListDigraph> inDeg(digraph);
 		    OutDegMap<ListDigraph> outDeg(digraph);
 		    std::vector<ListDigraph::Node> nodes(nodeNum);
 		    for (int i = 0; i < nodeNum; ++i) {
 		      nodes[i] = digraph.addNode();
+		    }
 		    std::vector<ListDigraph::Arc> arcs(arcNum);
 		    for (int i = 0; i < arcNum; ++i) {
 		      arcs[i] =
 			digraph.addArc(nodes[rnd[nodeNum]], nodes[rnd[nodeNum]]);
+		    }
 		    for (int i = 0; i < nodeNum; ++i) {
 		      check(inDeg[nodes[i]] == countInArcs(digraph, nodes[i]),
 			    "Wrong in degree map");
+		    }
 		    for (int i = 0; i < nodeNum; ++i) {
 		      check(outDeg[nodes[i]] == countOutArcs(digraph, nodes[i]),
 			    "Wrong in degree map");
+		    }
+		  }
 		  ///Everything is OK
 		  std::cout << __FILE__ ": All tests passed.\n";
 		  return 0;
+		}

test/graph_utils_test.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_TEST_GRAPH_UTILS_TEST_H
 		#define LEMON_TEST_GRAPH_UTILS_TEST_H
 		#include "test_tools.h"
 		#include <cstdlib>
 		#include <ctime>
 		//! \ingroup misc
 		//! \file
 		//! \brief Test cases for graph utils.
 		namespace lemon {
 		  template <typename Digraph>
 		  void checkDigraphCounters() {
 		    const int num = 5;
 		    Digraph digraph;
 		    addPetersen(digraph, num);
 		    bidirDigraph(digraph);
 		    check(countNodes(digraph) == 2*num, "Wrong node number.");
 		    check(countArcs(digraph) == 6*num, "Wrong arc number.");
 		    for (typename Digraph::NodeIt it(digraph); it != INVALID; ++it) {
 		      check(countOutArcs(digraph, it) == 3, "Wrong out degree number.");
 		      check(countInArcs(digraph, it) == 3, "Wrong in degree number.");
+		    }
+		  }
 		  template <typename Digraph>
 		  void checkFindArc() {
 		    typedef typename Digraph::Node Node;
 		    typedef typename Digraph::Arc Arc;
 		    typedef typename Digraph::NodeIt NodeIt;
 		    typedef typename Digraph::ArcIt ArcIt;
 		    Digraph digraph;
 		    for (int i = 0; i < 10; ++i) {
 		      digraph.addNode();
+		    }
 		    DescriptorMap<Digraph, Node> nodes(digraph);
 		    typename DescriptorMap<Digraph, Node>::InverseMap invNodes(nodes);
 		    for (int i = 0; i < 100; ++i) {
 		      int src = rnd[invNodes.size()];
 		      int trg = rnd[invNodes.size()];
 		      digraph.addArc(invNodes[src], invNodes[trg]);
+		    }
 		    typename Digraph::template ArcMap<bool> found(digraph, false);
 		    DescriptorMap<Digraph, Arc> arcs(digraph);
 		    for (NodeIt src(digraph); src != INVALID; ++src) {
 		      for (NodeIt trg(digraph); trg != INVALID; ++trg) {
 			for (ConArcIt<Digraph> con(digraph, src, trg); con != INVALID; ++con) {
 			  check(digraph.source(con) == src, "Wrong source.");
 			  check(digraph.target(con) == trg, "Wrong target.");
 			  check(found[con] == false, "The arc found already.");
 			  found[con] = true;
+			}
+		      }
+		    }
 		    for (ArcIt it(digraph); it != INVALID; ++it) {
 		      check(found[it] == true, "The arc is not found.");
+		    }
+		  }
 		} //namespace lemon
 		#endif

lemon/bits/traits.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_BITS_TRAITS_H
 		#define LEMON_BITS_TRAITS_H
 		#include <lemon/bits/utility.h>
 		///\file
 		///\brief Traits for graphs and maps
 		///
 		namespace lemon {
 		  template <typename _Graph, typename _Item>
 		  class ItemSetTraits {};
 		  template <typename Graph, typename Enable = void>
 		  struct NodeNotifierIndicator {
 		    typedef InvalidType Type;
 		  };
 		  template <typename Graph>
 		  struct NodeNotifierIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::NodeNotifier::Notifier, void>::type
 		  > {
 		    typedef typename Graph::NodeNotifier Type;
 		  };
 		  template <typename _Graph>
 		  class ItemSetTraits<_Graph, typename _Graph::Node> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Node Item;
 		    typedef typename Graph::NodeIt ItemIt;
 		    typedef typename NodeNotifierIndicator<Graph>::Type ItemNotifier;
 		    template <typename _Value>
 		    class Map : public Graph::template NodeMap<_Value> {
 		    public:
 		      typedef typename Graph::template NodeMap<_Value> Parent;
 		      typedef typename Graph::template NodeMap<_Value> Type;
 		      typedef typename Parent::Value Value;
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		     };
 		  };
 		  template <typename Graph, typename Enable = void>
 		  struct ArcNotifierIndicator {
 		    typedef InvalidType Type;
 		  };
 		  template <typename Graph>
 		  struct ArcNotifierIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::ArcNotifier::Notifier, void>::type
 		  > {
 		    typedef typename Graph::ArcNotifier Type;
 		  };
 		  template <typename _Graph>
 		  class ItemSetTraits<_Graph, typename _Graph::Arc> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Arc Item;
 		    typedef typename Graph::ArcIt ItemIt;
 		    typedef typename ArcNotifierIndicator<Graph>::Type ItemNotifier;
 		    template <typename _Value>
 		    class Map : public Graph::template ArcMap<_Value> {
 		    public:
 		      typedef typename Graph::template ArcMap<_Value> Parent;
 		      typedef typename Graph::template ArcMap<_Value> Type;
 		      typedef typename Parent::Value Value;
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		    };
 		  };
 		  template <typename Graph, typename Enable = void>
 		  struct EdgeNotifierIndicator {
 		    typedef InvalidType Type;
 		  };
 		  template <typename Graph>
 		  struct EdgeNotifierIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::EdgeNotifier::Notifier, void>::type
 		  > {
 		    typedef typename Graph::EdgeNotifier Type;
 		  };
 		  template <typename _Graph>
 		  class ItemSetTraits<_Graph, typename _Graph::Edge> {
 		  public:
 		    typedef _Graph Graph;
 		    typedef typename Graph::Edge Item;
 		    typedef typename Graph::EdgeIt ItemIt;
 		    typedef typename EdgeNotifierIndicator<Graph>::Type ItemNotifier;
 		    template <typename _Value>
 		    class Map : public Graph::template EdgeMap<_Value> {
 		    public:
 		      typedef typename Graph::template EdgeMap<_Value> Parent;
 		      typedef typename Graph::template EdgeMap<_Value> Type;
 		      typedef typename Parent::Value Value;
 		      Map(const Graph& _digraph) : Parent(_digraph) {}
 		      Map(const Graph& _digraph, const Value& _value)
 			: Parent(_digraph, _value) {}
 		    };
 		  };
 		  template <typename Map, typename Enable = void>
 		  struct MapTraits {
 		    typedef False ReferenceMapTag;
 		    typedef typename Map::Key Key;
 		    typedef typename Map::Value Value;
 		    typedef const Value ConstReturnValue;
 		    typedef const Value ReturnValue;
 		  };
 		  template <typename Map>
 		  struct MapTraits<
 		    Map, typename enable_if<typename Map::ReferenceMapTag, void>::type >
+		  {
 		    typedef True ReferenceMapTag;
 		    typedef typename Map::Key Key;
 		    typedef typename Map::Value Value;
 		    typedef typename Map::ConstReference ConstReturnValue;
 		    typedef typename Map::Reference ReturnValue;
 		    typedef typename Map::ConstReference ConstReference;
 		    typedef typename Map::Reference Reference;
 		 };
 		  template <typename MatrixMap, typename Enable = void>
 		  struct MatrixMapTraits {
 		    typedef False ReferenceMapTag;
 		    typedef typename MatrixMap::FirstKey FirstKey;
 		    typedef typename MatrixMap::SecondKey SecondKey;
 		    typedef typename MatrixMap::Value Value;
 		    typedef const Value ConstReturnValue;
 		    typedef const Value ReturnValue;
 		  };
 		  template <typename MatrixMap>
 		  struct MatrixMapTraits<
 		    MatrixMap, typename enable_if<typename MatrixMap::ReferenceMapTag,
 		                                  void>::type >
+		  {
 		    typedef True ReferenceMapTag;
 		    typedef typename MatrixMap::FirstKey FirstKey;
 		    typedef typename MatrixMap::SecondKey SecondKey;
 		    typedef typename MatrixMap::Value Value;
 		    typedef typename MatrixMap::ConstReference ConstReturnValue;
 		    typedef typename MatrixMap::Reference ReturnValue;
 		    typedef typename MatrixMap::ConstReference ConstReference;
 		    typedef typename MatrixMap::Reference Reference;
 		 };
 		  // Indicators for the tags
 		  template <typename Graph, typename Enable = void>
 		  struct NodeNumTagIndicator {
 		    static const bool value = false;
 		  };
 		  template <typename Graph>
 		  struct NodeNumTagIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::NodeNumTag, void>::type
 		  > {
 		    static const bool value = true;
 		  };
 		  template <typename Graph, typename Enable = void>
-		  struct ArcNumTagIndicator {
+		  struct EdgeNumTagIndicator {
 		    static const bool value = false;
 		  };
 		  template <typename Graph>
-		  struct ArcNumTagIndicator<
+		  struct EdgeNumTagIndicator<
 		    Graph,
-		    typename enable_if<typename Graph::ArcNumTag, void>::type
+		    typename enable_if<typename Graph::EdgeNumTag, void>::type
 		  > {
 		    static const bool value = true;
 		  };
 		  template <typename Graph, typename Enable = void>
-		  struct FindArcTagIndicator {
+		  struct FindEdgeTagIndicator {
 		    static const bool value = false;
 		  };
 		  template <typename Graph>
-		  struct FindArcTagIndicator<
+		  struct FindEdgeTagIndicator<
 		    Graph,
-		    typename enable_if<typename Graph::FindArcTag, void>::type
+		    typename enable_if<typename Graph::FindEdgeTag, void>::type
 		  > {
 		    static const bool value = true;
 		  };
 		  template <typename Graph, typename Enable = void>
 		  struct UndirectedTagIndicator {
 		    static const bool value = false;
 		  };
 		  template <typename Graph>
 		  struct UndirectedTagIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::UndirectedTag, void>::type
 		  > {
 		    static const bool value = true;
 		  };
 		  template <typename Graph, typename Enable = void>
 		  struct BuildTagIndicator {
 		    static const bool value = false;
 		  };
 		  template <typename Graph>
 		  struct BuildTagIndicator<
 		    Graph,
 		    typename enable_if<typename Graph::BuildTag, void>::type
 		  > {
 		    static const bool value = true;
 		  };
+		}
 		#endif

lemon/graph_utils.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_GRAPH_UTILS_H
 		#define LEMON_GRAPH_UTILS_H
 		#include <iterator>
 		#include <vector>
 		#include <map>
 		#include <cmath>
 		#include <algorithm>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/bits/utility.h>
 		#include <lemon/maps.h>
 		#include <lemon/bits/traits.h>
 		#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
 		  ///\note If \c G it a template parameter, it should be used in this way.
 		  ///\code
 		  ///  GRAPH_TYPEDEFS(typename G);
 		  ///\endcode
 		  ///
 		  ///\warning There are no typedefs for the digraph maps because of the lack of
 		  ///template typedefs in C++.
-		#define GRAPH_TYPEDEFS(Digraph)				\
+		  ///\c OutArcIt, \c BoolNodeMap, \c IntNodeMap, \c DoubleNodeMap,
 		  ///\c BoolArcMap, \c IntArcMap, \c DoubleArcMap.
 		#define DIGRAPH_TYPEDEFS(Digraph)					\
 		  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
 		  ///\ref GRAPH_TYPEDEFS(Digraph) and three more, namely it creates
-		  ///\c Edge, \c EdgeIt, \c IncArcIt,
+		  ///This \c \#define creates the same convenience typedefs as defined
 		  ///by \ref DIGRAPH_TYPEDEFS(Graph) and six more, namely it creates
 		  ///\c Edge, \c EdgeIt, \c IncEdgeIt, \c BoolEdgeMap, \c IntEdgeMap,
 		  ///\c DoubleEdgeMap.
 		#define GRAPH_TYPEDEFS(Graph)						\
 		  DIGRAPH_TYPEDEFS(Graph);						\
 		  typedef Graph::Edge Edge;						\
 		  typedef Graph::EdgeIt EdgeIt;						\
 		  typedef Graph::IncEdgeIt IncEdgeIt
 		  /// \brief Function to count the items in the graph.
 		  ///
 		  ///\note If \c G it a template parameter, it should be used in this way.
 		  ///\code
 		  ///  UGRAPH_TYPEDEFS(typename G);
 		  ///\endcode
 		  ///
 		  ///\warning There are no typedefs for the digraph maps because of the lack of
 		  ///template typedefs in C++.
 		#define UGRAPH_TYPEDEFS(Digraph)				\
 		  GRAPH_TYPEDEFS(Digraph);				\
 		    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.
+		  /// This function counts the items (nodes, arcs etc) in the graph.
 		  /// The complexity of the function is O(n) because
 		  /// it iterates on all of the items.
 		  template <typename Digraph, typename Item>
 		  inline int countItems(const Digraph& g) {
 		    typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
 		  template <typename Graph, typename Item>
 		  inline int countItems(const Graph& g) {
 		    typedef typename ItemSetTraits<Graph, Item>::ItemIt ItemIt;
 		    int num = 0;
 		    for (ItemIt it(g); it != INVALID; ++it) {
 		      ++num;
+		    }
 		    return num;
+		  }
 		  // Node counting:
 		  namespace _digraph_utils_bits {
-		    template <typename Digraph, typename Enable = void>
+		  namespace _graph_utils_bits {
 		    template <typename Graph, typename Enable = void>
 		    struct CountNodesSelector {
 		      static int count(const Digraph &g) {
 		        return countItems<Digraph, typename Digraph::Node>(g);
 		      static int count(const Graph &g) {
 		        return countItems<Graph, typename Graph::Node>(g);
+		      }
 		    };
-		    template <typename Digraph>
+		    template <typename Graph>
 		    struct CountNodesSelector<
 		      Digraph, typename
 		      enable_if<typename Digraph::NodeNumTag, void>::type>
 		      Graph, typename
 		      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>
 		  inline int countNodes(const Digraph& g) {
-		    return _digraph_utils_bits::CountNodesSelector<Digraph>::count(g);
+		  template <typename Graph>
 		  inline int countNodes(const Graph& g) {
 		    return _graph_utils_bits::CountNodesSelector<Graph>::count(g);
+		  }
 		  namespace _digraph_utils_bits {
 		    template <typename Digraph, typename Enable = void>
 		    struct CountRedsSelector {
 		      static int count(const Digraph &g) {
 		        return countItems<Digraph, typename Digraph::Red>(g);
 		  // Arc counting:
 		  namespace _graph_utils_bits {
 		    template <typename Graph, typename Enable = void>
 		    struct CountArcsSelector {
 		      static int count(const Graph &g) {
 		        return countItems<Graph, typename Graph::Arc>(g);
+		      }
 		    };
 		    template <typename Digraph>
 		    struct CountRedsSelector<
 		      Digraph, typename
 		      enable_if<typename Digraph::NodeNumTag, void>::type>
 		    template <typename Graph>
 		    struct CountArcsSelector<
 		      Graph,
 		      typename enable_if<typename Graph::ArcNumTag, void>::type>
+		    {
 		      static int count(const Digraph &g) {
 		        return g.redNum();
+		      }
 		    };
+		  }
 		  /// \brief Function to count the reds in the digraph.
 		  ///
 		  /// This function counts the reds in the digraph.
 		  /// The complexity of the function is O(an) but for some
 		  /// digraph structures it is specialized to run in O(1).
 		  ///
 		  /// If the digraph contains an \e redNum() member function and a
 		  /// \e NodeNumTag tag then this function calls directly the member
 		  /// function to query the cardinality of the A-node set.
 		  template <typename Digraph>
 		  inline int countReds(const Digraph& g) {
 		    return _digraph_utils_bits::CountRedsSelector<Digraph>::count(g);
+		  }
 		  namespace _digraph_utils_bits {
 		    template <typename Digraph, typename Enable = void>
 		    struct CountBluesSelector {
 		      static int count(const Digraph &g) {
 		        return countItems<Digraph, typename Digraph::Blue>(g);
+		      }
 		    };
 		    template <typename Digraph>
 		    struct CountBluesSelector<
 		      Digraph, typename
 		      enable_if<typename Digraph::NodeNumTag, void>::type>
+		    {
 		      static int count(const Digraph &g) {
 		        return g.blueNum();
+		      }
 		    };
+		  }
 		  /// \brief Function to count the blues in the digraph.
 		  ///
 		  /// This function counts the blues in the digraph.
 		  /// The complexity of the function is O(bn) but for some
 		  /// digraph structures it is specialized to run in O(1).
 		  ///
 		  /// If the digraph contains a \e blueNum() member function and a
 		  /// \e NodeNumTag tag then this function calls directly the member
 		  /// function to query the cardinality of the B-node set.
 		  template <typename Digraph>
 		  inline int countBlues(const Digraph& g) {
 		    return _digraph_utils_bits::CountBluesSelector<Digraph>::count(g);
+		  }
 		  // Arc counting:
 		  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) {
 		      static int count(const Graph &g) {
 		        return g.arcNum();
+		      }
 		    };
+		  }
-		  /// \brief Function to count the arcs in the digraph.
+		  /// \brief Function to count the arcs in the graph.
 		  ///
-		  /// This function counts the arcs in the digraph.
+		  /// This function counts the arcs in the graph.
 		  /// 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 a \e arcNum() member function and a
 		  /// \e ArcNumTag tag then this function calls directly the member
 		  /// If the graph contains a \e arcNum() member function and a
 		  /// \e EdgeNumTag 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);
+		  template <typename Graph>
 		  inline int countArcs(const Graph& g) {
 		    return _graph_utils_bits::CountArcsSelector<Graph>::count(g);
+		  }
 		  // Undirected arc counting:
 		  namespace _digraph_utils_bits {
 		    template <typename Digraph, typename Enable = void>
 		  // Edge counting:
 		  namespace _graph_utils_bits {
 		    template <typename Graph, typename Enable = void>
 		    struct CountEdgesSelector {
 		      static int count(const Digraph &g) {
 		        return countItems<Digraph, typename Digraph::Edge>(g);
 		      static int count(const Graph &g) {
 		        return countItems<Graph, typename Graph::Edge>(g);
+		      }
 		    };
-		    template <typename Digraph>
+		    template <typename Graph>
 		    struct CountEdgesSelector<
 		      Digraph,
 		      typename enable_if<typename Digraph::ArcNumTag, void>::type>
 		      Graph,
 		      typename enable_if<typename Graph::EdgeNumTag, void>::type>
+		    {
-		      static int count(const Digraph &g) {
+		      static int count(const Graph &g) {
 		        return g.edgeNum();
+		      }
 		    };
+		  }
-		  /// \brief Function to count the edges in the digraph.
+		  /// \brief Function to count the edges in the graph.
 		  ///
 		  /// 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).
+		  /// This function counts the edges in the graph.
 		  /// The complexity of the function is O(m) but for some
 		  /// graph 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
 		  /// If the graph contains a \e edgeNum() member function and a
 		  /// \e EdgeNumTag 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 Graph>
 		  inline int countEdges(const Graph& g) {
 		    return _graph_utils_bits::CountEdgesSelector<Graph>::count(g);
+		  }
 		  template <typename Digraph, typename DegIt>
 		  inline int countNodeDegree(const Digraph& _g, const typename Digraph::Node& _n) {
 		  template <typename Graph, typename DegIt>
 		  inline int countNodeDegree(const Graph& _g, const typename Graph::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.
 		  template <typename Digraph>
 		  inline int countOutArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
 		    return countNodeDegree<Digraph, typename Digraph::OutArcIt>(_g, _n);
 		  /// in the graph.
 		  template <typename Graph>
 		  inline int countOutArcs(const Graph& _g,  const typename Graph::Node& _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.
 		  template <typename Digraph>
 		  inline int countInArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
 		    return countNodeDegree<Digraph, typename Digraph::InArcIt>(_g, _n);
 		  /// in the graph.
 		  template <typename Graph>
 		  inline int countInArcs(const Graph& _g,  const typename Graph::Node& _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
 		  /// in the digraph.
 		  template <typename Digraph>
 		  inline int countIncArcs(const Digraph& _g,  const typename Digraph::Node& _n) {
-		    return countNodeDegree<Digraph, typename Digraph::IncArcIt>(_g, _n);
+		  /// This function counts the number of the inc-edges to node \c n
 		  /// in the graph.
 		  template <typename Graph>
 		  inline int countIncEdges(const Graph& _g,  const typename Graph::Node& _n) {
 		    return countNodeDegree<Graph, typename Graph::IncEdgeIt>(_g, _n);
+		  }
 		  namespace _digraph_utils_bits {
-		    template <typename Digraph, typename Enable = void>
+		  namespace _graph_utils_bits {
 		    template <typename Graph, typename Enable = void>
 		    struct FindArcSelector {
 		      typedef typename Digraph::Node Node;
 		      typedef typename Digraph::Arc Arc;
-		      static Arc find(const Digraph &g, Node u, Node v, Arc e) {
+		      typedef typename Graph::Node Node;
 		      typedef typename Graph::Arc Arc;
 		      static Arc find(const Graph &g, Node u, Node v, Arc e) {
 		        if (e == INVALID) {
 		          g.firstOut(e, u);
 		        } else {
 		          g.nextOut(e);
+		        }
 		        while (e != INVALID && g.target(e) != v) {
 		          g.nextOut(e);
+		        }
 		        return e;
+		      }
 		    };
-		    template <typename Digraph>
+		    template <typename Graph>
 		    struct FindArcSelector<
 		      Digraph,
 		      typename enable_if<typename Digraph::FindArcTag, void>::type>
 		      Graph,
 		      typename enable_if<typename Graph::FindEdgeTag, void>::type>
+		    {
 		      typedef typename Digraph::Node Node;
 		      typedef typename Digraph::Arc Arc;
-		      static Arc find(const Digraph &g, Node u, Node v, Arc prev) {
+		      typedef typename Graph::Node Node;
 		      typedef typename Graph::Arc Arc;
 		      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.
 		  ///
 		  /// Thus you can iterate through each arc from \c u to \c v as it follows.
 		  ///\code
 		  /// for(Arc e=findArc(g,u,v);e!=INVALID;e=findArc(g,u,v,e)) {
 		  ///   ...
 		  /// }
 		  ///\endcode
 		  ///
 		  ///\sa ArcLookUp
 		  ///\sa AllArcLookUp
 		  ///\sa DynArcLookUp
 		  ///\sa ConArcIt
 		  template <typename Digraph>
 		  inline typename Digraph::Arc
 		  findArc(const Digraph &g, typename Digraph::Node u, typename Digraph::Node v,
 		           typename Digraph::Arc prev = INVALID) {
-		    return _digraph_utils_bits::FindArcSelector<Digraph>::find(g, u, v, prev);
+		  template <typename Graph>
 		  inline typename Graph::Arc
 		  findArc(const Graph &g, typename Graph::Node u, typename Graph::Node v,
 		           typename Graph::Arc prev = INVALID) {
 		    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>
 		  class ConArcIt : public _Digraph::Arc {
 		  template <typename _Graph>
 		  class ConArcIt : public _Graph::Arc {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Arc Parent;
 		    typedef typename Digraph::Arc Arc;
-		    typedef typename Digraph::Node Node;
+		    typedef _Graph Graph;
 		    typedef typename Graph::Arc Parent;
 		    typedef typename Graph::Arc Arc;
 		    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) {
 		      Parent::operator=(findArc(digraph, u, v));
 		    ConArcIt(const Graph& g, Node u, Node v) : _graph(g) {
 		      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),
 						 digraph.target(*this), *this));
 		      Parent::operator=(findArc(_graph, _graph.source(*this),
 						_graph.target(*this), *this));
 		      return *this;
+		    }
 		  private:
-		    const Digraph& digraph;
+		    const Graph& _graph;
 		  };
 		  namespace _digraph_utils_bits {
-		    template <typename Digraph, typename Enable = void>
+		  namespace _graph_utils_bits {
 		    template <typename Graph, typename Enable = void>
 		    struct FindEdgeSelector {
 		      typedef typename Digraph::Node Node;
 		      typedef typename Digraph::Edge Edge;
-		      static Edge find(const Digraph &g, Node u, Node v, Edge e) {
+		      typedef typename Graph::Node Node;
 		      typedef typename Graph::Edge Edge;
 		      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 {
 		            b = g.source(e) == u;
 		            g.nextInc(e, b);
+		          }
 		          while (e != INVALID && (b ? g.target(e) : g.source(e)) != v) {
 		            g.nextInc(e, b);
+		          }
 		        } else {
 		          if (e == INVALID) {
 		            g.firstInc(e, b, u);
 		          } else {
 		            b = true;
 		            g.nextInc(e, b);
+		          }
 		          while (e != INVALID && (!b || g.target(e) != v)) {
 		            g.nextInc(e, b);
+		          }
+		        }
 		        return e;
+		      }
 		    };
-		    template <typename Digraph>
+		    template <typename Graph>
 		    struct FindEdgeSelector<
 		      Digraph,
 		      typename enable_if<typename Digraph::FindArcTag, void>::type>
 		      Graph,
 		      typename enable_if<typename Graph::FindEdgeTag, void>::type>
+		    {
 		      typedef typename Digraph::Node Node;
 		      typedef typename Digraph::Edge Edge;
-		      static Edge find(const Digraph &g, Node u, Node v, Edge prev) {
+		      typedef typename Graph::Node Node;
 		      typedef typename Graph::Edge Edge;
 		      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.
 		  /// If the node \c u and node \c v is equal then each loop arc
-		  /// will be enumerated.
+		  /// 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 edge
 		  /// 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.
 		  ///
 		  /// Thus you can iterate through each arc from \c u to \c v as it follows.
 		  ///\code
 		  /// for(Edge e = findEdge(g,u,v); e != INVALID;
 		  ///     e = findEdge(g,u,v,e)) {
 		  ///   ...
 		  /// }
 		  ///\endcode
 		  ///
 		  ///\sa ConArcIt
 		  template <typename Digraph>
 		  inline typename Digraph::Edge
 		  findEdge(const Digraph &g, typename Digraph::Node u, typename Digraph::Node v,
 		            typename Digraph::Edge p = INVALID) {
-		    return _digraph_utils_bits::FindEdgeSelector<Digraph>::find(g, u, v, p);
+		  template <typename Graph>
 		  inline typename Graph::Edge
 		  findEdge(const Graph &g, typename Graph::Node u, typename Graph::Node v,
 		            typename Graph::Edge p = INVALID) {
 		    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>
 		  class ConEdgeIt : public _Digraph::Edge {
 		  template <typename _Graph>
 		  class ConEdgeIt : public _Graph::Edge {
 		  public:
 		    typedef _Digraph Digraph;
 		    typedef typename Digraph::Edge Parent;
 		    typedef typename Digraph::Edge Edge;
-		    typedef typename Digraph::Node Node;
+		    typedef _Graph Graph;
 		    typedef typename Graph::Edge Parent;
 		    typedef typename Graph::Edge Edge;
 		    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) {
 		      Parent::operator=(findEdge(digraph, u, v));
 		    ConEdgeIt(const Graph& g, Node u, Node v) : _graph(g) {
 		      Parent::operator=(findEdge(_graph, u, v));
+		    }
 		    /// \brief Constructor.
 		    ///
 		    /// Construct a new ConEdgeIt which continues the iterating from
 		    /// the \c e arc.
 		    ConEdgeIt(const Digraph& g, Edge e) : Parent(e), digraph(g) {}
 		    /// the \c e edge.
 		    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),
 						      digraph.target(*this), *this));
 		      Parent::operator=(findEdge(_graph, _graph.source(*this),
 						 _graph.target(*this), *this));
 		      return *this;
+		    }
 		  private:
-		    const Digraph& digraph;
+		    const Graph& _graph;
 		  };
 		  /// \brief Copy a map.
 		  ///
 		  /// 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 {
 		  namespace _graph_utils_bits {
 		    template <typename Digraph, typename Item, typename RefMap>
 		    class MapCopyBase {
 		    public:
 		      virtual void copy(const Digraph& from, const RefMap& refMap) = 0;
 		      virtual ~MapCopyBase() {}
 		    };
 		    template <typename Digraph, typename Item, typename RefMap,
 		              typename ToMap, typename FromMap>
 		    class MapCopy : public MapCopyBase<Digraph, Item, RefMap> {
 		    public:
 		      MapCopy(ToMap& tmap, const FromMap& map)
 		        : _tmap(tmap), _map(map) {}
 		      virtual void copy(const Digraph& digraph, const RefMap& refMap) {
 		        typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
 		        for (ItemIt it(digraph); it != INVALID; ++it) {
 		          _tmap.set(refMap[it], _map[it]);
+		        }
+		      }
 		    private:
 		      ToMap& _tmap;
 		      const FromMap& _map;
 		    };
 		    template <typename Digraph, typename Item, typename RefMap, typename It>
 		    class ItemCopy : public MapCopyBase<Digraph, Item, RefMap> {
 		    public:
 		      ItemCopy(It& it, const Item& item) : _it(it), _item(item) {}
 		      virtual void copy(const Digraph&, const RefMap& refMap) {
 		        _it = refMap[_item];
+		      }
 		    private:
 		      It& _it;
 		      Item _item;
 		    };
 		    template <typename Digraph, typename Item, typename RefMap, typename Ref>
 		    class RefCopy : public MapCopyBase<Digraph, Item, RefMap> {
 		    public:
 		      RefCopy(Ref& map) : _map(map) {}
 		      virtual void copy(const Digraph& digraph, const RefMap& refMap) {
 		        typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
 		        for (ItemIt it(digraph); it != INVALID; ++it) {
 		          _map.set(it, refMap[it]);
+		        }
+		      }
 		    private:
 		      Ref& _map;
 		    };
 		    template <typename Digraph, typename Item, typename RefMap,
 		              typename CrossRef>
 		    class CrossRefCopy : public MapCopyBase<Digraph, Item, RefMap> {
 		    public:
 		      CrossRefCopy(CrossRef& cmap) : _cmap(cmap) {}
 		      virtual void copy(const Digraph& digraph, const RefMap& refMap) {
 		        typedef typename ItemSetTraits<Digraph, Item>::ItemIt ItemIt;
 		        for (ItemIt it(digraph); it != INVALID; ++it) {
 		          _cmap.set(refMap[it], it);
+		        }
+		      }
 		    private:
 		      CrossRef& _cmap;
 		    };
 		    template <typename Digraph, typename Enable = void>
 		    struct DigraphCopySelector {
 		      template <typename From, typename NodeRefMap, typename ArcRefMap>
 		      static void copy(Digraph &to, const From& from,
 		                       NodeRefMap& nodeRefMap, ArcRefMap& arcRefMap) {
 		        for (typename From::NodeIt it(from); it != INVALID; ++it) {
 		          nodeRefMap[it] = to.addNode();
+		        }
 		        for (typename From::ArcIt it(from); it != INVALID; ++it) {
 		          arcRefMap[it] = to.addArc(nodeRefMap[from.source(it)],
 		                                          nodeRefMap[from.target(it)]);
+		        }
+		      }
 		    };
 		    template <typename Digraph>
 		    struct DigraphCopySelector<
 		      Digraph,
 		      typename enable_if<typename Digraph::BuildTag, void>::type>
+		    {
 		      template <typename From, typename NodeRefMap, typename ArcRefMap>
 		      static void copy(Digraph &to, const From& from,
 		                       NodeRefMap& nodeRefMap, ArcRefMap& arcRefMap) {
 		        to.build(from, nodeRefMap, arcRefMap);
+		      }
 		    };
 		    template <typename Graph, typename Enable = void>
 		    struct GraphCopySelector {
 		      template <typename From, typename NodeRefMap, typename EdgeRefMap>
 		      static void copy(Graph &to, const From& from,
 		                       NodeRefMap& nodeRefMap, EdgeRefMap& edgeRefMap) {
 		        for (typename From::NodeIt it(from); it != INVALID; ++it) {
 		          nodeRefMap[it] = to.addNode();
+		        }
 		        for (typename From::EdgeIt it(from); it != INVALID; ++it) {
 		          edgeRefMap[it] = to.addArc(nodeRefMap[from.source(it)],
 						       nodeRefMap[from.target(it)]);
+		        }
+		      }
 		    };
 		    template <typename Graph>
 		    struct GraphCopySelector<
 		      Graph,
 		      typename enable_if<typename Graph::BuildTag, void>::type>
+		    {
 		      template <typename From, typename NodeRefMap, typename EdgeRefMap>
 		      static void copy(Graph &to, const From& from,
 		                       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;
 		    typedef typename From::NodeIt NodeIt;
 		    typedef typename From::Arc Arc;
 		    typedef typename From::ArcIt ArcIt;
 		    typedef typename To::Node TNode;
 		    typedef typename To::Arc TArc;
 		    typedef typename From::template NodeMap<TNode> NodeRefMap;
 		    typedef typename From::template ArcMap<TArc> ArcRefMap;
 		  public:
 		    /// \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)
 		      : from(_from), to(_to) {}
 		    DigraphCopy(To& to, const From& from)
 		      : _from(from), _to(to) {}
 		    /// \brief Destructor of the DigraphCopy
 		    ///
 		    /// Destructor of the DigraphCopy
 		    ~DigraphCopy() {
 		      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
 		        delete nodeMapCopies[i];
 		      for (int i = 0; i < int(_node_maps.size()); ++i) {
 		        delete _node_maps[i];
+		      }
 		      for (int i = 0; i < int(arcMapCopies.size()); ++i) {
 		        delete arcMapCopies[i];
 		      for (int i = 0; i < int(_arc_maps.size()); ++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));
 		      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));
 		      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.
+		    /// The new map's key type is the destination graph's node type,
 		    /// and the copied map's key type is the source graph's node 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));
 		      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));
 		      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));
 		      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));
 		      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>
 		    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));
 		      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));
 		      return *this;
+		    }
 		    /// \brief Executes the copies.
 		    ///
 		    /// Executes the copies.
 		    void run() {
 		      NodeRefMap nodeRefMap(from);
 		      ArcRefMap arcRefMap(from);
 		      _digraph_utils_bits::DigraphCopySelector<To>::
 		        copy(to, from, nodeRefMap, arcRefMap);
 		      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
 		        nodeMapCopies[i]->copy(from, nodeRefMap);
 		      NodeRefMap nodeRefMap(_from);
 		      ArcRefMap arcRefMap(_from);
 		      _graph_utils_bits::DigraphCopySelector<To>::
 		        copy(_to, _from, nodeRefMap, arcRefMap);
 		      for (int i = 0; i < int(_node_maps.size()); ++i) {
 		        _node_maps[i]->copy(_from, nodeRefMap);
+		      }
 		      for (int i = 0; i < int(arcMapCopies.size()); ++i) {
 		        arcMapCopies[i]->copy(from, arcRefMap);
 		      for (int i = 0; i < int(_arc_maps.size()); ++i) {
 		        _arc_maps[i]->copy(_from, arcRefMap);
+		      }
+		    }
 		  protected:
 		    const From& from;
 		    To& to;
 		    std::vector<_digraph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
 		    nodeMapCopies;
 		    std::vector<_digraph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
 		    arcMapCopies;
 		    const From& _from;
 		    To& _to;
 		    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
 		    _node_maps;
 		    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
 		    _arc_maps;
 		  };
 		  /// \brief Copy a digraph to another digraph.
 		  ///
 		  /// Copy a digraph to another digraph.
 		  /// The usage of the function:
 		  ///
+		  /// Copy a digraph to another digraph. The complete usage of the
 		  /// 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
 		  /// 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 DigraphCopy
 		  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).
 		  /// The simplest way of using it is through the \c copyGraph() function.
 		  /// Class to copy a graph to another graph (duplicate a graph). The
 		  /// 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::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 NodeMap<TNode> NodeRefMap;
 		    typedef typename From::template EdgeMap<TEdge> EdgeRefMap;
 		    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) {}
 		      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);
 		          (_from.direction(key) ==
 			   (_node_ref[_from.source(key)] == _to.source(_edge_ref[key])));
 			return _to.direct(_edge_ref[key], forward);
+		      }
 		      const To& to;
 		      const From& from;
 		      const EdgeRefMap& edge_ref;
 		      const NodeRefMap& node_ref;
 		      const To& _to;
 		      const From& _from;
 		      const EdgeRefMap& _edge_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
 		    /// \c _to digraph.
 		    GraphCopy(To& _to, const From& _from)
 		      : from(_from), to(_to) {}
 		    /// \brief Destructor of the DigraphCopy
 		    /// It copies the content of the \c _from graph into the
 		    /// \c _to graph.
 		    GraphCopy(To& to, const From& from)
 		      : _from(from), _to(to) {}
 		    /// \brief Destructor of the GraphCopy
 		    ///
-		    /// Destructor of the DigraphCopy
+		    /// Destructor of the GraphCopy
 		    ~GraphCopy() {
 		      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
 		        delete nodeMapCopies[i];
 		      for (int i = 0; i < int(_node_maps.size()); ++i) {
 		        delete _node_maps[i];
+		      }
 		      for (int i = 0; i < int(arcMapCopies.size()); ++i) {
 		        delete arcMapCopies[i];
 		      for (int i = 0; i < int(_arc_maps.size()); ++i) {
 		        delete _arc_maps[i];
+		      }
 		      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
 		        delete edgeMapCopies[i];
 		      for (int i = 0; i < int(_edge_maps.size()); ++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));
 		      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));
 		      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
+		    /// Makes copy of the given map for the newly created graph.
 		    /// The new map's key type is the to graph's node type,
 		    /// 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));
 		      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));
 		      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));
 		      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));
 		      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
+		    /// Makes copy of the given map for the newly created graph.
 		    /// The new map's key type is the to graph's arc type,
 		    /// 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));
 		      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));
 		      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));
 		      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));
 		      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
+		    /// Makes copy of the given map for the newly created graph.
 		    /// The new map's key type is the to graph's edge type,
 		    /// 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));
 		      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));
 		      return *this;
+		    }
 		    /// \brief Executes the copies.
 		    ///
 		    /// Executes the copies.
 		    void run() {
 		      NodeRefMap nodeRefMap(from);
 		      EdgeRefMap edgeRefMap(from);
 		      ArcRefMap arcRefMap(to, from, edgeRefMap, nodeRefMap);
 		      _digraph_utils_bits::GraphCopySelector<To>::
 		        copy(to, from, nodeRefMap, edgeRefMap);
 		      for (int i = 0; i < int(nodeMapCopies.size()); ++i) {
-		        nodeMapCopies[i]->copy(from, nodeRefMap);
+		      NodeRefMap nodeRefMap(_from);
 		      EdgeRefMap edgeRefMap(_from);
 		      ArcRefMap arcRefMap(_to, _from, edgeRefMap, nodeRefMap);
 		      _graph_utils_bits::GraphCopySelector<To>::
 		        copy(_to, _from, nodeRefMap, edgeRefMap);
 		      for (int i = 0; i < int(_node_maps.size()); ++i) {
 		        _node_maps[i]->copy(_from, nodeRefMap);
+		      }
 		      for (int i = 0; i < int(edgeMapCopies.size()); ++i) {
 		        edgeMapCopies[i]->copy(from, edgeRefMap);
 		      for (int i = 0; i < int(_edge_maps.size()); ++i) {
 		        _edge_maps[i]->copy(_from, edgeRefMap);
+		      }
 		      for (int i = 0; i < int(arcMapCopies.size()); ++i) {
 		        arcMapCopies[i]->copy(from, arcRefMap);
 		      for (int i = 0; i < int(_arc_maps.size()); ++i) {
 		        _arc_maps[i]->copy(_from, arcRefMap);
+		      }
+		    }
 		  private:
 		    const From& from;
 		    To& to;
 		    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;
+		    const From& _from;
 		    To& _to;
 		    std::vector<_graph_utils_bits::MapCopyBase<From, Node, NodeRefMap>* >
 		    _node_maps;
 		    std::vector<_graph_utils_bits::MapCopyBase<From, Arc, ArcRefMap>* >
 		    _arc_maps;
 		    std::vector<_graph_utils_bits::MapCopyBase<From, Edge, EdgeRefMap>* >
 		    _edge_maps;
 		  };
-		  /// \brief Copy an graph to another digraph.
+		  /// \brief Copy a graph to another graph.
 		  ///
 		  /// Copy an graph to another digraph.
 		  /// The usage of the function:
 		  ///
+		  /// Copy a graph to another graph. The complete usage of the
 		  /// 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
 		  /// \c ecr will contain the mapping from the arcs of the \c to digraph
-		  /// to the arcs of the \c from digraph.
+		  /// 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 graph
 		  /// 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
 		  /// class \c InverseMap.
 		  /// the items stored in the graph. This map can be inverted with its member
 		  /// 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).
 		    ///
 		    /// The class represents the inverse of its owner (IdMap).
 		    /// \see inverse()
 		    class InverseMap {
 		    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.
-		  /// This type provides simple invertable digraph-maps.
+		  /// \brief General invertable graph-map type.
 		  /// 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 _Item The item type of the digraph.
 		  /// \param _Graph The graph type.
 		  /// \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>
 		  class InvertableMap : protected DefaultMap<_Digraph, _Item, _Value> {
 		  template <typename _Graph, typename _Item, typename _Value>
 		  class InvertableMap : protected DefaultMap<_Graph, _Item, _Value> {
 		  private:
 		    typedef DefaultMap<_Digraph, _Item, _Value> Map;
 		    typedef _Digraph Digraph;
 		    typedef DefaultMap<_Graph, _Item, _Value> Map;
 		    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;
 		    /// The value type of the InvertableMap.
 		    typedef typename Map::Value Value;
 		    /// \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
 		    /// be accessed in the [beginValue, endValue) range.
 		    ///
 		    class ValueIterator
 		      : public std::iterator<std::forward_iterator_tag, Value> {
 		      friend class InvertableMap;
 		    private:
 		      ValueIterator(typename Container::const_iterator _it)
 		        : it(_it) {}
 		    public:
 		      ValueIterator() {}
 		      ValueIterator& operator++() { ++it; return *this; }
 		      ValueIterator operator++(int) {
 		        ValueIterator tmp(*this);
 		        operator++();
 		        return tmp;
+		      }
 		      const Value& operator*() const { return it->first; }
 		      const Value* operator->() const { return &(it->first); }
 		      bool operator==(ValueIterator jt) const { return it == jt.it; }
 		      bool operator!=(ValueIterator jt) const { return it != jt.it; }
 		    private:
 		      typename Container::const_iterator it;
 		    };
 		    /// \brief Returns an iterator to the first value.
 		    ///
 		    /// 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);
 		      if (it != invMap.end() && it->second == key) {
-			invMap.erase(it);
+		      typename Container::iterator it = _inv_map.find(oldval);
 		      if (it != _inv_map.end() && it->second == key) {
 			_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.
 		    ///
 		    /// It gives back the value associated with the key.
 		    typename MapTraits<Map>::ConstReturnValue
 		    operator[](const Key& key) const {
 		      return Map::operator[](key);
+		    }
 		    /// \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);
 		      return it != invMap.end() ? it->second : INVALID;
 		      typename Container::const_iterator it = _inv_map.find(key);
 		      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);
 		      if (it != invMap.end() && it->second == key) {
-			invMap.erase(it);
+		      typename Container::iterator it = _inv_map.find(val);
 		      if (it != _inv_map.end() && it->second == key) {
 			_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);
 			if (it != invMap.end() && it->second == keys[i]) {
-			  invMap.erase(it);
+			typename Container::iterator it = _inv_map.find(val);
 			if (it != _inv_map.end() && it->second == keys[i]) {
 			  _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:
 		    /// \brief The inverse map type.
 		    ///
 		    /// The inverse of this map. The subscript operator of the map
 		    /// gives back always the item what was last assigned to the value.
 		    class InverseMap {
 		    public:
 		      /// \brief Constructor of the InverseMap.
 		      ///
 		      /// Constructor of the InverseMap.
 		      explicit InverseMap(const InvertableMap& _inverted)
 		        : inverted(_inverted) {}
 		      explicit InverseMap(const InvertableMap& 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.
 		    InverseMap inverse() const {
 		      return InverseMap(*this);
+		    }
 		  };
 		  /// \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>
 		  class DescriptorMap : protected DefaultMap<_Digraph, _Item, int> {
 		  template <typename _Graph, typename _Item>
 		  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.
 		    typedef _Digraph Digraph;
 		    /// The graph class of DescriptorMap.
 		    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());
 			invMap.push_back(it);
 			Map::set(it, _inv_map.size());
 			_inv_map.push_back(it);
+		      }
+		    }
 		  protected:
 		    /// \brief Add a new key to the map.
 		    ///
 		    /// 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());
 		      invMap.push_back(item);
 		      Map::set(item, _inv_map.size());
 		      _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());
 			invMap.push_back(items[i]);
 			Map::set(items[i], _inv_map.size());
 			_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));
 		      invMap[Map::operator[](item)] = invMap.back();
-		      invMap.pop_back();
+		      Map::set(_inv_map.back(), Map::operator[](item));
 		      _inv_map[Map::operator[](item)] = _inv_map.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]));
 			invMap[Map::operator[](items[i])] = invMap.back();
-			invMap.pop_back();
+			Map::set(_inv_map.back(), Map::operator[](items[i]));
 			_inv_map[Map::operator[](items[i])] = _inv_map.back();
 			_inv_map.pop_back();
+		      }
 		      Map::erase(items);
+		    }
 		    /// \brief Build the unique map.
 		    ///
 		    /// Build the unique map. It is called by the
 		    /// \c AlterationNotifier.
 		    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());
 			invMap.push_back(it);
 			Map::set(it, _inv_map.size());
 			_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.
 		    int operator[](const Item& item) const {
 		      return Map::operator[](item);
+		    }
 		    /// \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)
 			: inverted(_inverted) {}
 		      explicit InverseMap(const DescriptorMap& inverted)
 			: _inverted(inverted) {}
 		      /// The value type of the InverseMap.
 		      typedef typename DescriptorMap::Key Value;
 		      /// The key type of the InverseMap.
 		      typedef typename DescriptorMap::Value Key;
 		      /// \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.
 		    const InverseMap inverse() const {
 		      return InverseMap(*this);
+		    }
 		  };
 		  /// \brief Returns the source of the given arc.
 		  ///
 		  /// The SourceMap gives back the source Node of the given arc.
 		  /// \see TargetMap
 		  /// \author Balazs Dezso
 		  template <typename Digraph>
 		  class SourceMap {
 		  public:
 		    typedef typename Digraph::Node Value;
 		    typedef typename Digraph::Arc Key;
 		    /// \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.
 		  /// \relates SourceMap
 		  template <typename Digraph>
 		  inline SourceMap<Digraph> sourceMap(const Digraph& digraph) {
 		    return SourceMap<Digraph>(digraph);
+		  }
 		  /// \brief Returns the target of the given arc.
 		  ///
 		  /// The TargetMap gives back the target Node of the given arc.
 		  /// \see SourceMap
 		  /// \author Balazs Dezso
 		  template <typename Digraph>
 		  class TargetMap {
 		  public:
 		    typedef typename Digraph::Node Value;
 		    typedef typename Digraph::Arc Key;
 		    /// \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.
 		  /// \relates TargetMap
 		  template <typename Digraph>
 		  inline TargetMap<Digraph> targetMap(const Digraph& digraph) {
 		    return TargetMap<Digraph>(digraph);
+		  }
 		  /// \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 Digraph::Edge Key;
 		    typedef typename Graph::Arc Value;
 		    typedef typename Graph::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor
 		    /// \param _digraph The digraph that the map belongs to.
 		    explicit ForwardMap(const Digraph& _digraph) : digraph(_digraph) {}
 		    /// \param _graph The graph that the map belongs to.
 		    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>
 		  inline ForwardMap<Digraph> forwardMap(const Digraph& digraph) {
-		    return ForwardMap<Digraph>(digraph);
+		  template <typename Graph>
 		  inline ForwardMap<Graph> forwardMap(const Graph& graph) {
 		    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 Digraph::Edge Key;
 		    typedef typename Graph::Arc Value;
 		    typedef typename Graph::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor
 		    /// \param _digraph The digraph that the map belongs to.
 		    explicit BackwardMap(const Digraph& _digraph) : digraph(_digraph) {}
 		    /// \param _graph The graph that the map belongs to.
 		    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>
 		  inline BackwardMap<Digraph> backwardMap(const Digraph& digraph) {
-		    return BackwardMap<Digraph>(digraph);
+		  template <typename Graph>
 		  inline BackwardMap<Graph> backwardMap(const Graph& graph) {
 		    return BackwardMap<Graph>(graph);
+		  }
 		  /// \brief Potential difference map
 		  ///
 		  /// If there is an potential map on the nodes then we
 		  /// can get an arc map as we get the substraction of the
 		  /// values of the target and source.
 		  template <typename Digraph, typename NodeMap>
 		  class PotentialDifferenceMap {
 		  public:
 		    typedef typename Digraph::Arc Key;
 		    typedef typename NodeMap::Value Value;
 		    /// \brief Constructor
 		    ///
 		    /// Contructor of the map
 		    explicit PotentialDifferenceMap(const Digraph& _digraph,
 		                                    const NodeMap& _potential)
-		      : digraph(_digraph), potential(_potential) {}
+		    explicit PotentialDifferenceMap(const Digraph& digraph,
 		                                    const NodeMap& 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 NodeMap& potential;
 		    const Digraph& _digraph;
 		    const NodeMap& _potential;
 		  };
 		  /// \brief Returns a PotentialDifferenceMap.
 		  ///
 		  /// This function just returns a PotentialDifferenceMap.
 		  /// \relates PotentialDifferenceMap
 		  template <typename Digraph, typename NodeMap>
 		  PotentialDifferenceMap<Digraph, NodeMap>
 		  potentialDifferenceMap(const Digraph& digraph, const NodeMap& potential) {
 		    return PotentialDifferenceMap<Digraph, NodeMap>(digraph, potential);
+		  }
 		  /// \brief Map of the node in-degrees.
 		  ///
 		  /// This map returns the in-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides addNode() and addArc(), a digraph structure may provide
 		  /// alternative ways to modify the digraph. The correct behavior of InDegMap
 		  /// is not guarantied if these additional features are used. For example
 		  /// the functions \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa OutDegMap
 		  template <typename _Digraph>
 		  class InDegMap
 		    : protected ItemSetTraits<_Digraph, typename _Digraph::Arc>
 		      ::ItemNotifier::ObserverBase {
 		  public:
 		    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 typename Parent::Digraph Digraph;
 		      typedef DefaultMap<Digraph, Key, int> Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 			Parent::add(key);
 			Parent::set(key, 0);
+		      }
 		      virtual void add(const std::vector<Key>& keys) {
 			Parent::add(keys);
 			for (int i = 0; i < int(keys.size()); ++i) {
 			  Parent::set(keys[i], 0);
+			}
+		      }
 		      virtual void build() {
 			Parent::build();
 			Key it;
 			typename Parent::Notifier* nf = Parent::notifier();
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  Parent::set(it, 0);
+			}
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating in-degree map.
 		    explicit InDegMap(const Digraph& _digraph) : digraph(_digraph), deg(_digraph) {
 		      Parent::attach(digraph.notifier(typename _Digraph::Arc()));
 		      for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
-			deg[it] = countInArcs(digraph, it);
+		    explicit InDegMap(const Digraph& digraph)
 		      : _digraph(digraph), _deg(digraph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++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) {
 			deg[it] = countInArcs(digraph, it);
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 			_deg[it] = countInArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
 			deg[it] = 0;
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 			_deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const _Digraph& digraph;
 		    AutoNodeMap deg;
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  /// \brief Map of the node out-degrees.
 		  ///
 		  /// This map returns the out-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides addNode() and addArc(), a digraph structure may provide
 		  /// alternative ways to modify the digraph. The correct behavior of OutDegMap
 		  /// is not guarantied if these additional features are used. For example
 		  /// the functions \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa InDegMap
 		  template <typename _Digraph>
 		  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 typename Parent::Digraph Digraph;
 		      typedef DefaultMap<Digraph, Key, int> Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 			Parent::add(key);
 			Parent::set(key, 0);
+		      }
 		      virtual void add(const std::vector<Key>& keys) {
 			Parent::add(keys);
 			for (int i = 0; i < int(keys.size()); ++i) {
 			  Parent::set(keys[i], 0);
+			}
+		      }
 		      virtual void build() {
 			Parent::build();
 			Key it;
 			typename Parent::Notifier* nf = Parent::notifier();
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  Parent::set(it, 0);
+			}
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating out-degree map.
 		    explicit OutDegMap(const Digraph& _digraph) : digraph(_digraph), deg(_digraph) {
 		      Parent::attach(digraph.notifier(typename _Digraph::Arc()));
 		      for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
-			deg[it] = countOutArcs(digraph, it);
+		    explicit OutDegMap(const Digraph& digraph)
 		      : _digraph(digraph), _deg(digraph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++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) {
 			deg[it] = countOutArcs(digraph, it);
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 			_deg[it] = countOutArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename _Digraph::NodeIt it(digraph); it != INVALID; ++it) {
 			deg[it] = 0;
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 			_deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const _Digraph& digraph;
 		    AutoNodeMap deg;
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  ///Dynamic arc look up between given endpoints.
 		  ///\ingroup gutils
 		  ///Using this class, you can find an arc in a digraph from a given
 		  ///source to a given target in amortized time <em>O(log d)</em>,
 		  ///where <em>d</em> is the out-degree of the source node.
 		  ///
 		  ///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
 		  ///queries.
 		  ///
 		  ///\param G The type of the underlying digraph.
 		  ///
 		  ///\sa ArcLookUp
 		  ///\sa AllArcLookUp
 		  template<class G>
 		  class DynArcLookUp
 		    : protected ItemSetTraits<G, typename G::Arc>::ItemNotifier::ObserverBase
+		  {
 		  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> {
 		    public:
 		      typedef DefaultMap<G, Node, Arc> Parent;
 		      AutoNodeMap(const G& digraph) : Parent(digraph, INVALID) {}
 		      virtual void add(const Node& node) {
 			Parent::add(node);
 			Parent::set(node, INVALID);
+		      }
 		      virtual void add(const std::vector<Node>& nodes) {
 			Parent::add(nodes);
 			for (int i = 0; i < int(nodes.size()); ++i) {
 			  Parent::set(nodes[i], INVALID);
+			}
+		      }
 		      virtual void build() {
 			Parent::build();
 			Node it;
 			typename Parent::Notifier* nf = Parent::notifier();
 			for (nf->first(it); it != INVALID; nf->next(it)) {
 			  Parent::set(it, INVALID);
+			}
+		      }
 		    };
 		    const Digraph &_g;
 		    AutoNodeMap _head;
 		    typename Digraph::template ArcMap<Arc> _parent;
 		    typename Digraph::template ArcMap<Arc> _left;
 		    typename Digraph::template ArcMap<Arc> _right;
 		    class ArcLess {
 		      const Digraph &g;
 		    public:
 		      ArcLess(const Digraph &_g) : g(_g) {}
 		      bool operator()(Arc a,Arc b) const
+		      {
 			return g.target(a)<g.target(b);
+		      }
 		    };
 		  public:
 		    ///Constructor
 		    ///Constructor.
 		    ///
 		    ///It builds up the search database.
 		    DynArcLookUp(const Digraph &g)
 		      : _g(g),_head(g),_parent(g),_left(g),_right(g)
+		    {
 		      Parent::attach(_g.notifier(typename Digraph::Arc()));
 		      refresh();
+		    }
 		  protected:
 		    virtual void add(const Arc& arc) {
 		      insert(arc);
+		    }
 		    virtual void add(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 			insert(arcs[i]);
+		      }
+		    }
 		    virtual void erase(const Arc& arc) {
 		      remove(arc);
+		    }
 		    virtual void erase(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 			remove(arcs[i]);
+		      }
+		    }
 		    virtual void build() {
 		      refresh();
+		    }
 		    virtual void clear() {
 		      for(NodeIt n(_g);n!=INVALID;++n) {
 			_head.set(n, INVALID);
+		      }
+		    }
 		    void insert(Arc arc) {
 		      Node s = _g.source(arc);
 		      Node t = _g.target(arc);
 		      _left.set(arc, INVALID);
 		      _right.set(arc, INVALID);
 		      Arc e = _head[s];
 		      if (e == INVALID) {
 			_head.set(s, arc);
 			_parent.set(arc, INVALID);
 			return;
+		      }
 		      while (true) {
 			if (t < _g.target(e)) {
 			  if (_left[e] == INVALID) {
 			    _left.set(e, arc);
 			    _parent.set(arc, e);
 			    splay(arc);
 			    return;
 			  } else {
 			    e = _left[e];
+			  }
 			} else {
 			  if (_right[e] == INVALID) {
 			    _right.set(e, arc);
 			    _parent.set(arc, e);
 			    splay(arc);
 			    return;
 			  } else {
 			    e = _right[e];
+			  }
+			}
+		      }
+		    }
 		    void remove(Arc arc) {
 		      if (_left[arc] == INVALID) {
 			if (_right[arc] != INVALID) {
 			  _parent.set(_right[arc], _parent[arc]);
+			}
 			if (_parent[arc] != INVALID) {
 			  if (_left[_parent[arc]] == arc) {
 			    _left.set(_parent[arc], _right[arc]);
 			  } else {
 			    _right.set(_parent[arc], _right[arc]);
+			  }
 			} else {
 			  _head.set(_g.source(arc), _right[arc]);
+			}
 		      } else if (_right[arc] == INVALID) {
 			_parent.set(_left[arc], _parent[arc]);
 			if (_parent[arc] != INVALID) {
 			  if (_left[_parent[arc]] == arc) {
 			    _left.set(_parent[arc], _left[arc]);
 			  } else {
 			    _right.set(_parent[arc], _left[arc]);
+			  }
 			} else {
 			  _head.set(_g.source(arc), _left[arc]);
+			}
 		      } else {
 			Arc e = _left[arc];
 			if (_right[e] != INVALID) {
 			  e = _right[e];
 			  while (_right[e] != INVALID) {
 			    e = _right[e];
+			  }
 			  Arc s = _parent[e];
 			  _right.set(_parent[e], _left[e]);
 			  if (_left[e] != INVALID) {
 			    _parent.set(_left[e], _parent[e]);
+			  }
 			  _left.set(e, _left[arc]);
 			  _parent.set(_left[arc], e);
 			  _right.set(e, _right[arc]);
 			  _parent.set(_right[arc], e);
 			  _parent.set(e, _parent[arc]);
 			  if (_parent[arc] != INVALID) {
 			    if (_left[_parent[arc]] == arc) {
 			      _left.set(_parent[arc], e);
 			    } else {
 			      _right.set(_parent[arc], e);
+			    }
+			  }
 			  splay(s);
 			} else {
 			  _right.set(e, _right[arc]);
 			  _parent.set(_right[arc], e);
 			  if (_parent[arc] != INVALID) {
 			    if (_left[_parent[arc]] == arc) {
 			      _left.set(_parent[arc], e);
 			    } else {
 			      _right.set(_parent[arc], e);
+			    }
 			  } else {
 			    _head.set(_g.source(arc), e);
+			  }
+			}
+		      }
+		    }
 		    Arc refreshRec(std::vector<Arc> &v,int a,int b)
+		    {
 		      int m=(a+b)/2;
 		      Arc me=v[m];
 		      if (a < m) {
 			Arc left = refreshRec(v,a,m-1);
 			_left.set(me, left);
 			_parent.set(left, me);
 		      } else {
 			_left.set(me, INVALID);
+		      }
 		      if (m < b) {
 			Arc right = refreshRec(v,m+1,b);
 			_right.set(me, right);
 			_parent.set(right, me);
 		      } else {
 			_right.set(me, INVALID);
+		      }
 		      return me;
+		    }
 		    void refresh() {
 		      for(NodeIt n(_g);n!=INVALID;++n) {
 			std::vector<Arc> v;
 			for(OutArcIt e(_g,n);e!=INVALID;++e) v.push_back(e);
 			if(v.size()) {
 			  std::sort(v.begin(),v.end(),ArcLess(_g));
 			  Arc head = refreshRec(v,0,v.size()-1);
 			  _head.set(n, head);
 			  _parent.set(head, INVALID);
+			}
 			else _head.set(n, INVALID);
+		      }
+		    }
 		    void zig(Arc v) {
 		      Arc w = _parent[v];
 		      _parent.set(v, _parent[w]);
 		      _parent.set(w, v);
 		      _left.set(w, _right[v]);
 		      _right.set(v, w);
 		      if (_parent[v] != INVALID) {
 			if (_right[_parent[v]] == w) {
 			  _right.set(_parent[v], v);
 			} else {
 			  _left.set(_parent[v], v);
+			}
+		      }
 		      if (_left[w] != INVALID){
 			_parent.set(_left[w], w);
+		      }
+		    }
 		    void zag(Arc v) {
 		      Arc w = _parent[v];
 		      _parent.set(v, _parent[w]);
 		      _parent.set(w, v);
 		      _right.set(w, _left[v]);
 		      _left.set(v, w);
 		      if (_parent[v] != INVALID){
 			if (_left[_parent[v]] == w) {
 			  _left.set(_parent[v], v);
 			} else {
 			  _right.set(_parent[v], v);
+			}
+		      }
 		      if (_right[w] != INVALID){
 			_parent.set(_right[w], w);
+		      }
+		    }
 		    void splay(Arc v) {
 		      while (_parent[v] != INVALID) {
 			if (v == _left[_parent[v]]) {
 			  if (_parent[_parent[v]] == INVALID) {
 			    zig(v);
 			  } else {
 			    if (_parent[v] == _left[_parent[_parent[v]]]) {
 			      zig(_parent[v]);
 			      zig(v);
 			    } else {
 			      zig(v);
 			      zag(v);
+			    }
+			  }
 			} else {
 			  if (_parent[_parent[v]] == INVALID) {
 			    zag(v);
 			  } else {
 			    if (_parent[v] == _left[_parent[_parent[v]]]) {
 			      zag(v);
 			      zig(v);
 			    } else {
 			      zag(_parent[v]);
 			      zag(v);
+			    }
+			  }
+			}
+		      }
 		      _head[_g.source(v)] = v;
+		    }
 		  public:
 		    ///Find an arc between two nodes.
 		    ///Find an arc between two nodes in time <em>O(</em>log<em>d)</em>, where
 		    /// <em>d</em> is the number of outgoing arcs of \c s.
 		    ///\param s The source node
 		    ///\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) {
 			  const_cast<DynArcLookUp&>(*this).splay(e);
 			  return e;
 			} else if (t < _g.target(e)) {
 			  if (_left[e] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(e);
 			if (_g.target(a) == t) {
 			  const_cast<DynArcLookUp&>(*this).splay(a);
 			  return a;
 			} else if (t < _g.target(a)) {
 			  if (_left[a] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(a);
 			    return INVALID;
 			  } else {
-			    e = _left[e];
+			    a = _left[a];
+			  }
 			} else  {
 			  if (_right[e] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(e);
 			  if (_right[a] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(a);
 			    return INVALID;
 			  } else {
-			    e = _right[e];
+			    a = _right[a];
+			  }
+			}
+		      }
+		    }
 		    ///Find the first arc between two nodes.
 		    ///Find the first arc between two nodes in time
 		    /// <em>O(</em>log<em>d)</em>, where <em>d</em> is the number of
 		    /// outgoing arcs of \c s.
 		    ///\param s The source node
 		    ///\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 (_right[e] == INVALID) {
-			    const_cast<DynArcLookUp&>(*this).splay(e);
+			if (_g.target(a) < t) {
 			  if (_right[a] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(a);
 			    return r;
 			  } else {
-			    e = _right[e];
+			    a = _right[a];
+			  }
 			} else {
 			  if (_g.target(e) == t) {
 			    r = e;
 			  if (_g.target(a) == t) {
 			    r = a;
+			  }
 			  if (_left[e] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(e);
 			  if (_left[a] == INVALID) {
 			    const_cast<DynArcLookUp&>(*this).splay(a);
 			    return r;
 			  } else {
-			    e = _left[e];
+			    a = _left[a];
+			  }
+			}
+		      }
+		    }
 		    ///Find the next arc between two nodes.
 		    ///Find the next arc between two nodes in time
 		    /// <em>O(</em>log<em>d)</em>, where <em>d</em> is the number of
 		    /// outgoing arcs of \c s.
 		    ///\param s The source node
 		    ///\param t The target node
 		    ///\return An arc from \c s to \c t if there exists, \ref INVALID
 		    /// 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) {
 			e = _right[e];
 			while (_left[e] != INVALID) {
 			  e = _left[e];
 		      if (_right[a] != INVALID) {
 			a = _right[a];
 			while (_left[a] != INVALID) {
 			  a = _left[a];
+			}
-			const_cast<DynArcLookUp&>(*this).splay(e);
+			const_cast<DynArcLookUp&>(*this).splay(a);
 		      } else {
 			while (_parent[e] != INVALID && _right[_parent[e]] ==  e) {
 			  e = _parent[e];
 			while (_parent[a] != INVALID && _right[_parent[a]] ==  a) {
 			  a = _parent[a];
+			}
-			if (_parent[e] == INVALID) {
+			if (_parent[a] == INVALID) {
 			  return INVALID;
 			} else {
 			  e = _parent[e];
 			  const_cast<DynArcLookUp&>(*this).splay(e);
 			  a = _parent[a];
 			  const_cast<DynArcLookUp&>(*this).splay(a);
+			}
+		      }
-		      if (_g.target(e) == t) return e;
+		      if (_g.target(a) == t) return a;
 		      else return INVALID;
+		    }
 		  };
 		  ///Fast arc look up between given endpoints.
 		  ///\ingroup gutils
 		  ///Using this class, you can find an arc in a digraph from a given
 		  ///source to a given target in time <em>O(log d)</em>,
 		  ///where <em>d</em> is the out-degree of the source node.
 		  ///
 		  ///It is not possible to find \e all parallel arcs between two nodes.
 		  ///Use \ref AllArcLookUp for this purpose.
 		  ///
 		  ///\warning This class is static, so you should refresh() (or at least
 		  ///refresh(Node)) this data structure
 		  ///whenever the digraph changes. This is a time consuming (superlinearly
 		  ///proportional (<em>O(m</em>log<em>m)</em>) to the number of arcs).
 		  ///
 		  ///\param G The type of the underlying digraph.
 		  ///
 		  ///\sa DynArcLookUp
 		  ///\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;
 		    typename Digraph::template ArcMap<Arc> _left;
 		    typename Digraph::template ArcMap<Arc> _right;
 		    class ArcLess {
 		      const Digraph &g;
 		    public:
 		      ArcLess(const Digraph &_g) : g(_g) {}
 		      bool operator()(Arc a,Arc b) const
+		      {
 			return g.target(a)<g.target(b);
+		      }
 		    };
 		  public:
 		    ///Constructor
 		    ///Constructor.
 		    ///
 		    ///It builds up the search database, which remains valid until the digraph
 		    ///changes.
 		    ArcLookUp(const Digraph &g) :_g(g),_head(g),_left(g),_right(g) {refresh();}
 		  private:
 		    Arc refreshRec(std::vector<Arc> &v,int a,int b)
+		    {
 		      int m=(a+b)/2;
 		      Arc me=v[m];
 		      _left[me] = a<m?refreshRec(v,a,m-1):INVALID;
 		      _right[me] = m<b?refreshRec(v,m+1,b):INVALID;
 		      return me;
+		    }
 		  public:
 		    ///Refresh the data structure at a node.
 		    ///Build up the search database of node \c n.
 		    ///
 		    ///It runs in time <em>O(d</em>log<em>d)</em>, where <em>d</em> is
 		    ///the number of the outgoing arcs of \c n.
 		    void refresh(Node n)
+		    {
 		      std::vector<Arc> v;
 		      for(OutArcIt e(_g,n);e!=INVALID;++e) v.push_back(e);
 		      if(v.size()) {
 			std::sort(v.begin(),v.end(),ArcLess(_g));
 			_head[n]=refreshRec(v,0,v.size()-1);
+		      }
 		      else _head[n]=INVALID;
+		    }
 		    ///Refresh the full data structure.
 		    ///Build up the full search database. In fact, it simply calls
 		    ///\ref refresh(Node) "refresh(n)" for each node \c n.
 		    ///
 		    ///It runs in time <em>O(m</em>log<em>D)</em>, where <em>m</em> is
 		    ///the number of the arcs of \c n and <em>D</em> is the maximum
 		    ///out-degree of the digraph.
 		    void refresh()
+		    {
 		      for(NodeIt n(_g);n!=INVALID;++n) refresh(n);
+		    }
 		    ///Find an arc between two nodes.
 		    ///Find an arc between two nodes in time <em>O(</em>log<em>d)</em>, where
 		    /// <em>d</em> is the number of outgoing arcs of \c s.
 		    ///\param s The source node
 		    ///\param t The target node
 		    ///\return An arc from \c s to \c t if there exists,
 		    ///\ref INVALID otherwise.
 		    ///
 		    ///\warning If you change the digraph, refresh() must be called before using
 		    ///this operator. If you change the outgoing arcs of
 		    ///a single node \c n, then
 		    ///\ref refresh(Node) "refresh(n)" is enough.
 		    ///
 		    Arc operator()(Node s, Node t) const
+		    {
 		      Arc e;
 		      for(e=_head[s];
 			  e!=INVALID&&_g.target(e)!=t;
 			  e = t < _g.target(e)?_left[e]:_right[e]) ;
 		      return e;
+		    }
 		  };
 		  ///Fast look up of all arcs between given endpoints.
 		  ///\ingroup gutils
 		  ///This class is the same as \ref ArcLookUp, with the addition
 		  ///that it makes it possible to find all arcs between given endpoints.
 		  ///
 		  ///\warning This class is static, so you should refresh() (or at least
 		  ///refresh(Node)) this data structure
 		  ///whenever the digraph changes. This is a time consuming (superlinearly
 		  ///proportional (<em>O(m</em>log<em>m)</em>) to the number of arcs).
 		  ///
 		  ///\param G The type of the underlying digraph.
 		  ///
 		  ///\sa DynArcLookUp
 		  ///\sa ArcLookUp
 		  template<class G>
 		  class AllArcLookUp : public ArcLookUp<G>
+		  {
 		    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)
+		    {
 		      if(head==INVALID) return next;
 		      else {
 			next=refreshNext(_right[head],next);
 		// 	_next[head]=next;
 			_next[head]=( next!=INVALID && _g.target(next)==_g.target(head))
 			  ? next : INVALID;
 			return refreshNext(_left[head],head);
+		      }
+		    }
 		    void refreshNext()
+		    {
 		      for(NodeIt n(_g);n!=INVALID;++n) refreshNext(_head[n]);
+		    }
 		  public:
 		    ///Constructor
 		    ///Constructor.
 		    ///
 		    ///It builds up the search database, which remains valid until the digraph
 		    ///changes.
 		    AllArcLookUp(const Digraph &g) : ArcLookUp<G>(g), _next(g) {refreshNext();}
 		    ///Refresh the data structure at a node.
 		    ///Build up the search database of node \c n.
 		    ///
 		    ///It runs in time <em>O(d</em>log<em>d)</em>, where <em>d</em> is
 		    ///the number of the outgoing arcs of \c n.
 		    void refresh(Node n)
+		    {
 		      ArcLookUp<G>::refresh(n);
 		      refreshNext(_head[n]);
+		    }
 		    ///Refresh the full data structure.
 		    ///Build up the full search database. In fact, it simply calls
 		    ///\ref refresh(Node) "refresh(n)" for each node \c n.
 		    ///
 		    ///It runs in time <em>O(m</em>log<em>D)</em>, where <em>m</em> is
 		    ///the number of the arcs of \c n and <em>D</em> is the maximum
 		    ///out-degree of the digraph.
 		    void refresh()
+		    {
 		      for(NodeIt n(_g);n!=INVALID;++n) refresh(_head[n]);
+		    }
 		    ///Find an arc between two nodes.
 		    ///Find an arc between two nodes.
 		    ///\param s The source node
 		    ///\param t The target node
 		    ///\param prev The previous arc between \c s and \c t. It it is INVALID or
 		    ///not given, the operator finds the first appropriate arc.
 		    ///\return An arc from \c s to \c t after \c prev or
 		    ///\ref INVALID if there is no more.
 		    ///
 		    ///For example, you can count the number of arcs from \c u to \c v in the
 		    ///following way.
 		    ///\code
 		    ///AllArcLookUp<ListDigraph> ae(g);
 		    ///...
 		    ///int n=0;
 		    ///for(Arc e=ae(u,v);e!=INVALID;e=ae(u,v,e)) n++;
 		    ///\endcode
 		    ///
 		    ///Finding the first arc take <em>O(</em>log<em>d)</em> time, where
 		    /// <em>d</em> is the number of outgoing arcs of \c s. Then, the
 		    ///consecutive arcs are found in constant time.
 		    ///
 		    ///\warning If you change the digraph, refresh() must be called before using
 		    ///this operator. If you change the outgoing arcs of
 		    ///a single node \c n, then
 		    ///\ref refresh(Node) "refresh(n)" is enough.
 		    ///
 		#ifdef DOXYGEN
 		    Arc operator()(Node s, Node t, Arc prev=INVALID) const {}
 		#else
 		    using ArcLookUp<G>::operator() ;
 		    Arc operator()(Node s, Node t, Arc prev) const
+		    {
 		      return prev==INVALID?(*this)(s,t):_next[prev];
+		    }
 		#endif
 		  };
 		  /// @}
 		} //END OF NAMESPACE LEMON
 		#endif

lemon/lgf_reader.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\ingroup lemon_io
 		///\file
 		///\brief Lemon Graph Format reader.
 		#ifndef LEMON_LGF_READER_H
 		#define LEMON_LGF_READER_H
 		#include <iostream>
 		#include <fstream>
 		#include <sstream>
 		#include <set>
 		#include <map>
 		#include <lemon/assert.h>
 		#include <lemon/graph_utils.h>
 		#include <lemon/lgf_writer.h>
 		#include <lemon/concept_check.h>
 		#include <lemon/concepts/maps.h>
 		namespace lemon {
 		  namespace _reader_bits {
 		    template <typename Value>
 		    struct DefaultConverter {
 		      Value operator()(const std::string& str) {
 			std::istringstream is(str);
 			Value value;
 			is >> value;
 			char c;
 			if (is >> std::ws >> c) {
 			  throw DataFormatError("Remaining characters in token");
+			}
 			return value;
+		      }
 		    };
 		    template <>
 		    struct DefaultConverter<std::string> {
 		      std::string operator()(const std::string& str) {
 			return str;
+		      }
 		    };
 		    template <typename _Item>
 		    class MapStorageBase {
 		    public:
 		      typedef _Item Item;
 		    public:
 		      MapStorageBase() {}
 		      virtual ~MapStorageBase() {}
 		      virtual void set(const Item& item, const std::string& value) = 0;
 		    };
 		    template <typename _Item, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      Map& _map;
 		      Converter _converter;
 		    public:
 		      MapStorage(Map& map, const Converter& converter = Converter())
 			: _map(map), _converter(converter) {}
 		      virtual ~MapStorage() {}
 		      virtual void set(const Item& item ,const std::string& value) {
 			_map.set(item, _converter(value));
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual void set(const std::string&) = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(Value& value, const Converter& converter = Converter())
 		 	: _value(value), _converter(converter) {}
 		      virtual void set(const std::string& value) {
 			_value = _converter(value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<std::string, Value>& _map;
 		      MapLookUpConverter(const std::map<std::string, Value>& map)
 		        : _map(map) {}
 		      Value operator()(const std::string& str) {
 		        typename std::map<std::string, Value>::const_iterator it =
 		          _map.find(str);
 		        if (it == _map.end()) {
 		          std::ostringstream msg;
 		          msg << "Item not found: " << str;
 		          throw DataFormatError(msg.str().c_str());
+		        }
 		        return it->second;
+		      }
 		    };
 		    bool isWhiteSpace(char c) {
 		      return c == ' ' || c == '\t' || c == '\v' ||
 		        c == '\n' || c == '\r' || c == '\f';
+		    }
 		    bool isOct(char c) {
 		      return '0' <= c && c <='7';
+		    }
 		    int valueOct(char c) {
 		      LEMON_ASSERT(isOct(c), "The character is not octal.");
 		      return c - '0';
+		    }
 		    bool isHex(char c) {
 		      return ('0' <= c && c <= '9') ||
 			('a' <= c && c <= 'z') ||
 			('A' <= c && c <= 'Z');
+		    }
 		    int valueHex(char c) {
 		      LEMON_ASSERT(isHex(c), "The character is not hexadecimal.");
 		      if ('0' <= c && c <= '9') return c - '0';
 		      if ('a' <= c && c <= 'z') return c - 'a' + 10;
 		      return c - 'A' + 10;
+		    }
 		    bool isIdentifierFirstChar(char c) {
 		      return ('a' <= c && c <= 'z') ||
 			('A' <= c && c <= 'Z') || c == '_';
+		    }
 		    bool isIdentifierChar(char c) {
 		      return isIdentifierFirstChar(c) ||
 			('0' <= c && c <= '9');
+		    }
 		    char readEscape(std::istream& is) {
 		      char c;
 		      if (!is.get(c))
 			throw DataFormatError("Escape format error");
 		      switch (c) {
 		      case '\\':
 			return '\\';
 		      case '\"':
 			return '\"';
 		      case '\'':
 			return '\'';
 		      case '\?':
 			return '\?';
 		      case 'a':
 			return '\a';
 		      case 'b':
 			return '\b';
 		      case 'f':
 			return '\f';
 		      case 'n':
 			return '\n';
 		      case 'r':
 			return '\r';
 		      case 't':
 			return '\t';
 		      case 'v':
 			return '\v';
 		      case 'x':
+			{
 			  int code;
 			  if (!is.get(c) || !isHex(c))
 			    throw DataFormatError("Escape format error");
 			  else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
 			  else code = code * 16 + valueHex(c);
 			  return code;
+			}
 		      default:
+			{
 			  int code;
 			  if (!isOct(c))
 			    throw DataFormatError("Escape format error");
 			  else if (code = valueOct(c), !is.get(c) || !isOct(c))
 			    is.putback(c);
 			  else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
 			    is.putback(c);
 			  else code = code * 8 + valueOct(c);
 			  return code;
+			}
+		      }
+		    }
 		    std::istream& readToken(std::istream& is, std::string& str) {
 		      std::ostringstream os;
 		      char c;
 		      is >> std::ws;
 		      if (!is.get(c))
 			return is;
 		      if (c == '\"') {
 			while (is.get(c) && c != '\"') {
 			  if (c == '\\')
 			    c = readEscape(is);
 			  os << c;
+			}
 			if (!is)
 			  throw DataFormatError("Quoted format error");
 		      } else {
 			is.putback(c);
 			while (is.get(c) && !isWhiteSpace(c)) {
 			  if (c == '\\')
 			    c = readEscape(is);
 			  os << c;
+			}
 			if (!is) {
 			  is.clear();
 			} else {
 			  is.putback(c);
+			}
+		      }
 		      str = os.str();
 		      return is;
+		    }
 		    std::istream& readIdentifier(std::istream& is, std::string& str) {
 		      std::ostringstream os;
 		      char c;
 		      is >> std::ws;
 		      if (!is.get(c))
 			return is;
 		      if (!isIdentifierFirstChar(c))
 			throw DataFormatError("Wrong char in identifier");
 		      os << c;
 		      while (is.get(c) && !isWhiteSpace(c)) {
 			if (!isIdentifierChar(c))
 			  throw DataFormatError("Wrong char in identifier");
 			os << c;
+		      }
 		      if (!is) is.clear();
 		      str = os.str();
 		      return is;
+		    }
+		  }
 		  /// \e
 		  template <typename _Digraph>
 		  class DigraphReader {
 		  public:
 		    typedef _Digraph Digraph;
-		    GRAPH_TYPEDEFS(typename Digraph);
+		    DIGRAPH_TYPEDEFS(typename Digraph);
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<std::string, Node> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<std::string, Arc> ArcIndex;
 		    ArcIndex _arc_index;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Node>*> > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Arc>*> >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
 		      Attributes;
 		    Attributes _attributes;
 		    bool _use_nodes;
 		    bool _use_arcs;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \e
 		    DigraphReader(std::istream& is, Digraph& digraph)
 		      : _is(&is), local_is(false), _digraph(digraph),
 			_use_nodes(false), _use_arcs(false) {}
 		    /// \e
 		    DigraphReader(const std::string& fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
 		    	_use_nodes(false), _use_arcs(false) {}
 		    /// \e
 		    DigraphReader(const char* fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
 		    	_use_nodes(false), _use_arcs(false) {}
 		    /// \e
 		    DigraphReader(DigraphReader& other)
 		      : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
 			_use_nodes(other._use_nodes), _use_arcs(other._use_arcs) {
 		      other.is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    /// \e
 		    ~DigraphReader() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_is) {
 			delete _is;
+		      }
+		    }
 		  private:
 		    DigraphReader& operator=(const DigraphReader&);
 		  public:
 		    /// \e
 		    template <typename Map>
 		    DigraphReader& nodeMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphReader& nodeMap(const std::string& caption, Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map>
 		    DigraphReader& arcMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Arc>* storage =
 			new _reader_bits::MapStorage<Arc, Map>(map);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphReader& arcMap(const std::string& caption, Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Arc>* storage =
 			new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Value>
 		    DigraphReader& attribute(const std::string& caption, Value& value) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value>(value);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Value, typename Converter>
 		    DigraphReader& attribute(const std::string& caption, Value& value,
 					     const Converter& converter = Converter()) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphReader& node(const std::string& caption, Node& node) {
 		      typedef _reader_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphReader& arc(const std::string& caption, Arc& arc) {
 		      typedef _reader_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphReader& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \e
 		    DigraphReader& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \e
 		    DigraphReader& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map>
 		    DigraphReader& useNodes(const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphReader& useNodes(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map>
 		    DigraphReader& useArcs(const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 		      _use_arcs = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 			_arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphReader& useArcs(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 		      _use_arcs = true;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 			_arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		  private:
 		    bool readLine() {
 		      std::string str;
 		      while(++line_num, std::getline(*_is, str)) {
 			line.clear(); line.str(str);
 			char c;
 			if (line >> std::ws >> c && c != '#') {
 			  line.putback(c);
 			  return true;
+			}
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 			readLine();
+		      }
 		      line.putback(c);
+		    }
 		    void readNodes() {
 		      std::vector<int> map_index(_node_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readIdentifier(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of node map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));
 			  ++index;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  std::map<std::string, int>::iterator jt =
 			    maps.find(_node_maps[i].first);
 			  if (jt == maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Map not found in file: " << _node_maps[i].first;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  map_index[i] = jt->second;
+			}
+			{
 			  std::map<std::string, int>::iterator jt = maps.find("label");
 			  if (jt == maps.end())
 			    throw DataFormatError("Label map not found in file");
 			  label_index = jt->second;
+			}
 			map_num = maps.size();
+		      }
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::vector<std::string> tokens(map_num);
 			for (int i = 0; i < map_num; ++i) {
 			  if (!_reader_bits::readToken(line, tokens[i])) {
 			    std::ostringstream msg;
 			    msg << "Column not found (" << i + 1 << ")";
 			    throw DataFormatError(msg.str().c_str());
+			  }
+			}
 			if (line >> std::ws >> c)
 			  throw DataFormatError("Extra character on the end of line");
 			Node n;
 			if (!_use_nodes) {
 			  n = _digraph.addNode();
 			  _node_index.insert(std::make_pair(tokens[label_index], n));
 			} else {
 			  typename std::map<std::string, Node>::iterator it =
 			    _node_index.find(tokens[label_index]);
 			  if (it == _node_index.end()) {
 			    std::ostringstream msg;
 			    msg << "Node with label not found: " << tokens[label_index];
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  n = it->second;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  _node_maps[i].second->set(n, tokens[map_index[i]]);
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
+		    }
 		    void readArcs() {
 		      std::vector<int> map_index(_arc_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readIdentifier(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of arc map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));

lemon/lgf_writer.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		///\ingroup lemon_io
 		///\file
 		///\brief Lemon Graph Format writer.
 		#ifndef LEMON_LGF_WRITER_H
 		#define LEMON_LGF_WRITER_H
 		#include <iostream>
 		#include <fstream>
 		#include <sstream>
 		#include <algorithm>
 		#include <vector>
 		#include <functional>
 		#include <lemon/assert.h>
 		#include <lemon/graph_utils.h>
 		namespace lemon {
 		  namespace _writer_bits {
 		    template <typename Value>
 		    struct DefaultConverter {
 		      std::string operator()(const Value& value) {
 			std::ostringstream os;
 			os << value;
 			return os.str();
+		      }
 		    };
 		    template <typename T>
 		    bool operator<(const T&, const T&) {
 		      throw DataFormatError("Label map is not comparable");
+		    }
 		    template <typename _Map>
 		    class MapLess {
 		    public:
 		      typedef _Map Map;
 		      typedef typename Map::Key Item;
 		    private:
 		      const Map& _map;
 		    public:
 		      MapLess(const Map& map) : _map(map) {}
 		      bool operator()(const Item& left, const Item& right) {
 			return _map[left] < _map[right];
+		      }
 		    };
 		    template <typename _Item>
 		    class MapStorageBase {
 		    public:
 		      typedef _Item Item;
 		    public:
 		      MapStorageBase() {}
 		      virtual ~MapStorageBase() {}
 		      virtual std::string get(const Item& item) = 0;
 		      virtual void sort(std::vector<Item>&) = 0;
 		    };
 		    template <typename _Item, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      const Map& _map;
 		      Converter _converter;
 		    public:
 		      MapStorage(const Map& map, const Converter& converter = Converter())
 			: _map(map), _converter(converter) {}
 		      virtual ~MapStorage() {}
 		      virtual std::string get(const Item& item) {
 			return _converter(_map[item]);
+		      }
 		      virtual void sort(std::vector<Item>& items) {
 			MapLess<Map> less(_map);
 			std::sort(items.begin(), items.end(), less);
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual std::string get() = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      const Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(const Value& value, const Converter& converter = Converter())
 		 	: _value(value), _converter(converter) {}
 		      virtual std::string get() {
 			return _converter(_value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<Value, std::string>& _map;
 		      MapLookUpConverter(const std::map<Value, std::string>& map)
 			: _map(map) {}
 		      std::string operator()(const Value& str) {
 			typename std::map<Value, std::string>::const_iterator it =
 			  _map.find(str);
 			if (it == _map.end()) {
 			  throw DataFormatError("Item not found");
+			}
 			return it->second;
+		      }
 		    };
 		    bool isWhiteSpace(char c) {
 		      return c == ' ' || c == '\t' || c == '\v' ||
 		        c == '\n' || c == '\r' || c == '\f';
+		    }
 		    bool isEscaped(char c) {
 		      return c == '\\' || c == '\"' || c == '\'' ||
 			c == '\a' || c == '\b';
+		    }
 		    static void writeEscape(std::ostream& os, char c) {
 		      switch (c) {
 		      case '\\':
 			os << "\\\\";
 			return;
 		      case '\"':
 			os << "\\\"";
 			return;
 		      case '\a':
 			os << "\\a";
 			return;
 		      case '\b':
 			os << "\\b";
 			return;
 		      case '\f':
 			os << "\\f";
 			return;
 		      case '\r':
 			os << "\\r";
 			return;
 		      case '\n':
 			os << "\\n";
 			return;
 		      case '\t':
 			os << "\\t";
 			return;
 		      case '\v':
 			os << "\\v";
 			return;
 		      default:
 			if (c < 0x20) {
 			  os << '\\' << std::oct << static_cast<int>(c);
 			} else {
 			  os << c;
+			}
 			return;
+		      }
+		    }
 		    bool requireEscape(const std::string& str) {
 		      std::istringstream is(str);
 		      char c;
 		      while (is.get(c)) {
 			if (isWhiteSpace(c) || isEscaped(c)) {
 			  return true;
+			}
+		      }
 		      return false;
+		    }
 		    std::ostream& writeToken(std::ostream& os, const std::string& str) {
 		      if (requireEscape(str)) {
 			os << '\"';
 			for (std::string::const_iterator it = str.begin();
 			     it != str.end(); ++it) {
 			  writeEscape(os, *it);
+			}
 			os << '\"';
 		      } else {
 			os << str;
+		      }
 		      return os;
+		    }
+		  }
 		  /// \e
 		  template <typename _Digraph>
 		  class DigraphWriter {
 		  public:
 		    typedef _Digraph Digraph;
-		    GRAPH_TYPEDEFS(typename Digraph);
+		    DIGRAPH_TYPEDEFS(typename Digraph);
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<Node, std::string> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<Arc, std::string> ArcIndex;
 		    ArcIndex _arc_index;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Node>* > > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Arc>* > >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::ValueStorageBase*> > Attributes;
 		    Attributes _attributes;
 		    bool _skip_nodes;
 		    bool _skip_arcs;
 		  public:
 		    /// \e
 		    DigraphWriter(std::ostream& is, Digraph& digraph)
 		      : _os(&is), local_os(false), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    /// \e
 		    DigraphWriter(const std::string& fn, Digraph& digraph)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    /// \e
 		    DigraphWriter(const char* fn, Digraph& digraph)
 		      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    DigraphWriter(DigraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
 			_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 		      other.is = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    /// \e
 		    ~DigraphWriter() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_os) {
 			delete _os;
+		      }
+		    }
 		  private:
 		    DigraphWriter& operator=(const DigraphWriter&);
 		  public:
 		    /// \e
 		    template <typename Map>
 		    DigraphWriter& nodeMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphWriter& nodeMap(const std::string& caption, const Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map>
 		    DigraphWriter& arcMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Arc>* storage =
 			new _writer_bits::MapStorage<Arc, Map>(map);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Map, typename Converter>
 		    DigraphWriter& arcMap(const std::string& caption, const Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Arc>* storage =
 			new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Value>
 		    DigraphWriter& attribute(const std::string& caption, const Value& value) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value>(value);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    template <typename Value, typename Converter>
 		    DigraphWriter& attribute(const std::string& caption, const Value& value,
 					     const Converter& converter = Converter()) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphWriter& node(const std::string& caption, const Node& node) {
 		      typedef _writer_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphWriter& arc(const std::string& caption, const Arc& arc) {
 		      typedef _writer_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \e
 		    DigraphWriter& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \e
 		    DigraphWriter& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \e
 		    DigraphWriter& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    DigraphWriter& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Multiple usage of skipNodes() member");
 		      return *this;
+		    }
 		    DigraphWriter& skipArcs() {
 		      LEMON_ASSERT(!_skip_arcs, "Multiple usage of skipArcs() member");
 		      return *this;
+		    }
 		  private:
 		    void writeNodes() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@nodes";
 		      if (!_nodes_caption.empty()) {
 			*_os << ' ' << _nodes_caption;
+		      }
 		      *_os << std::endl;
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			*_os << it->first << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Node> nodes;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			nodes.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Digraph, Node> id_map(_digraph);
 			_writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map);
 			std::sort(nodes.begin(), nodes.end(), id_less);
 		      } else {
 			label->sort(nodes);
+		      }
 		      for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
 			Node n = nodes[i];
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _digraph.id(n);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _node_index.insert(std::make_pair(n, os.str()));
+			}
 			for (typename NodeMaps::iterator it = _node_maps.begin();
 			     it != _node_maps.end(); ++it) {
 			  std::string value = it->second->get(n);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _node_index.insert(std::make_pair(n, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeArcs() {
 		      _writer_bits::MapStorageBase<Arc>* label = 0;
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@arcs";
 		      if (!_arcs_caption.empty()) {
 			*_os << ' ' << _arcs_caption;
+		      }
 		      *_os << std::endl;
 		      *_os << '\t' << '\t';
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			*_os << it->first << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Arc> arcs;
 		      for (ArcIt n(_digraph); n != INVALID; ++n) {
 			arcs.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Digraph, Arc> id_map(_digraph);
 			_writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map);
 			std::sort(arcs.begin(), arcs.end(), id_less);
 		      } else {
 			label->sort(arcs);
+		      }
 		      for (int i = 0; i < static_cast<int>(arcs.size()); ++i) {
 			Arc a = arcs[i];
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_digraph.source(a))->second);
 			*_os << '\t';
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_digraph.target(a))->second);
 			*_os << '\t';
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _digraph.id(a);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _arc_index.insert(std::make_pair(a, os.str()));
+			}
 			for (typename ArcMaps::iterator it = _arc_maps.begin();
 			     it != _arc_maps.end(); ++it) {
 			  std::string value = it->second->get(a);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _arc_index.insert(std::make_pair(a, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeAttributes() {
 		      if (_attributes.empty()) return;
 		      *_os << "@attributes";
 		      if (!_attributes_caption.empty()) {
 			*_os << ' ' << _attributes_caption;
+		      }
 		      *_os << std::endl;
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			*_os << it->first << ' ';
 			_writer_bits::writeToken(*_os, it->second->get());
 			*_os << std::endl;
+		      }
+		    }
 		  public:
 		    /// \e
 		    void run() {
 		      if (!_skip_nodes) {
 			writeNodes();
+		      }
 		      if (!_skip_arcs) {
 			writeArcs();
+		      }
 		      writeAttributes();
+		    }
 		    /// \e
 		    std::ostream& stream() {
 		      return *_os;
+		    }
 		  };
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(std::istream& is, Digraph& digraph) {
 		    return DigraphWriter<Digraph>(is, digraph);
+		  }
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 						       Digraph& digraph) {
 		    return DigraphWriter<Digraph>(fn, digraph);
+		  }
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
 		    return DigraphWriter<Digraph>(fn, digraph);
+		  }

lemon/smart_graph.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_SMART_GRAPH_H
 		#define LEMON_SMART_GRAPH_H
 		///\ingroup graphs
 		///\file
 		///\brief SmartDigraph and SmartGraph classes.
 		#include <vector>
 		#include <lemon/bits/invalid.h>
 		#include <lemon/bits/base_extender.h>
 		#include <lemon/bits/graph_extender.h>
 		#include <lemon/bits/utility.h>
 		#include <lemon/error.h>
 		#include <lemon/bits/graph_extender.h>
 		namespace lemon {
 		  class SmartDigraph;
 		  ///Base of SmartDigraph
 		  ///Base of SmartDigraph
 		  ///
 		  class SmartDigraphBase {
 		  protected:
 		    struct NodeT
+		    {
 		      int first_in, first_out;
 		      NodeT() {}
 		    };
 		    struct ArcT
+		    {
 		      int target, source, next_in, next_out;
 		      ArcT() {}
 		    };
 		    std::vector<NodeT> nodes;
 		    std::vector<ArcT> arcs;
 		  public:
 		    typedef SmartDigraphBase Graph;
 		    class Node;
 		    class Arc;
 		  public:
 		    SmartDigraphBase() : nodes(), arcs() { }
 		    SmartDigraphBase(const SmartDigraphBase &_g)
 		      : nodes(_g.nodes), arcs(_g.arcs) { }
 		    typedef True NodeNumTag;
-		    typedef True ArcNumTag;
+		    typedef True EdgeNumTag;
 		    int nodeNum() const { return nodes.size(); }
 		    int arcNum() const { return arcs.size(); }
 		    int maxNodeId() const { return nodes.size()-1; }
 		    int maxArcId() const { return arcs.size()-1; }
 		    Node addNode() {
 		      int n = nodes.size();
 		      nodes.push_back(NodeT());
 		      nodes[n].first_in = -1;
 		      nodes[n].first_out = -1;
 		      return Node(n);
+		    }
 		    Arc addArc(Node u, Node v) {
 		      int n = arcs.size();
 		      arcs.push_back(ArcT());
 		      arcs[n].source = u._id;
 		      arcs[n].target = v._id;
 		      arcs[n].next_out = nodes[u._id].first_out;
 		      arcs[n].next_in = nodes[v._id].first_in;
 		      nodes[u._id].first_out = nodes[v._id].first_in = n;
 		      return Arc(n);
+		    }
 		    void clear() {
 		      arcs.clear();
 		      nodes.clear();
+		    }
 		    Node source(Arc a) const { return Node(arcs[a._id].source); }
 		    Node target(Arc a) const { return Node(arcs[a._id].target); }
 		    static int id(Node v) { return v._id; }
 		    static int id(Arc a) { return a._id; }
 		    static Node nodeFromId(int id) { return Node(id);}
 		    static Arc arcFromId(int id) { return Arc(id);}
 		    class Node {
 		      friend class SmartDigraphBase;
 		      friend class SmartDigraph;
 		    protected:
 		      int _id;
 		      explicit Node(int id) : _id(id) {}
 		    public:
 		      Node() {}
 		      Node (Invalid) : _id(-1) {}
 		      bool operator==(const Node i) const {return _id == i._id;}
 		      bool operator!=(const Node i) const {return _id != i._id;}
 		      bool operator<(const Node i) const {return _id < i._id;}
 		    };
 		    class Arc {
 		      friend class SmartDigraphBase;
 		      friend class SmartDigraph;
 		    protected:
 		      int _id;
 		      explicit Arc(int id) : _id(id) {}
 		    public:
 		      Arc() { }
 		      Arc (Invalid) : _id(-1) {}
 		      bool operator==(const Arc i) const {return _id == i._id;}
 		      bool operator!=(const Arc i) const {return _id != i._id;}
 		      bool operator<(const Arc i) const {return _id < i._id;}
 		    };
 		    void first(Node& node) const {
 		      node._id = nodes.size() - 1;
+		    }
 		    static void next(Node& node) {
 		      --node._id;
+		    }
 		    void first(Arc& arc) const {
 		      arc._id = arcs.size() - 1;
+		    }
 		    static void next(Arc& arc) {
 		      --arc._id;
+		    }
 		    void firstOut(Arc& arc, const Node& node) const {
 		      arc._id = nodes[node._id].first_out;
+		    }
 		    void nextOut(Arc& arc) const {
 		      arc._id = arcs[arc._id].next_out;
+		    }
 		    void firstIn(Arc& arc, const Node& node) const {
 		      arc._id = nodes[node._id].first_in;
+		    }
 		    void nextIn(Arc& arc) const {
 		      arc._id = arcs[arc._id].next_in;
+		    }
 		  };
 		  typedef DigraphExtender<SmartDigraphBase> ExtendedSmartDigraphBase;
 		  ///\ingroup graphs
 		  ///
 		  ///\brief A smart directed graph class.
 		  ///
 		  ///This is a simple and fast digraph implementation.
 		  ///It is also quite memory efficient, but at the price
 		  ///that <b> it does support only limited (only stack-like)
 		  ///node and arc deletions</b>.
 		  ///It conforms to the \ref concepts::Digraph "Digraph concept" with
 		  ///an important extra feature that its maps are real \ref
 		  ///concepts::ReferenceMap "reference map"s.
 		  ///
 		  ///\sa concepts::Digraph.
 		  ///
 		  ///\author Alpar Juttner
 		  class SmartDigraph : public ExtendedSmartDigraphBase {
 		  public:
 		    typedef ExtendedSmartDigraphBase Parent;
 		  private:
 		    ///SmartDigraph is \e not copy constructible. Use DigraphCopy() instead.
 		    ///SmartDigraph is \e not copy constructible. Use DigraphCopy() instead.
 		    ///
 		    SmartDigraph(const SmartDigraph &) : ExtendedSmartDigraphBase() {};
 		    ///\brief Assignment of SmartDigraph to another one is \e not allowed.
 		    ///Use DigraphCopy() instead.
 		    ///Assignment of SmartDigraph to another one is \e not allowed.
 		    ///Use DigraphCopy() instead.
 		    void operator=(const SmartDigraph &) {}
 		  public:
 		    /// Constructor
 		    /// Constructor.
 		    ///
 		    SmartDigraph() {};
 		    ///Add a new node to the digraph.
 		    /// \return the new node.
 		    ///
 		    Node addNode() { return Parent::addNode(); }
 		    ///Add a new arc to the digraph.
 		    ///Add a new arc to the digraph with source node \c s
 		    ///and target node \c t.
 		    ///\return the new arc.
 		    Arc addArc(const Node& s, const Node& t) {
 		      return Parent::addArc(s, t);
+		    }
 		    /// \brief Using this it is possible to avoid the superfluous memory
 		    /// allocation.
 		    /// Using this it is possible to avoid the superfluous memory
 		    /// allocation: if you know that the digraph you want to build will
 		    /// be very large (e.g. it will contain millions of nodes and/or arcs)
 		    /// then it is worth reserving space for this amount before starting
 		    /// to build the digraph.
 		    /// \sa reserveArc
 		    void reserveNode(int n) { nodes.reserve(n); };
 		    /// \brief Using this it is possible to avoid the superfluous memory
 		    /// allocation.
 		    /// Using this it is possible to avoid the superfluous memory
 		    /// allocation: if you know that the digraph you want to build will
 		    /// be very large (e.g. it will contain millions of nodes and/or arcs)
 		    /// then it is worth reserving space for this amount before starting
 		    /// to build the digraph.
 		    /// \sa reserveNode
 		    void reserveArc(int m) { arcs.reserve(m); };
 		    ///Clear the digraph.
 		    ///Erase all the nodes and arcs from the digraph.
 		    ///
 		    void clear() {
 		      Parent::clear();
+		    }
 		    ///Split a node.
 		    ///This function splits a node. First a new node is added to the digraph,
 		    ///then the source of each outgoing arc of \c n is moved to this new node.
 		    ///If \c connect is \c true (this is the default value), then a new arc
 		    ///from \c n to the newly created node is also added.
 		    ///\return The newly created node.
 		    ///
 		    ///\note The <tt>Arc</tt>s
 		    ///referencing a moved arc remain
 		    ///valid. However <tt>InArc</tt>'s and <tt>OutArc</tt>'s
 		    ///may be invalidated.
 		    ///\warning This functionality cannot be used together with the Snapshot
 		    ///feature.
 		    ///\todo It could be implemented in a bit faster way.
 		    Node split(Node n, bool connect = true)
+		    {
 		      Node b = addNode();
 		      nodes[b._id].first_out=nodes[n._id].first_out;
 		      nodes[n._id].first_out=-1;
 		      for(int i=nodes[b._id].first_out;i!=-1;i++) arcs[i].source=b._id;
 		      if(connect) addArc(n,b);
 		      return b;
+		    }
 		  public:
 		    class Snapshot;
 		  protected:
 		    void restoreSnapshot(const Snapshot &s)
+		    {
 		      while(s.arc_num<arcs.size()) {
 		        Arc arc = arcFromId(arcs.size()-1);
 			Parent::notifier(Arc()).erase(arc);
 			nodes[arcs.back().source].first_out=arcs.back().next_out;
 			nodes[arcs.back().target].first_in=arcs.back().next_in;
 			arcs.pop_back();
+		      }
 		      while(s.node_num<nodes.size()) {
 		        Node node = nodeFromId(nodes.size()-1);
 			Parent::notifier(Node()).erase(node);
 			nodes.pop_back();
+		      }
+		    }
 		  public:
 		    ///Class to make a snapshot of the digraph and to restrore to it later.
 		    ///Class to make a snapshot of the digraph and to restrore to it later.
 		    ///
 		    ///The newly added nodes and arcs can be removed using the
 		    ///restore() function.
 		    ///\note After you restore a state, you cannot restore
 		    ///a later state, in other word you cannot add again the arcs deleted
 		    ///by restore() using another one Snapshot instance.
 		    ///
 		    ///\warning If you do not use correctly the snapshot that can cause
 		    ///either broken program, invalid state of the digraph, valid but
 		    ///not the restored digraph or no change. Because the runtime performance
 		    ///the validity of the snapshot is not stored.
 		    class Snapshot
+		    {
 		      SmartDigraph *_graph;
 		    protected:
 		      friend class SmartDigraph;
 		      unsigned int node_num;
 		      unsigned int arc_num;
 		    public:
 		      ///Default constructor.
 		      ///Default constructor.
 		      ///To actually make a snapshot you must call save().
 		      ///
 		      Snapshot() : _graph(0) {}
 		      ///Constructor that immediately makes a snapshot
 		      ///This constructor immediately makes a snapshot of the digraph.
 		      ///\param _g The digraph we make a snapshot of.
 		      Snapshot(SmartDigraph &graph) : _graph(&graph) {
 			node_num=_graph->nodes.size();
 			arc_num=_graph->arcs.size();
+		      }
 		      ///Make a snapshot.
 		      ///Make a snapshot of the digraph.
 		      ///
 		      ///This function can be called more than once. In case of a repeated
 		      ///call, the previous snapshot gets lost.
 		      ///\param _g The digraph we make the snapshot of.
 		      void save(SmartDigraph &graph)
+		      {
 			_graph=&graph;
 			node_num=_graph->nodes.size();
 			arc_num=_graph->arcs.size();
+		      }
 		      ///Undo the changes until a snapshot.
 		      ///Undo the changes until a snapshot created by save().
 		      ///
 		      ///\note After you restored a state, you cannot restore
 		      ///a later state, in other word you cannot add again the arcs deleted
 		      ///by restore().
 		      void restore()
+		      {
 			_graph->restoreSnapshot(*this);
+		      }
 		    };
 		  };
 		  class SmartGraphBase {
 		  protected:
 		    struct NodeT {
 		      int first_out;
 		    };
 		    struct ArcT {
 		      int target;
 		      int next_out;
 		    };
 		    std::vector<NodeT> nodes;
 		    std::vector<ArcT> arcs;
 		    int first_free_arc;
 		  public:
 		    typedef SmartGraphBase Digraph;
 		    class Node;
 		    class Arc;
 		    class Edge;
 		    class Node {
 		      friend class SmartGraphBase;
 		    protected:
 		      int _id;
 		      explicit Node(int id) { _id = id;}
 		    public:
 		      Node() {}
 		      Node (Invalid) { _id = -1; }
 		      bool operator==(const Node& node) const {return _id == node._id;}
 		      bool operator!=(const Node& node) const {return _id != node._id;}
 		      bool operator<(const Node& node) const {return _id < node._id;}
 		    };
 		    class Edge {
 		      friend class SmartGraphBase;
 		    protected:
 		      int _id;
 		      explicit Edge(int id) { _id = id;}
 		    public:
 		      Edge() {}
 		      Edge (Invalid) { _id = -1; }
 		      bool operator==(const Edge& arc) const {return _id == arc._id;}
 		      bool operator!=(const Edge& arc) const {return _id != arc._id;}
 		      bool operator<(const Edge& arc) const {return _id < arc._id;}
 		    };
 		    class Arc {
 		      friend class SmartGraphBase;
 		    protected:
 		      int _id;
 		      explicit Arc(int id) { _id = id;}
 		    public:
 		      operator Edge() const { return edgeFromId(_id / 2); }
 		      Arc() {}
 		      Arc (Invalid) { _id = -1; }
 		      bool operator==(const Arc& arc) const {return _id == arc._id;}
 		      bool operator!=(const Arc& arc) const {return _id != arc._id;}
 		      bool operator<(const Arc& arc) const {return _id < arc._id;}
 		    };

test/Makefile.am

Show inline comments

 		EXTRA_DIST += \
 			test/Makefile
 		noinst_HEADERS += \
 			test/digraph_test.h \
 			test/graph_utils_test.h \
 			test/heap_test.h \
 			test/map_test.h \
 		        test/test_tools.h
 		check_PROGRAMS += \
 			test/bfs_test \
 		        test/counter_test \
 			test/dfs_test \
 			test/digraph_test \
 		        test/dim_test \
 			test/error_test \
 			test/graph_test \
 			test/graph_utils_test \
 			test/kruskal_test \
 		        test/maps_test \
 		        test/random_test \
 		        test/path_test \
 		        test/test_tools_fail \
 		        test/test_tools_pass \
 		        test/time_measure_test \
 			test/unionfind_test
 		TESTS += $(check_PROGRAMS)
 		XFAIL_TESTS += test/test_tools_fail$(EXEEXT)
 		test_bfs_test_SOURCES = test/bfs_test.cc
 		test_counter_test_SOURCES = test/counter_test.cc
 		test_dfs_test_SOURCES = test/dfs_test.cc
 		test_digraph_test_SOURCES = test/digraph_test.cc
 		test_dim_test_SOURCES = test/dim_test.cc
 		test_error_test_SOURCES = test/error_test.cc
 		test_graph_test_SOURCES = test/graph_test.cc
 		test_graph_utils_test_SOURCES = test/graph_utils_test.cc
 		# test_heap_test_SOURCES = test/heap_test.cc
 		test_kruskal_test_SOURCES = test/kruskal_test.cc
 		test_maps_test_SOURCES = test/maps_test.cc
 		test_path_test_SOURCES = test/path_test.cc
 		test_random_test_SOURCES = test/random_test.cc
 		test_test_tools_fail_SOURCES = test/test_tools_fail.cc
 		test_test_tools_pass_SOURCES = test/test_tools_pass.cc
 		test_time_measure_test_SOURCES = test/time_measure_test.cc
 		test_unionfind_test_SOURCES = test/unionfind_test.cc

0 comments (0 inline)

RhodeCode

Login to your account