minor consistency corrections

darcs-hash:20060301000429-3cc5d-f17992b55cfc239392f501b707c844864f682ba9.gz

diff --git a/dev/graph-generation.lisp b/dev/graph-generation.lisp
index 36bcbb7..46d813e 100644 (file)
--- a/dev/graph-generation.lisp
+++ b/dev/graph-generation.lisp
@@ -1428,6 +1428,13 @@ should include pointer back to original graph
 ;;; ---------------------------------------------------------------------------
 
 (defmethod generate-simple-preferential-attachment-graph
+           (generator (graph-class symbol) size minimum-degree)
+  (generate-simple-preferential-attachment-graph
+   generator (make-instance graph-class) size minimum-degree))
+
+;;; ---------------------------------------------------------------------------
+
+(defmethod generate-simple-preferential-attachment-graph
            (generator graph size minimum-degree)
   (bind ((m (make-array (list (* 2 size minimum-degree)))))
     (loop for v from 0 to (1- size) do
@@ -1646,7 +1653,7 @@ should include pointer back to original graph
 
 ;;; ---------------------------------------------------------------------------
 
-(Defmethod generate-acquaintance-network 
+(defmethod generate-acquaintance-network 
            (generator graph size death-probability iterations vertex-labeler
                       &key (duplicate-edge-function :ignore))
   ;; bring the graph up to size

diff --git a/dev/graphviz/graphviz-support.lisp b/dev/graphviz/graphviz-support.lisp
index 4b3bbd3..f1f7e09 100644 (file)
--- a/dev/graphviz/graphviz-support.lisp
+++ b/dev/graphviz/graphviz-support.lisp
@@ -17,6 +17,11 @@ This file contains the stuff that does not depend on cl-graphviz.
 |#
 (in-package metabang.graph)
 
+(export '(
+         print-dot-key-value
+         *dot-graph-attributes*
+         ))
+
 ;;; ---------------------------------------------------------------------------
 ;
 ; This outputs the graph to string in accordance with the DOT file format.  
@@ -243,7 +248,7 @@ B--D []
 |#
 
 (defparameter *dot-graph-attributes*
-  '((:size coord)
+  '((:size coordinate)
     (:bb bounding-box)
     (:page text)
     (:ratio (:fill :compress :auto)) ;; Could actually be a float number too