Removed the need for metabang-bind

[cl-graph.git] / dev / graph-metrics.lisp

diff --git a/dev/graph-metrics.lisp b/dev/graph-metrics.lisp
index df4c395..95dfe8a 100644 (file)
--- a/dev/graph-metrics.lisp
+++ b/dev/graph-metrics.lisp
@@ -11,6 +11,13 @@ DISCUSSION
 |#
 (in-package #:metabang.graph)
 
+(eval-always 
+  (import '(cl-mathstats:matrix-trace
+           cl-mathstats:sum-of-array-elements
+           cl-mathstats:matrix-multiply
+           cl-mathstats:normalize-matrix
+           cl-mathstats:combination-count
+           )))
 
 (defun vertex-degree-counts (g)
   "Returns an associative-container mapping edge-counts to the number of vertexes with that edge-count."
@@ -67,7 +74,7 @@ DISCUSSION
                                     &key (edge-size (constantly 1)))
   "Prints a summary of vertex degrees in `graph` to standard-out. Both the average degree of all vertexes and the average degree between all pairs of vertex classes \(as determined by the vertex-classifier\) will be printed. The `edge-size` parameter is passed on to `vertex-degree` to allow for weighted edges."
   
-  (bind ((counts (node-counts graph :key vertex-classifier))
+  (let ((counts (node-counts graph :key vertex-classifier))
          (kinds (collect-elements counts :transform #'first)))
     (format t "~%Vertex counts: ")
     (loop for (kind count) in counts do