lemon-main: comparison lemon/concepts/graph

equal deleted inserted replaced

-:a834a966d935
+:c79deb9cf2c0
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
 *
-* This file is a part of LEMON, a generic C++ optimization library
+* This file is a part of LEMON, a generic C++ optimization library.
 *
 * Copyright (C) 2003-2008
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
 *
 template <char _selector = '0'>
 #endif
 class GraphItem {
 public:
 /// \brief Default constructor.
 ///
 /// \warning The default constructor is not required to set
 /// the item to some well-defined value. So you should consider it
 /// as uninitialized.
 GraphItem() {}
 /// \brief Copy constructor.
 /// This constructor initializes the item to be invalid.
 /// \sa Invalid for more details.
 GraphItem(Invalid) {}
 /// \brief Assign operator for nodes.
 ///
 /// The nodes are assignable.
 ///
 GraphItem& operator=(GraphItem const&) { return *this; }
 /// \brief Equality operator.
 ///
 /// Two iterators are equal if and only if they represents the
 /// ordering of the items.
 bool operator<(GraphItem) const { return false; }
 template<typename _GraphItem>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  _GraphItem i1;
+_GraphItem i1;
-	  _GraphItem i2 = i1;
+_GraphItem i2 = i1;
-	  _GraphItem i3 = INVALID;
+_GraphItem i3 = INVALID;
-	  i1 = i2 = i3;
+i1 = i2 = i3;
-	  bool b;
+bool b;
-	  //	  b = (ia == ib) && (ia != ib) && (ia < ib);
+//          b = (ia == ib) && (ia != ib) && (ia < ib);
-	  b = (ia == ib) && (ia != ib);
+b = (ia == ib) && (ia != ib);
-	  b = (ia == INVALID) && (ib != INVALID);
+b = (ia == INVALID) && (ib != INVALID);
 b = (ia < ib);
-	}
+}
-	const _GraphItem &ia;
+const _GraphItem &ia;
-	const _GraphItem &ib;
+const _GraphItem &ib;
 };
 };
 /// \brief An empty base directed graph class.
 ///
 /// This class provides the minimal set of features needed for a
 /// directed graph structure. All digraph concepts have to be
 /// conform to this base directed graph. It just provides types
 /// for nodes and arcs and functions to get the source and the
 /// target of the arcs.
 class BaseDigraphComponent {
 public:
 typedef BaseDigraphComponent Digraph;
 /// \brief Node class of the digraph.
 ///
 /// This class represents the Nodes of the digraph.
 ///
 typedef GraphItem<'n'> Node;
 /// \brief Arc class of the digraph.
 ///
 /// This class represents the Arcs of the digraph.
 ///
 typedef GraphItem<'e'> Arc;
 /// \brief Gives back the target node of an arc.
 ///
 return INVALID;
 }
 template <typename _Digraph>
 struct Constraints {
-	typedef typename _Digraph::Node Node;
+typedef typename _Digraph::Node Node;
-	typedef typename _Digraph::Arc Arc;
+typedef typename _Digraph::Arc Arc;
-	void constraints() {
+void constraints() {
-	  checkConcept<GraphItem<'n'>, Node>();
+checkConcept<GraphItem<'n'>, Node>();
-	  checkConcept<GraphItem<'a'>, Arc>();
+checkConcept<GraphItem<'a'>, Arc>();
-	  {
+{
-	    Node n;
+Node n;
-	    Arc e(INVALID);
+Arc e(INVALID);
-	    n = digraph.source(e);
+n = digraph.source(e);
-	    n = digraph.target(e);
+n = digraph.target(e);
 n = digraph.oppositeNode(n, e);
-	  }
+}
-	}
+}
-	const _Digraph& digraph;
+const _Digraph& digraph;
 };
 };
 /// \brief An empty base undirected graph class.
 ///
 /// This class provides the minimal set of features needed for an
 /// undirected graph structure. All undirected graph concepts have
 /// to be conform to this base graph. It just provides types for
 /// nodes, arcs and edges and functions to get the
 /// source and the target of the arcs and edges,
 /// directed arcs.
 class Edge : public GraphItem<'u'> {
 public:
 typedef GraphItem<'u'> Parent;
 /// \brief Default constructor.
 ///
 /// \warning The default constructor is not required to set
 /// the item to some well-defined value. So you should consider it
 /// as uninitialized.
 Edge() {}
 /// \brief Copy constructor.
 /// \sa Invalid for more details.
 Edge(Invalid) {}
 /// \brief Converter from arc to edge.
 ///
 /// Besides the core graph item functionality each arc should
 /// be convertible to the represented edge.
 Edge(const Arc&) {}
 /// \brief Assign arc to edge.
 ///
 /// Besides the core graph item functionality each arc should
 /// be convertible to the represented edge.
 Edge& operator=(const Arc&) { return *this; }
 };
 /// \brief Returns the direction of the arc.
 ///
 /// \brief Returns the directed arc.
 ///
 /// Returns the directed arc from its direction and the
 /// represented edge.
 Arc direct(const Edge&, bool) const { return INVALID;}
 /// \brief Returns the directed arc.
 ///
 /// Returns the directed arc from its source and the
 /// represented edge.
 Arc direct(const Edge&, const Node&) const { return INVALID;}
 /// \brief Returns the opposite arc.
 ///
 /// Returns the opposite arc. It is the arc representing the
 /// same edge and has opposite direction.
 /// \brief Gives back the other ending of an edge.
 ///
 /// Gives back the other ending of an edge.
 Node v(const Edge&) const { return INVALID;}
 template <typename _Graph>
 struct Constraints {
-	typedef typename _Graph::Node Node;
+typedef typename _Graph::Node Node;
-	typedef typename _Graph::Arc Arc;
+typedef typename _Graph::Arc Arc;
-	typedef typename _Graph::Edge Edge;
+typedef typename _Graph::Edge Edge;
-	void constraints() {
+void constraints() {
 checkConcept<BaseDigraphComponent, _Graph>();
-	  checkConcept<GraphItem<'u'>, Edge>();
+checkConcept<GraphItem<'u'>, Edge>();
-	  {
+{
-	    Node n;
+Node n;
-	    Edge ue(INVALID);
+Edge ue(INVALID);
 Arc e;
-	    n = graph.u(ue);
+n = graph.u(ue);
-	    n = graph.v(ue);
+n = graph.v(ue);
 e = graph.direct(ue, true);
 e = graph.direct(ue, n);
 e = graph.oppositeArc(e);
 ue = e;
 bool d = graph.direction(e);
 ignore_unused_variable_warning(d);
-	  }
+}
-	}
+}
-	const _Graph& graph;
+const _Graph& graph;
 };
 };
 /// \brief An empty idable base digraph class.
 ///
 /// This class provides beside the core digraph features
 /// core id functions for the digraph structure.
 /// The most of the base digraphs should be conform to this concept.
 /// The id's are unique and immutable.
 template <typename _Base = BaseDigraphComponent>
 typedef _Base Base;
 typedef typename Base::Node Node;
 typedef typename Base::Arc Arc;
 /// \brief Gives back an unique integer id for the Node.
 ///
 /// Gives back an unique integer id for the Node.
 ///
 int id(const Node&) const { return -1;}
 /// \brief Gives back the node by the unique id.
 ///
 /// Gives back the node by the unique id.
 /// If the digraph does not contain node with the given id
 /// then the result of the function is undetermined.
 Node nodeFromId(int) const { return INVALID;}
 /// \brief Gives back an unique integer id for the Arc.
 ///
 /// Gives back an unique integer id for the Arc.
 ///
 int id(const Arc&) const { return -1;}
 /// \brief Gives back the arc by the unique id.
 ///
 /// Gives back the arc by the unique id.
 /// If the digraph does not contain arc with the given id
 /// then the result of the function is undetermined.
 Arc arcFromId(int) const { return INVALID;}
 /// \brief Gives back an integer greater or equal to the maximum
 /// Node id.
 ///
 int maxArcId() const { return -1;}
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Digraph >();
+checkConcept<Base, _Digraph >();
-	  typename _Digraph::Node node;
+typename _Digraph::Node node;
-	  int nid = digraph.id(node);
+int nid = digraph.id(node);
-	  nid = digraph.id(node);
+nid = digraph.id(node);
-	  node = digraph.nodeFromId(nid);
+node = digraph.nodeFromId(nid);
-	  typename _Digraph::Arc arc;
+typename _Digraph::Arc arc;
-	  int eid = digraph.id(arc);
+int eid = digraph.id(arc);
-	  eid = digraph.id(arc);
+eid = digraph.id(arc);
-	  arc = digraph.arcFromId(eid);
+arc = digraph.arcFromId(eid);
-	  nid = digraph.maxNodeId();
+nid = digraph.maxNodeId();
-	  ignore_unused_variable_warning(nid);
+ignore_unused_variable_warning(nid);
-	  eid = digraph.maxArcId();
+eid = digraph.maxArcId();
-	  ignore_unused_variable_warning(eid);
+ignore_unused_variable_warning(eid);
-	}
+}
-	const _Digraph& digraph;
+const _Digraph& digraph;
 };
 };
 /// \brief An empty idable base undirected graph class.
 ///
 /// This class provides beside the core undirected graph features
 /// core id functions for the undirected graph structure.  The
 /// most of the base undirected graphs should be conform to this
 /// concept.  The id's are unique and immutable.
 template <typename _Base = BaseGraphComponent>
 typedef _Base Base;
 typedef typename Base::Edge Edge;
 using IDableDigraphComponent<_Base>::id;
 /// \brief Gives back an unique integer id for the Edge.
 ///
 /// Gives back an unique integer id for the Edge.
 ///
 int id(const Edge&) const { return -1;}
 /// \brief Gives back the edge by the unique id.
 ///
 int maxEdgeId() const { return -1;}
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Graph >();
+checkConcept<Base, _Graph >();
-	  checkConcept<IDableDigraphComponent<Base>, _Graph >();
+checkConcept<IDableDigraphComponent<Base>, _Graph >();
-	  typename _Graph::Edge edge;
+typename _Graph::Edge edge;
-	  int ueid = graph.id(edge);
+int ueid = graph.id(edge);
-	  ueid = graph.id(edge);
+ueid = graph.id(edge);
-	  edge = graph.edgeFromId(ueid);
+edge = graph.edgeFromId(ueid);
-	  ueid = graph.maxEdgeId();
+ueid = graph.maxEdgeId();
-	  ignore_unused_variable_warning(ueid);
+ignore_unused_variable_warning(ueid);
-	}
+}
-	const _Graph& graph;
+const _Graph& graph;
 };
 };
 /// \brief Skeleton class for graph NodeIt and ArcIt
 ///
 /// This constructor initializes the item to be invalid.
 /// \sa Invalid for more details.
 GraphItemIt(Invalid) {}
 /// \brief Assign operator for items.
 ///
 /// The items are assignable.
 ///
 GraphItemIt& operator=(const GraphItemIt&) { return *this; }
 /// \brief Next item.
 ///
 /// Assign the iterator to the next item.
 ///
 GraphItemIt& operator++() { return *this; }
 /// \brief Equality operator
 ///
 /// Two iterators are equal if and only if they point to the
 /// same object or both are invalid.
 bool operator==(const GraphItemIt&) const { return true;}
 /// \brief Inequality operator
 ///
 /// \sa operator==(Node n)
 ///
 bool operator!=(const GraphItemIt&) const { return true;}
 template<typename _GraphItemIt>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  _GraphItemIt it1(g);
