lemon-1.1: comparison lemon/bits/edge_set

equal deleted inserted replaced

-:a1a78c74df98
+:640139f74440
-/* -*- 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
+* Copyright (C) 2003-2011
 * 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
 return Parent::arcFromId(id);
 }
 Node oppositeNode(const Node &n, const Arc &e) const {
 if (n == Parent::source(e))
-	return Parent::target(e);
+return Parent::target(e);
 else if(n==Parent::target(e))
-	return Parent::source(e);
+return Parent::source(e);
 else
-	return INVALID;
+return INVALID;
 }
 // Alteration notifier extensions
 return arc_notifier;
 }
 // Iterable extensions
 class NodeIt : public Node {
 const Digraph* digraph;
 public:
 NodeIt() {}
 NodeIt(Invalid i) : Node(i) { }
 explicit NodeIt(const Digraph& _graph) : digraph(&_graph) {
-	_graph.first(static_cast<Node&>(*this));
+_graph.first(static_cast<Node&>(*this));
 }
 NodeIt(const Digraph& _graph, const Node& node)
-	: Node(node), digraph(&_graph) {}
+: Node(node), digraph(&_graph) {}
 NodeIt& operator++() {
-	digraph->next(*this);
+digraph->next(*this);
-	return *this;
+return *this;
 }
 };
 class ArcIt : public Arc {
 const Digraph* digraph;
 public:
 ArcIt() { }
 ArcIt(Invalid i) : Arc(i) { }
 explicit ArcIt(const Digraph& _graph) : digraph(&_graph) {
-	_graph.first(static_cast<Arc&>(*this));
+_graph.first(static_cast<Arc&>(*this));
 }
 ArcIt(const Digraph& _graph, const Arc& e) :
-	Arc(e), digraph(&_graph) { }
+Arc(e), digraph(&_graph) { }
 ArcIt& operator++() {
-	digraph->next(*this);
+digraph->next(*this);
-	return *this;
+return *this;
 }
 };
 class OutArcIt : public Arc {
 const Digraph* digraph;
 public:
 OutArcIt() { }
 OutArcIt(Invalid i) : Arc(i) { }
 OutArcIt(const Digraph& _graph, const Node& node)
-	: digraph(&_graph) {
+: digraph(&_graph) {
-	_graph.firstOut(*this, node);
+_graph.firstOut(*this, node);
 }
 OutArcIt(const Digraph& _graph, const Arc& arc)
-	: Arc(arc), digraph(&_graph) {}
+: Arc(arc), digraph(&_graph) {}
 OutArcIt& operator++() {
-	digraph->nextOut(*this);
+digraph->nextOut(*this);
-	return *this;
+return *this;
 }
 };
 class InArcIt : public Arc {
 const Digraph* digraph;
 public:
 InArcIt() { }
 InArcIt(Invalid i) : Arc(i) { }
 InArcIt(const Digraph& _graph, const Node& node)
-	: digraph(&_graph) {
+: digraph(&_graph) {
-	_graph.firstIn(*this, node);
+_graph.firstIn(*this, node);
 }
 InArcIt(const Digraph& _graph, const Arc& arc) :
-	Arc(arc), digraph(&_graph) {}
+Arc(arc), digraph(&_graph) {}
 InArcIt& operator++() {
-	digraph->nextIn(*this);
+digraph->nextIn(*this);
-	return *this;
+return *this;
 }
 };
 // \brief Base node of the iterator
 }
 using Parent::first;
 // Mappable extension
 template <typename _Value>
 class ArcMap
 : public MapExtender<DefaultMap<Digraph, Arc, _Value> > {
 typedef MapExtender<DefaultMap<Digraph, Arc, _Value> > Parent;
 public:
 explicit ArcMap(const Digraph& _g)
-	: Parent(_g) {}
+: Parent(_g) {}
 ArcMap(const Digraph& _g, const _Value& _v)
-	: Parent(_g, _v) {}
+: Parent(_g, _v) {}
 ArcMap& operator=(const ArcMap& cmap) {
-	return operator=<ArcMap>(cmap);
+return operator=<ArcMap>(cmap);
 }
 template <typename CMap>
 ArcMap& operator=(const CMap& cmap) {
 Parent::operator=(cmap);
-	return *this;
+return *this;
 }
 };
 Arc addArc(const Node& from, const Node& to) {
 Arc arc = Parent::addArc(from, to);
 notifier(Arc()).add(arc);
 return arc;
 }
 void clear() {
 notifier(Arc()).clear();
 Parent::clear();
 }
 return Parent::edgeFromId(id);
 }
 Node oppositeNode(const Node &n, const Edge &e) const {
 if( n == Parent::u(e))
-	return Parent::v(e);
+return Parent::v(e);
 else if( n == Parent::v(e))
-	return Parent::u(e);
+return Parent::u(e);
 else
-	return INVALID;
+return INVALID;
 }
 Arc oppositeArc(const Arc &e) const {
 return Parent::direct(e, !Parent::direction(e));
 }
 mutable EdgeNotifier edge_notifier;
 public:
 using Parent::notifier;
 ArcNotifier& notifier(Arc) const {
 return arc_notifier;
 }
 EdgeNotifier& notifier(Edge) const {
 return edge_notifier;
 }
 class NodeIt : public Node {
 const Graph* graph;
 public:
 NodeIt() {}
 NodeIt(Invalid i) : Node(i) { }
 explicit NodeIt(const Graph& _graph) : graph(&_graph) {
-	_graph.first(static_cast<Node&>(*this));
+_graph.first(static_cast<Node&>(*this));
 }
 NodeIt(const Graph& _graph, const Node& node)
-	: Node(node), graph(&_graph) {}
+: Node(node), graph(&_graph) {}
 NodeIt& operator++() {
-	graph->next(*this);
+graph->next(*this);
-	return *this;
+return *this;
 }
 };
 class ArcIt : public Arc {
 const Graph* graph;
 public:
 ArcIt() { }
 ArcIt(Invalid i) : Arc(i) { }
 explicit ArcIt(const Graph& _graph) : graph(&_graph) {
-	_graph.first(static_cast<Arc&>(*this));
+_graph.first(static_cast<Arc&>(*this));
 }
 ArcIt(const Graph& _graph, const Arc& e) :
-	Arc(e), graph(&_graph) { }
+Arc(e), graph(&_graph) { }
 ArcIt& operator++() {
-	graph->next(*this);
+graph->next(*this);
-	return *this;
+return *this;
 }
 };
 class OutArcIt : public Arc {
 const Graph* graph;
 public:
 OutArcIt() { }
 OutArcIt(Invalid i) : Arc(i) { }
 OutArcIt(const Graph& _graph, const Node& node)
-	: graph(&_graph) {
+: graph(&_graph) {
-	_graph.firstOut(*this, node);
+_graph.firstOut(*this, node);
 }
 OutArcIt(const Graph& _graph, const Arc& arc)
-	: Arc(arc), graph(&_graph) {}
+: Arc(arc), graph(&_graph) {}
 OutArcIt& operator++() {
-	graph->nextOut(*this);
+graph->nextOut(*this);
-	return *this;
+return *this;
 }
 };
 class InArcIt : public Arc {
 const Graph* graph;
 public:
 InArcIt() { }
 InArcIt(Invalid i) : Arc(i) { }
 InArcIt(const Graph& _graph, const Node& node)
-	: graph(&_graph) {
+: graph(&_graph) {
-	_graph.firstIn(*this, node);
+_graph.firstIn(*this, node);
 }
 InArcIt(const Graph& _graph, const Arc& arc) :
-	Arc(arc), graph(&_graph) {}
+Arc(arc), graph(&_graph) {}
 InArcIt& operator++() {
-	graph->nextIn(*this);
+graph->nextIn(*this);
-	return *this;
+return *this;
 }
 };
 class EdgeIt : public Parent::Edge {
 const Graph* graph;
 public:
 EdgeIt() { }
 EdgeIt(Invalid i) : Edge(i) { }
 explicit EdgeIt(const Graph& _graph) : graph(&_graph) {
-	_graph.first(static_cast<Edge&>(*this));
+_graph.first(static_cast<Edge&>(*this));
 }
 EdgeIt(const Graph& _graph, const Edge& e) :
-	Edge(e), graph(&_graph) { }
+Edge(e), graph(&_graph) { }
 EdgeIt& operator++() {
-	graph->next(*this);
+graph->next(*this);
-	return *this;
+return *this;
 }
 };
 class IncEdgeIt : public Parent::Edge {
 IncEdgeIt() { }
 IncEdgeIt(Invalid i) : Edge(i), direction(false) { }
 IncEdgeIt(const Graph& _graph, const Node &n) : graph(&_graph) {
-	_graph.firstInc(*this, direction, n);
+_graph.firstInc(*this, direction, n);
 }
 IncEdgeIt(const Graph& _graph, const Edge &ue, const Node &n)
-	: graph(&_graph), Edge(ue) {
+: graph(&_graph), Edge(ue) {
-	direction = (_graph.source(ue) == n);
+direction = (_graph.source(ue) == n);
 }
 IncEdgeIt& operator++() {
-	graph->nextInc(*this, direction);
+graph->nextInc(*this, direction);
-	return *this;
+return *this;
 }
 };
 // \brief Base node of the iterator
 //
 return e.direction ? v(e) : u(e);
 }
 template <typename _Value>
 class ArcMap
 : public MapExtender<DefaultMap<Graph, Arc, _Value> > {
 typedef MapExtender<DefaultMap<Graph, Arc, _Value> > Parent;
 public:
 explicit ArcMap(const Graph& _g)
-	: Parent(_g) {}
+: Parent(_g) {}
 ArcMap(const Graph& _g, const _Value& _v)
-	: Parent(_g, _v) {}
+: Parent(_g, _v) {}
 ArcMap& operator=(const ArcMap& cmap) {
-	return operator=<ArcMap>(cmap);
+return operator=<ArcMap>(cmap);
 }
 template <typename CMap>
 ArcMap& operator=(const CMap& cmap) {
 Parent::operator=(cmap);
-	return *this;
+return *this;
 }
 };
 template <typename _Value>
 class EdgeMap
 : public MapExtender<DefaultMap<Graph, Edge, _Value> > {
 typedef MapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
 public:
 explicit EdgeMap(const Graph& _g)
-	: Parent(_g) {}
+: Parent(_g) {}
 EdgeMap(const Graph& _g, const _Value& _v)
-	: Parent(_g, _v) {}
+: Parent(_g, _v) {}
 EdgeMap& operator=(const EdgeMap& cmap) {
-	return operator=<EdgeMap>(cmap);
+return operator=<EdgeMap>(cmap);
 }
 template <typename CMap>
 EdgeMap& operator=(const CMap& cmap) {
 Parent::operator=(cmap);
-	return *this;
+return *this;
 }
 };
 arcs.push_back(Parent::direct(edge, true));
 arcs.push_back(Parent::direct(edge, false));
 notifier(Arc()).add(arcs);
 return edge;
 }
 void clear() {
 notifier(Arc()).clear();
 notifier(Edge()).clear();
 Parent::clear();
 }
 ~EdgeSetExtender() {
 edge_notifier.clear();
 arc_notifier.clear();
 }
 };
 }
 #endif

branch	1.1
changeset 784	a30455cd0107
parent 725	8af504c71ac4
child 793	8d2e55fac752