lemon-1.3: comparison lemon/bits/base

equal deleted inserted replaced

-:b78d12b1833c
+:f62ffd1acdaf
-/* -*- 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).
 *
 /// Invalid arc constructor
 Arc(Invalid i) : Edge(i), forward(true) {}
 bool operator==(const Arc &that) const {
-	return forward==that.forward && Edge(*this)==Edge(that);
+return forward==that.forward && Edge(*this)==Edge(that);
 }
 bool operator!=(const Arc &that) const {
-	return forward!=that.forward || Edge(*this)!=Edge(that);
+return forward!=that.forward || Edge(*this)!=Edge(that);
 }
 bool operator<(const Arc &that) const {
-	return forward<that.forward ||
+return forward<that.forward ||
-	  (!(that.forward<forward) && Edge(*this)<Edge(that));
+(!(that.forward<forward) && Edge(*this)<Edge(that));
 }
 };
 e.forward=true;
 }
 void next(Arc &e) const {
 if( e.forward ) {
-	e.forward = false;
+e.forward = false;
 }
 else {
-	Parent::next(e);
+Parent::next(e);
-	e.forward = true;
+e.forward = true;
 }
 }
 void firstOut(Arc &e, const Node &n) const {
 Parent::firstIn(e,n);
 if( Edge(e) != INVALID ) {
-	e.forward = false;
+e.forward = false;
 }
 else {
-	Parent::firstOut(e,n);
+Parent::firstOut(e,n);
-	e.forward = true;
+e.forward = true;
 }
 }
 void nextOut(Arc &e) const {
 if( ! e.forward ) {
-	Node n = Parent::target(e);
+Node n = Parent::target(e);
-	Parent::nextIn(e);
+Parent::nextIn(e);
-	if( Edge(e) == INVALID ) {
+if( Edge(e) == INVALID ) {
-	  Parent::firstOut(e, n);
+Parent::firstOut(e, n);
-	  e.forward = true;
+e.forward = true;
-	}
+}
 }
 else {
-	Parent::nextOut(e);
+Parent::nextOut(e);
 }
 }
 void firstIn(Arc &e, const Node &n) const {
 Parent::firstOut(e,n);
 if( Edge(e) != INVALID ) {
-	e.forward = false;
+e.forward = false;
 }
 else {
-	Parent::firstIn(e,n);
+Parent::firstIn(e,n);
-	e.forward = true;
+e.forward = true;
 }
 }
 void nextIn(Arc &e) const {
 if( ! e.forward ) {
-	Node n = Parent::source(e);
+Node n = Parent::source(e);
-	Parent::nextOut(e);
+Parent::nextOut(e);
-	if( Edge(e) == INVALID ) {
+if( Edge(e) == INVALID ) {
-	  Parent::firstIn(e, n);
+Parent::firstIn(e, n);
-	  e.forward = true;
+e.forward = true;
-	}
+}
 }
 else {
-	Parent::nextIn(e);
+Parent::nextIn(e);
 }
 }
 void firstInc(Edge &e, bool &d, const Node &n) const {
 d = true;
 Parent::firstIn(e, n);
 }
 void nextInc(Edge &e, bool &d) const {
 if (d) {
-	Node s = Parent::source(e);
+Node s = Parent::source(e);
-	Parent::nextOut(e);
+Parent::nextOut(e);
-	if (e != INVALID) return;
+if (e != INVALID) return;
-	d = false;
+d = false;
-	Parent::firstIn(e, s);
+Parent::firstIn(e, s);
 } else {
-	Parent::nextIn(e);
+Parent::nextIn(e);
 }
 }
 Node nodeFromId(int ix) const {
 return Parent::nodeFromId(ix);
 return Parent::arcNum();
 }
 Arc findArc(Node s, Node t, Arc p = INVALID) const {
 if (p == INVALID) {
-	Edge arc = Parent::findArc(s, t);
+Edge arc = Parent::findArc(s, t);
-	if (arc != INVALID) return direct(arc, true);
+if (arc != INVALID) return direct(arc, true);
-	arc = Parent::findArc(t, s);
+arc = Parent::findArc(t, s);
-	if (arc != INVALID) return direct(arc, false);
+if (arc != INVALID) return direct(arc, false);
 } else if (direction(p)) {
-	Edge arc = Parent::findArc(s, t, p);
+Edge arc = Parent::findArc(s, t, p);
-	if (arc != INVALID) return direct(arc, true);
+if (arc != INVALID) return direct(arc, true);
-	arc = Parent::findArc(t, s);
+arc = Parent::findArc(t, s);
-	if (arc != INVALID) return direct(arc, false);
+if (arc != INVALID) return direct(arc, false);
 } else {
-	Edge arc = Parent::findArc(t, s, p);
+Edge arc = Parent::findArc(t, s, p);
-	if (arc != INVALID) return direct(arc, false);
+if (arc != INVALID) return direct(arc, false);
 }
 return INVALID;
 }
 Edge findEdge(Node s, Node t, Edge p = INVALID) const {
 if (arc != INVALID) return arc;
 } else if (Parent::s(p) == s) {
 Edge arc = Parent::findArc(s, t, p);
 if (arc != INVALID) return arc;
 arc = Parent::findArc(t, s);
 if (arc != INVALID) return arc;
 } else {
 Edge arc = Parent::findArc(t, s, p);
 if (arc != INVALID) return arc;
 }
 } else {
 return Parent::findArc(s, t, p);
 }
 return INVALID;
 class Red : public Node {
 friend class BidirBpGraphExtender;
 public:
 Red() {}
 Red(const Node& node) : Node(node) {
-	LEMON_ASSERT(Parent::red(node) || node == INVALID,
+LEMON_ASSERT(Parent::red(node) || node == INVALID,
-		     typename Parent::NodeSetError());
+typename Parent::NodeSetError());
 }
 Red& operator=(const Node& node) {
-	LEMON_ASSERT(Parent::red(node) || node == INVALID,
+LEMON_ASSERT(Parent::red(node) || node == INVALID,
-		     typename Parent::NodeSetError());
+typename Parent::NodeSetError());
 Node::operator=(node);
 return *this;
 }
 Red(Invalid) : Node(INVALID) {}
 Red& operator=(Invalid) {
 class Blue : public Node {
 friend class BidirBpGraphExtender;
 public:
 Blue() {}
 Blue(const Node& node) : Node(node) {
-	LEMON_ASSERT(Parent::blue(node) || node == INVALID,
+LEMON_ASSERT(Parent::blue(node) || node == INVALID,
-		     typename Parent::NodeSetError());
+typename Parent::NodeSetError());
 }
 Blue& operator=(const Node& node) {
-	LEMON_ASSERT(Parent::blue(node) || node == INVALID,
+LEMON_ASSERT(Parent::blue(node) || node == INVALID,
-		     typename Parent::NodeSetError());
+typename Parent::NodeSetError());
 Node::operator=(node);
 return *this;
 }
 Blue(Invalid) : Node(INVALID) {}
 Blue& operator=(Invalid) {
 Parent::firstBlue(static_cast<Node&>(node));
 }
 void next(Blue& node) const {
 Parent::nextBlue(static_cast<Node&>(node));
 }
 int id(const Blue& node) const {
 return Parent::redId(node);
 }
 Node source(const Edge& arc) const {
 return blue(arc);
 }
 void firstInc(Edge& arc, bool& dir, const Node& node) const {
 if (Parent::red(node)) {
-	Parent::firstFromRed(arc, node);
+Parent::firstFromRed(arc, node);
-	dir = true;
+dir = true;
 } else {
-	Parent::firstFromBlue(arc, node);
+Parent::firstFromBlue(arc, node);
-	dir = static_cast<Edge&>(arc) == INVALID;
+dir = static_cast<Edge&>(arc) == INVALID;
 }
 }
 void nextInc(Edge& arc, bool& dir) const {
 if (dir) {
-	Parent::nextFromRed(arc);
+Parent::nextFromRed(arc);
 } else {
-	Parent::nextFromBlue(arc);
+Parent::nextFromBlue(arc);
-	if (arc == INVALID) dir = true;
+if (arc == INVALID) dir = true;
 }
 }
 class Arc : public Edge {
 friend class BidirBpGraphExtender;
 protected:
 bool forward;
 Arc(const Edge& arc, bool _forward)
-	: Edge(arc), forward(_forward) {}
+: Edge(arc), forward(_forward) {}
 public:
 Arc() {}
 Arc (Invalid) : Edge(INVALID), forward(true) {}
 bool operator==(const Arc& i) const {
-	return Edge::operator==(i) && forward == i.forward;
+return Edge::operator==(i) && forward == i.forward;
 }
 bool operator!=(const Arc& i) const {
-	return Edge::operator!=(i) || forward != i.forward;
+return Edge::operator!=(i) || forward != i.forward;
 }
 bool operator<(const Arc& i) const {
-	return Edge::operator<(i) ||
+return Edge::operator<(i) ||
-	  (!(i.forward<forward) && Edge(*this)<Edge(i));
+(!(i.forward<forward) && Edge(*this)<Edge(i));
 }
 };
 void first(Arc& arc) const {
 Parent::first(static_cast<Edge&>(arc));
 arc.forward = true;
 }
 void next(Arc& arc) const {
 if (!arc.forward) {
-	Parent::next(static_cast<Edge&>(arc));
+Parent::next(static_cast<Edge&>(arc));
 }
 arc.forward = !arc.forward;
 }
 void firstOut(Arc& arc, const Node& node) const {
 if (Parent::red(node)) {
-	Parent::firstFromRed(arc, node);
+Parent::firstFromRed(arc, node);
-	arc.forward = true;
+arc.forward = true;
 } else {
-	Parent::firstFromBlue(arc, node);
+Parent::firstFromBlue(arc, node);
-	arc.forward = static_cast<Edge&>(arc) == INVALID;
+arc.forward = static_cast<Edge&>(arc) == INVALID;
 }
 }
 void nextOut(Arc& arc) const {
 if (arc.forward) {
-	Parent::nextFromRed(arc);
+Parent::nextFromRed(arc);
 } else {
-	Parent::nextFromBlue(arc);
+Parent::nextFromBlue(arc);
 arc.forward = static_cast<Edge&>(arc) == INVALID;
 }
 }
 void firstIn(Arc& arc, const Node& node) const {
 if (Parent::blue(node)) {
-	Parent::firstFromBlue(arc, node);
+Parent::firstFromBlue(arc, node);
-	arc.forward = true;
+arc.forward = true;
 } else {
-	Parent::firstFromRed(arc, node);
+Parent::firstFromRed(arc, node);
-	arc.forward = static_cast<Edge&>(arc) == INVALID;
+arc.forward = static_cast<Edge&>(arc) == INVALID;
 }
 }
 void nextIn(Arc& arc) const {
 if (arc.forward) {
-	Parent::nextFromBlue(arc);
+Parent::nextFromBlue(arc);
 } else {
-	Parent::nextFromRed(arc);
+Parent::nextFromRed(arc);
-	arc.forward = static_cast<Edge&>(arc) == INVALID;
+arc.forward = static_cast<Edge&>(arc) == INVALID;
 }
 }
 Node source(const Arc& arc) const {
 return arc.forward ? Parent::red(arc) : Parent::blue(arc);
 Node target(const Arc& arc) const {
 return arc.forward ? Parent::blue(arc) : Parent::red(arc);
 }
 int id(const Arc& arc) const {
 return (Parent::id(static_cast<const Edge&>(arc)) << 1) +
 (arc.forward ? 0 : 1);
 }
 Arc arcFromId(int ix) const {
 return Arc(Parent::fromEdgeId(ix >> 1), (ix & 1) == 0);
 }

changeset 218	0d6511647639
parent 107	31a2e6d28f61
child 220	a5d8c039f218