+_GraphItemIt it1(g);
-	  _GraphItemIt it2;
+_GraphItemIt it2;
-	  it2 = ++it1;
+it2 = ++it1;
-	  ++it2 = it1;
+++it2 = it1;
-	  ++(++it1);
+++(++it1);
-	  _Item bi = it1;
+_Item bi = it1;
-	  bi = it2;
+bi = it2;
-	}
+}
-	_Graph& g;
+_Graph& g;
 };
 };
 /// \brief Skeleton class for graph InArcIt and OutArcIt
 ///
 /// \note Because InArcIt and OutArcIt may not inherit from the same
 /// base class, the _selector is a additional template parameter. For
 /// InArcIt you should instantiate it with character 'i' and for
 /// OutArcIt with 'o'.
 template <typename _Graph,
-	      typename _Item = typename _Graph::Arc,
+typename _Item = typename _Graph::Arc,
 typename _Base = typename _Graph::Node,
-	      char _selector = '0'>
+char _selector = '0'>
 class GraphIncIt : public _Item {
 public:
 /// \brief Default constructor.
 ///
 /// @warning The default constructor sets the iterator
 /// \brief Copy constructor.
 ///
 /// Copy constructor.
 ///
 GraphIncIt(GraphIncIt const& gi) : _Item(gi) {}
 /// \brief Sets the iterator to the first arc incoming into or outgoing
 /// from the node.
 ///
 /// Sets the iterator to the first arc incoming into or outgoing
 /// from the node.
 ///
 explicit GraphIncIt(const _Graph&, const _Base&) {}
 /// \brief Invalid constructor \& conversion.
 ///
 /// This constructor initializes the item to be invalid.
 /// \sa Invalid for more details.
 GraphIncIt(Invalid) {}
 /// \brief Assign operator for iterators.
 ///
 /// The iterators are assignable.
 ///
 GraphIncIt& operator=(GraphIncIt const&) { return *this; }
 /// \brief Next item.
 ///
 /// Assign the iterator to the next item.
 ///
 GraphIncIt& operator++() { return *this; }
 ///
 bool operator!=(const GraphIncIt&) const { return true;}
 template <typename _GraphIncIt>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<GraphItem<_selector>, _GraphIncIt>();
+checkConcept<GraphItem<_selector>, _GraphIncIt>();
-	  _GraphIncIt it1(graph, node);
+_GraphIncIt it1(graph, node);
-	  _GraphIncIt it2;
+_GraphIncIt it2;
-	  it2 = ++it1;
+it2 = ++it1;
-	  ++it2 = it1;
+++it2 = it1;
-	  ++(++it1);
+++(++it1);
-	  _Item e = it1;
+_Item e = it1;
-	  e = it2;
+e = it2;
-	}
+}
-	_Item arc;
+_Item arc;
-	_Base node;
+_Base node;
-	_Graph graph;
+_Graph graph;
-	_GraphIncIt it;
+_GraphIncIt it;
 };
 };
 /// \brief An empty iterable digraph class.
 /// This concept is part of the Digraph concept.
 template <typename _Base = BaseDigraphComponent>
 class IterableDigraphComponent : public _Base {
 public:
 typedef _Base Base;
 typedef typename Base::Node Node;
 typedef typename Base::Arc Arc;
 typedef IterableDigraphComponent Digraph;
 /// \name Base iteration
 ///
 /// This interface provides functions for iteration on digraph items
 ///
 /// @{
 /// \brief Gives back the first node in the iterating order.
 ///
 /// Gives back the first node in the iterating order.
 ///
 void first(Node&) const {}
 /// \brief Gives back the next node in the iterating order.
 ///
 /// Gives back the next node in the iterating order.
 ///
 void next(Node&) const {}
 /// \brief Gives back the first arc in the iterating order.
 ///
 /// Gives back the first arc in the iterating order.
 ///
 void first(Arc&) const {}
 /// \brief Gives back the next arc in the iterating order.
 ///
 /// Gives back the next arc in the iterating order.
 ///
 void next(Arc&) const {}
 /// \brief Gives back the first of the arcs point to the given
 /// node.
 ///
 /// Gives back the first of the arcs point to the given node.
 ///
 void firstIn(Arc&, const Node&) const {}
 /// \brief Gives back the next of the arcs points to the given
 /// node.
 ///
 ///
 void nextIn(Arc&) const {}
 /// \brief Gives back the first of the arcs start from the
 /// given node.
 ///
 /// Gives back the first of the arcs start from the given node.
 ///
 void firstOut(Arc&, const Node&) const {}
 /// \brief Gives back the next of the arcs start from the given
 /// node.
 ///
 /// Gives back the next of the arcs start from the given node.
 ///
 void nextOut(Arc&) const {}
 /// @}
 /// \name Class based iteration
 ///
 /// This interface provides functions for iteration on digraph items
 ///
 /// @{
 /// \brief This iterator goes through each node.
 /// It is always the target of the pointed arc.
 Node runningNode(const OutArcIt&) const { return INVALID; }
 /// @}
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Digraph>();
+checkConcept<Base, _Digraph>();
 {
 typename _Digraph::Node node(INVALID);
 typename _Digraph::Arc arc(INVALID);
 {
 digraph.first(node);
 digraph.next(node);
 }
 }
 {
 digraph.firstOut(arc, node);
 digraph.nextOut(arc);
 }
 }
 {
 checkConcept<GraphItemIt<_Digraph, typename _Digraph::Arc>,
 typename _Digraph::ArcIt >();
 checkConcept<GraphItemIt<_Digraph, typename _Digraph::Node>,
 typename _Digraph::NodeIt >();
 checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 typename _Digraph::Node, 'i'>, typename _Digraph::InArcIt>();
 checkConcept<GraphIncIt<_Digraph, typename _Digraph::Arc,
 typename _Digraph::Node, 'o'>, typename _Digraph::OutArcIt>();
 typename _Digraph::Node n;
 typename _Digraph::InArcIt ieit(INVALID);
 typename _Digraph::OutArcIt oeit(INVALID);
 n = digraph.baseNode(oeit);
 n = digraph.runningNode(oeit);
 ignore_unused_variable_warning(n);
 }
 }
