Updated for mlisp

darcs-hash:20060320235541-3cc5d-aef6da0f02c9f5aa8913153d9ea0eeb045e958c8.gz

diff --git a/dev/graph-and-variates.lisp b/dev/graph-and-variates.lisp
index d2fcd1c..82d0e55 100644 (file)
--- a/dev/graph-and-variates.lisp
+++ b/dev/graph-and-variates.lisp
@@ -12,6 +12,7 @@
        cl-variates:next-element)
  "CL-GRAPH")
 
-(use-package (find-package "CL-VARIATES") 
-             (find-package "CL-GRAPH"))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (use-package (find-package 'cl-variates) 
+               (find-package 'cl-graph)))
 

diff --git a/dev/graph-generation.lisp b/dev/graph-generation.lisp
index 4df3ca7..90f1f5d 100644 (file)
--- a/dev/graph-generation.lisp
+++ b/dev/graph-generation.lisp
@@ -1,31 +1,32 @@
 (in-package metabang.graph)
 
-(export '(generate-Gnp
-          generate-Gnm
-          generate-undirected-graph-via-assortativity-matrix
-          generate-undirected-graph-via-vertex-probabilities
-          generate-multi-group-graph-fixed
-          #+Ignore generate-girvan-newman-graph
-          generate-scale-free-graph
-          generate-assortative-graph-with-degree-distributions
-          
-          generate-simple-preferential-attachment-graph
-          generate-preferential-attachment-graph
-          
-          generate-acquaintance-network
-          generate-acquaintance-network-until-stable
-
-          generate-graph-by-resampling-edges
-
-          sample-edge
-          basic-edge-sampler
-          weighted-edge-sampler
-          simple-group-id-generator
-          simple-group-id-parser
-          
-          make-degree-sampler
-          poisson-vertex-degree-distribution
-          power-law-vertex-degree-distribution))
+(eval-when (:compile-toplevel :load-toplevel :execute)
+  (export '(generate-Gnp
+            generate-Gnm
+            generate-undirected-graph-via-assortativity-matrix
+            generate-undirected-graph-via-vertex-probabilities
+            generate-multi-group-graph-fixed
+            #+Ignore generate-girvan-newman-graph
+            generate-scale-free-graph
+            generate-assortative-graph-with-degree-distributions
+            
+            generate-simple-preferential-attachment-graph
+            generate-preferential-attachment-graph
+            
+            generate-acquaintance-network
+            generate-acquaintance-network-until-stable
+            
+            generate-graph-by-resampling-edges
+            
+            sample-edge
+            basic-edge-sampler
+            weighted-edge-sampler
+            simple-group-id-generator
+            simple-group-id-parser
+            
+            make-degree-sampler
+            poisson-vertex-degree-distribution
+            power-law-vertex-degree-distribution)))
 
 ;;; ---------------------------------------------------------------------------
 ;;; classes

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index fe614aa..63cd048 100644 (file)
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -17,13 +17,6 @@ This file contains the stuff that does not depend on cl-graphviz.
 |#
 (in-package metabang.graph)
 
-(export '(
-         print-dot-key-value
-         dot-attribute-value
-         dot-attributes-mixin
-         *dot-graph-attributes*
-         ))
-
 ;;; ---------------------------------------------------------------------------
 ;
 ; This outputs the graph to string in accordance with the DOT file format.  
@@ -347,6 +340,7 @@ B--D []
 
 
 (defmethod (setf dot-attribute-value) :before (value (attr symbol) (thing dot-attributes-mixin))
+  (declare (ignore value))
   (ensure-valid-dot-attribute attr thing))
 
 (defmethod (setf dot-attribute-value) (value (attr symbol) (thing dot-attributes-mixin))

diff --git a/dev/package.lisp b/dev/package.lisp
index 4a00188..21c7f39 100644 (file)
--- a/dev/package.lisp
+++ b/dev/package.lisp
@@ -9,10 +9,10 @@ DISCUSSION
 |#
 (in-package common-lisp-user)
 
-(defpackage "CL-GRAPH"
-  (:use "COMMON-LISP" "METATILITIES" "CL-CONTAINERS" 
-        "METABANG.BIND" "METABANG.MATH")
-  (:nicknames "METABANG.GRAPH")
+(defpackage #:cl-graph
+  (:use #:common-lisp #:metatilities #:cl-containers 
+        #:metabang.bind #:metabang.math)
+  (:nicknames #:metabang.graph)
   (:documentation "CL-Graph is a Common Lisp library for manipulating graphs and running graph algorithms.")
   
   (:export 
@@ -169,4 +169,11 @@ DISCUSSION
    #:graph-mixing-matrix
    #:graph-edge-mixture-matrix
    #:assortativity-coefficient
-   #:vertex-degree-summary))
\ No newline at end of file
+   #:vertex-degree-summary)
+
+  (:export
+   #:print-dot-key-value
+   #:dot-attribute-value
+   #:dot-attributes-mixin
+   #:*dot-graph-attributes*
+   ))
\ No newline at end of file