LEMON/LEMON-official Changeset - r125:19e82bda606a

Repositories » LEMON » LEMON-official

Changeset - r125:19e82bda606a

« 124:ae7785

126:e1dd2a »

r125:19e82bda606a

Mon, 14 Apr 2008 18:37:18

[Not Reviewed]

0 comments (0 inline)

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

Fix bug #83 in graph concept, extender and smart graph

0 4 0

default

4 files changed with 17 insertions and 17 deletions:

lemon/bits/graph_extender.h

lemon/concepts/digraph.h

lemon/concepts/graph.h

lemon/smart_graph.h

↑ Collapse diff ↑

lemon/bits/graph_extender.h

Show inline comments

@@ -367,10 +367,10 @@
+		    }
 		    Node oppositeNode(const Node &n, const Edge &e) const {
 		      if( n == Parent::source(e))
 			return Parent::target(e);
 		      else if( n == Parent::target(e))
 			return Parent::source(e);
 		      if( n == Parent::u(e))
 			return Parent::v(e);
 		      else if( n == Parent::v(e))
 			return Parent::u(e);
 		      else
 			return INVALID;
+		    }
@@ -381,7 +381,7 @@
 		    using Parent::direct;
 		    Arc direct(const Edge &edge, const Node &node) const {
-		      return Parent::direct(edge, Parent::source(edge) == node);
+		      return Parent::direct(edge, Parent::u(edge) == node);
+		    }
 		    // Alterable extension
@@ -586,13 +586,13 @@
 		    ///
 		    /// Returns the base node of the iterator
 		    Node baseNode(const IncEdgeIt &edge) const {
-		      return edge._direction ? source(edge) : target(edge);
+		      return edge._direction ? u(edge) : v(edge);
+		    }
 		    /// Running node of the iterator
 		    ///
 		    /// Returns the running node of the iterator
 		    Node runningNode(const IncEdgeIt &edge) const {
-		      return edge._direction ? target(edge) : source(edge);
+		      return edge._direction ? v(edge) : u(edge);
+		    }
 		    // Mappable extension

lemon/concepts/digraph.h

Show inline comments

@@ -467,12 +467,12 @@
+		        }
 		      };
-		      template <typename RDigraph>
+		      template <typename _Digraph>
 		      struct Constraints {
 		        void constraints() {
 		          checkConcept<IterableDigraphComponent<>, Digraph>();
 			  checkConcept<IDableDigraphComponent<>, Digraph>();
-		          checkConcept<MappableDigraphComponent<>, Digraph>();
+		          checkConcept<IterableDigraphComponent<>, _Digraph>();
 			  checkConcept<IDableDigraphComponent<>, _Digraph>();
 		          checkConcept<MappableDigraphComponent<>, _Digraph>();
+		        }
 		      };

lemon/concepts/graph.h

Show inline comments

@@ -731,12 +731,12 @@
 			return INVALID;
+		      }
-		      template <typename Graph>
+		      template <typename _Graph>
 		      struct Constraints {
 			void constraints() {
 			  checkConcept<IterableGraphComponent<>, Graph>();
 			  checkConcept<IDableGraphComponent<>, Graph>();
-			  checkConcept<MappableGraphComponent<>, Graph>();
+			  checkConcept<IterableGraphComponent<>, _Graph>();
 			  checkConcept<IDableGraphComponent<>, _Graph>();
 			  checkConcept<MappableGraphComponent<>, _Graph>();
+			}
 		      };

lemon/smart_graph.h

Show inline comments

@@ -470,8 +470,8 @@
 		    Node source(Arc e) const { return Node(arcs[e._id ^ 1].target); }
 		    Node target(Arc e) const { return Node(arcs[e._id].target); }
 		    Node source(Edge e) const { return Node(arcs[2 * e._id].target); }
 		    Node target(Edge e) const { return Node(arcs[2 * e._id + 1].target); }
 		    Node u(Edge e) const { return Node(arcs[2 * e._id].target); }
 		    Node v(Edge e) const { return Node(arcs[2 * e._id + 1].target); }
 		    static bool direction(Arc e) {
 		      return (e._id & 1) == 1;

0 comments (0 inline)

RhodeCode