-	const _Digraph& digraph;
+const _Digraph& digraph;
 };
 };
 /// \brief An empty iterable undirected graph class.
 ///
 typedef _Base Base;
 typedef typename Base::Node Node;
 typedef typename Base::Arc Arc;
 typedef typename Base::Edge Edge;
 typedef IterableGraphComponent Graph;
 /// \name Base iteration
 ///
 /// This interface provides functions for iteration on graph items
 /// @{
 using IterableDigraphComponent<_Base>::first;
 using IterableDigraphComponent<_Base>::next;
 /// \brief Gives back the first edge in the iterating
 /// order.
 ///
 /// Gives back the first edge in the iterating order.
 ///
 void first(Edge&) const {}
 /// \brief Gives back the next edge in the iterating
 /// order.
 ///
 /// Gives back the next edge in the iterating order.
 ///
 void next(Edge&) const {}
 /// \brief Gives back the first of the edges from the
 /// given node.
 using IterableDigraphComponent<_Base>::runningNode;
 /// @}
 /// \name Class based iteration
 ///
 /// This interface provides functions for iteration on graph items
 ///
 /// @{
 /// \brief This iterator goes through each node.
 /// Gives back the running node of the iterator.
 Node runningNode(const IncEdgeIt&) const { return INVALID; }
 /// @}
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<IterableDigraphComponent<Base>, _Graph>();
+checkConcept<IterableDigraphComponent<Base>, _Graph>();
 {
 typename _Graph::Node node(INVALID);
 typename _Graph::Edge edge(INVALID);
 bool dir;
 }
 {
 graph.firstInc(edge, dir, node);
 graph.nextInc(edge, dir);
 }
 }
 {
 checkConcept<GraphItemIt<_Graph, typename _Graph::Edge>,
 typename _Graph::EdgeIt >();
 checkConcept<GraphIncIt<_Graph, typename _Graph::Edge,
 typename _Graph::Node, 'u'>, typename _Graph::IncEdgeIt>();
 typename _Graph::Node n;
 typename _Graph::IncEdgeIt ueit(INVALID);
 n = graph.baseNode(ueit);
 n = graph.runningNode(ueit);
 }
 }
