From a4a389d3e6bf65538f6e6115a1aa30fb50c9f562 Mon Sep 17 00:00:00 2001 From: Gary King Date: Thu, 13 Apr 2006 10:48:35 -0400 Subject: [PATCH] Cleaned up old copying code darcs-hash:20060413144835-3cc5d-0735217465ca8b762c68e15285048034307dd907.gz --- dev/graph.lisp | 13 +++---------- dev/graphviz/graphviz-support.lisp | 6 +----- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dev/graph.lisp b/dev/graph.lisp index e0c5aee..34896e7 100644 --- a/dev/graph.lisp +++ b/dev/graph.lisp @@ -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) diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp index 26a35bf..f82f2b0 100644 --- a/dev/graphviz/graphviz-support.lisp +++ b/dev/graphviz/graphviz-support.lisp @@ -4,10 +4,6 @@ $Id: graphviz-support.lisp,v 1.7 2005/06/21 20:51:51 moody Exp $ -Copyright 1992 - 2005 Experimental Knowledge Systems Lab, -University of Massachusetts Amherst MA, 01003-4610 -Professor Paul Cohen, Director - Author: Gary King, Levente Mészáros, Attila Lendvai DISCUSSION @@ -23,7 +19,7 @@ This file contains the stuff that does not depend on cl-graphviz. ; For more information about DOT file format, search the web for "DOTTY" and ; "GRAPHVIZ". ; -(defmethod graph->dot ((g basic-graph) (stream stream) + graph->dot ((g basic-graph) (stream stream) &key (graph-formatter 'graph->dot-properties) (vertex-key 'vertex-id) -- 1.7.10.4