X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=dev%2Fgraph-generation.lisp;h=1638596a32cf16589140e1ed297ce4c689ab2de9;hb=a196e72eb584440a594f0665ff5c97037ce4cf70;hp=90f1f5d93d724dbef75f6d98cb5ae7fb20fa5eaf;hpb=29f19f46a66f8f773af7e87760756c93d31717c0;p=cl-graph.git diff --git a/dev/graph-generation.lisp b/dev/graph-generation.lisp index 90f1f5d..1638596 100644 --- a/dev/graph-generation.lisp +++ b/dev/graph-generation.lisp @@ -1,8 +1,8 @@ (in-package metabang.graph) (eval-when (:compile-toplevel :load-toplevel :execute) - (export '(generate-Gnp - generate-Gnm + (export '(generate-gnp + generate-gnm generate-undirected-graph-via-assortativity-matrix generate-undirected-graph-via-vertex-probabilities generate-multi-group-graph-fixed @@ -60,16 +60,16 @@ ;;; --------------------------------------------------------------------------- -;;; generate-Gnp +;;; generate-gnp ;;; --------------------------------------------------------------------------- -(defmethod generate-Gnp (generator (graph-class symbol) n p &key (label 'identity)) - (generate-Gnp +(defmethod generate-gnp (generator (graph-class symbol) n p &key (label 'identity)) + (generate-gnp generator (make-instance graph-class) n p :label label)) ;;; --------------------------------------------------------------------------- -(defmethod generate-Gnp (generator (graph basic-graph) n p &key (label 'identity)) +(defmethod generate-gnp (generator (graph basic-graph) n p &key (label 'identity)) (let ((v 1) (w -1) (log-1-p (log (- 1 p)))) @@ -89,16 +89,16 @@ graph)) ;;; --------------------------------------------------------------------------- -;;; generate-Gnm +;;; generate-gnm ;;; --------------------------------------------------------------------------- -(defmethod generate-Gnm (generator (graph-class symbol) n p &key (label 'identity)) - (generate-Gnm +(defmethod generate-gnm (generator (graph-class symbol) n p &key (label 'identity)) + (generate-gnm generator (make-instance graph-class) n p :label label)) ;;; --------------------------------------------------------------------------- -(defmethod generate-Gnm (generator (graph basic-graph) n m &key (label 'identity)) +(defmethod generate-gnm (generator (graph basic-graph) n m &key (label 'identity)) (let ((max-edge-index (1- (combination-count n 2)))) (assert (<= m max-edge-index)) #+Ignore