-	const _Graph& graph;
+const _Graph& graph;
 };
 };
 /// \brief An empty alteration notifier digraph class.
 ///
 /// This class provides beside the core digraph features alteration
 /// notifier interface for the digraph structure.  This implements
 /// an observer-notifier pattern for each digraph item. More
 /// obsevers can be registered into the notifier and whenever an
 /// alteration occured in the digraph all the observers will
 typedef typename Base::Node Node;
 typedef typename Base::Arc Arc;
 /// The node observer registry.
 typedef AlterationNotifier<AlterableDigraphComponent, Node>
 NodeNotifier;
 /// The arc observer registry.
 typedef AlterationNotifier<AlterableDigraphComponent, Arc>
 ArcNotifier;
 /// \brief Gives back the node alteration notifier.
 ///
 /// Gives back the node alteration notifier.
 NodeNotifier& notifier(Node) const {
-	return NodeNotifier();
+return NodeNotifier();
 }
 /// \brief Gives back the arc alteration notifier.
 ///
 /// Gives back the arc alteration notifier.
 ArcNotifier& notifier(Arc) const {
-	return ArcNotifier();
+return ArcNotifier();
 }
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Digraph>();
+checkConcept<Base, _Digraph>();
 typename _Digraph::NodeNotifier& nn
 = digraph.notifier(typename _Digraph::Node());
 typename _Digraph::ArcNotifier& en
 = digraph.notifier(typename _Digraph::Arc());
 ignore_unused_variable_warning(nn);
 ignore_unused_variable_warning(en);
