LEMON/LEMON-main Changeset - r125:19e82bda606a

Repositories » LEMON » LEMON-main

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

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

@@ -358,39 +358,39 @@
 		      return Parent::nodeFromId(id);
+		    }
 		    Arc fromId(int id, Arc) const {
 		      return Parent::arcFromId(id);
+		    }
 		    Edge fromId(int id, Edge) const {
 		      return Parent::edgeFromId(id);
+		    }
 		    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;
+		    }
 		    Arc oppositeArc(const Arc &arc) const {
 		      return Parent::direct(arc, !Parent::direction(arc));
+		    }
 		    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
 		    typedef AlterationNotifier<GraphExtender, Node> NodeNotifier;
 		    typedef AlterationNotifier<GraphExtender, Arc> ArcNotifier;
 		    typedef AlterationNotifier<GraphExtender, Edge> EdgeNotifier;
 		  protected:
 		    mutable NodeNotifier node_notifier;
@@ -577,31 +577,31 @@
 		    /// \brief Running node of the iterator
 		    ///
 		    /// Returns the running node (ie. the source in this case) of the
 		    /// iterator
 		    Node runningNode(const InArcIt &arc) const {
 		      return Parent::source(static_cast<const Arc&>(arc));
+		    }
 		    /// Base node of the iterator
 		    ///
 		    /// 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
 		    template <typename _Value>
 		    class NodeMap
 		      : public MapExtender<DefaultMap<Graph, Node, _Value> > {
 		    public:
 		      typedef GraphExtender Graph;
 		      typedef MapExtender<DefaultMap<Graph, Node, _Value> > Parent;
 		      NodeMap(const Graph& graph)

lemon/concepts/digraph.h

Show inline comments

@@ -458,29 +458,29 @@
 		        ///\e
 		        ArcMap(const Digraph&, T) { }
 		        ///Copy constructor
 		        ArcMap(const ArcMap& em) : ReadWriteMap<Arc,T>(em) { }
 		        ///Assignment operator
 		        template <typename CMap>
 		        ArcMap& operator=(const CMap&) {
 		          checkConcept<ReadMap<Arc, T>, CMap>();
 		          return *this;
+		        }
 		      };
-		      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>();
+		        }
 		      };
 		    };
 		  } //namespace concepts
 		} //namespace lemon
 		#endif // LEMON_CONCEPT_DIGRAPH_H

lemon/concepts/graph.h

Show inline comments

@@ -722,28 +722,28 @@
 		      /// Returns the base node of the iterator
 		      Node baseNode(IncEdgeIt) const {
 			return INVALID;
+		      }
 		      /// \brief Running node of the iterator
 		      ///
 		      /// Returns the running node of the iterator
 		      Node runningNode(IncEdgeIt) const {
 			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>();
+			}
 		      };
 		    };
+		  }
+		}
 		#endif

lemon/smart_graph.h

Show inline comments

@@ -461,26 +461,26 @@
 		    SmartGraphBase()
 		      : nodes(), arcs() {}
 		    int maxNodeId() const { return nodes.size()-1; }
 		    int maxEdgeId() const { return arcs.size() / 2 - 1; }
 		    int maxArcId() const { return arcs.size()-1; }
 		    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;
+		    }
 		    static Arc direct(Edge e, bool d) {
 		      return Arc(e._id * 2 + (d ? 1 : 0));
+		    }
 		    void first(Node& node) const {
 		      node._id = nodes.size() - 1;
+		    }

0 comments (0 inline)

RhodeCode

Login to your account