Using CL-SLICE (sub is obsolete).

Author: tpapp

cl-random.asd

@@ -8,6 +8,7 @@
                #:array-operations
                #:cl-num-utils
                #:cl-rmath
+               #:cl-slice
                #:let-plus
                #:lla)
   :pathname #P"src/"

src/multivariate.lisp

@@ -39,13 +39,13 @@ square root of variance."
           (dotimes (i n)
             (setf (aref x i) (* sd (draw-standard-normal))))
           (e+ mean (mm variance-left-sqrt x))))
-  (sub (&rest index-specifications)
-       (let+ (((index-specification) index-specifications)
-              (mean (sub mean index-specification))
-              (variance (sub (variance instance) index-specification)))
-         (if (vectorp mean)
-             (r-multivariate-normal mean variance)
-             (r-normal mean variance)))))
+  (slice (&rest slices)
+         (let+ (((slice) slices)
+                (mean (slice mean slice))
+                (variance (slice (variance instance) slice slice)))
+           (if (vectorp mean)
+               (r-multivariate-normal mean variance)
+               (r-normal mean variance)))))
 
 ;;;  Multivariate T distribution
 ;;;
@@ -107,9 +107,9 @@ square root of variance."
         (let ((scaling-factor (draw scaling-factor)))
           (values (draw multivariate-normal :scale scaling-factor)
                   scaling-factor)))
-  (sub (&rest index-specifications)
-       (let+ (((index-specification) index-specifications)
-              (normal (sub multivariate-normal index-specification))
+  (slice (&rest slices)
+       (let+ (((slice) slices)
+              (normal (slice multivariate-normal slice))
               ((&accessors-r/o nu s^2) scaling-factor))
          (etypecase normal
            (r-normal
@@ -190,11 +190,10 @@ returned as decompositions.")
    (alpha0 :type internal-float :documentation "Sum of alphas."))
   (let ((alpha (as-float-vector alpha :copy? t)))
     (make :alpha alpha :alpha0 (clnu:sum alpha)))
-  (cl-slice:slice
-   (&rest slices)
-   (let+ (((slice) slices)
-          (slice (cl-slice-dev:canonical-representation (length alpha) slice)))
-     (if (cl-slice-dev:singleton-representation? slice)
-         (let ((alpha (aref alpha slice)))
-           (r-beta alpha (- alpha0 alpha)))
-         (error "Not implemented for multivariate selections.")))))
+  (slice (&rest slices)
+         (let+ (((slice) slices)
+                (slice (cl-slice-dev:canonical-representation (length alpha) slice)))
+           (if (cl-slice-dev:singleton-representation? slice)
+               (let ((alpha (aref alpha slice)))
+                 (r-beta alpha (- alpha0 alpha)))
+               (error "Not implemented for multivariate selections.")))))

src/package.lisp

@@ -5,6 +5,7 @@
         #:anaphora
         #:cl-num-utils.num=
         #:cl-random.internals
+        #:cl-slice
         #:let-plus
         #:lla)
   (:shadow #:mean #:variance)           ; also in ALEXANDRIA