Changeset 2222:a24939ee343c in lemon-0.x

Timestamp:

09/29/06 13:23:54 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

findEdge extension also for the BpUGraphs
proper handling of loop edges in the UGraph::findUEdge

Location:

lemon/bits

Files:

• base_extender.h (modified) (3 diffs)
• graph_extender.h (modified) (1 diff)

lemon/bits/base_extender.h

@@ -36 +36 @@
   /// \ingroup graphbits
   ///
-  /// \brief BaseExtender for the UGraphs
+  /// \brief BaseGraph to BaseUGraph extender
   template <typename Base>
   class UndirGraphExtender : public Base {
@@ -239 +239 @@
     }
 
-    Edge findEdge(Node source, Node target, Edge prev) const {
+    Edge findEdge(Node source, Node target, Edge prev = INVALID) const {
       if (prev == INVALID) {
         UEdge edge = Parent::findEdge(source, target);
@@ -257 +257 @@
     }
 
-    UEdge findUEdge(Node source, Node target, UEdge prev) const {
-      if (prev == INVALID) {
-        UEdge edge = Parent::findEdge(source, target);
-        if (edge != INVALID) return edge;
-        edge = Parent::findEdge(target, source);
-        if (edge != INVALID) return edge;
-      } else if (Parent::source(prev) == source) {
-        UEdge edge = Parent::findEdge(source, target, prev);
-        if (edge != INVALID) return edge;
-        edge = Parent::findEdge(target, source);
-        if (edge != INVALID) return edge;       
+    UEdge findUEdge(Node source, Node target, UEdge prev = INVALID) const {
+      if (source != target) {
+        if (prev == INVALID) {
+          UEdge edge = Parent::findEdge(source, target);
+          if (edge != INVALID) return edge;
+          edge = Parent::findEdge(target, source);
+          if (edge != INVALID) return edge;
+        } else if (Parent::source(prev) == source) {
+          UEdge edge = Parent::findEdge(source, target, prev);
+          if (edge != INVALID) return edge;
+          edge = Parent::findEdge(target, source);
+          if (edge != INVALID) return edge;     
+        } else {
+          UEdge edge = Parent::findEdge(target, source, prev);
+          if (edge != INVALID) return edge;           
+        }
       } else {
-        UEdge edge = Parent::findEdge(target, source, prev);
-        if (edge != INVALID) return edge;             
+        return Parent::findEdge(source, target, prev);
       }
       return INVALID;

lemon/bits/graph_extender.h

@@ -1524 +1524 @@
     }
 
+    Edge findEdge(Node u, Node v, Edge prev = INVALID) const {
+      UEdge uedge = Parent::findUEdge(u, v, prev);
+      if (uedge != INVALID) {
+        return direct(uedge, Parent::aNode(u));
+      } else {
+        return INVALID;
+      }
+    }
 
   };