mostly maintenance in maintaining internal conventions... a few more tests as well

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

diff --git a/dev/graph-container.lisp b/dev/graph-container.lisp
index b5305d9..345ee48 100644 (file)
--- a/dev/graph-container.lisp
+++ b/dev/graph-container.lisp
@@ -9,7 +9,7 @@ DISCUSSION
 
 |#
 
-(in-package metabang.graph)
+(in-package #:metabang.graph)
 
 ;;; ---------------------------------------------------------------------------
 ;;; class defs
@@ -192,12 +192,15 @@ DISCUSSION
                                           (vertex-1 graph-container-vertex) 
                                           (vertex-2 graph-container-vertex)
                                           fn
-                                          &key error-if-not-found?)
-  (declare (ignore error-if-not-found?))
-  (search-for-match (vertex-edges vertex-1)
-                    (lambda (edge)
-                      (and (eq vertex-2 (other-vertex edge vertex-1))
-                           (funcall fn edge)))))
+                                          &key error-if-not-found?) 
+  (let ((it (search-for-match (vertex-edges vertex-1)
+                              (lambda (edge)
+                                (and (eq vertex-2 (other-vertex edge vertex-1))
+                                     (funcall fn edge))))))
+    (when (and error-if-not-found? (not it))
+      (error 'graph-edge-not-found-error 
+             :vertex-1 vertex-1 :vertex-2 vertex-1))
+    it))    
 
 ;;; ---------------------------------------------------------------------------
 
@@ -208,9 +211,10 @@ 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?)))
-    (find-edge-between-vertexes-if 
-     graph v1 v2 fn 
-     :error-if-not-found? 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)))))
 
 ;;; ---------------------------------------------------------------------------
 
@@ -228,11 +232,19 @@ DISCUSSION
     (delete-item (vertex-edges vertex-1) edge)
     (delete-item (vertex-edges vertex-2) edge)
     (setf (item-at-1 (vertex-pair->edge graph) (cons vertex-1 vertex-2))
-          (delete (cons vertex-1 vertex-2) 
+          (delete edge
                   (item-at-1 (vertex-pair->edge graph) (cons vertex-1 vertex-2))
-                  :test #'equal)))
+                  :test #'eq)))
   edge)
 
+(defmethod delete-all-edges ((graph graph-container))
+  (iterate-vertexes 
+   graph
+   (lambda (vertex)
+     (empty! (vertex-edges vertex))))
+  (empty! (vertex-pair->edge graph))
+  graph)
+
 ;;; ---------------------------------------------------------------------------
 
 (defmethod empty! :after ((graph graph-container))