Changeset 993:157427808b40 in lemon-main

Timestamp:

08/24/12 15:37:23 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Children:

994:20ae244b4779, 997:761fe0846f49

Phase:

public

Message:

Bugfix in AllArcLookUp?<> (#447)

Files:

• lemon/core.h (modified) (1 diff)
• test/CMakeLists.txt (modified) (1 diff)
• test/arc_look_up_test.cc (added)

lemon/core.h

@@ -1849 +1849 @@
     ///a single node \c n, then \ref refresh(Node) "refresh(n)" is enough.
     ///
-#ifdef DOXYGEN
-    Arc operator()(Node s, Node t, Arc prev=INVALID) const {}
-#else
-    using ArcLookUp<GR>::operator() ;
-    Arc operator()(Node s, Node t, Arc prev) const
+    Arc operator()(Node s, Node t, Arc prev=INVALID) const
     {
-      return prev==INVALID?(*this)(s,t):_next[prev];
-    }
+      if(prev==INVALID)
+        {
+          Arc f=INVALID;
+          Arc e;
+          for(e=_head[s];
+              e!=INVALID&&_g.target(e)!=t;
+              e = t < _g.target(e)?_left[e]:_right[e]) ;
+          while(e!=INVALID)
+            if(_g.target(e)==t)
+              {
+                f = e;
+                e = _left[e];
+              }
+            else e = _right[e];
+          return f;
+        }
+      else return _next[prev];
+    }
+
+  };
+
+  /// @}
+
+} //namespace lemon
+
 #endif
-
-  };
-
-  /// @}
-
-} //namespace lemon
-
-#endif

test/CMakeLists.txt

@@ -14 +14 @@
 SET(TESTS
   adaptors_test
+  arc_look_up_test
   bfs_test
   circulation_test