Changeset 1627:3fd1ba6e9872 in lemon-0.x for lemon/bits/undir_graph_extender.h

Timestamp:

08/11/05 17:55:17 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some modification on the undirected graph interface.
Doc improvments

File:

• lemon/bits/undir_graph_extender.h (modified) (4 diffs)

lemon/bits/undir_graph_extender.h

@@ -43 +43 @@
       bool forward;
 
+      Edge(const UndirEdge &ue, bool _forward) :
+        UndirEdge(ue), forward(_forward) {}
+
     public:
       Edge() {}
-
-      /// \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) {}
-
-      /// \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
@@ -80 +68 @@
     ///
     /// Returns the Edge of opposite direction.
-    Edge opposite(const Edge &e) const {
+    Edge oppositeEdge(const Edge &e) const {
       return Edge(e,!e.forward);
     }
@@ -114 +102 @@
       return _dirTarget(e);
     }
-
-    /// Returns whether the given directed edge is same orientation as the
-    /// corresponding undirected edge.
-    ///
-    /// \todo reference to the corresponding point of the undirected graph
-    /// concept. "What does the direction of an undirected edge mean?"
-    bool forward(const Edge &e) const { return e.forward; }
 
     Node oppositeNode(const Node &n, const UndirEdge &e) const {
@@ -131 +112 @@
     }
 
-    /// Directed edge from an undirected edge and a source node.
+    /// \brief 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, ue, s);
-    }
+    Edge direct(const UndirEdge &ue, const Node &s) const {
+      return Edge(ue, s == source(ue));
+    }
+
+    /// \brief Directed edge from an undirected edge.
+    ///
+    /// Returns a directed edge corresponding to the specified UndirEdge.
+    /// If the given bool is true the given undirected edge and the
+    /// returned edge have the same source node.
+    Edge direct(const UndirEdge &ue, bool d) const {
+      return Edge(ue, d);
+    }
+
+    /// Returns whether the given directed edge is same orientation as the
+    /// corresponding undirected edge.
+    ///
+    /// \todo reference to the corresponding point of the undirected graph
+    /// concept. "What does the direction of an undirected edge mean?"
+    bool direction(const Edge &e) const { return e.forward; }
+
 
     using Parent::first;