X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraph.lisp;h=d71ab6ce0d27437d457784501804948b9e33ae23;hb=e95dd49b959e672614b7eb2c109c2d842b6f4a23;hp=663088bc7c925aa8037629957442d6d3d804463c;hpb=bf38951682661e4e59bfa0d3a6687bab94bee35a;p=cl-graph.git diff --git a/dev/graph.lisp b/dev/graph.lisp index 663088b..d71ab6c 100644 --- a/dev/graph.lisp +++ b/dev/graph.lisp @@ -848,15 +848,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 +870,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?