Changeset 1158:29961fa390a3 in lemon-0.x for src/lemon/undir_graph_extender.h

Timestamp:

02/20/05 02:02:07 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1559

Message:

Graph and UndirGraph? concept modifications.

• For incidence iterators ({In,Out,Inc}EdgeIt?) there is now baseNode and runningNode functions in graph interface
• For Edge in undir graphs: Edge(UndirGraph? const &, UndirEdge?, Node) constructor. Same for IncEdgeIt?
• Edge(UndirEdge?, bool) constructor is no more in the public interface. (But we need it in the developpers interface).

File:

• src/lemon/undir_graph_extender.h (modified) (3 diffs)

src/lemon/undir_graph_extender.h

@@ -45 +45 @@
     public:
       Edge() {}
-      /// Construct a direct edge from undirect edge and a direction.
+
+      /// \brief Directed edge from undirected edge and a direction.
+      ///
+      /// This constructor is not a part of the concept interface of
+      /// undirected graph, so please avoid using it if possible!
       Edge(const UndirEdge &ue, bool _forward) :
-        UndirEdge(ue), forward(_forward) {}
+        UndirEdge(ue), forward(_forward) {}
+
+      /// \brief Directed edge from undirected edge and a source node.
+      ///
+      /// Constructs a directed edge from undirected edge and a source node.
+      ///
+      /// \note You have to specify the graph for this constructor.
+      Edge(const Graph &g, const UndirEdge &ue, const Node &n) :
+        UndirEdge(ue) { forward = (g.source(ue) == n); }
+
       /// Invalid edge constructor
       Edge(Invalid i) : UndirEdge(i), forward(true) {}
@@ -64 +77 @@
 
 
-    /// \brief Returns the Edge of opposite direction.
-    ///
-    /// \bug Is this a good name for this? Or "reverse" is better?
+    /// \brief Edge of opposite direction.
+    ///
+    /// Returns the Edge of opposite direction.
     Edge opposite(const Edge &e) const {
       return Edge(e,!e.forward);
@@ -118 +131 @@
     }
 
+    /// Directed edge from an undirected edge and a source node.
+    ///
+    /// Returns a (directed) Edge corresponding to the specified UndirEdge
+    /// and source Node.
+    ///
+    ///\todo Do we need this?
+    ///
+    ///\todo Better name...
+    Edge edgeWithSource(const UndirEdge &ue, const Node &s) const {
+      return Edge(*this, eu, s);
+    }
 
     using Parent::first;