X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraph-container.lisp;h=91fde47f25b8d4e791c846664ca613a03a2bd36d;hb=47ed448564c30a2d685e8897a80b14aa7798261a;hp=345ee48354cd3d2dfacfbacfea85ba136ddb6dec;hpb=24c645986ed5cc5b0b26605cbe2f44873870a624;p=cl-graph.git

diff --git a/dev/graph-container.lisp b/dev/graph-container.lisp
index 345ee48..91fde47 100644
--- a/dev/graph-container.lisp
+++ b/dev/graph-container.lisp
@@ -211,10 +211,9 @@ DISCUSSION
                                           &key error-if-not-found?)
   (bind ((v1 (find-vertex graph value-1 error-if-not-found?))
          (v2 (find-vertex graph value-2 error-if-not-found?)))
-    (aif (and v1 v2 (find-edge-between-vertexes-if graph v1 v2 fn))
-         it
-         (when error-if-not-found?
-           (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2)))))
+    (or (and v1 v2 (find-edge-between-vertexes-if graph v1 v2 fn))
+	(when error-if-not-found?
+	  (error 'graph-edge-not-found-error :vertex-1 v1 :vertex-2 v2)))))
 
 ;;; ---------------------------------------------------------------------------
 
@@ -269,7 +268,7 @@ DISCUSSION
   (iterate-elements (vertex-edges vertex)
                     (lambda (edge)
                       (when (or (undirected-edge-p edge)
-                                (eq vertex (target-vertex edge)))
+                                (eq vertex (source-vertex edge)))
                         (funcall fn edge)))))
 
 ;;; ---------------------------------------------------------------------------
@@ -278,7 +277,7 @@ DISCUSSION
   (iterate-elements (vertex-edges vertex)
                     (lambda (edge)
                       (when (or (undirected-edge-p edge)
-                                (eq vertex (source-vertex edge)))
+                                (eq vertex (target-vertex edge)))
                         (funcall fn edge)))))
 
 ;;; ---------------------------------------------------------------------------