-	}
+}
-	const _Digraph& digraph;
+const _Digraph& digraph;
 };
 };
 /// \brief An empty alteration notifier undirected graph class.
 ///
 /// This class provides beside the core graph features alteration
 /// notifier interface for the graph structure.  This implements
 /// an observer-notifier pattern for each graph item. More
 /// obsevers can be registered into the notifier and whenever an
 /// alteration occured in the graph all the observers will
 typedef _Base Base;
 typedef typename Base::Edge Edge;
 /// The arc observer registry.
 typedef AlterationNotifier<AlterableGraphComponent, Edge>
 EdgeNotifier;
 /// \brief Gives back the arc alteration notifier.
 ///
 /// Gives back the arc alteration notifier.
 EdgeNotifier& notifier(Edge) const {
-	return EdgeNotifier();
+return EdgeNotifier();
 }
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<AlterableGraphComponent<Base>, _Graph>();
+checkConcept<AlterableGraphComponent<Base>, _Graph>();
 typename _Graph::EdgeNotifier& uen
 = graph.notifier(typename _Graph::Edge());
 ignore_unused_variable_warning(uen);
-	}
+}
-	const _Graph& graph;
+const _Graph& graph;
 };
 };
 /// \brief Class describing the concept of graph maps
 ///
 /// This class describes the common interface of the graph maps
 /// (NodeMap, ArcMap), that is \ref maps-page "maps" which can be used to
 /// associate data to graph descriptors (nodes or arcs).
 template <typename _Graph, typename _Item, typename _Value>
 class GraphMap : public ReadWriteMap<_Item, _Value> {
 GraphMap(const Graph&, const Value&) {}
 /// \brief Copy constructor.
 ///
 /// Copy Constructor.
 GraphMap(const GraphMap&) : Parent() {}
 /// \brief Assign operator.
 ///
 /// Assign operator. It does not mofify the underlying graph,
 /// it just iterates on the current item set and set the  map
 /// with the value returned by the assigned map.
 template <typename CMap>
 GraphMap& operator=(const CMap&) {
 checkConcept<ReadMap<Key, Value>, CMap>();
 return *this;
 }
 template<typename _Map>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<ReadWriteMap<Key, Value>, _Map >();
+checkConcept<ReadWriteMap<Key, Value>, _Map >();
-	  // Construction with a graph parameter
+// Construction with a graph parameter
-	  _Map a(g);
+_Map a(g);
-	  // Constructor with a graph and a default value parameter
+// Constructor with a graph and a default value parameter
-	  _Map a2(g,t);
+_Map a2(g,t);
-	  // Copy constructor.
+// Copy constructor.
-	  _Map b(c);
+_Map b(c);
 ReadMap<Key, Value> cmap;
 b = cmap;
-	  ignore_unused_variable_warning(a2);
+ignore_unused_variable_warning(a2);
-	  ignore_unused_variable_warning(b);
+ignore_unused_variable_warning(b);
-	}
+}
-	const _Map &c;
+const _Map &c;
-	const Graph &g;
+const Graph &g;
-	const typename GraphMap::Value &t;
+const typename GraphMap::Value &t;
 };
 };
 /// \brief An empty mappable digraph class.
 template <typename _Value>
 class NodeMap : public GraphMap<Digraph, Node, _Value> {
 public:
 typedef GraphMap<MappableDigraphComponent, Node, _Value> Parent;
-	/// \brief Construct a new map.
+/// \brief Construct a new map.
-	///
+///
-	/// Construct a new map for the digraph.
+/// Construct a new map for the digraph.
-	explicit NodeMap(const MappableDigraphComponent& digraph)
+explicit NodeMap(const MappableDigraphComponent& digraph)
 : Parent(digraph) {}
-	/// \brief Construct a new map with default value.
+/// \brief Construct a new map with default value.
-	///
+///
-	/// Construct a new map for the digraph and initalise the values.
+/// Construct a new map for the digraph and initalise the values.
-	NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
+NodeMap(const MappableDigraphComponent& digraph, const _Value& value)
 : Parent(digraph, value) {}
-	/// \brief Copy constructor.
+/// \brief Copy constructor.
-	///
+///
-	/// Copy Constructor.
+/// Copy Constructor.
-	NodeMap(const NodeMap& nm) : Parent(nm) {}
+NodeMap(const NodeMap& nm) : Parent(nm) {}
-	/// \brief Assign operator.
+/// \brief Assign operator.
-	///
+///
-	/// Assign operator.
+/// Assign operator.
 template <typename CMap>
 NodeMap& operator=(const CMap&) {
 checkConcept<ReadMap<Node, _Value>, CMap>();
 return *this;
 }
 };
 template <typename _Value>
 class ArcMap : public GraphMap<Digraph, Arc, _Value> {
 public:
 typedef GraphMap<MappableDigraphComponent, Arc, _Value> Parent;
-	/// \brief Construct a new map.
+/// \brief Construct a new map.
-	///
+///
-	/// Construct a new map for the digraph.
+/// Construct a new map for the digraph.
-	explicit ArcMap(const MappableDigraphComponent& digraph)
+explicit ArcMap(const MappableDigraphComponent& digraph)
 : Parent(digraph) {}
-	/// \brief Construct a new map with default value.
+/// \brief Construct a new map with default value.
-	///
+///
-	/// Construct a new map for the digraph and initalise the values.
+/// Construct a new map for the digraph and initalise the values.
-	ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
+ArcMap(const MappableDigraphComponent& digraph, const _Value& value)
 : Parent(digraph, value) {}
-	/// \brief Copy constructor.
+/// \brief Copy constructor.
-	///
+///
-	/// Copy Constructor.
+/// Copy Constructor.
-	ArcMap(const ArcMap& nm) : Parent(nm) {}
+ArcMap(const ArcMap& nm) : Parent(nm) {}
-	/// \brief Assign operator.
+/// \brief Assign operator.
-	///
+///
-	/// Assign operator.
+/// Assign operator.
 template <typename CMap>
 ArcMap& operator=(const CMap&) {
 checkConcept<ReadMap<Arc, _Value>, CMap>();
 return *this;
 }
 };
 template <typename _Digraph>
 struct Constraints {
-	struct Dummy {
+struct Dummy {
-	  int value;
+int value;
-	  Dummy() : value(0) {}
+Dummy() : value(0) {}
-	  Dummy(int _v) : value(_v) {}
+Dummy(int _v) : value(_v) {}
-	};
+};
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Digraph>();
+checkConcept<Base, _Digraph>();
-	  { // int map test
+{ // int map test
-	    typedef typename _Digraph::template NodeMap<int> IntNodeMap;
+typedef typename _Digraph::template NodeMap<int> IntNodeMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Node, int>,
-	      IntNodeMap >();
+IntNodeMap >();
-	  } { // bool map test
+} { // bool map test
-	    typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
+typedef typename _Digraph::template NodeMap<bool> BoolNodeMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Node, bool>,
-	      BoolNodeMap >();
+BoolNodeMap >();
-	  } { // Dummy map test
+} { // Dummy map test
-	    typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
+typedef typename _Digraph::template NodeMap<Dummy> DummyNodeMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Node, Dummy>,
-	      DummyNodeMap >();
+DummyNodeMap >();
-	  }
+}
-	  { // int map test
+{ // int map test
-	    typedef typename _Digraph::template ArcMap<int> IntArcMap;
+typedef typename _Digraph::template ArcMap<int> IntArcMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, int>,
-	      IntArcMap >();
+IntArcMap >();
-	  } { // bool map test
+} { // bool map test
-	    typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
+typedef typename _Digraph::template ArcMap<bool> BoolArcMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, bool>,
-	      BoolArcMap >();
+BoolArcMap >();
-	  } { // Dummy map test
+} { // Dummy map test
-	    typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
+typedef typename _Digraph::template ArcMap<Dummy> DummyArcMap;
-	    checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>,
+checkConcept<GraphMap<_Digraph, typename _Digraph::Arc, Dummy>,
-	      DummyArcMap >();
+DummyArcMap >();
-	  }
+}
-	}
+}
-	_Digraph& digraph;
+_Digraph& digraph;
 };
 };
 /// \brief An empty mappable base bipartite graph class.
 ///
 /// \brief ReadWrite map of the edges.
 ///
 /// ReadWrite map of the edges.
 ///
 template <typename _Value>
 class EdgeMap : public GraphMap<Graph, Edge, _Value> {
 public:
 typedef GraphMap<MappableGraphComponent, Edge, _Value> Parent;
-	/// \brief Construct a new map.
+/// \brief Construct a new map.
-	///
+///
-	/// Construct a new map for the graph.
+/// Construct a new map for the graph.
-	explicit EdgeMap(const MappableGraphComponent& graph)
+explicit EdgeMap(const MappableGraphComponent& graph)
 : Parent(graph) {}
-	/// \brief Construct a new map with default value.
+/// \brief Construct a new map with default value.
-	///
+///
-	/// Construct a new map for the graph and initalise the values.
+/// Construct a new map for the graph and initalise the values.
-	EdgeMap(const MappableGraphComponent& graph, const _Value& value)
+EdgeMap(const MappableGraphComponent& graph, const _Value& value)
 : Parent(graph, value) {}
-	/// \brief Copy constructor.
+/// \brief Copy constructor.
-	///
+///
-	/// Copy Constructor.
+/// Copy Constructor.
-	EdgeMap(const EdgeMap& nm) : Parent(nm) {}
+EdgeMap(const EdgeMap& nm) : Parent(nm) {}
-	/// \brief Assign operator.
+/// \brief Assign operator.
-	///
+///
-	/// Assign operator.
+/// Assign operator.
 template <typename CMap>
 EdgeMap& operator=(const CMap&) {
 checkConcept<ReadMap<Edge, _Value>, CMap>();
 return *this;
 }
 };
 template <typename _Graph>
 struct Constraints {
-	struct Dummy {
+struct Dummy {
-	  int value;
+int value;
-	  Dummy() : value(0) {}
+Dummy() : value(0) {}
-	  Dummy(int _v) : value(_v) {}
+Dummy(int _v) : value(_v) {}
-	};
+};
-	void constraints() {
+void constraints() {
-	  checkConcept<MappableGraphComponent<Base>, _Graph>();
+checkConcept<MappableGraphComponent<Base>, _Graph>();
-	  { // int map test
+{ // int map test
-	    typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
+typedef typename _Graph::template EdgeMap<int> IntEdgeMap;
-	    checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
+checkConcept<GraphMap<_Graph, typename _Graph::Edge, int>,
-	      IntEdgeMap >();
+IntEdgeMap >();
-	  } { // bool map test
+} { // bool map test
-	    typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
+typedef typename _Graph::template EdgeMap<bool> BoolEdgeMap;
-	    checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
+checkConcept<GraphMap<_Graph, typename _Graph::Edge, bool>,
-	      BoolEdgeMap >();
+BoolEdgeMap >();
-	  } { // Dummy map test
+} { // Dummy map test
-	    typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
+typedef typename _Graph::template EdgeMap<Dummy> DummyEdgeMap;
-	    checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>,
+checkConcept<GraphMap<_Graph, typename _Graph::Edge, Dummy>,
-	      DummyEdgeMap >();
+DummyEdgeMap >();
-	  }
+}
-	}
+}
-	_Graph& graph;
+_Graph& graph;
 };
 };
 /// \brief An empty extendable digraph class.
 ///
 /// \brief Adds a new node to the digraph.
 ///
 /// Adds a new node to the digraph.
 ///
 Node addNode() {
-	return INVALID;
+return INVALID;
 }
 /// \brief Adds a new arc connects the given two nodes.
 ///
 /// Adds a new arc connects the the given two nodes.
 Arc addArc(const Node&, const Node&) {
-	return INVALID;
+return INVALID;
 }
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
 checkConcept<Base, _Digraph>();
