parenthetically speaking, the definition of find-edge-between-vertexes was borked.

[cl-graph.git] / dev / graph.lisp

diff --git a/dev/graph.lisp b/dev/graph.lisp
index 663088b..6ff6b65 100644 (file)
--- a/dev/graph.lisp
+++ b/dev/graph.lisp
@@ -461,9 +461,10 @@ something is putting something on the vertexes plist's
      &key (error-if-not-found? t))
   (let* ((v1 (find-vertex graph value-1 error-if-not-found?))
         (v2 (find-vertex graph value-2 error-if-not-found?)))
-    (or (and v1 v2 (find-edge-between-vertexes graph v1 v2)))
-    (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 graph v1 v2))
+       (when error-if-not-found?
+         (error 'graph-edge-not-found-error
+                :graph graph :vertex-1 v1 :vertex-2 v2)))))
 
 ;;; ---------------------------------------------------------------------------
 
@@ -848,15 +849,15 @@ something is putting something on the vertexes plist's
 ;;; ---------------------------------------------------------------------------
 
 ;; also in metatilites
-(defun graph-search (states goal-p successors combiner
-                     &key (state= #'eql) old-states
-                     (new-state-fn #'new-states))
+(defun graph-search-for-cl-graph (states goal-p successors combiner
+                                 &key (state= #'eql) old-states
+                                 (new-state-fn #'new-states))
   "Find a state that satisfies goal-p.  Start with states,
   and search according to successors and combiner.  
   Don't try the same state twice."
   (cond ((null states) nil)
         ((funcall goal-p (first states)) (first states))
-        (t (graph-search
+        (t (graph-search-for-cl-graph
              (funcall
                combiner
                (funcall new-state-fn states successors state= old-states)
@@ -870,7 +871,7 @@ something is putting something on the vertexes plist's
 (defmethod in-cycle-p ((graph basic-graph) (start-vertex basic-vertex))
   (let ((first-time? t))
     (not (null
-          (graph-search 
+          (graph-search-for-cl-graph 
            (list start-vertex)
            (lambda (v)
              (if first-time?