X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraph.lisp;h=a204446e5941130fd406ea1541ba8a73fb9efbb1;hb=2d52d1e533a3c73bffd2dd81620cc5bd540c314a;hp=e0c5aeeff257562139cff75c8882f4aa67c7f928;hpb=a196e72eb584440a594f0665ff5c97037ce4cf70;p=cl-graph.git

diff --git a/dev/graph.lisp b/dev/graph.lisp
index e0c5aee..a204446 100644
--- a/dev/graph.lisp
+++ b/dev/graph.lisp
@@ -14,7 +14,7 @@ something is putting something on the vertexes plist's
 |#
 
 
-(in-package metabang.graph)
+(in-package #:metabang.graph)
 
 ;;; ---------------------------------------------------------------------------
 ;;; classes
@@ -87,11 +87,6 @@ something is putting something on the vertexes plist's
 
 ;;; ---------------------------------------------------------------------------
 
-#+COPYING
-(defcopy-methods basic-vertex :copy-all t)
-
-;;; ---------------------------------------------------------------------------
-
 (defmethod initialize-instance :after ((object basic-vertex) &key graph vertex-id)
   (when (and graph (not vertex-id))
     (setf (slot-value object 'vertex-id)
@@ -116,7 +111,6 @@ something is putting something on the vertexes plist's
    (color nil ia "The `color` is used by some algorithms for bookkeeping. [?? Should probably be in a mixin]"))
   (:export-p t)
   (:export-slots edge-id element tag color)
-  #+COPYING :copy-slots
   (:make-load-form-p t)
   (:documentation "This is the root class for all edges in CL-Graph."))
 
@@ -136,15 +130,14 @@ something is putting something on the vertexes plist's
 
 ;;; ---------------------------------------------------------------------------
 
-(defclass* directed-edge-mixin (#+COPYING copyable-mixin) ()
+(defclass* directed-edge-mixin () ()
   (:export-p t)
   (:documentation "This mixin class is used to indicate that an edge is directed."))
 
 ;;; ---------------------------------------------------------------------------
 
-(defclass* weighted-edge-mixin (#+COPYING copyable-mixin)
+(defclass* weighted-edge-mixin ()
   ((weight 1d0 ia "The value of the weight of this edge. Defaults to 1.0d0"))
-  #+COPYING :copy-slots
   :export-slots
   (:export-p t)
   (:documentation "This mixin class adds a `weight` slot to an edge."))
@@ -155,7 +148,7 @@ something is putting something on the vertexes plist's
 
 ;;; ---------------------------------------------------------------------------
 
-(defclass* basic-graph (#+COPYING copyable-mixin)
+(defclass* basic-graph ()
   ((graph-vertexes :unbound ir)
    (graph-edges :unbound ir)
    (largest-vertex-id 0 r)
@@ -229,18 +222,6 @@ something is putting something on the vertexes plist's
                                 &allow-other-keys)
   (remf args :edge-class)
   (remf args :edge-type)
-  
-  #| I removed 'em, gwk
-  
-  ;;; I added these - jjm
-  (remf args :vertex-test)
-  (remf args :vertex-key)
-  (remf args :edge-key)
-  (remf args :edge-test)
-  (remf args :force-new?)
-  
-|#  
-  
   (assert (or (null edge-type)
               (eq edge-type :directed)
               (eq edge-type :undirected)) nil
@@ -263,7 +244,6 @@ something is putting something on the vertexes plist's
          :graph graph
          :vertex-1 vertex-1 :vertex-2 vertex-2 args))
 
-
 ;;; ---------------------------------------------------------------------------
 
 (defmethod make-graph ((graph-type symbol) &rest args &key &allow-other-keys)
@@ -501,6 +481,11 @@ something is putting something on the vertexes plist's
   (delete-item (graph-edges graph) edge)
   edge)
 
+
+(defmethod delete-all-edges :after ((graph basic-graph))
+  (empty! (graph-edges graph))
+  graph)
+
 ;;; ---------------------------------------------------------------------------
 
 (defmethod delete-vertex ((graph basic-graph) value-or-vertex)
@@ -811,16 +796,6 @@ something is putting something on the vertexes plist's
 
 ;;; ---------------------------------------------------------------------------
                                 
-#+COPYING
-(defmethod generate-directed-free-tree ((graph basic-graph) (root basic-vertex))
-  (let ((new-graph (copy-top-level graph)))
-    (empty! new-graph)
-    (nilf (contains-undirected-edge-p new-graph))
-    (neighbors-to-children new-graph root)
-    (values new-graph)))
-
-;;; ---------------------------------------------------------------------------
-
 (defmethod generate-directed-free-tree ((graph basic-graph) root)
   (generate-directed-free-tree graph (find-vertex graph root)))
 
@@ -1031,48 +1006,48 @@ nil gathers the entire closure(s)."
 
 (defmethod make-filtered-graph ((old-graph basic-graph)
                                 test-fn
-                                &optional
+                                &key
                                 (graph-completion-method nil)
-                                (depth nil))
-  (let ((new-graph 
-         (copy-template old-graph)))
-    (ecase graph-completion-method
-      ((nil 
-        :complete-links)
-       (iterate-vertexes old-graph
-                         (lambda (vertex)
-                           (when (funcall test-fn vertex)
-                             (add-vertex new-graph (value vertex))))))
-      ((:complete-closure-nodes-only 
-        :complete-closure-with-links)
-       (let* ((old-graph-vertexes  (collect-items old-graph :filter test-fn))
-              (closure-vertexes 
-               (get-transitive-closure old-graph-vertexes depth)))
-         (dolist (vertex closure-vertexes)
-           (add-vertex new-graph (copy-template vertex))))))
-    
-    (ecase graph-completion-method
+                                (depth nil)
+				(new-graph 
+				 (copy-template old-graph)))
+  (ecase graph-completion-method
+    ((nil 
+      :complete-links)
+     (iterate-vertexes old-graph
+		       (lambda (vertex)
+			 (when (funcall test-fn vertex)
+			   (add-vertex new-graph (value vertex))))))
+    ((:complete-closure-nodes-only 
+      :complete-closure-with-links)
+     (let* ((old-graph-vertexes  (collect-items old-graph :filter test-fn))
+	    (closure-vertexes 
+	     (get-transitive-closure old-graph-vertexes depth)))
+       (dolist (vertex closure-vertexes)
+	 (add-vertex new-graph (copy-template vertex))))))
+  (ecase graph-completion-method
       ((nil :complete-closure-nodes-only) nil)
       ((:complete-links
         :complete-closure-with-links)
        (complete-links new-graph old-graph)))
-    
-    new-graph))
+  new-graph)
 
 ;;; ---------------------------------------------------------------------------
 
 (defmethod subgraph-containing ((graph basic-graph) (vertex basic-vertex)
-                                &optional (depth nil))
-  (make-filtered-graph graph
-                       #'(lambda (v)
-                           (equal v vertex))
-                       :complete-closure-with-links
-                       depth))
+                                &rest args &key (depth nil) (new-graph nil))
+  (declare (ignore depth new-graph))
+  (apply #'make-filtered-graph
+	 graph
+	 #'(lambda (v)
+	     (equal v vertex))
+	 :graph-completion-method :complete-closure-with-links
+	 args))
 
 ;;; ---------------------------------------------------------------------------
 
 (defmethod edge-count ((graph basic-graph))
-  (length (edges graph)))
+  (count-using #'iterate-edges nil graph))
 
 ;;; ---------------------------------------------------------------------------