-	  typename _Digraph::Node node_a, node_b;
+typename _Digraph::Node node_a, node_b;
-	  node_a = digraph.addNode();
+node_a = digraph.addNode();
-	  node_b = digraph.addNode();
+node_b = digraph.addNode();
-	  typename _Digraph::Arc arc;
+typename _Digraph::Arc arc;
-	  arc = digraph.addArc(node_a, node_b);
+arc = digraph.addArc(node_a, node_b);
-	}
+}
-	_Digraph& digraph;
+_Digraph& digraph;
 };
 };
 /// \brief An empty extendable base undirected graph class.
 ///
 /// \brief Adds a new node to the graph.
 ///
 /// Adds a new node to the graph.
 ///
 Node addNode() {
-	return INVALID;
+return INVALID;
 }
 /// \brief Adds a new arc connects the given two nodes.
 ///
 /// Adds a new arc connects the the given two nodes.
 Edge addArc(const Node&, const Node&) {
-	return INVALID;
+return INVALID;
 }
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
-	  checkConcept<Base, _Graph>();
+checkConcept<Base, _Graph>();
-	  typename _Graph::Node node_a, node_b;
+typename _Graph::Node node_a, node_b;
-	  node_a = graph.addNode();
+node_a = graph.addNode();
-	  node_b = graph.addNode();
+node_b = graph.addNode();
-	  typename _Graph::Edge edge;
+typename _Graph::Edge edge;
-	  edge = graph.addEdge(node_a, node_b);
+edge = graph.addEdge(node_a, node_b);
-	}
+}
-	_Graph& graph;
+_Graph& graph;
 };
 };
 /// \brief An empty erasable digraph class.
 ///
 /// This class provides beside the core digraph features core erase
 /// functions for the digraph structure. The main difference between
 /// the base and this interface is that the digraph alterations
 /// should handled already on this level.
 template <typename _Base = BaseDigraphComponent>
 typedef typename Base::Node Node;
 typedef typename Base::Arc Arc;
 /// \brief Erase a node from the digraph.
 ///
 /// Erase a node from the digraph. This function should
 /// erase all arcs connecting to the node.
 void erase(const Node&) {}
 /// \brief Erase an arc from the digraph.
 ///
 /// Erase an arc from the digraph.
 ///
 void erase(const Arc&) {}
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
 checkConcept<Base, _Digraph>();
-	  typename _Digraph::Node node;
+typename _Digraph::Node node;
-	  digraph.erase(node);
+digraph.erase(node);
-	  typename _Digraph::Arc arc;
+typename _Digraph::Arc arc;
-	  digraph.erase(arc);
+digraph.erase(arc);
-	}
+}
-	_Digraph& digraph;
+_Digraph& digraph;
 };
 };
 /// \brief An empty erasable base undirected graph class.
 ///
 /// This class provides beside the core undirected graph features
 /// core erase functions for the undirceted graph structure. The
 /// main difference between the base and this interface is that
 /// the graph alterations should handled already on this level.
 template <typename _Base = BaseGraphComponent>
 /// \brief Erase a node from the graph.
 ///
 /// Erase a node from the graph. This function should erase
 /// arcs connecting to the node.
 void erase(const Node&) {}
 /// \brief Erase an arc from the graph.
 ///
 /// Erase an arc from the graph.
 ///
 void erase(const Edge&) {}
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
 checkConcept<Base, _Graph>();
-	  typename _Graph::Node node;
+typename _Graph::Node node;
-	  graph.erase(node);
+graph.erase(node);
-	  typename _Graph::Edge edge;
+typename _Graph::Edge edge;
-	  graph.erase(edge);
+graph.erase(edge);
-	}
+}
-	_Graph& graph;
+_Graph& graph;
 };
 };
 /// \brief An empty clearable base digraph class.
 ///
 /// \brief Erase all nodes and arcs from the digraph.
 ///
 /// Erase all nodes and arcs from the digraph.
 ///
 void clear() {}
 template <typename _Digraph>
 struct Constraints {
-	void constraints() {
+void constraints() {
 checkConcept<Base, _Digraph>();
-	  digraph.clear();
+digraph.clear();
-	}
+}
-	_Digraph digraph;
+_Digraph digraph;
 };
 };
 /// \brief An empty clearable base undirected graph class.
 ///
 typedef _Base Base;
 template <typename _Graph>
 struct Constraints {
-	void constraints() {
+void constraints() {
 checkConcept<ClearableGraphComponent<Base>, _Graph>();
-	}
+}
-	_Graph graph;
+_Graph graph;
 };
 };
 }

changeset 219	b9c6a47c977b
parent 169	5b507a86ad72
child 220	a5d8c039f218