diff --git a/basis-splines.lisp b/basis-splines.lisp index d108121e9e5f6292379a418170c1062b50aca80e..25b7e72ae7ad7854c063c0df75f02794b0d2f6c9 100644 --- a/basis-splines.lisp +++ b/basis-splines.lisp @@ -1,6 +1,6 @@ ;; Basis splines. ;; Liam Healy 2008-02-18 14:43:20EST basis-splines.lisp -;; Time-stamp: <2010-01-17 10:41:03EST basis-splines.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT basis-splines.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -56,7 +56,7 @@ (defmfun evaluate ((workspace basis-spline) x - &key (B (make-marray 'double-float + &key (B (grid:make-foreign-array 'double-float :dimensions (number-of-coefficients workspace)))) "gsl_bspline_eval" ((x :double) ((mpointer B) :pointer) ((mpointer workspace) :pointer)) @@ -112,13 +112,13 @@ (bw (make-basis-spline order nbreak)) (mw (make-fit-workspace ndata ncoeffs)) (rng (make-random-number-generator +mt19937+ 0)) - (B (make-marray 'double-float :dimensions ncoeffs)) - (c (make-marray 'double-float :dimensions ncoeffs)) - (cov (make-marray 'double-float :dimensions (list ncoeffs ncoeffs))) - (w (make-marray 'double-float :dimensions ndata)) - (x (make-marray 'double-float :dimensions ndata)) - (y (make-marray 'double-float :dimensions ndata)) - (Xmatrix (make-marray 'double-float :dimensions (list ndata ncoeffs))) + (B (grid:make-foreign-array 'double-float :dimensions ncoeffs)) + (c (grid:make-foreign-array 'double-float :dimensions ncoeffs)) + (cov (grid:make-foreign-array 'double-float :dimensions (list ncoeffs ncoeffs))) + (w (grid:make-foreign-array 'double-float :dimensions ndata)) + (x (grid:make-foreign-array 'double-float :dimensions ndata)) + (y (grid:make-foreign-array 'double-float :dimensions ndata)) + (Xmatrix (grid:make-foreign-array 'double-float :dimensions (list ndata ncoeffs))) (sigma 0.1d0)) ;; The data to be fitted. (dotimes (i ndata) diff --git a/calculus/monte-carlo.lisp b/calculus/monte-carlo.lisp index 573a9f9e17c1fb7088185a479fa87d743221f420..cb18bb10a3e6e491f02281dc7f0c59d4e2670b2d 100644 --- a/calculus/monte-carlo.lisp +++ b/calculus/monte-carlo.lisp @@ -1,6 +1,6 @@ ;; Monte Carlo Integration ;; Liam Healy Sat Feb 3 2007 - 17:42 -;; Time-stamp: <2010-06-27 18:13:57EDT monte-carlo.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT monte-carlo.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -211,7 +211,7 @@ (defparameter *mc-lower* #m(0.0d0 0.0d0 0.0d0)) (defparameter *mc-upper* - (make-marray 'double-float :initial-contents (list pi pi pi))) + (grid:make-foreign-array 'double-float :initial-contents (list pi pi pi))) (defun random-walk-plain-example (&optional (nsamples 500000)) (monte-carlo-integrate-plain 'mcrw *mc-lower* *mc-upper* nsamples)) diff --git a/data/both.lisp b/data/both.lisp index 72b50ee7166e13b672b168b01cff709a0ce9d0f8..3afc593c14aebe0ec199e9024056acae82601836 100644 --- a/data/both.lisp +++ b/data/both.lisp @@ -1,6 +1,6 @@ ;; Functions for both vectors and matrices. ;; Liam Healy 2008-04-26 20:48:44EDT both.lisp -;; Time-stamp: <2010-06-27 21:31:00EDT both.lisp> +;; Time-stamp: <2010-06-29 22:12:07EDT both.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -81,7 +81,7 @@ (defmfun grid:copy-making-destination ((source both) &aux (destination - (make-marray element-type :dimensions (dimensions source)))) + (grid:make-foreign-array element-type :dimensions (dimensions source)))) ("gsl_" :category :type "_memcpy") (((mpointer destination) :pointer) ((mpointer source) :pointer)) :definition :methods diff --git a/data/copy-cl.lisp b/data/copy-cl.lisp index d183099852ddd0678c46351188116b81bab39bd6..2f55cf1e4af604c4e0e7505a62d09d19c5a590c7 100644 --- a/data/copy-cl.lisp +++ b/data/copy-cl.lisp @@ -1,6 +1,6 @@ -;; Copy marrays to/from CL arrays +;; Copy grid:foreign-arrays to/from CL arrays ;; Liam Healy 2009-02-11 19:28:44EST copy-cl.lisp -;; Time-stamp: <2010-06-27 18:03:25EDT copy-cl.lisp> +;; Time-stamp: <2010-06-29 22:51:21EDT copy-cl.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -20,17 +20,17 @@ ;;; The function #'copy can be used to copy the contents to or from a ;;; CL array. If the destination isn't literally supplied, it can be -;;; a symbol 'array indicating that the marray is to be copied to a CL +;;; a symbol 'array indicating that the grid:foreign-array is to be copied to a CL ;;; array, or an element type like 'double-float, indicating the -;;; contents of the CL array is to be copied to a new marray with the +;;; contents of the CL array is to be copied to a new grid:foreign-array with the ;;; given element type. ;;; Contrast this with the function #'cl-array or the initarg -;;; :cl-array to #'make-marray. The function returns the cl-array +;;; :cl-array to #'grid:make-foreign-array. The function returns the cl-array ;;; without copying, and so might be faster but also makes the -;;; original marray object vulnerable if an element is changed, which +;;; original grid:foreign-array object vulnerable if an element is changed, which ;;; officially has unpredictable results. Likewise, the initarg will -;;; use the given CL array directly in the created marray without +;;; use the given CL array directly in the created grid:foreign-array without ;;; copying. (in-package :gsl) @@ -68,21 +68,21 @@ (setf (maref destination i j) (aref source i j)))) destination) -(defmethod grid:copy-to-destination ((source marray) (destclass (eql 'array))) +(defmethod grid:copy-to-destination ((source grid:foreign-array) (destclass (eql 'array))) (let ((destination (grid:make-ffa (element-type source) :dimensions (dimensions source)))) (grid:copy-to-destination source destination))) -;;; Copy to a named marray element-type, where the type is a symbol +;;; Copy to a named grid:foreign-array element-type, where the type is a symbol (defmethod grid:copy-to-destination ((source array) (destclass symbol)) (let ((destination - (make-marray destclass :dimensions (array-dimensions source)))) + (grid:make-foreign-array destclass :dimensions (array-dimensions source)))) (grid:copy-to-destination source destination))) -;;; Copy to a named marray element-type, where the type is a list +;;; Copy to a named grid:foreign-array element-type, where the type is a list (defmethod grid:copy-to-destination ((source array) (destclass list)) (let ((destination - (make-marray destclass :dimensions (array-dimensions source)))) + (grid:make-foreign-array destclass :dimensions (array-dimensions source)))) (grid:copy-to-destination source destination))) ;;; Examples and tests diff --git a/data/foreign-array.lisp b/data/foreign-array.lisp index 4692c956f5adc35d675be6598a3f39957cb2ed94..f4b250c81a89bbdceee97d9464a879c7d51f4781 100644 --- a/data/foreign-array.lisp +++ b/data/foreign-array.lisp @@ -1,6 +1,6 @@ ;; A grid:foreign-array with added metadata for GSL. ;; Liam Healy 2008-04-06 21:23:41EDT -;; Time-stamp: <2010-06-29 21:41:40EDT foreign-array.lisp> +;; Time-stamp: <2010-06-29 22:08:52EDT foreign-array.lisp> ;; ;; Copyright 2008, 2009, 2010 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -69,36 +69,6 @@ (metadata-slot object 'mpointer) (make-gsl-metadata object))) -;;;;**************************************************************************** -;;;; Make data from either the dimensions provided or from the initial values -;;;;**************************************************************************** - -;;;;;;; There are >1400 calls to make-marray, write an emulation? -;;; This should probably be moved/renamed grid:make-foreign-array. -(export 'make-marray) -(defun make-marray (element-type &rest keys &key dimensions &allow-other-keys) - "Make a GSLL array with the given element type, - :dimensions, and :initial-contents, :initial-element or :data." - (when (subtypep element-type 'grid:foreign-array) - (error "Can't take a class name here anymore, sorry.")) - (apply - 'grid:make-grid - `((grid:foreign-array ,@(alexandria:ensure-list dimensions)) ,element-type) - keys)) - -(defun make-marray-or-default - (default dimensions - &optional dont-make-if-nil (element-type 'double-float) initial-element) - "If default is T or dont-make-if-nil, make a marray and - returned with the dimensions and element-type. If default is a - marray, it is returned." - (if (member default (list t dont-make-if-nil)) - (if initial-element - (make-marray - element-type :dimensions dimensions :initial-element initial-element) - (make-marray element-type :dimensions dimensions)) - default)) - ;;;;**************************************************************************** ;;;; Make from GSL mpointers ;;;;**************************************************************************** diff --git a/data/matrix.lisp b/data/matrix.lisp index e0c4a5168902a701e6aac1a36e2c5277fb1bf5a5..4ebdbcbf1c945a7fad7b79e60e2cc326ad979ffd 100644 --- a/data/matrix.lisp +++ b/data/matrix.lisp @@ -1,6 +1,6 @@ ;; Matrices ;; Liam Healy 2008-04-15 21:57:52EDT matrix.lisp -;; Time-stamp: <2010-06-28 11:03:21EDT matrix.lisp> +;; Time-stamp: <2010-06-29 22:10:48EDT matrix.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -45,7 +45,7 @@ (defmfun row ((matrix matrix) i - &optional (vector (make-marray element-type :dimensions (dim1 matrix)))) + &optional (vector (grid:make-foreign-array element-type :dimensions (dim1 matrix)))) ("gsl_matrix" :type "_get_row") (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i sizet)) :definition :generic @@ -70,7 +70,7 @@ (defmfun column ((matrix matrix) i - &optional (vector (make-marray element-type :dimensions (dim0 matrix)))) + &optional (vector (grid:make-foreign-array element-type :dimensions (dim0 matrix)))) ("gsl_matrix" :type "_get_col") (((mpointer vector) :pointer) ((mpointer matrix) :pointer) (i sizet)) :definition :generic @@ -145,7 +145,7 @@ ((source matrix) &optional (destination - (make-marray element-type :dimensions (reverse (dimensions source))))) + (grid:make-foreign-array element-type :dimensions (reverse (dimensions source))))) ("gsl_matrix" :type "_transpose_memcpy") (((mpointer destination) :pointer) ((mpointer source) :pointer)) :definition :generic diff --git a/documentation/index.html b/documentation/index.html index 40152e642e7240f4b249a5992e882a59a07a4c50..d8759d5e947278de4c8e0b4078e34f1436f7ec77 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -290,12 +290,12 @@ area of memory.</p> <p> The <a href="http://repo.or.cz/w/gsd.git">GSD</a> suite provides many functions for construction, transformation, and composition of - GSL marrays. When using grid functions for this purpose, + GSL grid:foreign-arrays. When using grid functions for this purpose, the <code>grid:specification</code> will - contain <code>gsl:marray</code> as the type; for example, + contain <code>grid:foreign-array</code> as the type; for example, </p> <pre> -(grid:make-grid '((gsl:marray 3 3) double-float) :initial-element 0) +(grid:make-grid '((grid:foreign-array 3 3) double-float) :initial-element 0) </pre> <p> will make a 3x3 <code>matrix-double-float</code>. @@ -304,7 +304,7 @@ area of memory.</p> in that collection. </p> <p> - Common Lisp arrays should be created with <code>make-marray</code> or + Common Lisp arrays should be created with <code>grid:make-foreign-array</code> or <code>#m</code>: The #m reader macro in the default form creates a vector or matrix of element type double-float, which is the most common type needed for @@ -348,8 +348,8 @@ area of memory.</p> with <code>setf maref</code>. A complete CL array may be extracted with the function <code>#'cl-array</code>. </p> -<p>Copying marrays is performed with the function <code>copy</code>. - This works between marrays, pointers, and CL arrays. It is useful +<p>Copying grid:foreign-arrays is performed with the function <code>copy</code>. + This works between grid:foreign-arrays, pointers, and CL arrays. It is useful for functions intended to be passed to GSL functions (for e.g. solving, minimizing or fitting) that need to set a GSL vector or matrix, because one can simply copy into the passed-in pointer. @@ -361,7 +361,7 @@ area of memory.</p> <p>If you use <a href="http://common-lisp.net/project/iterate/">iterate</a>, there are extensions defined that make it easier to iterate over - marrays. These are: + grid:foreign-arrays. These are: <ul> <li><code>matrix-row</code>, <code>matrix-row-index</code></li> <li><code>matrix-column</code>, <code>matrix-column-index</code></li> @@ -472,7 +472,7 @@ and arrays used internally or for function return. <!-- Created: Feb 25 2005 --> <!-- hhmts start --> <small> -Time-stamp: <2010-06-27 18:05:50EDT index.html> +Time-stamp: <2010-06-29 22:51:17EDT index.html> </small> <!-- hhmts end --> </div> diff --git a/eigensystems/generalized.lisp b/eigensystems/generalized.lisp index 98f3b881a48ea99e9c0d367e5fd95574a0e9f54d..c0a0cbbfcbbbd49123463e78df43d5a3feda8f06 100644 --- a/eigensystems/generalized.lisp +++ b/eigensystems/generalized.lisp @@ -1,6 +1,6 @@ ;; Real generalized eigensystems ;; Liam Healy 2009-02-16 12:55:04EST real-generalized.lisp -;; Time-stamp: <2009-12-27 09:45:35EST generalized.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT generalized.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -59,7 +59,7 @@ (defmfun eigenvalues-gensymm ((A matrix) (B matrix) &optional - (eigenvalues (make-marray element-type :dimensions (dim0 A))) + (eigenvalues (grid:make-foreign-array element-type :dimensions (dim0 A))) (ws (eltcase complex (make-eigen-genherm (dim0 A)) t (make-eigen-gensymm (dim0 A))))) (double-float "gsl_eigen_gensymm" @@ -81,8 +81,8 @@ (defmfun eigenvalues-eigenvectors-gensymm ((A matrix) (B matrix) &optional - (eigenvalues (make-marray element-type :dimensions (dim0 A))) - (eigenvectors (make-marray element-type :dimensions (dimensions A))) + (eigenvalues (grid:make-foreign-array element-type :dimensions (dim0 A))) + (eigenvectors (grid:make-foreign-array element-type :dimensions (dimensions A))) (ws (eltcase complex (make-eigen-hermv (dim0 A)) t (make-eigen-symmv (dim0 A))))) (double-float "gsl_eigen_gensymmv" diff --git a/eigensystems/nonsymmetric-generalized.lisp b/eigensystems/nonsymmetric-generalized.lisp index 30790dee76eab71273f0d8419b8ab6cc9b64ad7b..9ec85cfed0dc049ea7e308e52066b5b2e934700c 100644 --- a/eigensystems/nonsymmetric-generalized.lisp +++ b/eigensystems/nonsymmetric-generalized.lisp @@ -1,6 +1,6 @@ ;; Generalized eigensystems for nonsymmetric real matrices ;; Liam Healy 2009-02-16 14:27:20EST nonsymmetric-generalized.lisp -;; Time-stamp: <2009-12-27 09:45:35EST nonsymmetric-generalized.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT nonsymmetric-generalized.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -54,20 +54,20 @@ (A B &optional (alpha - (make-marray '(complex double-float) :dimensions (dim0 A))) + (grid:make-foreign-array '(complex double-float) :dimensions (dim0 A))) (beta - (make-marray 'double-float :dimensions (dim0 A))) + (grid:make-foreign-array 'double-float :dimensions (dim0 A))) (ws (make-eigen-gen (dim0 A))) compute-shur-form-s compute-shur-form-t shur-vectors &aux (balance nil) ; unused by GSL (Q (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors)) (Z (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors))) ("gsl_eigen_gen" "gsl_eigen_gen_QZ") ((((mpointer A) :pointer) ((mpointer B) :pointer) @@ -114,22 +114,22 @@ (A B &optional (alpha - (make-marray '(complex double-float) :dimensions (dim0 A))) + (grid:make-foreign-array '(complex double-float) :dimensions (dim0 A))) (beta - (make-marray 'double-float :dimensions (dim0 A))) + (grid:make-foreign-array 'double-float :dimensions (dim0 A))) (eigenvectors - (make-marray 'double-float :dimensions (dimensions A))) + (grid:make-foreign-array 'double-float :dimensions (dimensions A))) (ws (make-eigen-genv (dim0 A))) compute-shur-form-s compute-shur-form-t shur-vectors &aux (balance nil) ; unused by GSL (Q (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors)) (Z (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors))) ("gsl_eigen_genv" "gsl_eigen_genv_QZ") ((((mpointer A) :pointer) ((mpointer B) :pointer) diff --git a/eigensystems/nonsymmetric.lisp b/eigensystems/nonsymmetric.lisp index 7cf2be833a4d309c253f495071d9735d4b8ebe20..fc68668ae1e4c4075a19bf4759d4d089b7e39cca 100644 --- a/eigensystems/nonsymmetric.lisp +++ b/eigensystems/nonsymmetric.lisp @@ -1,6 +1,6 @@ ;; Eigensystems for nonsymmetric real matrices ;; Liam Healy 2009-02-16 12:51:18EST nonsymmetric.lisp -;; Time-stamp: <2009-12-27 09:45:34EST nonsymmetric.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT nonsymmetric.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -52,13 +52,13 @@ (A &optional (eigenvalues - (make-marray '(complex double-float) :dimensions (dim0 A))) + (grid:make-foreign-array '(complex double-float) :dimensions (dim0 A))) (ws (make-eigen-nonsymm (dim0 A))) compute-shur-form balance shur-vectors &aux (sv (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors))) ("gsl_eigen_nonsymm" "gsl_eigen_nonsymm_Z") ((((mpointer A) :pointer) @@ -117,15 +117,15 @@ (A &optional (eigenvalues - (make-marray '(complex double-float) :dimensions (dim0 A))) + (grid:make-foreign-array '(complex double-float) :dimensions (dim0 A))) (eigenvectors - (make-marray '(complex double-float) :dimensions (dimensions A))) + (grid:make-foreign-array '(complex double-float) :dimensions (dimensions A))) (ws (make-eigen-nonsymmv (dim0 A))) shur-vectors &aux (sv (if (eql shur-vectors t) - (make-marray 'double-float :dimensions (dimensions A)) + (grid:make-foreign-array 'double-float :dimensions (dimensions A)) shur-vectors))) ("gsl_eigen_nonsymmv" "gsl_eigen_nonsymmv_Z") ((((mpointer A) :pointer) diff --git a/eigensystems/symmetric-hermitian.lisp b/eigensystems/symmetric-hermitian.lisp index 30ab7783a7d59a357d6145495b866e7d1e6e70c4..507003d567c7f336f55c8cd37bce81bdeb4c6841 100644 --- a/eigensystems/symmetric-hermitian.lisp +++ b/eigensystems/symmetric-hermitian.lisp @@ -1,6 +1,6 @@ ;; Eigenvectors and eigenvalues ;; Liam Healy, Sun May 21 2006 - 19:52 -;; Time-stamp: <2009-12-27 09:43:47EST symmetric-hermitian.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT symmetric-hermitian.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -69,7 +69,7 @@ (defmfun eigenvalues ((A matrix) &optional - (eigenvalues (make-marray element-type :dimensions (dim0 A))) + (eigenvalues (grid:make-foreign-array element-type :dimensions (dim0 A))) (ws (eltcase complex (make-eigen-herm (dim0 A)) t (make-eigen-symm (dim0 A))))) (double-float "gsl_eigen_symm" @@ -94,8 +94,8 @@ (defmfun eigenvalues-eigenvectors ((A matrix) &optional - (eigenvalues (make-marray element-type :dimensions (dim0 A))) - (eigenvectors (make-marray element-type :dimensions (dimensions A))) + (eigenvalues (grid:make-foreign-array element-type :dimensions (dim0 A))) + (eigenvectors (grid:make-foreign-array element-type :dimensions (dimensions A))) (ws (eltcase complex (make-eigen-hermv (dim0 A)) t (make-eigen-symmv (dim0 A))))) (double-float "gsl_eigen_symmv" @@ -159,8 +159,8 @@ |# (defun eigenvalue-eigenvectors-example () - (let ((evecs (make-marray 'double-float :dimensions '(3 3))) - (evals (make-marray 'double-float :dimensions 3)) + (let ((evecs (grid:make-foreign-array 'double-float :dimensions '(3 3))) + (evals (grid:make-foreign-array 'double-float :dimensions 3)) (mat #m(20.0d0 -10.0d0 0.0d0 ^ -10.0d0 30.0d0 0.0d0 ^ 0.0d0 0.0d0 40.0d0))) diff --git a/fast-fourier-transforms/discrete.lisp b/fast-fourier-transforms/discrete.lisp index 82d428197b7f7003b6f7606ec86c9f87a57b7b70..6d85e2912d3d24730412d65a41ee5159ec24eddb 100644 --- a/fast-fourier-transforms/discrete.lisp +++ b/fast-fourier-transforms/discrete.lisp @@ -1,6 +1,6 @@ ;; Discrete Fourier Transforms ;; Liam Healy 2009-11-07 14:24:07EST -;; Time-stamp: <2010-06-27 18:13:59EDT discrete.lisp> +;; Time-stamp: <2010-06-29 22:15:25EDT discrete.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -29,7 +29,7 @@ (defmfun forward-discrete-fourier-transform ((vector vector) &key (stride 1) - (result (make-marray element-type :dimensions (dimensions vector)))) + (result (grid:make-foreign-array element-type :dimensions (dimensions vector)))) ("gsl_dft" :type "_forward") (((foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet) ((foreign-pointer result) :pointer)) @@ -45,7 +45,7 @@ (defmfun backward-discrete-fourier-transform ((vector vector) &key (stride 1) - (result (make-marray element-type :dimensions (dimensions vector)))) + (result (grid:make-foreign-array element-type :dimensions (dimensions vector)))) ("gsl_dft" :type "_backward") (((foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet) ((foreign-pointer result) :pointer)) @@ -61,7 +61,7 @@ (defmfun inverse-discrete-fourier-transform ((vector vector) &key (stride 1) - (result (make-marray element-type :dimensions (dimensions vector)))) + (result (grid:make-foreign-array element-type :dimensions (dimensions vector)))) ("gsl_dft" :type "_inverse") (((foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet) ((foreign-pointer result) :pointer)) @@ -77,7 +77,7 @@ (defmfun discrete-fourier-transform ((vector vector) &key (stride 1) - (result (make-marray element-type :dimensions (dimensions vector)))) + (result (grid:make-foreign-array element-type :dimensions (dimensions vector)))) ("gsl_dft" :type "_transform") (((foreign-pointer vector) :pointer) (stride sizet) ((floor (size vector) stride) sizet) ((foreign-pointer result) :pointer)) diff --git a/fast-fourier-transforms/example.lisp b/fast-fourier-transforms/example.lisp index 734cc2afd03b987fd68502ca2ebdf09541f8dbeb..499726ceb17a48be467cf2a671e9a65b3964ecd1 100644 --- a/fast-fourier-transforms/example.lisp +++ b/fast-fourier-transforms/example.lisp @@ -1,6 +1,6 @@ ;; Example FFT: transform a pulse (using the "clean" fft interface) ;; Sumant Oemrawsingh, Sat Oct 31 2009 - 00:24 -;; Time-stamp: <2010-06-27 18:03:24EDT example.lisp> +;; Time-stamp: <2010-06-29 22:15:25EDT example.lisp> ;; ;; Copyright 2009 Sumant Oemrawsingh, Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -40,7 +40,7 @@ (defun fft-pulse-test (element-type dimension) (assert (and (integerp dimension) (> dimension 20))) - (let ((pulse (make-marray element-type :dimensions dimension)) + (let ((pulse (grid:make-foreign-array element-type :dimensions dimension)) (init-value (coerce 1 element-type))) (setf (maref pulse 0) init-value) (loop for i from 1 to 10 @@ -76,7 +76,7 @@ ;; (make-urand-vector '(complex double-float) 5) (defun make-urand-vector (element-type dimension &key (stride 1)) "Make a vector with random elements." - (let ((vec (make-marray `(complex ,(grid:component-float-type element-type)) + (let ((vec (grid:make-foreign-array `(complex ,(grid:component-float-type element-type)) :dimensions (list (* stride dimension))))) (loop for i from 0 below (* stride dimension) by stride do @@ -89,7 +89,7 @@ (defun realpart-vector (complex-vector) "The real vector consisting of the real part of the complex vector." (let ((real-vector - (make-marray + (grid:make-foreign-array (grid:component-float-type (element-type complex-vector)) :dimensions (dimensions complex-vector)))) (loop for i below (total-size complex-vector) do @@ -141,7 +141,7 @@ (if (and (have-at-least-gsl-version '(1 12)) #+fsbv t #-fsbv nil) (elt/ (copy backward) (size-vector-real backward :stride stride)) ;; Hack for old GSL version without complex vector math - (make-marray + (grid:make-foreign-array (element-type backward) :dimensions (dimensions backward) :initial-contents diff --git a/fast-fourier-transforms/extras.lisp b/fast-fourier-transforms/extras.lisp index 9d311d13061cc39f3d696274392fc8877539dea9..7ce70ccbad7aa2c8b397667b636cd0db70ce5054 100644 --- a/fast-fourier-transforms/extras.lisp +++ b/fast-fourier-transforms/extras.lisp @@ -59,7 +59,7 @@ neg-f (loop for i from min-f-index below 0 collect (coerce (* i df) element-type))) - (make-marray element-type + (grid:make-foreign-array element-type :initial-contents (if shifted (nconc neg-f pos-f) (nconc pos-f neg-f)))))) diff --git a/fast-fourier-transforms/unpack.lisp b/fast-fourier-transforms/unpack.lisp index c676830846d09cac5a84c88d71b3ebe042741296..228b4679d5d2ea4b1cc2e8a95568f25fca1fd39d 100644 --- a/fast-fourier-transforms/unpack.lisp +++ b/fast-fourier-transforms/unpack.lisp @@ -1,6 +1,6 @@ ;; Unpack functions for FFT vectors. ;; Sumant Oemrawsingh, Sun Oct 25 2009 - 16:35 -;; Time-stamp: <2010-06-27 18:14:00EDT unpack.lisp> +;; Time-stamp: <2010-06-29 22:12:06EDT unpack.lisp> ;; ;; Copyright 2009 Sumant Oemrawsingh, Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -30,9 +30,9 @@ &key (stride 1) (output (eltcase single-float - (make-marray '(complex single-float) :dimensions (size vector)) + (grid:make-foreign-array '(complex single-float) :dimensions (size vector)) t - (make-marray '(complex double-float) :dimensions (size vector))))) + (grid:make-foreign-array '(complex double-float) :dimensions (size vector))))) ("gsl_fft_real" :type "_unpack") (((foreign-pointer vector) :pointer) ((foreign-pointer output) :pointer) @@ -54,9 +54,9 @@ &key (stride 1) (output (eltcase single-float - (make-marray '(complex single-float) :dimensions (size vector)) + (grid:make-foreign-array '(complex single-float) :dimensions (size vector)) t - (make-marray '(complex double-float) :dimensions (size vector))))) + (grid:make-foreign-array '(complex double-float) :dimensions (size vector))))) ("gsl_fft_halfcomplex" :type "_radix2_unpack") (((foreign-pointer vector) :pointer) ((foreign-pointer output) :pointer) @@ -77,9 +77,9 @@ &key (stride 1) (output (eltcase single-float - (make-marray '(complex single-float) :dimensions (size vector)) + (grid:make-foreign-array '(complex single-float) :dimensions (size vector)) t - (make-marray '(complex double-float) :dimensions (size vector))))) + (grid:make-foreign-array '(complex double-float) :dimensions (size vector))))) ("gsl_fft_halfcomplex" :type "_unpack") (((foreign-pointer vector) :pointer) ((foreign-pointer output) :pointer) diff --git a/hankel.lisp b/hankel.lisp index 8365576f6566fc5752911f094adbe5d048629f3f..3879f7c3330bf39de8360886b8615bf78d6c0a79 100644 --- a/hankel.lisp +++ b/hankel.lisp @@ -1,6 +1,6 @@ ;; Discrete Hankel Transforms. ;; Liam Healy, Sat Dec 8 2007 - 16:50 -;; Time-stamp: <2010-06-27 18:13:50EDT hankel.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT hankel.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -39,7 +39,7 @@ (defmfun apply-hankel (hankel array-in &optional - (array-out (make-marray 'double-float :dimensions (dimensions array-in)))) + (array-out (grid:make-foreign-array 'double-float :dimensions (dimensions array-in)))) "gsl_dht_apply" (((mpointer hankel) :pointer) ((foreign-pointer array-in) :pointer) ((foreign-pointer array-out) :pointer)) @@ -79,7 +79,7 @@ 'array)) ;; Simple (let ((hank (make-hankel 128 0.0d0 100.0d0)) - (in (make-marray 'double-float :dimensions 128))) + (in (grid:make-foreign-array 'double-float :dimensions 128))) (loop for n from 0 below 128 do (setf (maref in n) (/ (1+ (expt (sample-x-hankel hank n) 2))))) @@ -87,13 +87,13 @@ ;; Integrate[ x exp(-x) J_1(a x), {x,0,Inf}] = a F(3/2, 2; 2; -a^2) ;; expected accuracy only about 2% (let ((hank (make-hankel 128 1.0d0 20.0d0)) - (in (make-marray 'double-float :dimensions 128))) + (in (grid:make-foreign-array 'double-float :dimensions 128))) (loop for n from 0 below 128 do (setf (maref in n) (exp (- (sample-x-hankel hank n))))) (copy (apply-hankel hank in) 'array)) ;; Integrate[ x^2 (1-x^2) J_1(a x), {x,0,1}] = 2/a^2 J_3(a) (let ((hank (make-hankel 128 1.0d0 1.0d0)) - (in (make-marray 'double-float :dimensions 128))) + (in (grid:make-foreign-array 'double-float :dimensions 128))) (loop for n from 0 below 128 do (setf (maref in n) (let ((x (sample-x-hankel hank n))) diff --git a/init/callback.lisp b/init/callback.lisp index 4782896b1559ba727137634f8ef8ea95a86d882a..35d69cc4c2076206c744259ba161b38dcd0401be 100644 --- a/init/callback.lisp +++ b/init/callback.lisp @@ -1,6 +1,6 @@ ;; Foreign callback functions. ;; Liam Healy -;; Time-stamp: <2010-06-27 18:03:22EDT callback.lisp> +;; Time-stamp: <2010-06-29 22:51:19EDT callback.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -37,13 +37,13 @@ ;;; they are defined with those tasks. The macro #'defmcallback can ;;; specify that the CL function is to expect in arglist and return as ;;; multiple values scalar quantities that come from and will be bound -;;; to either marrays or C vectors. This is done with a list of the +;;; to either grid:foreign-arrays or C vectors. This is done with a list of the ;;; type and size, e.g. (:double 3), and for setting :set, type size, -;;; e.g. (:set :double 3). If the 'marray argument is nil, it will +;;; e.g. (:set :double 3). If the 'grid:foreign-array argument is nil, it will ;;; expand to read or set a C vector; if it is T, it will expand to -;;; read or set a marray. This allows the user to define ordinary CL +;;; read or set a grid:foreign-array. This allows the user to define ordinary CL ;;; functions with scalars as input and output. However, it may be -;;; desirable to read and set marrays, in which case :pointer is the +;;; desirable to read and set grid:foreign-arrays, in which case :pointer is the ;;; right specification. ;;;;**************************************************************************** @@ -125,7 +125,7 @@ (ecase component (io (first argspec)) ; :input or :output (element-type (second argspec)) ; :double - (array-type (third argspec)) ; :marray or :cvector + (array-type (third argspec)) ; :foreign-array or :cvector (dimensions (nthcdr 3 argspec)))) ;;;;**************************************************************************** diff --git a/init/funcallable.lisp b/init/funcallable.lisp index 91fd397652755329c7642d0f2b4e13f667c7d994..d648807c8be8171ab6f06d12ebe8b575bfbd2b55 100644 --- a/init/funcallable.lisp +++ b/init/funcallable.lisp @@ -1,6 +1,6 @@ ;; Generate a lambda that calls the user function; will be called by callback. ;; Liam Healy -;; Time-stamp: <2010-06-27 18:03:18EDT funcallable.lisp> +;; Time-stamp: <2010-06-29 22:49:08EDT funcallable.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -70,7 +70,7 @@ "Form to reference, for getting or setting, the element of a foreign array, or a scalar." (if (parse-callback-argspec argspec 'dimensions) - (if (eql (parse-callback-argspec argspec 'array-type) :marray) + (if (eql (parse-callback-argspec argspec 'array-type) :foreign-array) `(maref ,foreign-variable-name ,@(let ((dims (value-from-dimensions argspec dimension-values))) diff --git a/init/generate-examples.lisp b/init/generate-examples.lisp index 71cff4ed2841a528e0c952051e0976451193d43a..be3fe0343f60905f318e8b4c788e536a6586554a 100644 --- a/init/generate-examples.lisp +++ b/init/generate-examples.lisp @@ -1,6 +1,6 @@ ;; Define examples. ;; Liam Healy 2008-09-07 21:00:48EDT generate-tests.lisp -;; Time-stamp: <2010-06-27 18:03:19EDT generate-examples.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT generate-examples.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -115,9 +115,9 @@ (let ((matrixp (listp spec))) (if no-init ;; No initial values, just dimension - `(make-marray ',default-element-type :dimensions ',spec) + `(grid:make-foreign-array ',default-element-type :dimensions ',spec) ;; Initial contents - `(make-marray + `(grid:make-foreign-array ',default-element-type :initial-contents ',(if matrixp diff --git a/init/mobject.lisp b/init/mobject.lisp index 348484673fb3ae463803e14a746aa6e6b164dab3..f675a2dabcde4b48b2913a4a0ae629faa9c414f8 100644 --- a/init/mobject.lisp +++ b/init/mobject.lisp @@ -1,6 +1,6 @@ ;; Definition of GSL objects and ways to use them. ;; Liam Healy, Sun Dec 3 2006 - 10:21 -;; Time-stamp: <2010-06-27 18:26:32EDT mobject.lisp> +;; Time-stamp: <2010-06-29 22:51:18EDT mobject.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -359,7 +359,7 @@ ;; Defined for ;; histogram, histogram2d, ;; random-number-generator, quasi-random-number-generator, - (if (typep object 'marray) + (if (typep object 'grid:foreign-array) (call-next-method) (make-instance (class-of object) :mpointer (call-next-method))) ;; The subclass does not supply a method, so this will be called diff --git a/interpolation/spline-example.lisp b/interpolation/spline-example.lisp index 1571b62ef33ad861edd3fd0fe73816baf4fd1edf..1e18f9613c52eaca199a18e6a49ff6d713e3c60f 100644 --- a/interpolation/spline-example.lisp +++ b/interpolation/spline-example.lisp @@ -1,6 +1,6 @@ ;; Example spline ;; Liam Healy, Sat Nov 10 2007 - 21:18 -;; Time-stamp: <2009-12-27 09:52:13EST spline-example.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT spline-example.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -23,13 +23,13 @@ (defun spline-example (&optional (step 0.01d0)) "The first example in Sec. 26.7 of the GSL manual." (let* ((xarr - (make-marray + (grid:make-foreign-array 'double-float :initial-contents (loop for i from 0.0d0 below 10.0d0 collect (+ i (* 0.5d0 (sin i)))))) (yarr - (make-marray + (grid:make-foreign-array 'double-float :initial-contents (loop for i from 0.0d0 below 10.0d0 @@ -46,9 +46,9 @@ (loop with step = (/ (* 2.0 pi) intervals) for i from 0 upto intervals collect (* i step))) - (xmarr (make-marray 'double-float :initial-contents xarr)) + (xmarr (grid:make-foreign-array 'double-float :initial-contents xarr)) (ymarr - (make-marray 'double-float :initial-contents (mapcar 'sin xarr))) + (grid:make-foreign-array 'double-float :initial-contents (mapcar 'sin xarr))) (spline (make-spline +periodic-cubic-spline-interpolation+ xmarr ymarr))) (evaluate-integral spline 0d0 diff --git a/linear-algebra/blas1.lisp b/linear-algebra/blas1.lisp index 7da4379a6580beadb4472dade9fb6f291d50b78a..23f69530aec6f3c897852ac25b2c490ef1eff65e 100644 --- a/linear-algebra/blas1.lisp +++ b/linear-algebra/blas1.lisp @@ -1,6 +1,6 @@ ;; BLAS level 1, Vector operations ;; Liam Healy, Wed Apr 26 2006 - 15:23 -;; Time-stamp: <2010-06-27 18:13:54EDT blas1.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT blas1.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -112,7 +112,7 @@ (defmfun axpy (alpha (x vector) &optional - (y (make-marray element-type :dimensions (dimensions x)))) + (y (grid:make-foreign-array element-type :dimensions (dimensions x)))) ;; This gets an error for complex types because you can't pass a ;; struct in CFFI yet. ("gsl_blas_" :type "axpy") diff --git a/linear-algebra/blas2.lisp b/linear-algebra/blas2.lisp index c3f2d1ba7e73728f7b7cd9afbc94c65cf32ed045..9475881cc5a80a6fc7d6647a239ca7db7d9e93b8 100644 --- a/linear-algebra/blas2.lisp +++ b/linear-algebra/blas2.lisp @@ -1,6 +1,6 @@ ;; BLAS level 2, Matrix-vector operations ;; Liam Healy, Wed Apr 26 2006 - 21:08 -;; Time-stamp: <2009-12-27 09:55:01EST blas2.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT blas2.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -53,7 +53,7 @@ (alpha 1) (beta 1) (TransA :notrans) TransB &aux (yarr - (make-marray-or-default + (grid:make-foreign-array-or-default y (matrix-product-dimensions A x) nil element-type 0))) ("gsl_blas_" :type "gemv") ((transa cblas-transpose) (alpha :element-c-type) ((mpointer A) :pointer) @@ -143,7 +143,7 @@ &aux (yarr (or y - (make-marray element-type :dimensions (matrix-product-dimensions A x) + (grid:make-foreign-array element-type :dimensions (matrix-product-dimensions A x) :initial-element 0)))) ("gsl_blas_" :type "symv") ((uplo cblas-uplo) (alpha :element-c-type) ((mpointer A) :pointer) @@ -172,7 +172,7 @@ (defmfun matrix-product-hermitian ((A matrix) (x vector) &optional - (y (make-marray element-type :dimensions (matrix-product-dimensions A x) + (y (grid:make-foreign-array element-type :dimensions (matrix-product-dimensions A x) :initial-element 0)) (alpha 1) (beta 1) (uplo :upper) (side :left)) ("gsl_blas_" :type "hemv") diff --git a/linear-algebra/blas3.lisp b/linear-algebra/blas3.lisp index 2bc038187061a15ec28694b6bb49d60caa5fb16b..1b504ecfca6e8bf19c935d5262b1106419c00f4f 100644 --- a/linear-algebra/blas3.lisp +++ b/linear-algebra/blas3.lisp @@ -1,6 +1,6 @@ ;; BLAS level 3, Matrix-matrix operations ;; Liam Healy, Wed Apr 26 2006 - 21:08 -;; Time-stamp: <2009-12-27 09:55:00EST blas3.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT blas3.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -41,7 +41,7 @@ &aux (Carr (or C - (make-marray element-type :dimensions (matrix-product-dimensions A B) + (grid:make-foreign-array element-type :dimensions (matrix-product-dimensions A B) :initial-element 0)))) ("gsl_blas_" :type "gemm") ((TransA cblas-transpose) (TransB cblas-transpose) @@ -58,7 +58,7 @@ &aux (Carr (or C - (make-marray element-type :dimensions (matrix-product-dimensions A B) + (grid:make-foreign-array element-type :dimensions (matrix-product-dimensions A B) :initial-element 0)))) ("gsl_blas_" :type "symm") ((side cblas-side) (uplo cblas-uplo) (alpha :element-c-type) @@ -73,7 +73,7 @@ (defmfun matrix-product-hermitian ((A matrix) (B matrix) &optional - (C (make-marray element-type :dimensions (matrix-product-dimensions A B) + (C (grid:make-foreign-array element-type :dimensions (matrix-product-dimensions A B) :initial-element 0)) (alpha 1) (beta 1) (uplo :upper) (side :left)) ;; This always signals an error because you can't pass a diff --git a/linear-algebra/cholesky.lisp b/linear-algebra/cholesky.lisp index 4f1b1479cb138e9b5a67fcc93fcb97f31cf63ac1..c6cc6c27dbef7a1f9d7895b2ba34e0f46c8d63e8 100644 --- a/linear-algebra/cholesky.lisp +++ b/linear-algebra/cholesky.lisp @@ -1,6 +1,6 @@ ;; Cholesky Decomposition ;; Liam Healy, Wed May 3 2006 - 16:38 -;; Time-stamp: <2010-01-18 19:37:37EST cholesky.lisp> +;; Time-stamp: <2010-06-29 22:51:20EDT cholesky.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -53,7 +53,7 @@ (defmfun cholesky-solve ((A matrix) (b vector) &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) (("gsl_linalg" :complex "_cholesky_svx") ("gsl_linalg" :complex "_cholesky_solve")) ((((mpointer A) :pointer) ((mpointer b) :pointer)) @@ -69,7 +69,7 @@ decomposition of A into the matrix given by #'cholesky-decomposition. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the - solution returned in it. If x-spec is a marray, the solution will + solution returned in it. If x-spec is a grid:foreign-array, the solution will be returned in it.") (defmfun cholesky-invert (cholesky) diff --git a/linear-algebra/diagonal.lisp b/linear-algebra/diagonal.lisp index dec00edb2c07ef45fa8b797d89e42bf5d2fd5ef3..8894fde463a3217adca6bbae3fe7a4e6a8ebf667 100644 --- a/linear-algebra/diagonal.lisp +++ b/linear-algebra/diagonal.lisp @@ -1,6 +1,6 @@ ;; Tridiagonal and Bidiagonal matrices ;; Liam Healy, Thu May 4 2006 - 15:43 -;; Time-stamp: <2009-12-27 09:55:00EST diagonal.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT diagonal.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -246,8 +246,8 @@ (labels ((mvec (dimension &key initial-element) "Shorthand for initializing gsll vectors" (if initial-element - (make-marray 'double-float :dimensions dimension :initial-element initial-element) - (make-marray 'double-float :dimensions dimension)))) + (grid:make-foreign-array 'double-float :dimensions dimension :initial-element initial-element) + (grid:make-foreign-array 'double-float :dimensions dimension)))) (let ((x (mvec n)) (b (mvec n :initial-element 1d0)) (diag (mvec n :initial-element -1d0)) diff --git a/linear-algebra/exponential.lisp b/linear-algebra/exponential.lisp index 9aec9bc36b8f748be9fd8807e419ba2452c1a416..688d420f87210e234c372c23785228568caea86d 100644 --- a/linear-algebra/exponential.lisp +++ b/linear-algebra/exponential.lisp @@ -1,6 +1,6 @@ ;; Exponential of a matrix ;; Liam Healy 2008-08-10 17:25:35EDT exponential.lisp -;; Time-stamp: <2009-12-27 09:55:00EST exponential.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT exponential.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -40,7 +40,7 @@ ;;; A matrix of the form [[0, 1], [-1, 0]] ;;; when exponentiated gives [[cos x, sin x], [-sin x, cos x]] (let ((mat #m(0.0d0 1.0d0 ^ -1.0d0 0.0d0)) - (exp (make-marray 'double-float :dimensions '(2 2)))) + (exp (grid:make-foreign-array 'double-float :dimensions '(2 2)))) (cl-array (matrix-exponential mat exp))) #2A((0.5403023058681384d0 0.841470984807895d0) (-0.841470984807895d0 0.5403023058681384d0)) diff --git a/linear-algebra/householder.lisp b/linear-algebra/householder.lisp index 4c828311f2ae0fa34b18e445c2fec27dfdd1c84b..7545f90dc8299a2d2c91be49bf1563adeadbc8be 100644 --- a/linear-algebra/householder.lisp +++ b/linear-algebra/householder.lisp @@ -1,6 +1,6 @@ ;; Householder Transformations ;; Liam Healy, Wed May 10 2006 - 10:03 -;; Time-stamp: <2009-12-27 09:54:59EST householder.lisp> +;; Time-stamp: <2010-06-29 22:51:21EDT householder.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -87,7 +87,7 @@ (defmfun householder-solve (A b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_HH_svx" "gsl_linalg_HH_solve") ((((mpointer A) :pointer) ((mpointer b) :pointer)) (((mpointer A) :pointer) ((mpointer b) :pointer) @@ -99,7 +99,7 @@ "Solve the system A x = b directly using Householder transformations. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the - solution returned in it. If x-spec is a marray, the solution will + solution returned in it. If x-spec is a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The matrix A is destroyed by the Householder transformations. The solution is returned from the diff --git a/linear-algebra/lu.lisp b/linear-algebra/lu.lisp index bfce16cfd04f0174c936837a3aaf9f40205da5f2..bcc9084ee0090538dbed840c72c78d57bbf387ce 100644 --- a/linear-algebra/lu.lisp +++ b/linear-algebra/lu.lisp @@ -1,6 +1,6 @@ ;; LU decomposition ;; Liam Healy, Thu Apr 27 2006 - 12:42 -;; Time-stamp: <2010-02-05 09:39:38EST lu.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT lu.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -56,7 +56,7 @@ ((A matrix) (b vector) permutation &optional x-spec &aux (x (if (eq x-spec t) - (make-marray element-type :dimensions (dimensions b)) + (grid:make-foreign-array element-type :dimensions (dimensions b)) x-spec))) (("gsl_linalg" :complex "_LU_svx") ("gsl_linalg" :complex "_LU_solve")) @@ -79,7 +79,7 @@ (defmfun LU-refine ((A matrix) LU p (b vector) (x vector) - &optional (residual (make-marray element-type :dimensions (dim0 A)))) + &optional (residual (grid:make-foreign-array element-type :dimensions (dim0 A)))) ("gsl_linalg" :complex "_LU_refine") (((mpointer A) :pointer) ((mpointer LU) :pointer) ((mpointer p) :pointer) @@ -154,7 +154,7 @@ "Invert the matrix." (let* ((dim (first (dimensions mat))) (per (make-permutation dim)) - (inv (make-marray 'double-float :dimensions (list dim dim)))) + (inv (grid:make-foreign-array 'double-float :dimensions (list dim dim)))) (LU-decomposition mat per) (lu-invert mat per inv))) @@ -166,7 +166,7 @@ lu (cl-array (invert-matrix - (make-marray 'double-float + (grid:make-foreign-array 'double-float :dimensions '(2 2) :initial-contents '(1.0d0 2.0d0 3.0d0 4.0d0))))) diff --git a/linear-algebra/matrix-generation.lisp b/linear-algebra/matrix-generation.lisp index df9c0ad45fe50bebf87442129b1b4d371f4729b8..9430e1f291c2d81c77ef1f9d367d1d1663152cca 100644 --- a/linear-algebra/matrix-generation.lisp +++ b/linear-algebra/matrix-generation.lisp @@ -1,6 +1,6 @@ ;; Generate matrices used in tests of linear algebra functions ;; Liam Healy 2009-09-19 18:28:31EDT matrix-generation.lisp -;; Time-stamp: <2010-06-29 21:48:06EDT matrix-generation.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT matrix-generation.lisp> ;; ;; Copyright 2009, 2010 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -100,14 +100,14 @@ (defparameter *hilb12* (create-hilbert-matrix 12)) (defparameter *hilb2-soln* - (make-marray 'double-float :initial-contents '(-8.0d0 18.0d0))) + (grid:make-foreign-array 'double-float :initial-contents '(-8.0d0 18.0d0))) (defparameter *hilb3-soln* - (make-marray 'double-float :initial-contents '(27.0d0 -192.0d0 210.0d0))) + (grid:make-foreign-array 'double-float :initial-contents '(27.0d0 -192.0d0 210.0d0))) (defparameter *hilb4-soln* - (make-marray 'double-float + (grid:make-foreign-array 'double-float :initial-contents '(-64.0d0 900.0d0 -2520.0d0 1820.0d0))) (defparameter *hilb12-soln* - (make-marray 'double-float :initial-contents + (grid:make-foreign-array 'double-float :initial-contents '(-1728.0d0 245388.0d0 -8528520.0d0 127026900.0d0 -1009008000.0d0 4768571808.0d0 -14202796608.0d0 27336497760.0d0 -33921201600.0d0 @@ -119,15 +119,15 @@ (defparameter *vander12* (create-vandermonde-matrix 12)) (defparameter *vander2-soln* - (make-marray 'double-float :initial-contents '(1.0d0 0.0d0))) + (grid:make-foreign-array 'double-float :initial-contents '(1.0d0 0.0d0))) (defparameter *vander3-soln* - (make-marray 'double-float :initial-contents + (grid:make-foreign-array 'double-float :initial-contents '(0.0d0 1.0d0 0.0d0))) (defparameter *vander4-soln* - (make-marray 'double-float :initial-contents + (grid:make-foreign-array 'double-float :initial-contents '(0.0d0 0.0d0 1.0d0 0.0d0))) (defparameter *vander12-soln* - (make-marray 'double-float :initial-contents + (grid:make-foreign-array 'double-float :initial-contents '(0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 1.0d0 0.0d0))) diff --git a/linear-algebra/qr.lisp b/linear-algebra/qr.lisp index a6529524f8c638cf85267db9cde9c3d31a0a0258..00efdfe1ca496ba231c37f8adc4527d0874e2299 100644 --- a/linear-algebra/qr.lisp +++ b/linear-algebra/qr.lisp @@ -1,6 +1,6 @@ ;; QR decomposition ;; Liam Healy 2008-02-17 11:05:20EST qr.lisp -;; Time-stamp: <2009-12-27 09:54:58EST qr.lisp> +;; Time-stamp: <2010-06-29 22:51:19EDT qr.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -38,7 +38,7 @@ (defmfun QR-decomposition (A &optional - (tau (make-marray 'double-float :dimensions (min (dim0 A) (dim1 A))))) + (tau (grid:make-foreign-array 'double-float :dimensions (min (dim0 A) (dim1 A))))) "gsl_linalg_QR_decomp" (((mpointer A) :pointer) ((mpointer tau) :pointer)) :inputs (A) @@ -62,7 +62,7 @@ (defmfun QR-solve (QR tau b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_QR_svx" "gsl_linalg_QR_solve") ((((mpointer QR) :pointer) ((mpointer tau) :pointer) ((mpointer b) :pointer)) @@ -77,15 +77,15 @@ rectangular systems can be found using QR-lssolve. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the solution returned in it. If - x-spec is a marray, the solution will be returned in it. If x-spec + x-spec is a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The solution is returned from the function call.") (defmfun QR-solve-least-squares (QR tau b &optional - (x (make-marray 'double-float :dimensions (dim1 QR))) - (residual (make-marray 'double-float :dimensions (dim0 QR)))) + (x (grid:make-foreign-array 'double-float :dimensions (dim1 QR))) + (residual (grid:make-foreign-array 'double-float :dimensions (dim0 QR)))) "gsl_linalg_QR_lssolve" (((mpointer QR) :pointer) ((mpointer tau) :pointer) ((mpointer b) :pointer) ((mpointer x) :pointer) @@ -129,7 +129,7 @@ (defmfun QR-Rsolve (QR b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_QR_Rsvx" "gsl_linalg_QR_Rsolve") ((((mpointer QR) :pointer) ((mpointer b) :pointer)) (((mpointer QR) :pointer) ((mpointer b) :pointer) ((mpointer x) :pointer))) @@ -141,15 +141,15 @@ product b' = Q^T b has already been computed using QR-QTvec. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the solution returned in it. - If x-spec is a marray, the solution will be returned in it. If + If x-spec is a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The solution is returned from the function call.") (defmfun QR-unpack (QR tau &optional - (Q (make-marray 'double-float :dimensions (list (dim0 QR) (dim0 QR)))) - (R (make-marray 'double-float :dimensions (dimensions QR)))) + (Q (grid:make-foreign-array 'double-float :dimensions (list (dim0 QR) (dim0 QR)))) + (R (grid:make-foreign-array 'double-float :dimensions (dimensions QR)))) "gsl_linalg_QR_unpack" (((mpointer QR) :pointer) ((mpointer tau) :pointer) ((mpointer Q) :pointer) ((mpointer R) :pointer)) @@ -161,7 +161,7 @@ Q is M-by-M and R is M-by-N.") (defmfun QR-QRsolve - (Q R b &optional (x (make-marray 'double-float :dimensions (dim0 b)))) + (Q R b &optional (x (grid:make-foreign-array 'double-float :dimensions (dim0 b)))) "gsl_linalg_QR_QRsolve" (((mpointer Q) :pointer) ((mpointer R) :pointer) ((mpointer b) :pointer) ((mpointer x) :pointer)) @@ -189,7 +189,7 @@ (defmfun R-solve (R b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_R_svx" "gsl_linalg_R_solve") ((((mpointer R) :pointer) ((mpointer b) :pointer)) (((mpointer R) :pointer) ((mpointer b) :pointer) ((mpointer x) :pointer))) @@ -201,7 +201,7 @@ contain the right-hand side b, which is replaced by the solution on output. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the solution - returned in it. If x-spec is a marray, the solution will be + returned in it. If x-spec is a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The solution is returned from the function call.") @@ -261,7 +261,7 @@ (lambda (i j) (+ (maref matrix i j) (* (maref u i) (maref v j)))) dim0 dim1)) (qr2 (copy matrix)) - (w (make-marray 'double-float :dimensions dim0 :initial-element 0))) + (w (grid:make-foreign-array 'double-float :dimensions dim0 :initial-element 0))) (multiple-value-bind (QR2 tau) (QR-decomposition qr2) (multiple-value-bind (Q2 R2) diff --git a/linear-algebra/qrpt.lisp b/linear-algebra/qrpt.lisp index eabfef773c0b8ca6957a5c19b0809edd4429e9f5..6e093c4215513af0d3687eab167f84596ff7d33c 100644 --- a/linear-algebra/qrpt.lisp +++ b/linear-algebra/qrpt.lisp @@ -1,6 +1,6 @@ ;; QR with column pivoting ;; Liam Healy, Fri Apr 28 2006 - 16:53 -;; Time-stamp: <2010-06-27 18:27:59EDT qrpt.lisp> +;; Time-stamp: <2010-06-29 22:51:20EDT qrpt.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -25,9 +25,9 @@ (defmfun QRPT-decomposition (A &optional - (tau (make-marray 'double-float :dimensions (min (dim0 A) (dim1 A)))) + (tau (grid:make-foreign-array 'double-float :dimensions (min (dim0 A) (dim1 A)))) (permutation (make-permutation (dim1 A))) - (norm (make-marray 'double-float :dimensions (dim1 A)))) + (norm (grid:make-foreign-array 'double-float :dimensions (dim1 A)))) "gsl_linalg_QRPT_decomp" (((mpointer A) :pointer) ((mpointer tau) :pointer) ((mpointer permutation) :pointer) @@ -59,11 +59,11 @@ (defmfun QRPT-decomposition* (A &optional - (q (make-marray 'double-float :dimensions (list (dim0 A) (dim0 A)))) - (r (make-marray 'double-float :dimensions (dimensions A))) - (tau (make-marray 'double-float :dimensions (min (dim0 A) (dim1 A)))) + (q (grid:make-foreign-array 'double-float :dimensions (list (dim0 A) (dim0 A)))) + (r (grid:make-foreign-array 'double-float :dimensions (dimensions A))) + (tau (grid:make-foreign-array 'double-float :dimensions (min (dim0 A) (dim1 A)))) (permutation (make-permutation (dim1 A))) - (norm (make-marray 'double-float :dimensions (dim1 A)))) + (norm (grid:make-foreign-array 'double-float :dimensions (dim1 A)))) "gsl_linalg_QRPT_decomp2" (((mpointer A) :pointer) ((mpointer q) :pointer) ((mpointer r) :pointer) ((mpointer tau) :pointer) @@ -80,7 +80,7 @@ (defmfun QRPT-solve (QR tau permutation b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_QRPT_svx" "gsl_linalg_QRPT_solve") ((((mpointer QR) :pointer) ((mpointer tau) :pointer) ((mpointer permutation) :pointer) ((mpointer b) :pointer)) @@ -95,13 +95,13 @@ into (QR, tau, permutation) given by #'QRPT-decomposition. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the solution returned in it. If - x-spec is a marray, the solution will be returned in it. If x-spec + x-spec is a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The solution is returned from the function call.") (defmfun QRPT-QRsolve (Q R permutation b - &optional (x (make-marray 'double-float :dimensions (dim0 b)))) + &optional (x (grid:make-foreign-array 'double-float :dimensions (dim0 b)))) "gsl_linalg_QRPT_QRsolve" (((mpointer Q) :pointer) ((mpointer R) :pointer) ((mpointer permutation) :pointer) @@ -131,7 +131,7 @@ (defmfun QRPT-Rsolve (QR permutation b &optional x-spec &aux - (x (make-marray-or-default x-spec (dimensions b) t))) + (x (grid:make-foreign-array-or-default x-spec (dimensions b) t))) ("gsl_linalg_QRPT_Rsvx" "gsl_linalg_QRPT_Rsolve") ((((mpointer QR) :pointer) ((mpointer permutation) :pointer) ((mpointer b) :pointer)) @@ -146,7 +146,7 @@ side b, which is replaced by the solution on output. If x-spec is NIL (default), the solution will replace b. If x-spec is T, then an array will be created and the solution returned in it. If x-spec is - a marray, the solution will be returned in it. If x-spec is + a grid:foreign-array, the solution will be returned in it. If x-spec is non-NIL, on output the solution is stored in x and b is not modified. The solution is returned from the function call.") @@ -179,7 +179,7 @@ (multiple-value-bind (Q R) (QR-unpack QRPT tau) (let* ((qr (matrix-product Q R)) - (ans (make-marray + (ans (grid:make-foreign-array 'double-float :dimensions (dimensions qr) ;; It shouldn't be necessary to initialize values ;; because we are going to setf every row, diff --git a/linear-algebra/svd.lisp b/linear-algebra/svd.lisp index c88cd8b6b2042f2f48cd8cc979f91ba8059c1a0d..f9895fc137aff761c18310d51a3b7931327e6b07 100644 --- a/linear-algebra/svd.lisp +++ b/linear-algebra/svd.lisp @@ -1,6 +1,6 @@ ;; Singular Value Decomposition ;; Liam Healy, Tue May 2 2006 - 12:15 -;; Time-stamp: <2009-12-27 09:54:57EST svd.lisp> +;; Time-stamp: <2010-06-29 22:15:23EDT svd.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -44,9 +44,9 @@ (defmfun SV-decomposition (A &optional - (S (make-marray 'double-float :dimensions (dim1 A))) - (V (make-marray 'double-float :dimensions (list (dim1 A) (dim1 A)))) - (work (make-marray 'double-float :dimensions (dim1 A)))) + (S (grid:make-foreign-array 'double-float :dimensions (dim1 A))) + (V (grid:make-foreign-array 'double-float :dimensions (list (dim1 A) (dim1 A)))) + (work (grid:make-foreign-array 'double-float :dimensions (dim1 A)))) "gsl_linalg_SV_decomp" (((mpointer A) :pointer) ((mpointer V) :pointer) ((mpointer S) :pointer) ((mpointer work) :pointer)) @@ -68,10 +68,10 @@ (defmfun SV-modified-decomposition (A &optional - (S (make-marray 'double-float :dimensions (dim1 A))) - (V (make-marray 'double-float :dimensions (list (dim1 A) (dim1 A)))) - (X (make-marray 'double-float :dimensions (list (dim1 A) (dim1 A)))) - (work (make-marray 'double-float :dimensions (dim1 A)))) + (S (grid:make-foreign-array 'double-float :dimensions (dim1 A))) + (V (grid:make-foreign-array 'double-float :dimensions (list (dim1 A) (dim1 A)))) + (X (grid:make-foreign-array 'double-float :dimensions (list (dim1 A) (dim1 A)))) + (work (grid:make-foreign-array 'double-float :dimensions (dim1 A)))) "gsl_linalg_SV_decomp_mod" (((mpointer A) :pointer) ((mpointer X) :pointer) ((mpointer V) :pointer) @@ -86,8 +86,8 @@ (defmfun SV-jacobi-decomposition (A &optional - (S (make-marray 'double-float :dimensions (dim1 A))) - (V (make-marray 'double-float :dimensions (list (dim1 A) (dim1 A))))) + (S (grid:make-foreign-array 'double-float :dimensions (dim1 A))) + (V (grid:make-foreign-array 'double-float :dimensions (list (dim1 A) (dim1 A))))) "gsl_linalg_SV_decomp_jacobi" (((mpointer A) :pointer) ((mpointer V) :pointer) ((mpointer S) :pointer)) @@ -101,7 +101,7 @@ references for details).") (defmfun SV-solve - (U S V b &optional (x (make-marray 'double-float :dimensions (dim0 V)))) + (U S V b &optional (x (grid:make-foreign-array 'double-float :dimensions (dim0 V)))) "gsl_linalg_SV_solve" (((mpointer U) :pointer) ((mpointer V) :pointer) ((mpointer S) :pointer) diff --git a/ordinary-differential-equations/ode-system.lisp b/ordinary-differential-equations/ode-system.lisp index e67a03eb43c17f9113243774d8f7ae4532c220ae..89cf25ee280ac2f12c1991b495a649387a3dcd75 100644 --- a/ordinary-differential-equations/ode-system.lisp +++ b/ordinary-differential-equations/ode-system.lisp @@ -1,6 +1,6 @@ ;; ODE system setup ;; Liam Healy, Sun Apr 15 2007 - 14:19 -;; Time-stamp: <2009-12-27 09:56:55EST ode-system.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT ode-system.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -39,9 +39,9 @@ (control (make-y-control ,absolute-error ,relative-error)) (evolve (make-ode-evolution ,dimensions)) (,dep - (make-marray 'double-float :dimensions ,dimensions)) - (,ctime (make-marray 'double-float :dimensions 1)) - (,cstep (make-marray 'double-float :dimensions 1))) + (grid:make-foreign-array 'double-float :dimensions ,dimensions)) + (,ctime (grid:make-foreign-array 'double-float :dimensions 1)) + (,cstep (grid:make-foreign-array 'double-float :dimensions 1))) (symbol-macrolet ((,time (maref ,ctime 0)) (,step-size (maref ,cstep 0)) diff --git a/polynomial.lisp b/polynomial.lisp index b24e11a72773faaea68b333f75ab8c108202812b..40ae2fe2e044c63f22317b08c6cb60fb303b1bdb 100644 --- a/polynomial.lisp +++ b/polynomial.lisp @@ -1,6 +1,6 @@ ;; Polynomials ;; Liam Healy, Tue Mar 21 2006 - 18:33 -;; Time-stamp: <2010-06-29 20:56:39EDT polynomial.lisp> +;; Time-stamp: <2010-06-29 22:15:17EDT polynomial.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -74,7 +74,7 @@ ;;;;**************************************************************************** (defmfun divided-difference - (xa ya &optional (dd (make-marray 'double-float :dimensions (dim0 xa)))) + (xa ya &optional (dd (grid:make-foreign-array 'double-float :dimensions (dim0 xa)))) "gsl_poly_dd_init" (((foreign-pointer dd) :pointer) ((foreign-pointer xa) :pointer) ((foreign-pointer ya) :pointer) @@ -92,8 +92,8 @@ (defmfun taylor-divided-difference (xp dd xa &optional - (coefficients (make-marray 'double-float :dimensions (dim0 xa))) - (workspace (make-marray 'double-float :dimensions (dim0 xa)))) + (coefficients (grid:make-foreign-array 'double-float :dimensions (dim0 xa))) + (workspace (grid:make-foreign-array 'double-float :dimensions (dim0 xa)))) "gsl_poly_dd_taylor" (((foreign-pointer coefficients) :pointer) (xp :double) @@ -173,7 +173,7 @@ (defmfun polynomial-solve (coefficients &optional - (answer (make-marray '(complex double-float) + (answer (grid:make-foreign-array '(complex double-float) :dimensions (1- (size coefficients)))) (workspace (make-polynomial-complex-workspace (size coefficients)))) "gsl_poly_complex_solve" diff --git a/random/multinomial.lisp b/random/multinomial.lisp index c4a25c4fad4df40ca68f2782dc5fd6b9feb03f72..3e9a3b76af556fed78c0e79084e100e2993fafc3 100644 --- a/random/multinomial.lisp +++ b/random/multinomial.lisp @@ -1,6 +1,6 @@ ;; Multinomial distribution ;; Liam Healy, Sat Nov 25 2006 - 16:00 -;; Time-stamp: <2010-06-27 18:13:43EDT multinomial.lisp> +;; Time-stamp: <2010-06-29 22:15:17EDT multinomial.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -25,7 +25,7 @@ (defmfun sample ((generator random-number-generator) (type (eql :multinomial)) &key sum probabilities - (n (make-marray + (n (grid:make-foreign-array '(signed-byte 32) :dimensions (dim0 probabilities)))) "gsl_ran_multinomial" (((mpointer generator) :pointer) diff --git a/random/quasi.lisp b/random/quasi.lisp index 3501fae7dbbf9d53d4f0242d204c18501b88face..780baf4b97bc1ad97c705477168de829ea59b3f3 100644 --- a/random/quasi.lisp +++ b/random/quasi.lisp @@ -1,6 +1,6 @@ ;; Quasi-random sequences in arbitrary dimensions. ;; Liam Healy, Sun Jul 16 2006 - 15:54 -;; Time-stamp: <2010-06-29 21:11:34EDT quasi.lisp> +;; Time-stamp: <2010-06-29 22:15:18EDT quasi.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -120,7 +120,7 @@ (save-test quasi-random-number-generators ;; This example is given in the GSL documentation (let ((gen (make-quasi-random-number-generator +sobol+ 2)) - (vec (make-marray 'double-float :dimensions 2))) + (vec (grid:make-foreign-array 'double-float :dimensions 2))) (loop repeat 5 do (qrng-get gen vec) append (coerce (cl-array vec) 'list)))) diff --git a/random/shuffling-sampling.lisp b/random/shuffling-sampling.lisp index 25a4f298b759aa52d6e6302dc45877dd14ae1dbf..b92ea491930b1f789bad916f7c1b4fd455f10c41 100644 --- a/random/shuffling-sampling.lisp +++ b/random/shuffling-sampling.lisp @@ -1,6 +1,6 @@ ;; Shuffling and sampling ;; Liam Healy, Sat Dec 2 2006 - 18:40 -;; Time-stamp: <2010-06-27 18:13:45EDT shuffling-sampling.lisp> +;; Time-stamp: <2010-06-29 22:15:18EDT shuffling-sampling.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -46,7 +46,7 @@ &aux (destarr (if (integerp dest) - (make-marray (element-type src) :dimensions dest) + (grid:make-foreign-array (element-type src) :dimensions dest) dest))) "gsl_ran_choose" (((mpointer generator) :pointer) @@ -74,7 +74,7 @@ &aux (destarr (if (integerp dest) - (make-marray (element-type src) :dimensions dest) + (grid:make-foreign-array (element-type src) :dimensions dest) dest))) "gsl_ran_sample" (((mpointer generator) :pointer) diff --git a/series-acceleration.lisp b/series-acceleration.lisp index 8bd218b9bcca24199728c2cca811f64eadde904c..792a10ba93214bca6c2b019181831b19670c41ec 100644 --- a/series-acceleration.lisp +++ b/series-acceleration.lisp @@ -1,6 +1,6 @@ ;; Series acceleration. ;; Liam Healy, Wed Nov 21 2007 - 18:41 -;; Time-stamp: <2010-06-27 18:13:55EDT series-acceleration.lisp> +;; Time-stamp: <2010-06-29 22:15:24EDT series-acceleration.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -93,7 +93,7 @@ (sum 0.0d0) (zeta2 (/ (expt pi 2) 6))) (let ((levin (make-levin maxterms)) - (array (make-marray 'double-float :dimensions maxterms))) + (array (grid:make-foreign-array 'double-float :dimensions maxterms))) (dotimes (n maxterms) (setf (maref array n) (coerce (/ (expt (1+ n) 2)) 'double-float)) (incf sum (maref array n))) diff --git a/solve-minimize-fit/linear-least-squares.lisp b/solve-minimize-fit/linear-least-squares.lisp index 0b19ff6ba336e386aa8fc796583d5213b493133d..0e30a3b74f6f81e0bdde67d6882bf720711a03b0 100644 --- a/solve-minimize-fit/linear-least-squares.lisp +++ b/solve-minimize-fit/linear-least-squares.lisp @@ -1,6 +1,6 @@ ;; Linear least squares, or linear regression ;; Liam Healy <2008-01-21 12:41:46EST linear-least-squares.lisp> -;; Time-stamp: <2010-06-27 18:13:53EDT linear-least-squares.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT linear-least-squares.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -138,7 +138,7 @@ (dim0 array-or-size))) (defun default-covariance (parameters-or-size) - (make-marray + (grid:make-foreign-array 'double-float :dimensions (let ((s (size-array parameters-or-size))) (list s s)))) @@ -284,7 +284,7 @@ (x observations coefficients &optional (residuals - (make-marray 'double-float :dimensions (dimensions observations)))) + (grid:make-foreign-array 'double-float :dimensions (dimensions observations)))) "gsl_multifit_linear_residuals" (((mpointer x) :pointer) ((mpointer observations) :pointer) ((mpointer coefficients) :pointer) ((mpointer residuals) :pointer)) @@ -348,9 +348,9 @@ coefficients of x^0, x^1, x^2 for the best fit, and the chi squared." (let* ((n (length data)) - (x (make-marray 'double-float :dimensions (list n 3))) - (y (make-marray 'double-float :dimensions n)) - (w (make-marray 'double-float :dimensions n))) + (x (grid:make-foreign-array 'double-float :dimensions (list n 3))) + (y (grid:make-foreign-array 'double-float :dimensions n)) + (w (grid:make-foreign-array 'double-float :dimensions n))) (loop for i from 0 for row in data do (setf (maref X i 0) 1.0d0 diff --git a/solve-minimize-fit/minimization-multi.lisp b/solve-minimize-fit/minimization-multi.lisp index 0b1db42a17fa9cbad30db132471588513e32accc..aae03de74d0ab1b1651d8bbda1f0cfcc96af99b9 100644 --- a/solve-minimize-fit/minimization-multi.lisp +++ b/solve-minimize-fit/minimization-multi.lisp @@ -1,6 +1,6 @@ ;; Multivariate minimization. ;; Liam Healy <Tue Jan 8 2008 - 21:28> -;; Time-stamp: <2010-06-27 18:03:17EDT minimization-multi.lisp> +;; Time-stamp: <2010-06-29 22:49:05EDT minimization-multi.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -54,7 +54,7 @@ meaning of this parameter depends on the method used." :callbacks (callback fnstruct-dimension (dimension) - (function :double (:input :double :marray dim0) :slug)) + (function :double (:input :double :foreign-array dim0) :slug)) :initialize-suffix "set" :initialize-args ;; Could have one fewer argument: dimension=(dim0 initial) ((callback :pointer) ((mpointer initial) :pointer) @@ -78,14 +78,14 @@ tol |p| |g|." :callbacks (callback fnstruct-dimension-fdf (dimension) - (function :double (:input :double :marray dim0) :slug) + (function :double (:input :double :foreign-array dim0) :slug) (df :void - (:input :double :marray dim0) :slug - (:output :double :marray dim0)) + (:input :double :foreign-array dim0) :slug + (:output :double :foreign-array dim0)) (fdf :void - (:input :double :marray dim0) :slug + (:input :double :foreign-array dim0) :slug (:output :double :cvector 1) - (:output :double :marray dim0))) + (:output :double :foreign-array dim0))) :initialize-suffix "set" :initialize-args ((callback :pointer) ((mpointer initial) :pointer) @@ -367,7 +367,7 @@ (defun multimin-example-no-derivative (&optional (method +simplex-nelder-mead-on2+) (print-steps t)) - (let ((step-size (make-marray 'double-float :dimensions 2))) + (let ((step-size (grid:make-foreign-array 'double-float :dimensions 2))) (set-all step-size 1.0d0) (let ((minimizer (make-multi-dimensional-minimizer-f diff --git a/solve-minimize-fit/nonlinear-least-squares.lisp b/solve-minimize-fit/nonlinear-least-squares.lisp index ac3565c94ceff889dcae645fbcbe5f8fc173dd0e..d569fea4a63e3c06686d1666169d6f00c8f4a6c3 100644 --- a/solve-minimize-fit/nonlinear-least-squares.lisp +++ b/solve-minimize-fit/nonlinear-least-squares.lisp @@ -1,6 +1,6 @@ ;; Nonlinear least squares fitting. ;; Liam Healy, 2008-02-09 12:59:16EST nonlinear-least-squares.lisp -;; Time-stamp: <2010-06-27 08:42:19EDT nonlinear-least-squares.lisp> +;; Time-stamp: <2010-06-29 22:49:06EDT nonlinear-least-squares.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -41,8 +41,8 @@ (number-of-observations number-of-parameters) (function :success-failure - (:input :double :marray dim1) :slug - (:output :double :marray dim0))) + (:input :double :foreign-array dim1) :slug + (:output :double :foreign-array dim0))) :initialize-suffix "set" :initialize-args ((callback :pointer) ((mpointer initial-guess) :pointer)) :singular (function)) @@ -71,18 +71,18 @@ (callback fnstruct-fit-fdf (number-of-observations number-of-parameters) (function :success-failure - (:input :double :marray dim1) + (:input :double :foreign-array dim1) :slug - (:output :double :marray dim0)) + (:output :double :foreign-array dim0)) (df :success-failure - (:input :double :marray dim1) + (:input :double :foreign-array dim1) :slug - (:output :double :marray dim0 dim1)) + (:output :double :foreign-array dim0 dim1)) (fdf :success-failure - (:input :double :marray dim1) + (:input :double :foreign-array dim1) :slug - (:output :double :marray dim0) - (:output :double :marray dim0 dim1))) + (:output :double :foreign-array dim0) + (:output :double :foreign-array dim0 dim1))) :initialize-suffix "set" :initialize-args ((callback :pointer) ((mpointer initial-guess) :pointer))) @@ -245,7 +245,7 @@ (defmfun ls-covariance (solver relative-error &optional covariance &aux (cov (or covariance - (make-marray 'double-float + (grid:make-foreign-array 'double-float :dimensions (list (dim1 solver) (dim1 solver)))))) "gsl_multifit_covar" @@ -298,14 +298,14 @@ (make-exponent-fit-data :n number-of-observations :y - (let ((arr (make-marray 'double-float :dimensions number-of-observations)) + (let ((arr (grid:make-foreign-array 'double-float :dimensions number-of-observations)) (rng (make-random-number-generator +mt19937+ 0))) (dotimes (i number-of-observations arr) (setf (maref arr i) (+ 1 (* 5 (exp (* -1/10 i))) (sample rng :gaussian :sigma 0.1d0))))) :sigma - (make-marray + (grid:make-foreign-array 'double-float :dimensions number-of-observations :initial-element 0.1d0))) (defun exponential-residual (x f) diff --git a/solve-minimize-fit/roots-multi.lisp b/solve-minimize-fit/roots-multi.lisp index d9a19baa465bc5d78289f2d5eda3dbf0a2d4f4f9..6fa31d8fee639d978df12aaf508b8afabff1c968 100644 --- a/solve-minimize-fit/roots-multi.lisp +++ b/solve-minimize-fit/roots-multi.lisp @@ -1,6 +1,6 @@ ;;; Multivariate roots. ;;; Liam Healy 2008-01-12 12:49:08 -;;; Time-stamp: <2010-06-27 08:44:26EDT roots-multi.lisp> +;;; Time-stamp: <2010-06-29 22:51:17EDT roots-multi.lisp> ;; ;; Copyright 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -24,9 +24,9 @@ ;;; Currently, functions defined for root solving will be passed ;;; scalars and should return scalars as multiple values. A possible -;;; future enhancement is to optionally pass marrays and return -;;; marrays instead. This would allow directly manipulation of -;;; marrays by the user function. Notes Mon Jan 19 2009. +;;; future enhancement is to optionally pass grid:foreign-arrays and return +;;; grid:foreign-arrays instead. This would allow directly manipulation of +;;; grid:foreign-arrays by the user function. Notes Mon Jan 19 2009. ;;;;**************************************************************************** ;;;; Initialization @@ -47,8 +47,8 @@ (callback fnstruct-dimension (dimension) (function :success-failure - (:input :double :marray dim0) :slug - (:output :double :marray dim0))) + (:input :double :foreign-array dim0) :slug + (:output :double :foreign-array dim0))) :arglists-function (lambda (set) `((type &optional function-or-dimension (initial nil ,set) (scalarsp t)) @@ -73,18 +73,18 @@ :callbacks (callback fnstruct-dimension-fdf (dimension) (function :success-failure - (:input :double :marray dim0) + (:input :double :foreign-array dim0) :slug - (:output :double :marray dim0)) + (:output :double :foreign-array dim0)) (df :success-failure - (:input :double :marray dim0) + (:input :double :foreign-array dim0) :slug - (:output :double :marray dim0 dim0)) + (:output :double :foreign-array dim0 dim0)) (fdf :success-failure - (:input :double :marray dim0) + (:input :double :foreign-array dim0) :slug - (:output :double :marray dim0) - (:output :double :marray dim0 dim0))) + (:output :double :foreign-array dim0) + (:output :double :foreign-array dim0 dim0))) :arglists-function (lambda (set) `((type &optional function-or-dimension (initial nil ,set) diff --git a/solve-minimize-fit/simulated-annealing.lisp b/solve-minimize-fit/simulated-annealing.lisp index 8ecdd3a5f7acfb84cf705d0d61d022c6a80865de..21cb7d53e6190b4f6b3f4585a45e9fc52e3b739f 100644 --- a/solve-minimize-fit/simulated-annealing.lisp +++ b/solve-minimize-fit/simulated-annealing.lisp @@ -1,6 +1,6 @@ ;; Simulated Annealing ;; Liam Healy Sun Feb 11 2007 - 17:23 -;; Time-stamp: <2010-04-10 17:22:03EDT simulated-annealing.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT simulated-annealing.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -224,7 +224,7 @@ 200 1000 1.0d0 1.0d0 0.008d0 1.003d0 2.0d-6 ; parameters (make-random-number-generator +mt19937+ 0) (lambda (&optional initial) - (make-marray 'double-float :dimensions 1 :initial-contents initial)) + (grid:make-foreign-array 'double-float :dimensions 1 :initial-contents initial)) 'trivial-example-energy 'trivial-example-step 'trivial-example-metric @@ -245,7 +245,7 @@ 200 1000 1.0d0 1.0d0 0.008d0 1.003d0 2.0d-6 ; parameters (make-random-number-generator +mt19937+ 0) (lambda (&optional initial) - (make-marray 'double-float :dimensions 1 :initial-contents initial)) + (grid:make-foreign-array 'double-float :dimensions 1 :initial-contents initial)) 'trivial-test-energy 'trivial-example-step 'trivial-example-metric diff --git a/special-functions/bessel.lisp b/special-functions/bessel.lisp index 0f0fb7b5d4b83124cbed1379c67ce2aff9c0a77e..2a54878ac89d277a190a561cb2b2436933d198a2 100644 --- a/special-functions/bessel.lisp +++ b/special-functions/bessel.lisp @@ -1,6 +1,6 @@ ;; Bessel functions ;; Liam Healy, Fri Mar 17 2006 - 18:42 -;; Time-stamp: <2010-06-27 18:13:48EDT bessel.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT bessel.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -519,59 +519,59 @@ (cylindrical-bessel-Y0 4.0d0) (cylindrical-bessel-Y1 4.0d0) (cylindrical-bessel-Y 3 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (cylindrical-bessel-Yn-array 2.0d0 besarr 2) (cl-array besarr)) (cylindrical-bessel-I0 4.0d0) (cylindrical-bessel-I1 4.0d0) (cylindrical-bessel-I 3 4.0d0) (cylindrical-bessel-I 3.0d0 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (cylindrical-bessel-In-array 2.0d0 besarr 2) (cl-array besarr)) (cylindrical-bessel-I0-scaled 4.0d0) (cylindrical-bessel-I1-scaled 4.0d0) (cylindrical-bessel-I-scaled 3 4.0d0) (cylindrical-bessel-I-scaled 3.0d0 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (cylindrical-bessel-In-scaled-array 2.0d0 besarr 2) (cl-array besarr)) (cylindrical-bessel-K0 4.0d0) (cylindrical-bessel-K1 4.0d0) (cylindrical-bessel-K 2 4.0d0) (cylindrical-bessel-K 3.0d0 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (cylindrical-bessel-Kn-array 2.0d0 besarr 2) (cl-array besarr)) (cylindrical-bessel-K0-scaled 4.0d0) (cylindrical-bessel-K1-scaled 4.0d0) (cylindrical-bessel-K-scaled 2 4.0d0) (cylindrical-bessel-K-scaled 3.0d0 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (cylindrical-bessel-Kn-array 2.0d0 besarr 2) (cl-array besarr)) (spherical-bessel-j0 4.0d0) (spherical-bessel-j1 4.0d0) (spherical-bessel-j2 4.0d0) (spherical-bessel-jl 3 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (spherical-bessel-jl-array 4.0d0 besarr) (cl-array besarr)) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (spherical-bessel-jl-steed-array 4.0d0 besarr) (cl-array besarr)) (spherical-bessel-y0 4.0d0) (spherical-bessel-y1 4.0d0) (spherical-bessel-y2 4.0d0) (spherical-bessel-yl 2 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (spherical-bessel-yl-array 4.0d0 besarr) (cl-array besarr)) (spherical-bessel-i0-scaled 4.0d0) (spherical-bessel-i1-scaled 4.0d0) (spherical-bessel-i2-scaled 4.0d0) (spherical-bessel-il-scaled 3 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (spherical-bessel-il-scaled-array 4.0d0 besarr) (cl-array besarr)) (spherical-bessel-k0-scaled 4.0d0) @@ -579,7 +579,7 @@ (spherical-bessel-k2-scaled 4.0d0) (spherical-bessel-kl-scaled 3 4.0d0) - (let ((besarr (make-marray 'double-float :dimensions 4))) + (let ((besarr (grid:make-foreign-array 'double-float :dimensions 4))) (spherical-bessel-kl-scaled-array 4.0d0 besarr) (cl-array besarr)) (cylindrical-bessel-J 3.0d0 4.0d0) diff --git a/special-functions/coulomb.lisp b/special-functions/coulomb.lisp index 7ba3d5016583413b7e24804599993ed4e3f91f56..d62f63fbda31addb203448cd3178d7be324cdcd7 100644 --- a/special-functions/coulomb.lisp +++ b/special-functions/coulomb.lisp @@ -1,6 +1,6 @@ ;; Coulumb functions ;; Liam Healy, Sat Mar 18 2006 - 23:23 -;; Time-stamp: <2010-06-27 18:13:47EDT coulomb.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT coulomb.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -167,16 +167,16 @@ (hydrogenicr-1 1.0d0 2.5d0) (hydrogenicr 3 1 1.0d0 2.5d0) (coulomb-wave-FG 0.0d0 1.0d0 2.0d0 0) - (let ((arr (make-marray 'double-float :dimensions 3))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 3))) (coulomb-wave-F-array 0.0d0 1.0d0 2.0d0 arr) (cl-array arr)) (coulomb-wave-fg 1.0d0 2.0d0 2.5d0 1) - (let ((Farr (make-marray 'double-float :dimensions 3)) - (Garr (make-marray 'double-float :dimensions 3))) + (let ((Farr (grid:make-foreign-array 'double-float :dimensions 3)) + (Garr (grid:make-foreign-array 'double-float :dimensions 3))) (coulomb-wave-FG-array 1.5d0 1.0d0 1.0d0 Farr Garr) (append (coerce (cl-array Farr) 'list) (coerce (cl-array Garr) 'list))) - (let ((arr (make-marray 'double-float :dimensions 3))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 3))) (coulomb-wave-sphF-array 0.0d0 1.0d0 2.0d0 arr) (cl-array arr)) (coulomb-cl 1.0d0 2.5d0) - (let ((cl (make-marray 'double-float :dimensions 3))) + (let ((cl (grid:make-foreign-array 'double-float :dimensions 3))) (coulomb-CL-array 0.0d0 1.0d0 cl) (cl-array cl))) diff --git a/special-functions/legendre.lisp b/special-functions/legendre.lisp index d4f329a1460b36b31a5da3564b4e9218992bceed..dc6cc87e43e97e97b74a8ec191c715ce850d2ef0 100644 --- a/special-functions/legendre.lisp +++ b/special-functions/legendre.lisp @@ -1,6 +1,6 @@ ;; Legendre functions ;; Liam Healy, Sat Apr 29 2006 - 19:16 -;; Time-stamp: <2010-06-27 18:13:46EDT legendre.lisp> +;; Time-stamp: <2010-06-29 22:15:19EDT legendre.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -287,26 +287,26 @@ (legendre-Pl -4 0.3d0) (legendre-Pl 4 3.0d0) (legendre-Pl 4 0.3d0) - (let ((arr (make-marray 'double-float :dimensions 4))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-Pl-array 0.5d0 arr) (cl-array arr)) (legendre-Q0 3.3d0) (legendre-Q1 3.3d0) (legendre-Ql 2 3.3d0) (legendre-Plm 4 3 0.5d0) - (let ((arr (make-marray 'double-float :dimensions 4))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-Plm-array 2 0.5d0 arr) (cl-array arr)) - (let ((val (make-marray 'double-float :dimensions 4)) - (deriv (make-marray 'double-float :dimensions 4))) + (let ((val (grid:make-foreign-array 'double-float :dimensions 4)) + (deriv (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-Plm-deriv-array 2 0.5d0 val deriv) (cl-array deriv)) (legendre-sphplm 1200 1100 0.3d0) - (let ((arr (make-marray 'double-float :dimensions 4))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-sphPlm-array 4 0.5d0 arr) (cl-array arr)) - (let ((val (make-marray 'double-float :dimensions 4)) - (deriv (make-marray 'double-float :dimensions 4))) + (let ((val (grid:make-foreign-array 'double-float :dimensions 4)) + (deriv (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-sphPlm-deriv-array 4 0.5d0 val deriv) (cl-array deriv)) (legendre-conicalp-half 3.5d0 10.0d0) @@ -318,6 +318,6 @@ (legendre-h3d-0 1.0d0 0.5d0) (legendre-h3d-1 1.0d0 0.5d0) (legendre-h3d 4 1.0d0 0.5d0) - (let ((arr (make-marray 'double-float :dimensions 4))) + (let ((arr (grid:make-foreign-array 'double-float :dimensions 4))) (legendre-h3d-array 1.0d0 0.5d0 arr) (cl-array arr))) diff --git a/special-functions/return-structures.lisp b/special-functions/return-structures.lisp index c026a8dd5f53b119be459ef491fed3472c921273..208ae487995d423285aec3d75665af2ba18e387f 100644 --- a/special-functions/return-structures.lisp +++ b/special-functions/return-structures.lisp @@ -1,6 +1,6 @@ ;; Structures returned by special functions. ;; Liam Healy, Mon Jan 1 2007 - 11:35 -;; Time-stamp: <2009-12-27 10:10:00EST return-structures.lisp> +;; Time-stamp: <2010-06-29 22:15:22EDT return-structures.lisp> ;; ;; Copyright 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -43,7 +43,7 @@ (defun vdf (size-or-array) "Make or take a vector-double-float." (if (integerp size-or-array) - (make-marray 'double-float :dimensions size-or-array) + (grid:make-foreign-array 'double-float :dimensions size-or-array) size-or-array)) (defun vdf-size (size-or-array) diff --git a/test-unit/augment.lisp b/test-unit/augment.lisp index bd55b0e449571b9f33f4045b755b00660e977405..be6a234566b101d2a5393c59eb68a3175c8e3bea 100644 --- a/test-unit/augment.lisp +++ b/test-unit/augment.lisp @@ -1,6 +1,6 @@ ;; Additional methods for lisp-unit ;; Liam Healy 2009-04-15 23:23:30EDT augment.lisp -;; Time-stamp: <2010-06-01 22:02:57EDT augment.lisp> +;; Time-stamp: <2010-06-29 22:51:21EDT augment.lisp> ;; ;; Copyright 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -21,7 +21,7 @@ (in-package :gsl) (defmethod lisp-unit:numerical-equal - ((result1 marray) (result2 marray) &key (test #'lisp-unit:number-equal)) + ((result1 grid:foreign-array) (result2 grid:foreign-array) &key (test #'lisp-unit:number-equal)) "Return true if the arrays are numerically equal according to :TEST." (when (equal (dimensions result1) (dimensions result2)) (lisp-unit:numerical-equal (cl-array result1) (cl-array result2) diff --git a/tests/absolute-deviation.lisp b/tests/absolute-deviation.lisp index c9ed69edfab27c6868fc745abb8a9efc1ba4c6ca..00094a0d54c3237b884a114e662c24fe7c90f3ea 100644 --- a/tests/absolute-deviation.lisp +++ b/tests/absolute-deviation.lisp @@ -23,10 +23,10 @@ (LIST (LIST 6.18d0 6.647777777777779d0 6.18d0)) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-3.21d0 1.0d0 12.8d0))) (WEIGHTS - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(3.0d0 1.0d0 2.0d0)))) (LET ((MEAN (MEAN VEC))) (LIST (ABSOLUTE-DEVIATION VEC) diff --git a/tests/absolute-sum.lisp b/tests/absolute-sum.lisp index fc287e51284036d050a2e7471b05bb26fae19aa9..4d7ab271ae65169fc174e6c3ba9d5b2e1c585c7e 100644 --- a/tests/absolute-sum.lisp +++ b/tests/absolute-sum.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 157.99) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -36,7 +36,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 157.99d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -52,7 +52,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 388.65997) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS @@ -75,7 +75,7 @@ (LIST 388.65999999999997d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 diff --git a/tests/autocorrelation.lisp b/tests/autocorrelation.lisp index 8a047dfab322dd57d407e367429bb37d57f3ba70..4528fbcea24c5ecc0bcd7202583f9366e6d07b7b 100644 --- a/tests/autocorrelation.lisp +++ b/tests/autocorrelation.lisp @@ -24,7 +24,7 @@ (LIST -0.04646366834251103d0 -0.04646366834251103d0)) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-3.21d0 1.0d0 12.8d0)))) (LET ((MEAN (MEAN VEC))) (LIST (AUTOCORRELATION VEC) diff --git a/tests/axpy.lisp b/tests/axpy.lisp index 53f4f823bb351d58b8ac05ad4f3ff6dad79a54e7..8d28e853d49deb1f2401caeeee3f3a9b47a99296 100644 --- a/tests/axpy.lisp +++ b/tests/axpy.lisp @@ -25,11 +25,11 @@ 235.659 -1932.6083 485.93335)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08))) (SCALAR -39.66)) @@ -41,12 +41,12 @@ -1932.6082d0 485.93339999999995d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 -49.08d0))) @@ -61,14 +61,14 @@ #C(222.45422 1149.8602) #C(-3308.3872 917.76044))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08 -39.66 -49.46 @@ -89,7 +89,7 @@ #C(-3308.3871999999997d0 917.7603999999995d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -97,7 +97,7 @@ -16.12d0 -8.25d0 21.44d0 -49.08d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 diff --git a/tests/bessel.lisp b/tests/bessel.lisp index 8d92a00afd8bb166a51075b49b424560cc5d23e3..fba8646656edf879f3f1ff66ad989214ea0dc474 100644 --- a/tests/bessel.lisp +++ b/tests/bessel.lisp @@ -47,7 +47,7 @@ -2.7659432263306014d0 -9.935989128481978d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (CYLINDRICAL-BESSEL-YN-ARRAY 2.0d0 BESARR 2) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -68,7 +68,7 @@ 0.05072856997918024d0 0.009825679323131702d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (CYLINDRICAL-BESSEL-IN-ARRAY 2.0d0 BESARR 2) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -92,7 +92,7 @@ 0.006865365386320685d0 0.0013297610941881578d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (CYLINDRICAL-BESSEL-IN-SCALED-ARRAY 2.0d0 BESARR 2) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -128,7 +128,7 @@ 2.1959159274119586d0 9.431049100596468d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (CYLINDRICAL-BESSEL-KN-ARRAY 2.0d0 BESARR 2) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -149,7 +149,7 @@ 0.2762836857713501d0 0.22924385795503022d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (SPHERICAL-BESSEL-JL-ARRAY 4.0d0 BESARR) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -158,7 +158,7 @@ 0.27628368577135015d0 0.22924385795503024d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (SPHERICAL-BESSEL-JL-STEED-ARRAY 4.0d0 BESARR) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -179,7 +179,7 @@ 0.009129107382315343d0 -0.21864196590306362d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (SPHERICAL-BESSEL-YL-ARRAY 4.0d0 BESARR) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -204,7 +204,7 @@ 0.05460625514480483d0 0.02554459710460367d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (SPHERICAL-BESSEL-IL-SCALED-ARRAY 4.0d0 BESARR) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -229,7 +229,7 @@ 0.760854470791278d0 1.4419419406125027d0)) (MULTIPLE-VALUE-LIST (LET ((BESARR - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (SPHERICAL-BESSEL-KL-SCALED-ARRAY 4.0d0 BESARR) (CL-ARRAY BESARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL diff --git a/tests/blas-copy.lisp b/tests/blas-copy.lisp index 9a127843280dc68febfd9e58ee8b70d5599225b8..2dda8d0ef9f78ad765c42177dea2c0482eeba1d5 100644 --- a/tests/blas-copy.lisp +++ b/tests/blas-copy.lisp @@ -23,30 +23,30 @@ (LIST #(-34.5 8.24 3.29)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) - (V2 (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) + (V2 (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) (BLAS-COPY V1 V2) (CL-ARRAY V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-34.5d0 8.24d0 3.29d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) - (V2 (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) + (V2 (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) (BLAS-COPY V1 V2) (CL-ARRAY V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '3))) (BLAS-COPY V1 V2) (CL-ARRAY V2)))) @@ -56,12 +56,12 @@ #C(34.12d0 -6.15d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '3))) (BLAS-COPY V1 V2) (CL-ARRAY V2))))) diff --git a/tests/blas-swap.lisp b/tests/blas-swap.lisp index 77cb75779bbec4dc61909ff2988412c3a4702d44..deb41a29b93a1d74a457c7769e72ea9c706165db 100644 --- a/tests/blas-swap.lisp +++ b/tests/blas-swap.lisp @@ -23,10 +23,10 @@ (LIST (LIST #(-8.93 34.12 -6.15) #(-34.5 8.24 3.29))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (BLAS-SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -36,10 +36,10 @@ #(-34.5d0 8.24d0 3.29d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (BLAS-SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -50,12 +50,12 @@ #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15)))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-8.93 34.12 -6.15 49.27 -13.49 32.5)))) @@ -70,12 +70,12 @@ #C(34.12d0 -6.15d0)))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 32.5d0)))) diff --git a/tests/cdot.lisp b/tests/cdot.lisp index efe1b9d7dc617cb624820d81634f39ad7c8cd574..0cd8b041e170664ce297497a618b1dba9a1a7bda 100644 --- a/tests/cdot.lisp +++ b/tests/cdot.lisp @@ -23,14 +23,14 @@ (LIST #C(-1.1684039224427728d28 0.0d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08 -39.66 -49.46 @@ -41,7 +41,7 @@ (LIST #C(-6252.624d0 -6236.050300000001d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -49,7 +49,7 @@ -16.12d0 -8.25d0 21.44d0 -49.08d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 diff --git a/tests/cholesky.lisp b/tests/cholesky.lisp index 866fcd4994c945da2cc620b5c6ef40bb6edd303c..439a6a27fc3893761cd98c1fa7b108f9d3f5aa6f 100644 --- a/tests/cholesky.lisp +++ b/tests/cholesky.lisp @@ -39,13 +39,13 @@ (MULTIPLE-VALUE-LIST (TEST-CHOLESKY-DECOMP-DIM *HILB12*)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 2) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 2) :INITIAL-CONTENTS '(4.0d0 -6.000000000000001d0 -6.000000000000001d0 12.000000000000002d0))) (MULTIPLE-VALUE-LIST (TEST-CHOLESKY-INVERT-DIM *HILB2*))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3) :INITIAL-CONTENTS '(8.999999999999996d0 -35.99999999999997d0 29.999999999999968d0 -35.99999999999997d0 191.99999999999977d0 -179.99999999999974d0 @@ -54,7 +54,7 @@ (MULTIPLE-VALUE-LIST (TEST-CHOLESKY-INVERT-DIM *HILB3*))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(4 4) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(4 4) :INITIAL-CONTENTS '(15.999999999997954d0 -119.99999999997637d0 239.9999999999425d0 -139.9999999999624d0 -119.99999999997637d0 1199.9999999997276d0 @@ -66,7 +66,7 @@ (MULTIPLE-VALUE-LIST (TEST-CHOLESKY-INVERT-DIM *HILB4*))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(12 12) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(12 12) :INITIAL-CONTENTS '(140.93894922210026d0 -9909.515598314396d0 228130.1469667386d0 -2538275.7124035973d0 1.6095812913531223d7 -6.334945916568248d7 diff --git a/tests/column.lisp b/tests/column.lisp index 31a215b6adc6db119c1bfd54843f5ade4f7f2f1e..10d6eb8fc29fffa972749313d31c5bf690a01ed0 100644 --- a/tests/column.lisp +++ b/tests/column.lisp @@ -23,27 +23,27 @@ (LIST #(8.24 34.12 -13.49)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) - (COL (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) + (COL (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (COLUMN M1 1 COL))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(8.24d0 34.12d0 -13.49d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) - (COL (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) + (COL (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (COLUMN M1 1 COL))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(#C(3.29 -8.93) #C(-6.15 49.27) #C(32.5 42.73))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -52,7 +52,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (COL - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (COLUMN M1 1 COL))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -61,7 +61,7 @@ #C(32.5d0 42.73d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -70,13 +70,13 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (COL - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (COLUMN M1 1 COL))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -87,7 +87,7 @@ (73 -5 123)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS @@ -98,7 +98,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -109,7 +109,7 @@ (161 215 98)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS @@ -120,7 +120,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -131,7 +131,7 @@ (73 -5 123)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS @@ -142,7 +142,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -153,7 +153,7 @@ (161 215 98)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS @@ -164,7 +164,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -175,7 +175,7 @@ (73 -5 123)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS @@ -186,7 +186,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -197,7 +197,7 @@ (161 215 98)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS @@ -209,7 +209,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -220,7 +220,7 @@ (73 -5 123)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS @@ -232,7 +232,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS @@ -243,7 +243,7 @@ (161 215 98)))) (COL - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS diff --git a/tests/correlation.lisp b/tests/correlation.lisp index b34b10a50fb144260d3b896666579008dc14c57e..b05deb8870c95029d84a30b50812e783a43c12c1 100644 --- a/tests/correlation.lisp +++ b/tests/correlation.lisp @@ -23,80 +23,80 @@ (LIST 0.6345226832058398d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.6345226817840662d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.05125843466531291d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-91 52 -10)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -0.13540958697634814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(116 163 140)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.05125843466531291d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-91 52 -10)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -0.13540958697634814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(116 163 140)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0.05125843466531291d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-91 52 -10)))) (CORRELATION V1 V2)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -0.13540958697634814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (CORRELATION V1 V2)))) #+int64 @@ -104,10 +104,10 @@ (LIST 0.05125843466531291d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-91 52 -10)))) (CORRELATION V1 V2)))) #+int64 @@ -115,9 +115,9 @@ (LIST -0.13540958697634814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (CORRELATION V1 V2))))) diff --git a/tests/coulomb.lisp b/tests/coulomb.lisp index f3149f43e984545be63b073652324265758ba19a..b7ac7ad393f5f116c5f59aba8c3936a7d70774c0 100644 --- a/tests/coulomb.lisp +++ b/tests/coulomb.lisp @@ -38,7 +38,7 @@ #(0.6617816138326813d0 0.3614128577450535d0 0.13267757609917497d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) (COULOMB-WAVE-F-ARRAY 0.0d0 1.0d0 2.0d0 ARR) (CL-ARRAY ARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -55,8 +55,8 @@ 7.116955601984411d-4 6.471726496134135d0 27.57457472159366d0 170.56037293106908d0)) (MULTIPLE-VALUE-LIST - (LET ((FARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 3)) - (GARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) + (LET ((FARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 3)) + (GARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) (COULOMB-WAVE-FG-ARRAY 1.5d0 1.0d0 1.0d0 FARR GARR) (APPEND (COERCE (CL-ARRAY FARR) 'LIST) (COERCE (CL-ARRAY GARR) 'LIST))))) @@ -65,7 +65,7 @@ #(0.33089080691634065d0 0.18070642887252675d0 0.06633878804958748d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) (COULOMB-WAVE-SPHF-ARRAY 0.0d0 1.0d0 2.0d0 ARR) (CL-ARRAY ARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -76,7 +76,7 @@ #(0.10842251310207264d0 0.05111086283184191d0 0.011428736368066591d0)) (MULTIPLE-VALUE-LIST - (LET ((CL (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) + (LET ((CL (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 3))) (COULOMB-CL-ARRAY 0.0d0 1.0d0 CL) (CL-ARRAY CL))))) diff --git a/tests/covariance.lisp b/tests/covariance.lisp index a67ab75a837a0b6789c6ee898c9b36e03d3f5e63..b9f33c4d52446dd4168d65f29fed827393aae876 100644 --- a/tests/covariance.lisp +++ b/tests/covariance.lisp @@ -23,10 +23,10 @@ (LIST 357.3916088108699d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -34,10 +34,10 @@ (LIST 357.39161666666666d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -45,10 +45,10 @@ (LIST 290.8333333333335d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-91 52 -10)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -56,8 +56,8 @@ (LIST -248.0d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) - (V2 (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(116 163 140)))) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) + (V2 (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(116 163 140)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -65,9 +65,9 @@ (LIST 290.8333333333335d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) - (V2 (MAKE-MARRAY '(SIGNED-BYTE 16) + (V2 (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-91 52 -10)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -75,14 +75,14 @@ (LIST -248.0d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -95,18 +95,18 @@ (LIST 290.8333333333335d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-91 52 -10)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -248.0d0) (MULTIPLE-VALUE-LIST - (LET ((V1 (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) - (V2 (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) + (LET ((V1 (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) + (V2 (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -115,10 +115,10 @@ (LIST 290.8333333333335d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-91 52 -10)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2))))) @@ -127,8 +127,8 @@ (LIST -248.0d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) - (V2 (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) + (V2 (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (LET ((MEAN1 (MEAN V1)) (MEAN2 (MEAN V2))) (COVARIANCE V1 V2 MEAN1 MEAN2)))))) diff --git a/tests/dirichlet.lisp b/tests/dirichlet.lisp index 4d517f1b29f5cb7fae4c9002a77330c1e64c6072..1e36a5b0171fda28b1bc1169b499c060cb0c7cfb 100644 --- a/tests/dirichlet.lisp +++ b/tests/dirichlet.lisp @@ -31,20 +31,20 @@ (LIST 1080.0000000000025d0) (MULTIPLE-VALUE-LIST (LET ((ALPHA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0 4.0d0))) (THETA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0 4.0d0)))) (DIRICHLET-PDF ALPHA THETA)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6.984716320118268d0) (MULTIPLE-VALUE-LIST (LET ((ALPHA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0 4.0d0))) (THETA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0 4.0d0)))) (DIRICHLET-LOG-PDF ALPHA THETA))))) diff --git a/tests/discrete.lisp b/tests/discrete.lisp index 4f5334891402a8902e22c04beec3b78136f643bb..c0a3afa18941fa7aaf370aaf46b7204c8fb01bbe 100644 --- a/tests/discrete.lisp +++ b/tests/discrete.lisp @@ -23,7 +23,7 @@ (LIST (LIST 1 0 1 1 0 1 1 2 1 2 2)) (MULTIPLE-VALUE-LIST (LET* ((PROBABILITIES - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.25d0 0.5d0 0.25d0))) (TABLE (MAKE-DISCRETE-RANDOM PROBABILITIES)) (RNG @@ -34,7 +34,7 @@ (LIST 0.5d0) (MULTIPLE-VALUE-LIST (LET* ((PROBABILITIES - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.25d0 0.5d0 0.25d0))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.25d0 0.5d0 0.25d0))) (TABLE (MAKE-DISCRETE-RANDOM PROBABILITIES))) (DISCRETE-PDF 1 TABLE))))) diff --git a/tests/dot.lisp b/tests/dot.lisp index d7f3988073a3b6f9c3b3f39fb1995a48cefb4200..dce03a31d66b0b076b439b0616f2add2e75288d0 100644 --- a/tests/dot.lisp +++ b/tests/dot.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6.5285645) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -32,7 +32,7 @@ 49.27 -13.49))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(32.5 42.73 @@ -47,12 +47,12 @@ (LIST 6.528400000000033d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 -49.08d0)))) @@ -61,14 +61,14 @@ (LIST #C(-8.778225633844878d26 0.0d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08 -39.66 -49.46 @@ -79,7 +79,7 @@ (LIST #C(625.9736000000007d0 -4310.1183d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -87,7 +87,7 @@ -16.12d0 -8.25d0 21.44d0 -49.08d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 diff --git a/tests/euclidean-norm.lisp b/tests/euclidean-norm.lisp index 7586e2a4f6a4c8ca459494d697d08ac34f2dd934..5d91e528639fa5f411448d4a208ff09142adc699 100644 --- a/tests/euclidean-norm.lisp +++ b/tests/euclidean-norm.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 71.83472) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -37,7 +37,7 @@ (LIST 71.83471653734007d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -45,7 +45,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 115.80907) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LIST 115.8090670025452d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 diff --git a/tests/gegenbauer.lisp b/tests/gegenbauer.lisp index 27c88c080c55bb4d5c6b600854b11910d392d324..d3f3f8d84ebfeab630dbb3e694021834974bb324 100644 --- a/tests/gegenbauer.lisp +++ b/tests/gegenbauer.lisp @@ -34,7 +34,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(1.0d0 6.0d0 35.0d0 204.0d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (GEGENBAUER-ARRAY 1.0d0 3.0d0 ARR) (CL-ARRAY ARR))))) diff --git a/tests/givens.lisp b/tests/givens.lisp index 8750f1d2f9c855a14ce70e28c753df28956e766e..4903be72a30809af5d9f85c5a3d313def15eb5da 100644 --- a/tests/givens.lisp +++ b/tests/givens.lisp @@ -27,21 +27,21 @@ -49.08))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(32.5 42.73 -17.24 43.31 -16.12 -8.25 21.44 -49.08))) (ANGLES - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-39.66 -49.46 19.68 -5.55 -8.82 25.37 -30.58 31.67))) (SINES - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '8)) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '8)) (COSINES - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '8))) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '8))) (LOOP FOR I BELOW 8 DO (SETF (MAREF SINES I) (SIN (MAREF ANGLES I))) (SETF (MAREF COSINES I) @@ -57,24 +57,24 @@ -16.12d0 -8.25d0 21.44d0 -49.08d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0 -49.08d0))) (ANGLES - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-39.66d0 -49.46d0 19.68d0 -5.55d0 -8.82d0 25.37d0 -30.58d0 31.67d0))) (SINES - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '8)) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '8)) (COSINES - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '8))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '8))) (LOOP FOR I BELOW 8 DO (SETF (MAREF SINES I) (SIN (MAREF ANGLES I))) (SETF (MAREF COSINES I) diff --git a/tests/hankel.lisp b/tests/hankel.lisp index f78989113348b0fac3956cd51fb974f3afd13004..66fc52a6fab48de91513bbed131233ee178bb80f 100644 --- a/tests/hankel.lisp +++ b/tests/hankel.lisp @@ -26,7 +26,7 @@ (MULTIPLE-VALUE-LIST (COPY (APPLY-HANKEL (MAKE-HANKEL 3 1.0d0 1.0d0) - (MAKE-MARRAY 'DOUBLE-FLOAT + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0))) 'ARRAY))) @@ -40,7 +40,7 @@ (ELT* (EXPT (BESSEL-ZERO-J1 4) 2) (APPLY-HANKEL HANK (APPLY-HANKEL HANK - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 @@ -114,7 +114,7 @@ 0.0013372849617528388d0 6.61923918047693d-4)) (MULTIPLE-VALUE-LIST (LET ((HANK (MAKE-HANKEL 128 0.0d0 100.0d0)) - (IN (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) + (IN (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) (LOOP FOR N FROM 0 BELOW 128 DO (SETF (MAREF IN N) (/ @@ -190,7 +190,7 @@ 1.3342557428046146d-4 6.643887021579182d-5)) (MULTIPLE-VALUE-LIST (LET ((HANK (MAKE-HANKEL 128 1.0d0 20.0d0)) - (IN (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) + (IN (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) (LOOP FOR N FROM 0 BELOW 128 DO (SETF (MAREF IN N) (EXP (- (SAMPLE-X-HANKEL HANK N))))) @@ -263,7 +263,7 @@ 4.4958390074262106d-10 -2.2378156576350344d-10)) (MULTIPLE-VALUE-LIST (LET ((HANK (MAKE-HANKEL 128 1.0d0 1.0d0)) - (IN (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) + (IN (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 128))) (LOOP FOR N FROM 0 BELOW 128 DO (SETF (MAREF IN N) (LET ((X (SAMPLE-X-HANKEL HANK N))) diff --git a/tests/higher-moments.lisp b/tests/higher-moments.lisp index ff2f044dd0849c68ba95278c485d9dc4ac06be81..9bdef65f51a258b9f16d0eb613260a17f55c684b 100644 --- a/tests/higher-moments.lisp +++ b/tests/higher-moments.lisp @@ -25,7 +25,7 @@ -2.333333333333333d0 -2.333333333333333d0)) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-3.21d0 1.0d0 12.8d0)))) (LET* ((MEAN (MEAN VEC)) (SD (STANDARD-DEVIATION VEC MEAN))) diff --git a/tests/index-max.lisp b/tests/index-max.lisp index 59d8c582cedfea3bfc432c597744fd19187d29f2..ac18040feee9d2050636a0b1fc71558063835200 100644 --- a/tests/index-max.lisp +++ b/tests/index-max.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -35,7 +35,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -50,7 +50,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 4) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS @@ -71,7 +71,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 4) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS diff --git a/tests/inverse-matrix-product.lisp b/tests/inverse-matrix-product.lisp index b42bf51e1b78a991a311d4319c1885f81146060c..6a7d1b56b7b1c8ca7cb0f75acb3177295ca6601f 100644 --- a/tests/inverse-matrix-product.lisp +++ b/tests/inverse-matrix-product.lisp @@ -26,12 +26,12 @@ (-29.71983 -24.015656 -29.949932))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46)))) @@ -47,12 +47,12 @@ -29.949932307692308d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0)))) @@ -69,7 +69,7 @@ #C(-1.5907472 4.2853727)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -78,7 +78,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((42.73 -17.24 43.31 -16.12 -8.25 21.44) @@ -102,7 +102,7 @@ #C(-1.590747546093172d0 4.285372608973592d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -111,7 +111,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0) @@ -125,12 +125,12 @@ (LIST #(-1.1747805 -0.26507667 1.3326154)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31))) (S1 -16.12)) (CL-ARRAY (INVERSE-MATRIX-PRODUCT M1 V1 S1))))) @@ -140,12 +140,12 @@ 1.3326153846153848d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0))) (S1 -16.12d0)) (CL-ARRAY (INVERSE-MATRIX-PRODUCT M1 V1 S1))))) @@ -155,7 +155,7 @@ #C(0.4927793 -0.0056687724))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -164,7 +164,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44))) @@ -177,7 +177,7 @@ #C(0.49277927293827817d0 -0.005668775466541512d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -186,7 +186,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0))) diff --git a/tests/legendre.lisp b/tests/legendre.lisp index 74d6157ee038ba70e6fbf13644f737580ef2b8fd..e9622690a40edf0c43b5cb44e846b43fa12685a9 100644 --- a/tests/legendre.lisp +++ b/tests/legendre.lisp @@ -39,7 +39,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(1.0d0 0.5d0 -0.125d0 -0.4375d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-PL-ARRAY 0.5d0 ARR) (CL-ARRAY ARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -57,15 +57,15 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(2.25d0 5.625d0 4.21875d0 -4.921875d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-PLM-ARRAY 2 0.5d0 ARR) (CL-ARRAY ARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-3.0d0 3.75d0 33.75d0 55.78125d0)) (MULTIPLE-VALUE-LIST - (LET ((VAL (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4)) + (LET ((VAL (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4)) (DERIV - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-PLM-DERIV-ARRAY 2 0.5d0 VAL DERIV) (CL-ARRAY DERIV)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -77,7 +77,7 @@ #(0.24892463950030283d0 0.4127948151484927d0 0.35120655562190445d0 0.051599351893561574d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-SPHPLM-ARRAY 4 0.5d0 ARR) (CL-ARRAY ARR)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -85,9 +85,9 @@ #(-0.6637990386674741d0 -0.2751965434323283d0 1.2710332489173686d0 2.648766730536161d0)) (MULTIPLE-VALUE-LIST - (LET ((VAL (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4)) + (LET ((VAL (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4)) (DERIV - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-SPHPLM-DERIV-ARRAY 4 0.5d0 VAL DERIV) (CL-ARRAY DERIV)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -129,7 +129,7 @@ #(0.9200342692589379d0 0.21694026450392115d0 0.04795066048830776d0 0.010663769096144337d0)) (MULTIPLE-VALUE-LIST - (LET ((ARR (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) + (LET ((ARR (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 4))) (LEGENDRE-H3D-ARRAY 1.0d0 0.5d0 ARR) (CL-ARRAY ARR))))) diff --git a/tests/lu.lisp b/tests/lu.lisp index 09f71d47a19a2480acce147ee00f08563b441f06..2bf4fe784a9bbc9d0c89fc919d3e0603be791f94 100644 --- a/tests/lu.lisp +++ b/tests/lu.lisp @@ -59,7 +59,7 @@ (let ((lisp-unit:*epsilon* (* 2 1024 1024 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(2.40717272023734d+01 -9.84612797621247d+00 -2.69338853034031d+02 8.75455232472528d+01 2.96661356736296d+03 -1.02624473923993d+03 @@ -75,7 +75,7 @@ 19.679999999999993d0 -5.549999999999997d0)) (MULTIPLE-VALUE-LIST (LET ((MATRIX - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0) (34.12d0 -6.15d0 49.27d0 -13.49d0) @@ -84,7 +84,7 @@ (-16.12d0 -8.25d0 21.44d0 -49.08d0)))) (VEC - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-39.66d0 -49.46d0 19.68d0 -5.55d0)))) (MULTIPLE-VALUE-BIND @@ -108,7 +108,7 @@ #C(-30.580000000000002d0 31.67d0))) (MULTIPLE-VALUE-LIST (LET ((MATRIX - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 @@ -123,7 +123,7 @@ -49.08d0 -39.66d0 -49.46d0 19.68d0 -5.55d0)))) (VEC - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-39.66d0 -49.46d0 19.68d0 -5.55d0 -8.82d0 25.37d0 -30.58d0 @@ -146,6 +146,6 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (INVERT-MATRIX - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 2) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 2) :INITIAL-CONTENTS '(1.0d0 2.0d0 3.0d0 4.0d0))))))) diff --git a/tests/matrix-add-scalar.lisp b/tests/matrix-add-scalar.lisp index 45192da8dd666ea8dbba2c7ed6dd6c0b07840e70..6dc2ff247ca57b41bfb852e650727983a4e61111 100644 --- a/tests/matrix-add-scalar.lisp +++ b/tests/matrix-add-scalar.lisp @@ -26,7 +26,7 @@ (67.46 4.7000003 50.69))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -39,7 +39,7 @@ 50.69d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -48,7 +48,7 @@ (LIST #2A((-45 -49 89) (-72 70 8) (91 13 -115))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (ELT+ M1 18.19d0))))) @@ -56,7 +56,7 @@ (LIST #2A((85 62 207) (134 181 158) (179 233 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -65,7 +65,7 @@ (LIST #2A((-45 -49 89) (-72 70 8) (91 13 141))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -74,7 +74,7 @@ (LIST #2A((85 62 207) (134 181 158) (179 233 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -83,7 +83,7 @@ (LIST #2A((-45 -49 89) (-72 70 8) (91 13 141))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -92,7 +92,7 @@ (LIST #2A((85 62 207) (134 181 158) (179 233 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -102,7 +102,7 @@ (LIST #2A((-45 -49 89) (-72 70 8) (91 13 141))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -112,7 +112,7 @@ (LIST #2A((85 62 207) (134 181 158) (179 233 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-add.lisp b/tests/matrix-add.lisp index 5ec782805b9a0ca2009561fa420856356571a9ed..07680ac55776b75e6f1d32fdf2b2c6cbd4e271cf 100644 --- a/tests/matrix-add.lisp +++ b/tests/matrix-add.lisp @@ -26,12 +26,12 @@ (0.18999863 -53.15 -16.96))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46))))) @@ -44,12 +44,12 @@ (0.19000000000000483d0 -53.15d0 -16.96d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0))))) @@ -58,11 +58,11 @@ (LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 -65))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) (CL-ARRAY (ELT+ M1 M2))))) @@ -70,12 +70,12 @@ (LIST #2A((95 54 208) (144 85 101) (197 68 64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -84,12 +84,12 @@ (LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 191))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -98,12 +98,12 @@ (LIST #2A((95 54 208) (144 341 357) (197 324 320))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -112,12 +112,12 @@ (LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 191))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -126,12 +126,12 @@ (LIST #2A((95 54 208) (144 341 357) (197 324 320))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -141,12 +141,12 @@ (LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 191))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -156,12 +156,12 @@ (LIST #2A((95 54 208) (144 341 357) (197 324 320))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) diff --git a/tests/matrix-copy-to-cl-and-back.lisp b/tests/matrix-copy-to-cl-and-back.lisp index 6b2d6afeef85189a1871dafcb073c5adea48204f..821bc5dffed32c6db3e9b4bf11e097e9064fb6dd 100644 --- a/tests/matrix-copy-to-cl-and-back.lisp +++ b/tests/matrix-copy-to-cl-and-back.lisp @@ -28,7 +28,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))) @@ -43,7 +43,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))) @@ -59,7 +59,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) (-8.93 34.12 -6.15 49.27 -13.49 @@ -80,7 +80,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -96,7 +96,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))) 'ARRAY) @@ -107,7 +107,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))) 'ARRAY) @@ -118,7 +118,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))) 'ARRAY) @@ -129,7 +129,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))) 'ARRAY) @@ -140,7 +140,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))) 'ARRAY) @@ -151,7 +151,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))) 'ARRAY) @@ -163,7 +163,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))) 'ARRAY) @@ -175,7 +175,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))) 'ARRAY) diff --git a/tests/matrix-copy.lisp b/tests/matrix-copy.lisp index 154c021b43a16c77adb8f862a798d471661a8664..95bc0944615fb8f44868e7f0dfd8679e06259cfd 100644 --- a/tests/matrix-copy.lisp +++ b/tests/matrix-copy.lisp @@ -27,7 +27,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -38,7 +38,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))))) @@ -51,7 +51,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) (-8.93 34.12 -6.15 49.27 -13.49 32.5) @@ -68,7 +68,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -81,7 +81,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -89,7 +89,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -97,7 +97,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -105,7 +105,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -113,7 +113,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -121,7 +121,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))))) #+int64 @@ -130,7 +130,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))))) #+int64 @@ -139,7 +139,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))))))) diff --git a/tests/matrix-div.lisp b/tests/matrix-div.lisp index b79ed3ea2e24f91f95310b6e0cb735c8dcd2536a..5b34b46d41cc1deeb12943c7b424792b71528f41 100644 --- a/tests/matrix-div.lisp +++ b/tests/matrix-div.lisp @@ -26,12 +26,12 @@ (-1.0038712 0.3401412 -0.6570967))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46))))) @@ -46,12 +46,12 @@ -0.6570966437525273d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0))))) @@ -60,11 +60,11 @@ (LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) (CL-ARRAY (ELT/ M1 M2))))) @@ -72,12 +72,12 @@ (LIST #2A((2 4 9) (4 0 0) (4 1 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -86,12 +86,12 @@ (LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -100,12 +100,12 @@ (LIST #2A((2 4 9) (4 0 0) (4 1 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -114,12 +114,12 @@ (LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -128,12 +128,12 @@ (LIST #2A((2 4 9) (4 0 0) (4 1 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -143,12 +143,12 @@ (LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -158,12 +158,12 @@ (LIST #2A((2 4 9) (4 0 0) (4 1 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) diff --git a/tests/matrix-max-index.lisp b/tests/matrix-max-index.lisp index a01ccc303aae122d33608752b5c30ea506cf0617..56584303f6d505dae72507acde90073643c3a837 100644 --- a/tests/matrix-max-index.lisp +++ b/tests/matrix-max-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -38,7 +38,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -54,7 +54,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -82,7 +82,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -110,7 +110,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -124,7 +124,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -139,7 +139,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -154,7 +154,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-max.lisp b/tests/matrix-max.lisp index b8d35bde837adc6c54f47442e85965c421ecd96e..30e64b5dc6e6d8b71409d10ec63ea7de2e0dd3e8 100644 --- a/tests/matrix-max.lisp +++ b/tests/matrix-max.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 49.27) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -38,7 +38,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 49.27d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -54,7 +54,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -82,7 +82,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -110,7 +110,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -124,7 +124,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -139,7 +139,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -154,7 +154,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-mean.lisp b/tests/matrix-mean.lisp index e91d25937442f26d45266af26a6f0abfed49a4bb..481ca69878ed37e2b634572101e9eff31d60b85f 100644 --- a/tests/matrix-mean.lisp +++ b/tests/matrix-mean.lisp @@ -23,7 +23,7 @@ (LIST 7.149999883439806d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -31,7 +31,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 7.15d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -47,7 +47,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -62,7 +62,7 @@ (LIST 132.55555555555554d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -70,7 +70,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -85,7 +85,7 @@ (LIST 132.55555555555554d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -93,7 +93,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -108,7 +108,7 @@ (LIST 132.55555555555554d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -117,7 +117,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -133,7 +133,7 @@ (LIST 132.55555555555554d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-min-index.lisp b/tests/matrix-min-index.lisp index 4042a6ca142623bde22982f9274391853803055b..28caea195bc96f5ce85ee89f458908354a79e810 100644 --- a/tests/matrix-min-index.lisp +++ b/tests/matrix-min-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -38,7 +38,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -54,7 +54,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -82,7 +82,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -110,7 +110,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -124,7 +124,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -139,7 +139,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -154,7 +154,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-min.lisp b/tests/matrix-min.lisp index 71742c9126b9b75b635025207cc1e7df96a3f788..e0fd59f895790e10f3b09bf1cda0ce1f7ee0ad06 100644 --- a/tests/matrix-min.lisp +++ b/tests/matrix-min.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -38,7 +38,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -54,7 +54,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -82,7 +82,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -110,7 +110,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -124,7 +124,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -139,7 +139,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -154,7 +154,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-minmax-index.lisp b/tests/matrix-minmax-index.lisp index e6e2439d482cff0396ecbe64f2f68a92a829fdff..960d408ce14de5ecfbee69a5833af51a37a89c55 100644 --- a/tests/matrix-minmax-index.lisp +++ b/tests/matrix-minmax-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 0 2 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -39,7 +39,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 0 2 0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 @@ -56,7 +56,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -71,7 +71,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -86,7 +86,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -101,7 +101,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -116,7 +116,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -131,7 +131,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -147,7 +147,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -163,7 +163,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-minmax.lisp b/tests/matrix-minmax.lisp index b7334ac6414794db4808d78aa8d9ab3407a74c25..6e23b21c953a5188a620d1da3cfceb1e694e07e6 100644 --- a/tests/matrix-minmax.lisp +++ b/tests/matrix-minmax.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5 49.27) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 @@ -39,7 +39,7 @@ (LIST -34.5d0 49.27d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -47,7 +47,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -75,7 +75,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -89,7 +89,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -103,7 +103,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -117,7 +117,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -132,7 +132,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -147,7 +147,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/matrix-mult-scalar.lisp b/tests/matrix-mult-scalar.lisp index 2e317f04ef663057f7eb043ee865b8793c86903c..e1b76a9a9f5bab5fdefc696437ee603834e7d97f 100644 --- a/tests/matrix-mult-scalar.lisp +++ b/tests/matrix-mult-scalar.lisp @@ -26,7 +26,7 @@ (68.4853 -18.7511 45.175))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (68.4853d0 -18.751099999999997d0 45.175d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -47,7 +47,7 @@ (LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 -86))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (ELT* M1 1.39d0))))) @@ -55,7 +55,7 @@ (LIST #2A((93 61 6) (161 226 194) (223 42 136))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -64,7 +64,7 @@ (LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 170))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -73,7 +73,7 @@ (LIST #2A((93 61 262) (161 226 194) (223 298 136))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -82,7 +82,7 @@ (LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 170))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -91,7 +91,7 @@ (LIST #2A((93 61 262) (161 226 194) (223 298 136))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -101,7 +101,7 @@ (LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 170))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -111,7 +111,7 @@ (LIST #2A((93 61 262) (161 226 194) (223 298 136))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-mult.lisp b/tests/matrix-mult.lisp index 16b920767b904ff521938e8fb473c802d1fd290e..92ee63fb3af96fbbdacc5cd8bea65777178b4fd6 100644 --- a/tests/matrix-mult.lisp +++ b/tests/matrix-mult.lisp @@ -26,12 +26,12 @@ (-2418.1716 535.01337 -1607.45))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46))))) @@ -44,12 +44,12 @@ (-2418.1716d0 535.0133999999999d0 -1607.45d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0))))) @@ -58,11 +58,11 @@ (LIST #2A((0 -112 82) (-39 44 80) (-71 110 -84))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) (CL-ARRAY (ELT* M1 M2))))) @@ -70,12 +70,12 @@ (LIST #2A((84 184 7) (176 86 172) (164 139 252))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -87,12 +87,12 @@ (-1095 110 8364))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -104,12 +104,12 @@ (5796 23435 21756))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -121,12 +121,12 @@ (-1095 110 8364))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -138,12 +138,12 @@ (5796 23435 21756))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -156,12 +156,12 @@ (-1095 110 8364))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -174,12 +174,12 @@ (5796 23435 21756))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) diff --git a/tests/matrix-product-hermitian.lisp b/tests/matrix-product-hermitian.lisp index 7a96b2eb8104c31284f52bbc264a9635cbdcd7c5..d58d6cec0c6f87585ec2af529ca7611af618c639 100644 --- a/tests/matrix-product-hermitian.lisp +++ b/tests/matrix-product-hermitian.lisp @@ -30,7 +30,7 @@ #C(-57882.3 -176350.63)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -39,7 +39,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((42.73 -17.24 43.31 -16.12 -8.25 21.44) @@ -48,7 +48,7 @@ (-49.08 -39.66 -49.46 19.68 -5.55 -8.82)))) (M3 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((19.68 -5.55 -8.82 25.37 -30.58 31.67) @@ -73,7 +73,7 @@ #C(-57882.29909799999d0 -176350.62442500002d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -82,7 +82,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0) @@ -91,7 +91,7 @@ (-49.08d0 -39.66d0 -49.46d0 19.68d0 -5.55d0 -8.82d0)))) (M3 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((19.68d0 -5.55d0 -8.82d0 25.37d0 -30.58d0 31.67d0) @@ -109,7 +109,7 @@ #C(-104992.03 72729.13))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -118,12 +118,12 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-16.12 -8.25 21.44 -49.08 -39.66 -49.46))) @@ -138,7 +138,7 @@ #C(-104992.03586199998d0 72729.12516600001d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -147,12 +147,12 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-16.12d0 -8.25d0 21.44d0 -49.08d0 -39.66d0 -49.46d0))) diff --git a/tests/matrix-product-nonsquare.lisp b/tests/matrix-product-nonsquare.lisp index 352df8d94e154d6e8ee11d2081e99664bebac8af..82f833885c684645c6e57a6bcc1c9318cd4628a8 100644 --- a/tests/matrix-product-nonsquare.lisp +++ b/tests/matrix-product-nonsquare.lisp @@ -23,11 +23,11 @@ (LIST #2A((-1488.7347 959.9901) (774.94495 1312.0566))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((49.27 -13.49) (32.5 42.73) (-17.24 43.31))))) (CL-ARRAY (MATRIX-PRODUCT M1 M2))))) @@ -37,11 +37,11 @@ (774.9448999999998d0 1312.0567999999996d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((49.27d0 -13.49d0) (32.5d0 42.73d0) (-17.24d0 43.31d0))))) @@ -55,14 +55,14 @@ #C(-3290.4465 -801.0577)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) (-8.93 34.12 -6.15 49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((49.27 -13.49 32.5 42.73) (32.5 42.73 -17.24 43.31) @@ -77,14 +77,14 @@ #C(-3290.4465d0 -801.0577000000002d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) (-8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((49.27d0 -13.49d0 32.5d0 42.73d0) diff --git a/tests/matrix-product-symmetric.lisp b/tests/matrix-product-symmetric.lisp index 503f8b5090e8a1fcad977247e419c5b4cd8d37a2..ba0fefa66b98e4c367b3d6339b858a069a292fd8 100644 --- a/tests/matrix-product-symmetric.lisp +++ b/tests/matrix-product-symmetric.lisp @@ -26,17 +26,17 @@ (57711.813 52563.74 65404.063))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46)))) (M3 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((19.68 -5.55 -8.82) (25.37 -30.58 31.67) (29.36 -33.24 -27.03)))) @@ -54,17 +54,17 @@ 65404.066887d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0)))) (M3 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((19.68d0 -5.55d0 -8.82d0) (25.37d0 -30.58d0 31.67d0) (29.36d0 -33.24d0 -27.03d0)))) @@ -76,15 +76,15 @@ (LIST #(72971.1 24989.41 -82037.61)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31))) (V3 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-16.12 -8.25 21.44))) (S1 -49.08) (S2 -39.66)) @@ -96,15 +96,15 @@ -82037.597316d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0))) (V3 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-16.12d0 -8.25d0 21.44d0))) (S1 -49.08d0) (S2 -39.66d0)) diff --git a/tests/matrix-product-triangular.lisp b/tests/matrix-product-triangular.lisp index 30d6affbb89f5ec91373f2681e7db9a7552c6b54..a6a4320019b7e4c0e00b7ee351110e5a8442ad7f 100644 --- a/tests/matrix-product-triangular.lisp +++ b/tests/matrix-product-triangular.lisp @@ -26,12 +26,12 @@ (-31391.57 -25366.535 -31634.615))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46)))) @@ -47,12 +47,12 @@ -31634.616d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0)))) @@ -70,7 +70,7 @@ #C(8910.526 -4389.117)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -79,7 +79,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((42.73 -17.24 43.31 -16.12 -8.25 21.44) @@ -103,7 +103,7 @@ #C(8910.526581d0 -4389.116526d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -112,7 +112,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0) @@ -126,12 +126,12 @@ (LIST #(-1473.7527 -854.58527 1407.5751)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31))) (S1 -16.12)) (CL-ARRAY (MATRIX-PRODUCT-TRIANGULAR M1 V1 S1))))) @@ -139,12 +139,12 @@ (LIST #(-1473.7527d0 -854.5853d0 1407.575d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0))) (S1 -16.12d0)) (CL-ARRAY (MATRIX-PRODUCT-TRIANGULAR M1 V1 S1))))) @@ -155,7 +155,7 @@ #C(-786.3365 -726.9331))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -164,7 +164,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44))) @@ -178,7 +178,7 @@ #C(-786.3364000000001d0 -726.9331d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -187,7 +187,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0))) diff --git a/tests/matrix-product.lisp b/tests/matrix-product.lisp index df2c1d76733e207d6fae663ecf045ad2e214ae63..9a214c34795c0272e2b38dd99159b93a4c40bf98 100644 --- a/tests/matrix-product.lisp +++ b/tests/matrix-product.lisp @@ -26,17 +26,17 @@ (-29088.719 83072.016 -11019.719))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46)))) (M3 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((19.68 -5.55 -8.82) (25.37 -30.58 31.67) (29.36 -33.24 -27.03)))) @@ -53,17 +53,17 @@ -11019.721527000016d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0)))) (M3 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((19.68d0 -5.55d0 -8.82d0) (25.37d0 -30.58d0 31.67d0) (29.36d0 -33.24d0 -27.03d0)))) @@ -81,7 +81,7 @@ #C(45313.527 140641.6)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -90,7 +90,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((42.73 -17.24 43.31 -16.12 -8.25 21.44) @@ -99,7 +99,7 @@ (-49.08 -39.66 -49.46 19.68 -5.55 -8.82)))) (M3 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((19.68 -5.55 -8.82 25.37 -30.58 31.67) @@ -124,7 +124,7 @@ #C(45313.51313299998d0 140641.59851399998d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -133,7 +133,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0) @@ -142,7 +142,7 @@ (-49.08d0 -39.66d0 -49.46d0 19.68d0 -5.55d0 -8.82d0)))) (M3 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((19.68d0 -5.55d0 -8.82d0 25.37d0 -30.58d0 31.67d0) @@ -157,15 +157,15 @@ (LIST #(72971.1 60998.137 -184676.98)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-16.12 -8.25 21.44))) (S1 -49.08) (S2 -39.66)) @@ -176,15 +176,15 @@ -184676.981676d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-16.12d0 -8.25d0 21.44d0))) (S1 -49.08d0) (S2 -39.66d0)) @@ -196,7 +196,7 @@ #C(-189845.23 -81764.12))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -205,12 +205,12 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-16.12 -8.25 21.44 -49.08 -39.66 -49.46))) @@ -225,7 +225,7 @@ #C(-189845.21679399998d0 -81764.10481799999d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -234,12 +234,12 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-16.12d0 -8.25d0 21.44d0 -49.08d0 -39.66d0 -49.46d0))) diff --git a/tests/matrix-set-all.lisp b/tests/matrix-set-all.lisp index 568c6935bcfe3be27d87a260bb3c3f491c4c8ead..d239d798f011f152b4f6e22dc110a00b5546fd0b 100644 --- a/tests/matrix-set-all.lisp +++ b/tests/matrix-set-all.lisp @@ -26,7 +26,7 @@ (-34.5 -34.5 -34.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '(3 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -34.5))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST @@ -35,7 +35,7 @@ (-34.5d0 -34.5d0 -34.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -34.5d0))))) #+fsbv (LISP-UNIT:ASSERT-NUMERICAL-EQUAL @@ -45,7 +45,7 @@ (#C(-34.5 8.24) #C(-34.5 8.24) #C(-34.5 8.24)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 #C(-34.5 8.24)))))) #+fsbv @@ -59,49 +59,49 @@ #C(-34.5d0 8.24d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 #C(-34.5d0 8.24d0)))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -64))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((67 67 67) (67 67 67) (67 67 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 67))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -64))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((67 67 67) (67 67 67) (67 67 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 67))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -64))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #2A((67 67 67) (67 67 67) (67 67 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 67))))) #+int64 @@ -109,7 +109,7 @@ (LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 -64))))) #+int64 @@ -117,7 +117,7 @@ (LIST #2A((67 67 67) (67 67 67) (67 67 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '(3 3)))) (CL-ARRAY (SET-ALL M1 67)))))) diff --git a/tests/matrix-set-zero.lisp b/tests/matrix-set-zero.lisp index 1493d4237277bf8b67395fd21294d7044d7a5a5f..68d4ae5f367de416b62818d25627988b525e8835 100644 --- a/tests/matrix-set-zero.lisp +++ b/tests/matrix-set-zero.lisp @@ -23,7 +23,7 @@ (LIST #2A((0.0 0.0 0.0) (0.0 0.0 0.0) (0.0 0.0 0.0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -36,7 +36,7 @@ (0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -49,7 +49,7 @@ (#C(0.0 0.0) #C(0.0 0.0) #C(0.0 0.0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -67,7 +67,7 @@ #C(0.0d0 0.0d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -81,7 +81,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (SET-ZERO M1) @@ -90,7 +90,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -100,7 +100,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -110,7 +110,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -120,7 +120,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -130,7 +130,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -141,7 +141,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -152,7 +152,7 @@ (LIST #2A((0 0 0) (0 0 0) (0 0 0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-standard-deviation-with-fixed-mean.lisp b/tests/matrix-standard-deviation-with-fixed-mean.lisp index c4f59f1d29e1e77e7c96f4f56e38c4e304388efe..5d828d61f5995a64a8531673d6b48523fb7b4baf 100644 --- a/tests/matrix-standard-deviation-with-fixed-mean.lisp +++ b/tests/matrix-standard-deviation-with-fixed-mean.lisp @@ -23,7 +23,7 @@ (LIST 25.290257201025927d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -32,7 +32,7 @@ (LIST 25.290257236950186d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -41,7 +41,7 @@ (LIST 70.39570693980959d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (STANDARD-DEVIATION-WITH-FIXED-MEAN M1 (MEAN M1))))) @@ -49,7 +49,7 @@ (LIST 53.10599696437538d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -58,7 +58,7 @@ (LIST 70.39570693980959d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -67,7 +67,7 @@ (LIST 53.10599696437538d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -76,7 +76,7 @@ (LIST 70.39570693980959d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -85,7 +85,7 @@ (LIST 53.10599696437538d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -95,7 +95,7 @@ (LIST 70.39570693980959d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -105,7 +105,7 @@ (LIST 53.10599696437538d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-standard-deviation-with-mean.lisp b/tests/matrix-standard-deviation-with-mean.lisp index f52827a0f7d8caf952251fa929936d606c445a54..a89173a272fef59a4a3ab78ceca4e42ecaa0d18c 100644 --- a/tests/matrix-standard-deviation-with-mean.lisp +++ b/tests/matrix-standard-deviation-with-mean.lisp @@ -23,7 +23,7 @@ (LIST 26.824368547196023d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -32,7 +32,7 @@ (LIST 26.82436858529945d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -41,7 +41,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (STANDARD-DEVIATION M1 (MEAN M1))))) @@ -49,7 +49,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -58,7 +58,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -67,7 +67,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -76,7 +76,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -85,7 +85,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -95,7 +95,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -105,7 +105,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-standard-deviation.lisp b/tests/matrix-standard-deviation.lisp index 9f27312e2e006f682389d6b9f8dd7b11d4262937..f03008bcc9c3460143d987466006ce755eac2b06 100644 --- a/tests/matrix-standard-deviation.lisp +++ b/tests/matrix-standard-deviation.lisp @@ -23,7 +23,7 @@ (LIST 26.824368547196023d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -32,7 +32,7 @@ (LIST 26.82436858529945d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -41,7 +41,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (STANDARD-DEVIATION M1)))) @@ -49,7 +49,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -58,7 +58,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -67,7 +67,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -76,7 +76,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -85,7 +85,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -95,7 +95,7 @@ (LIST 74.66592261534039d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -105,7 +105,7 @@ (LIST 56.32741586277306d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-sub.lisp b/tests/matrix-sub.lisp index dfab554865a9c5f51f98fcaeef79c4da7eedba11..cb9b638b413aae20545eb01ab2cc04914146cbbe 100644 --- a/tests/matrix-sub.lisp +++ b/tests/matrix-sub.lisp @@ -26,12 +26,12 @@ (98.350006 26.17 81.96))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46))))) @@ -46,12 +46,12 @@ 81.96000000000001d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0))))) @@ -60,11 +60,11 @@ (LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) (CL-ARRAY (ELT- M1 M2))))) @@ -72,12 +72,12 @@ (LIST #2A((39 34 170) (88 241 179) (125 106 132))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -86,12 +86,12 @@ (LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -101,12 +101,12 @@ #2A((39 34 170) (88 65521 65459) (125 106 65412))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -115,12 +115,12 @@ (LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -132,12 +132,12 @@ (125 106 4294967172))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -147,12 +147,12 @@ (LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -165,12 +165,12 @@ (125 106 18446744073709551492))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) diff --git a/tests/matrix-swap.lisp b/tests/matrix-swap.lisp index 68c795f1b0303e263d6b2e70eab3d93e849c882a..861f586767a12b880a8b62a66c838903f4e4670a 100644 --- a/tests/matrix-swap.lisp +++ b/tests/matrix-swap.lisp @@ -30,12 +30,12 @@ (49.27 -13.49 32.5)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((42.73 -17.24 43.31) (-16.12 -8.25 21.44) (-49.08 -39.66 -49.46))))) @@ -52,12 +52,12 @@ (49.27d0 -13.49d0 32.5d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0) (-16.12d0 -8.25d0 21.44d0) (-49.08d0 -39.66d0 -49.46d0))))) @@ -78,7 +78,7 @@ #C(-17.24 43.31))))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -87,7 +87,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((42.73 -17.24 43.31 -16.12 -8.25 21.44) @@ -114,7 +114,7 @@ #C(-17.24d0 43.31d0))))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -123,7 +123,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0) @@ -139,11 +139,11 @@ #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) (SWAP M2 M1) @@ -154,12 +154,12 @@ #2A((67 44 189) (116 163 140) (161 215 98)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -171,12 +171,12 @@ #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -188,12 +188,12 @@ #2A((67 44 189) (116 163 140) (161 215 98)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -205,12 +205,12 @@ #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -222,12 +222,12 @@ #2A((67 44 189) (116 163 140) (161 215 98)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) @@ -240,12 +240,12 @@ #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((32 28 30) (37 -73 -8) (-15 -22 68))))) @@ -258,12 +258,12 @@ #2A((67 44 189) (116 163 140) (161 215 98)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((28 10 19) (28 178 217) (36 109 222))))) diff --git a/tests/matrix-transpose-copy.lisp b/tests/matrix-transpose-copy.lisp index 0f7adea5b0b765ddcd04bc20c0775f274decbdf6..b85169be412e655d03b2607b060c121529d877da 100644 --- a/tests/matrix-transpose-copy.lisp +++ b/tests/matrix-transpose-copy.lisp @@ -26,12 +26,12 @@ (3.29 -6.15 32.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '(3 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST @@ -40,12 +40,12 @@ (3.29d0 -6.15d0 32.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST @@ -55,7 +55,7 @@ #C(-17.24 43.31)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -64,7 +64,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (M2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -77,7 +77,7 @@ #C(-17.24d0 43.31d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -86,78 +86,78 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (M2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) #+int64 @@ -165,12 +165,12 @@ (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2))))) #+int64 @@ -178,12 +178,12 @@ (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '(3 3)))) (CL-ARRAY (MATRIX-TRANSPOSE M1 M2)))))) diff --git a/tests/matrix-transpose.lisp b/tests/matrix-transpose.lisp index f3615c2efa3bf72f90e36b20c5516a03edfbfab2..b5b8f4658bf0288e6ee6f9f54ff89406bd0caf20 100644 --- a/tests/matrix-transpose.lisp +++ b/tests/matrix-transpose.lisp @@ -26,7 +26,7 @@ (3.29 -6.15 32.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (3.29d0 -6.15d0 32.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -51,7 +51,7 @@ #C(-17.24 43.31)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -70,7 +70,7 @@ #C(-17.24d0 43.31d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -83,7 +83,7 @@ (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (MATRIX-TRANSPOSE* M1))))) @@ -91,7 +91,7 @@ (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -100,7 +100,7 @@ (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -109,7 +109,7 @@ (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -118,7 +118,7 @@ (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -127,7 +127,7 @@ (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -137,7 +137,7 @@ (LIST #2A((-64 -91 73) (-68 52 -5) (71 -10 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -147,7 +147,7 @@ (LIST #2A((67 116 161) (44 163 215) (189 140 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-variance-with-fixed-mean.lisp b/tests/matrix-variance-with-fixed-mean.lisp index 7f2df8fabc0da2981aabffcb96db4748512a11f9..6c66e156cbbc27dec7b7b3bd0a9613dd3031a31b 100644 --- a/tests/matrix-variance-with-fixed-mean.lisp +++ b/tests/matrix-variance-with-fixed-mean.lisp @@ -24,7 +24,7 @@ (LIST 639.5971092940438d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -33,7 +33,7 @@ (LIST 639.5971111111112d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -42,7 +42,7 @@ (LIST 4955.555555555556d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (VARIANCE-WITH-FIXED-MEAN M1 (MEAN M1))))) @@ -50,7 +50,7 @@ (LIST 2820.246913580247d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -59,7 +59,7 @@ (LIST 4955.555555555556d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -68,7 +68,7 @@ (LIST 2820.246913580247d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -77,7 +77,7 @@ (LIST 4955.555555555556d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -86,7 +86,7 @@ (LIST 2820.246913580247d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -96,7 +96,7 @@ (LIST 4955.555555555556d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -106,7 +106,7 @@ (LIST 2820.246913580247d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-variance-with-mean.lisp b/tests/matrix-variance-with-mean.lisp index 77f1145f03d9f795ed115cbfa74781d2ef6c162f..4c376ae3105d17a81b6e19c5ace9251eb31a5e94 100644 --- a/tests/matrix-variance-with-mean.lisp +++ b/tests/matrix-variance-with-mean.lisp @@ -23,7 +23,7 @@ (LIST 719.5467479557992d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -32,7 +32,7 @@ (LIST 719.5467500000001d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -40,7 +40,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -57,7 +57,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -65,7 +65,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -82,7 +82,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -90,7 +90,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -107,7 +107,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -116,7 +116,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -134,7 +134,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/matrix-variance.lisp b/tests/matrix-variance.lisp index ccc96390d6115d013fa5ed953aaecdb39f789d73..db95eafb16798d294dee4a77355f299425a0864b 100644 --- a/tests/matrix-variance.lisp +++ b/tests/matrix-variance.lisp @@ -23,7 +23,7 @@ (LIST 719.5467479557992d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -32,7 +32,7 @@ (LIST 719.5467500000001d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -40,7 +40,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -55,7 +55,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -63,7 +63,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -78,7 +78,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -86,7 +86,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -101,7 +101,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -110,7 +110,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 5575.0d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -126,7 +126,7 @@ (LIST 3172.777777777778d0) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/median-percentile.lisp b/tests/median-percentile.lisp index 44c04ab103f644574522a23422d87a0538a8eae9..298bb93d40baeced2d0c171678f0732e66013403 100644 --- a/tests/median-percentile.lisp +++ b/tests/median-percentile.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1.0d0) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-3.21d0 @@ -32,7 +32,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1.85d0) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-18.0d0 diff --git a/tests/multinomial.lisp b/tests/multinomial.lisp index 82bd53285585d5ad6896bf57f07bdd9c59f35f7a..def0fa0b6fb535a82282a5e47f11fc17b1b12abc 100644 --- a/tests/multinomial.lisp +++ b/tests/multinomial.lisp @@ -29,20 +29,20 @@ (LIST 8.064000000000026d-5) (MULTIPLE-VALUE-LIST (LET ((P - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.1d0 0.2d0 0.3d0 0.4d0))) (N - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(5 0 1 2)))) (MULTINOMIAL-PDF P N)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -9.425515753641212d0) (MULTIPLE-VALUE-LIST (LET ((P - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.1d0 0.2d0 0.3d0 0.4d0))) (N - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(5 0 1 2)))) (MULTINOMIAL-LOG-PDF P N))))) diff --git a/tests/permutation.lisp b/tests/permutation.lisp index 68916bbb645ce0f707c083ce40e6097fc38a8eea..939e7525b8dcf45637a4679853fa4904db051a45 100644 --- a/tests/permutation.lisp +++ b/tests/permutation.lisp @@ -80,7 +80,7 @@ (MAKE-PERMUTATION 4 T)) (INTVEC - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS diff --git a/tests/polynomial.lisp b/tests/polynomial.lisp index 440609e2961bb8cd95ace7bc0c63e28133b298e1..9c6b48a5da9dc17610e17420b89f47e69c3a3235 100644 --- a/tests/polynomial.lisp +++ b/tests/polynomial.lisp @@ -23,11 +23,11 @@ (LIST (LIST 2.5d0 7.2d0 32.7d0 91.0d0)) (MULTIPLE-VALUE-LIST (LET* ((XA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 1.0d0 2.0d0 3.0d0))) (DD (DIVIDED-DIFFERENCE XA - (MAKE-MARRAY 'DOUBLE-FLOAT + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(2.5d0 7.2d0 32.7d0 @@ -39,7 +39,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST 2.0d0) (MULTIPLE-VALUE-LIST (LET ((VEC - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1.0d0 2.0d0 @@ -80,7 +80,7 @@ (MULTIPLE-VALUE-LIST (COPY (POLYNOMIAL-SOLVE - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-1.0d0 0.0d0 0.0d0 0.0d0 0.0d0 1.0d0))) 'ARRAY))) @@ -88,13 +88,13 @@ (LIST 1.3250000029802322d0) (MULTIPLE-VALUE-LIST (EVALUATE - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1 0.5 0.3)) 0.5d0))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST 1.0d0) (MULTIPLE-VALUE-LIST (EVALUATE - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1 -1 1 -1 1 -1 1 @@ -231,7 +231,7 @@ (MULTIPLE-VALUE-LIST (COPY (POLYNOMIAL-SOLVE - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-120 274 -225 85 -15 1.0))) 'ARRAY))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL @@ -247,7 +247,7 @@ (MULTIPLE-VALUE-LIST (COPY (POLYNOMIAL-SOLVE - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(1 0 0 0 1 0 0 0 1))) 'ARRAY))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL @@ -267,11 +267,11 @@ 3.069999933242798d0))) (MULTIPLE-VALUE-LIST (LET* ((XA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.16 0.97 1.94 2.74 3.58 3.73 4.7))) (YA - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.73 1.11 1.49 1.84 2.3 2.41 3.07))) (DD (DIVIDED-DIFFERENCE XA YA))) diff --git a/tests/qr.lisp b/tests/qr.lisp index 0cb5b62133d1b5e59055d44fdea6426eed15ed42..e745116d27314d0f3f9e9977ef03b79753c9d4dc 100644 --- a/tests/qr.lisp +++ b/tests/qr.lisp @@ -92,9 +92,9 @@ (let ((lisp-unit:*epsilon* (* 2 128 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(52.5992295702070d0 -337.7263113752073d0 351.8823436427604d0)) - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-0.03018843019022285d0 0.30523642927546163d0 -0.4779674081526012d0 @@ -105,53 +105,53 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *hilb2-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *HILB2*)))) (let ((lisp-unit:*epsilon* (* 2 128 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *hilb3-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *HILB3*)))) (let ((lisp-unit:*epsilon* (* 2 2048 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *hilb4-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *HILB4*)))) (let ((lisp-unit:*epsilon* 0.5d0)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *hilb12-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *HILB12*)))) (let ((lisp-unit:*epsilon* (* 2 8 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *vander2-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *VANDER2*)))) (let ((lisp-unit:*epsilon* (* 2 64 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *vander3-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *vander3*)))) (let ((lisp-unit:*epsilon* (* 2 1024 double-float-epsilon))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *vander4-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *vander4*)))) (let ((lisp-unit:*epsilon* 0.05d0)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST *vander12-soln* - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (TEST-QR-LSSOLVE-DIM *vander12*)))) diff --git a/tests/quasi-random-number-generators.lisp b/tests/quasi-random-number-generators.lisp index 71f37f8602dcca22138d993a9262a6cc059787c6..d3948654cbf4d981b8ecea8a7d68074f1f6455e6 100644 --- a/tests/quasi-random-number-generators.lisp +++ b/tests/quasi-random-number-generators.lisp @@ -25,6 +25,6 @@ 0.375d0 0.875d0 0.875d0)) (MULTIPLE-VALUE-LIST (LET ((GEN (MAKE-QUASI-RANDOM-NUMBER-GENERATOR +SOBOL+ 2)) - (VEC (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS 2))) + (VEC (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS 2))) (LOOP REPEAT 5 DO (QRNG-GET GEN VEC) APPEND (COERCE (CL-ARRAY VEC) 'LIST)))))) diff --git a/tests/row.lisp b/tests/row.lisp index c89b53e880402f2458a447bb7d6ad4bb2385cb6d..3f3cf1f44cfd6f3f4f293455626ffa688624737b 100644 --- a/tests/row.lisp +++ b/tests/row.lisp @@ -23,28 +23,28 @@ (LIST #(-8.93 34.12 -6.15)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) - (ROW (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) + (ROW (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (ROW M1 1 ROW))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-8.93d0 34.12d0 -6.15d0)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) - (ROW (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) + (ROW (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (ROW M1 1 ROW))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(#C(-8.93 34.12) #C(-6.15 49.27) #C(-13.49 32.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -53,7 +53,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (ROW - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (ROW M1 1 ROW))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -62,7 +62,7 @@ #C(-13.49d0 32.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -71,13 +71,13 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (ROW - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (ROW M1 1 ROW))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 52 -10)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -88,7 +88,7 @@ (73 -5 123)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS @@ -99,7 +99,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(116 163 140)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -110,7 +110,7 @@ (161 215 98)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS @@ -121,7 +121,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 52 -10)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -132,7 +132,7 @@ (73 -5 123)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS @@ -143,7 +143,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(116 163 140)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -154,7 +154,7 @@ (161 215 98)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS @@ -165,7 +165,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 52 -10)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -176,7 +176,7 @@ (73 -5 123)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS @@ -187,7 +187,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(116 163 140)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -198,7 +198,7 @@ (161 215 98)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS @@ -210,7 +210,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 52 -10)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -221,7 +221,7 @@ (73 -5 123)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS @@ -233,7 +233,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(116 163 140)) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS @@ -244,7 +244,7 @@ (161 215 98)))) (ROW - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS diff --git a/tests/scale.lisp b/tests/scale.lisp index ea59ae67d67fb47ae878328e41ec3a58a3029fb0..44aac3345c088dd131b45952d41fdbd1ef8d226e 100644 --- a/tests/scale.lisp +++ b/tests/scale.lisp @@ -27,7 +27,7 @@ #C(-523.9 -268.125) #C(696.8 -1595.1001))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 @@ -45,7 +45,7 @@ #C(696.8000000000001d0 -1595.1d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -60,7 +60,7 @@ 1601.275 -438.425)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49))) (SCALAR 32.5)) @@ -72,7 +72,7 @@ -438.425d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) @@ -87,7 +87,7 @@ #C(-171.37753 -956.9326) #C(2793.9885 -678.9689))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 @@ -108,7 +108,7 @@ #C(2793.9883999999997d0 -678.9687999999999d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 diff --git a/tests/set-basis.lisp b/tests/set-basis.lisp index adac6e9138388c73d07a8b84821fa9a09498242d..c79be7f7270b76a403107ca8609476c8124bc92e 100644 --- a/tests/set-basis.lisp +++ b/tests/set-basis.lisp @@ -23,7 +23,7 @@ (LIST #(0.0 0.0 1.0 0.0 0.0 0.0 0.0 0.0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (SET-BASIS V1 2) @@ -33,7 +33,7 @@ #(0.0d0 0.0d0 1.0d0 0.0d0 0.0d0 0.0d0 0.0d0 0.0d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -45,7 +45,7 @@ #C(0.0 0.0) #C(0.0 0.0) #C(0.0 0.0) #C(0.0 0.0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 @@ -60,7 +60,7 @@ #C(0.0d0 0.0d0) #C(0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -73,7 +73,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SET-BASIS V1 2) (CL-ARRAY V1)))) @@ -81,7 +81,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SET-BASIS V1 2) @@ -90,7 +90,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SET-BASIS V1 2) @@ -99,7 +99,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SET-BASIS V1 2) @@ -108,7 +108,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SET-BASIS V1 2) @@ -117,7 +117,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SET-BASIS V1 2) @@ -127,7 +127,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SET-BASIS V1 2) @@ -137,7 +137,7 @@ (LIST #(0 0 1 0 0 0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SET-BASIS V1 2) diff --git a/tests/set-identity.lisp b/tests/set-identity.lisp index 1d665c1d33fd1db363f3171318dfe3a4c5091f57..0b2819436d475b8b2e70bb282c6b002d7447bb21 100644 --- a/tests/set-identity.lisp +++ b/tests/set-identity.lisp @@ -23,7 +23,7 @@ (LIST #2A((1.0 0.0 0.0) (0.0 1.0 0.0) (0.0 0.0 1.0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -35,7 +35,7 @@ (0.0d0 0.0d0 1.0d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -47,7 +47,7 @@ (#C(0.0 0.0) #C(0.0 0.0) #C(1.0 0.0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -64,7 +64,7 @@ #C(1.0d0 0.0d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -77,7 +77,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (SET-IDENTITY M1))))) @@ -85,7 +85,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -94,7 +94,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -103,7 +103,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -112,7 +112,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -121,7 +121,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -131,7 +131,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -141,7 +141,7 @@ (LIST #2A((1 0 0) (0 1 0) (0 0 1))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/setf-column.lisp b/tests/setf-column.lisp index 8720345ae539fd36c4bd41e55a47b32b3deeece2..68b7dd4ebab5d14238f881eb9c309ca14c0f1309 100644 --- a/tests/setf-column.lisp +++ b/tests/setf-column.lisp @@ -26,12 +26,12 @@ (49.27 -13.49 43.31))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (COL - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -42,12 +42,12 @@ (49.27d0 -13.49d0 43.31d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (COL - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -59,7 +59,7 @@ #C(-8.25 21.44)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -68,7 +68,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (COL - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44)))) @@ -84,7 +84,7 @@ #C(-8.25d0 21.44d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -93,7 +93,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (COL - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0)))) @@ -103,11 +103,11 @@ (LIST #2A((-64 -68 32) (-91 52 28) (73 -5 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (COL - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(32 28 30)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -115,12 +115,12 @@ (LIST #2A((67 44 28) (116 163 10) (161 215 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (COL - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(28 10 19)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -128,12 +128,12 @@ (LIST #2A((-64 -68 32) (-91 52 28) (73 -5 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (COL - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(32 28 30)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -141,12 +141,12 @@ (LIST #2A((67 44 28) (116 163 10) (161 215 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (COL - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(28 10 19)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -154,12 +154,12 @@ (LIST #2A((-64 -68 32) (-91 52 28) (73 -5 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (COL - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(32 28 30)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -167,12 +167,12 @@ (LIST #2A((67 44 28) (116 163 10) (161 215 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (COL - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(28 10 19)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -181,12 +181,12 @@ (LIST #2A((-64 -68 32) (-91 52 28) (73 -5 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (COL - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(32 28 30)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1)))) @@ -195,12 +195,12 @@ (LIST #2A((67 44 28) (116 163 10) (161 215 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (COL - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(28 10 19)))) (SETF (COLUMN M1 2) COL) (CL-ARRAY M1))))) diff --git a/tests/setf-row.lisp b/tests/setf-row.lisp index 91c4499b94103cddf1e16ff229fcc87bf5c26f52..541cc876d510052a2f6a547e40ed9fb36ff731ab 100644 --- a/tests/setf-row.lisp +++ b/tests/setf-row.lisp @@ -26,12 +26,12 @@ (42.73 -17.24 43.31))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (ROW - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(42.73 -17.24 43.31)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -42,12 +42,12 @@ (42.73d0 -17.24d0 43.31d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (ROW - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -59,7 +59,7 @@ #C(-8.25 21.44)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -68,7 +68,7 @@ (49.27 -13.49 32.5 42.73 -17.24 43.31)))) (ROW - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(42.73 -17.24 43.31 -16.12 -8.25 21.44)))) @@ -84,7 +84,7 @@ #C(-8.25d0 21.44d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -93,7 +93,7 @@ (49.27d0 -13.49d0 32.5d0 42.73d0 -17.24d0 43.31d0)))) (ROW - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(42.73d0 -17.24d0 43.31d0 -16.12d0 -8.25d0 21.44d0)))) @@ -103,11 +103,11 @@ (LIST #2A((-64 -68 71) (-91 52 -10) (32 28 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (ROW - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(32 28 30)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -115,12 +115,12 @@ (LIST #2A((67 44 189) (116 163 140) (28 10 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (ROW - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(28 10 19)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -128,12 +128,12 @@ (LIST #2A((-64 -68 71) (-91 52 -10) (32 28 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (ROW - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(32 28 30)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -141,12 +141,12 @@ (LIST #2A((67 44 189) (116 163 140) (28 10 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (ROW - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(28 10 19)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -154,12 +154,12 @@ (LIST #2A((-64 -68 71) (-91 52 -10) (32 28 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (ROW - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(32 28 30)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -167,12 +167,12 @@ (LIST #2A((67 44 189) (116 163 140) (28 10 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (ROW - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(28 10 19)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -181,12 +181,12 @@ (LIST #2A((-64 -68 71) (-91 52 -10) (32 28 30))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (ROW - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(32 28 30)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1)))) @@ -195,12 +195,12 @@ (LIST #2A((67 44 189) (116 163 140) (28 10 19))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (ROW - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(28 10 19)))) (SETF (ROW M1 2) ROW) (CL-ARRAY M1))))) diff --git a/tests/sort-matrix-largest.lisp b/tests/sort-matrix-largest.lisp index ed55e916a7ce8c3dddeb9471d948b8910561d46f..93bac3196a4a14aa980a839becffbb121375cf4f 100644 --- a/tests/sort-matrix-largest.lisp +++ b/tests/sort-matrix-largest.lisp @@ -23,94 +23,94 @@ (LIST #2A((49.27 34.12 32.5) (8.24 3.29 -6.15))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '(2 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((49.27d0 34.12d0 32.5d0) (8.24d0 3.29d0 -6.15d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((123 73 71) (52 -5 -10))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((215 189 163) (161 140 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((123 73 71) (52 -5 -10))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((215 189 163) (161 140 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((123 73 71) (52 -5 -10))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((215 189 163) (161 140 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) #+int64 @@ -118,12 +118,12 @@ (LIST #2A((123 73 71) (52 -5 -10))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1))))) #+int64 @@ -131,12 +131,12 @@ (LIST #2A((215 189 163) (161 140 116))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-LARGEST M2 M1)))))) diff --git a/tests/sort-matrix-smallest.lisp b/tests/sort-matrix-smallest.lisp index 20638ff8e1e8a1c7e157ec8d58afc9283560814a..42c44b00dfdcf8aca2fb9b23e4f8e120681779f6 100644 --- a/tests/sort-matrix-smallest.lisp +++ b/tests/sort-matrix-smallest.lisp @@ -23,12 +23,12 @@ (LIST #2A((-34.5 -13.49 -8.93) (-6.15 3.29 8.24))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5)))) (M2 - (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '(2 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST @@ -36,82 +36,82 @@ (-6.15d0 3.29d0 8.24d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0)))) (M2 - (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 3)))) + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-91 -68 -64) (-10 -5 52))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((44 67 98) (116 140 161))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-91 -68 -64) (-10 -5 52))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((44 67 98) (116 140 161))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((-91 -68 -64) (-10 -5 52))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #2A((44 67 98) (116 140 161))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) #+int64 @@ -119,12 +119,12 @@ (LIST #2A((-91 -68 -64) (-10 -5 52))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123)))) (M2 - (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1))))) #+int64 @@ -132,12 +132,12 @@ (LIST #2A((44 67 98) (116 140 161))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98)))) (M2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '(2 3)))) (CL-ARRAY (SORT-SMALLEST M2 M1)))))) diff --git a/tests/sort-matrix.lisp b/tests/sort-matrix.lisp index 678e0cf9af89e2c866941058bebd7283289fb1bf..164516cb91ce8ead284a698141d9f50f958dc3c4 100644 --- a/tests/sort-matrix.lisp +++ b/tests/sort-matrix.lisp @@ -26,7 +26,7 @@ (32.5 34.12 49.27))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (32.5d0 34.12d0 49.27d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -47,7 +47,7 @@ (LIST #2A((-91 -68 -64) (-10 -5 52) (71 73 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (MSORT M1))))) @@ -55,7 +55,7 @@ (LIST #2A((44 67 98) (116 140 161) (163 189 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -64,7 +64,7 @@ (LIST #2A((-91 -68 -64) (-10 -5 52) (71 73 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -73,7 +73,7 @@ (LIST #2A((44 67 98) (116 140 161) (163 189 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -82,7 +82,7 @@ (LIST #2A((-91 -68 -64) (-10 -5 52) (71 73 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -91,7 +91,7 @@ (LIST #2A((44 67 98) (116 140 161) (163 189 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -101,7 +101,7 @@ (LIST #2A((-91 -68 -64) (-10 -5 52) (71 73 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -111,7 +111,7 @@ (LIST #2A((44 67 98) (116 140 161) (163 189 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/sort-vector-index.lisp b/tests/sort-vector-index.lisp index a214713b5d8046394b5bf41ede0cf1392d4d4462..92320b162539e2b2c4feb65df4ca13babc32c9a8 100644 --- a/tests/sort-vector-index.lisp +++ b/tests/sort-vector-index.lisp @@ -24,7 +24,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (SORT-VECTOR-INDEX PERM V1) @@ -34,7 +34,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -45,7 +45,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SORT-VECTOR-INDEX PERM V1) (CL-ARRAY PERM)))) @@ -54,7 +54,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SORT-VECTOR-INDEX PERM V1) @@ -64,7 +64,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SORT-VECTOR-INDEX PERM V1) @@ -74,7 +74,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SORT-VECTOR-INDEX PERM V1) @@ -84,7 +84,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SORT-VECTOR-INDEX PERM V1) @@ -94,7 +94,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SORT-VECTOR-INDEX PERM V1) @@ -105,7 +105,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SORT-VECTOR-INDEX PERM V1) @@ -116,7 +116,7 @@ (MULTIPLE-VALUE-LIST (LET ((PERM (MAKE-PERMUTATION 8)) (V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SORT-VECTOR-INDEX PERM V1) diff --git a/tests/sort-vector-largest-index.lisp b/tests/sort-vector-largest-index.lisp index df29370129864b66c3e19b729dc714fb1b8c735f..44a3d739db0768d97366ac5e1fcdb34fa377d92a 100644 --- a/tests/sort-vector-largest-index.lisp +++ b/tests/sort-vector-largest-index.lisp @@ -25,7 +25,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -43,7 +43,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -63,7 +63,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -79,7 +79,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -112,7 +112,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -129,7 +129,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -145,7 +145,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -163,7 +163,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -180,7 +180,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/sort-vector-largest.lisp b/tests/sort-vector-largest.lisp index 94cbfc9960e394f2880af2784cd0fef36cd6bce5..682417dcdaa6b61a2b3a1c62a482b0dbf6008d97 100644 --- a/tests/sort-vector-largest.lisp +++ b/tests/sort-vector-largest.lisp @@ -23,29 +23,29 @@ (LIST #(49.27 34.12 8.24)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(32.5 42.73 -17.24)))) (CL-ARRAY (SORT-VECTOR-LARGEST V2 V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(49.27d0 34.12d0 8.24d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0)))) (CL-ARRAY (SORT-VECTOR-LARGEST V2 V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(73 71 52)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -53,7 +53,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -65,7 +65,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(215 189 163)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -74,7 +74,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -86,7 +86,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(73 71 52)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -94,7 +94,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -106,7 +106,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(215 189 163)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -115,7 +115,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -127,7 +127,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(73 71 52)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -135,7 +135,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -147,7 +147,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(215 189 163)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -156,7 +156,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -169,7 +169,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(73 71 52)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -177,7 +177,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -190,7 +190,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(215 189 163)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS @@ -199,7 +199,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/sort-vector-smallest-index.lisp b/tests/sort-vector-smallest-index.lisp index 68913a96a27f19a1a1ae8ffc9bf2d8aef53e60ba..fbd4c7cad117ab959459f1b62c873c37a83ec7b1 100644 --- a/tests/sort-vector-smallest-index.lisp +++ b/tests/sort-vector-smallest-index.lisp @@ -25,7 +25,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -43,7 +43,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -63,7 +63,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -79,7 +79,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -112,7 +112,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -129,7 +129,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -145,7 +145,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -163,7 +163,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -180,7 +180,7 @@ (MAKE-COMBINATION 8 3 NIL)) (V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/sort-vector-smallest.lisp b/tests/sort-vector-smallest.lisp index 2f4f5aaa82dfbf706e11a56c65fc32c15cdbc99d..65b810fd7b5c1f755eb8a22c4dac66c151c2d824 100644 --- a/tests/sort-vector-smallest.lisp +++ b/tests/sort-vector-smallest.lisp @@ -23,29 +23,29 @@ (LIST #(-34.5 -13.49 -8.93)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(32.5 42.73 -17.24)))) (CL-ARRAY (SORT-VECTOR-SMALLEST V2 V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-34.5d0 -13.49d0 -8.93d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(32.5d0 42.73d0 -17.24d0)))) (CL-ARRAY (SORT-VECTOR-SMALLEST V2 V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -53,7 +53,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -65,7 +65,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 67 116)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -74,7 +74,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -86,7 +86,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -94,7 +94,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -106,7 +106,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 67 116)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -115,7 +115,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -127,7 +127,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -135,7 +135,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -147,7 +147,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 67 116)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -156,7 +156,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -169,7 +169,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-91 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -177,7 +177,7 @@ -91 52 -10 73 -5))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -190,7 +190,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 67 116)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS @@ -199,7 +199,7 @@ 140 161 215))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/sort-vector.lisp b/tests/sort-vector.lisp index b0dc4d751a75f0ab3138b20e110dabdf70ffb895..892d611a1a87145ad72866d30eb38cc23101c68f 100644 --- a/tests/sort-vector.lisp +++ b/tests/sort-vector.lisp @@ -24,7 +24,7 @@ #(-34.5 -13.49 -8.93 -6.15 3.29 8.24 34.12 49.27)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -34,7 +34,7 @@ 34.12d0 49.27d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -43,14 +43,14 @@ (LIST #(-91 -68 -64 -10 -5 52 71 73)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (SORT-VECTOR V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 67 116 140 161 163 189 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -58,7 +58,7 @@ (LIST #(-91 -68 -64 -10 -5 52 71 73)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -66,7 +66,7 @@ (LIST #(44 67 116 140 161 163 189 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -74,7 +74,7 @@ (LIST #(-91 -68 -64 -10 -5 52 71 73)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -82,7 +82,7 @@ (LIST #(44 67 116 140 161 163 189 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -91,7 +91,7 @@ (LIST #(-91 -68 -64 -10 -5 52 71 73)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (SORT-VECTOR V1))))) @@ -100,7 +100,7 @@ (LIST #(44 67 116 140 161 163 189 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (SORT-VECTOR V1)))))) diff --git a/tests/swap-columns.lisp b/tests/swap-columns.lisp index 923da86f858202c4e190aa48aae3ec362be1f492..80b1dfb62e6282069178f96feb59bed01b55d87a 100644 --- a/tests/swap-columns.lisp +++ b/tests/swap-columns.lisp @@ -26,7 +26,7 @@ (49.27 32.5 -13.49))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (49.27d0 32.5d0 -13.49d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -51,7 +51,7 @@ #C(32.5 42.73)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -70,7 +70,7 @@ #C(32.5d0 42.73d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -83,7 +83,7 @@ (LIST #2A((-64 71 -68) (-91 -10 52) (73 123 -5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (SWAP-COLUMNS M1 1 2))))) @@ -91,7 +91,7 @@ (LIST #2A((67 189 44) (116 140 163) (161 98 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -100,7 +100,7 @@ (LIST #2A((-64 71 -68) (-91 -10 52) (73 123 -5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -109,7 +109,7 @@ (LIST #2A((67 189 44) (116 140 163) (161 98 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -118,7 +118,7 @@ (LIST #2A((-64 71 -68) (-91 -10 52) (73 123 -5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -127,7 +127,7 @@ (LIST #2A((67 189 44) (116 140 163) (161 98 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -137,7 +137,7 @@ (LIST #2A((-64 71 -68) (-91 -10 52) (73 123 -5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -147,7 +147,7 @@ (LIST #2A((67 189 44) (116 140 163) (161 98 215))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/swap-elements.lisp b/tests/swap-elements.lisp index f76397bd0f10b6a9350c520c703cb5c3fb3031b4..6700b13e6265f0ab65ddfea52975474f669fd98e 100644 --- a/tests/swap-elements.lisp +++ b/tests/swap-elements.lisp @@ -24,7 +24,7 @@ #(-34.5 8.24 -6.15 -8.93 34.12 3.29 49.27 -13.49)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (SWAP-ELEMENTS V1 2 5) @@ -35,7 +35,7 @@ 49.27d0 -13.49d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -48,7 +48,7 @@ #C(-16.12 -8.25) #C(21.44 -49.08))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 @@ -64,7 +64,7 @@ #C(-16.12d0 -8.25d0) #C(21.44d0 -49.08d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -77,7 +77,7 @@ (LIST #(-64 -68 -10 -91 52 71 73 -5)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SWAP-ELEMENTS V1 2 5) (CL-ARRAY V1)))) @@ -85,7 +85,7 @@ (LIST #(67 44 140 116 163 189 161 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SWAP-ELEMENTS V1 2 5) @@ -94,7 +94,7 @@ (LIST #(-64 -68 -10 -91 52 71 73 -5)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SWAP-ELEMENTS V1 2 5) @@ -103,7 +103,7 @@ (LIST #(67 44 140 116 163 189 161 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SWAP-ELEMENTS V1 2 5) @@ -112,7 +112,7 @@ (LIST #(-64 -68 -10 -91 52 71 73 -5)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SWAP-ELEMENTS V1 2 5) @@ -121,7 +121,7 @@ (LIST #(67 44 140 116 163 189 161 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SWAP-ELEMENTS V1 2 5) @@ -131,7 +131,7 @@ (LIST #(-64 -68 -10 -91 52 71 73 -5)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (SWAP-ELEMENTS V1 2 5) @@ -141,7 +141,7 @@ (LIST #(67 44 140 116 163 189 161 215)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (SWAP-ELEMENTS V1 2 5) diff --git a/tests/swap-row-column.lisp b/tests/swap-row-column.lisp index c97eebc827f9e1b9e23af539ec64ed1a46ad3b47..4e2c0a3c7385f5d6908bcaa696d1714c8175e5b0 100644 --- a/tests/swap-row-column.lisp +++ b/tests/swap-row-column.lisp @@ -26,7 +26,7 @@ (49.27 -13.49 -34.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (49.27d0 -13.49d0 -34.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -50,7 +50,7 @@ (#C(49.27 -13.49) #C(32.5 42.73) #C(-34.5 8.24)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -69,7 +69,7 @@ #C(-34.5d0 8.24d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -82,7 +82,7 @@ (LIST #2A((71 -10 123) (-91 52 -68) (73 -5 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (SWAP-ROW-COLUMN M1 0 2))))) @@ -90,7 +90,7 @@ (LIST #2A((189 140 98) (116 163 44) (161 215 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -99,7 +99,7 @@ (LIST #2A((71 -10 123) (-91 52 -68) (73 -5 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -108,7 +108,7 @@ (LIST #2A((189 140 98) (116 163 44) (161 215 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -117,7 +117,7 @@ (LIST #2A((71 -10 123) (-91 52 -68) (73 -5 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -126,7 +126,7 @@ (LIST #2A((189 140 98) (116 163 44) (161 215 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -136,7 +136,7 @@ (LIST #2A((71 -10 123) (-91 52 -68) (73 -5 -64))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -146,7 +146,7 @@ (LIST #2A((189 140 98) (116 163 44) (161 215 67))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/swap-rows.lisp b/tests/swap-rows.lisp index 45961ae64d7673556bc6aa2f19d9387a23ddea7c..cfc0270018e3c565b9b213ff8a6868f368ce6dff 100644 --- a/tests/swap-rows.lisp +++ b/tests/swap-rows.lisp @@ -26,7 +26,7 @@ (49.27 -13.49 32.5))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '((-34.5 8.24 3.29) (-8.93 34.12 -6.15) (49.27 -13.49 32.5))))) @@ -38,7 +38,7 @@ (49.27d0 -13.49d0 32.5d0))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0) (-8.93d0 34.12d0 -6.15d0) (49.27d0 -13.49d0 32.5d0))))) @@ -51,7 +51,7 @@ #C(-17.24 43.31)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '((-34.5 8.24 3.29 -8.93 34.12 -6.15) @@ -70,7 +70,7 @@ #C(-17.24d0 43.31d0)))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '((-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0) @@ -83,7 +83,7 @@ (LIST #2A((-91 52 -10) (-64 -68 71) (73 -5 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) (CL-ARRAY (SWAP-ROWS M1 0 1))))) @@ -91,7 +91,7 @@ (LIST #2A((116 163 140) (67 44 189) (161 215 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -100,7 +100,7 @@ (LIST #2A((-91 52 -10) (-64 -68 71) (73 -5 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -109,7 +109,7 @@ (LIST #2A((116 163 140) (67 44 189) (161 215 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -118,7 +118,7 @@ (LIST #2A((-91 52 -10) (-64 -68 71) (73 -5 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -127,7 +127,7 @@ (LIST #2A((116 163 140) (67 44 189) (161 215 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) @@ -137,7 +137,7 @@ (LIST #2A((-91 52 -10) (-64 -68 71) (73 -5 123))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '((-64 -68 71) (-91 52 -10) (73 -5 123))))) @@ -147,7 +147,7 @@ (LIST #2A((116 163 140) (67 44 189) (161 215 98))) (MULTIPLE-VALUE-LIST (LET ((M1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '((67 44 189) (116 163 140) (161 215 98))))) diff --git a/tests/vector-add-scalar.lisp b/tests/vector-add-scalar.lisp index 8501d9f8b1edf7157ed8f49b02b811618df37154..d9516f11b8935bfe5f1073114e4e55a940c3aa6d 100644 --- a/tests/vector-add-scalar.lisp +++ b/tests/vector-add-scalar.lisp @@ -23,20 +23,20 @@ (LIST #(-16.31 26.43 21.48)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29)))) (CL-ARRAY (ELT+ V1 18.19d0))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-16.31d0 26.43d0 21.48d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0)))) (CL-ARRAY (ELT+ V1 18.19d0))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-45 -49 89)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -48,7 +48,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(85 62 207)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -60,7 +60,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-45 -49 89)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -72,7 +72,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(85 62 207)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -84,7 +84,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-45 -49 89)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(85 62 207)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -108,7 +108,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-45 -49 89)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -120,7 +120,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(85 62 207)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-add.lisp b/tests/vector-add.lisp index 5020dfab36d7d462c099a9dddfb7e3c85595f3a3..1bd99ee9e67b12a8362ced38d6d927cc47524a8e 100644 --- a/tests/vector-add.lisp +++ b/tests/vector-add.lisp @@ -21,125 +21,125 @@ (LISP-UNIT:DEFINE-TEST VECTOR-ADD (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-43.43 42.36 -2.8600001))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-43.43d0 42.36d0 -2.8600000000000003d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(101 -16 61))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-91 52 -10)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(183 207 73))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(116 163 140)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-155 -16 61))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-91 52 -10)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(183 207 329))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(116 163 140)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-155 -16 61))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-91 52 -10)))) (ELT+ V1 V2)))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(183 207 329))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (ELT+ V1 V2)))) #+int64 (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-155 -16 61))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-91 52 -10)))) (ELT+ V1 V2)))) #+int64 (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(183 207 329))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (ELT+ V1 V2))))) diff --git a/tests/vector-copy-to-cl-and-back.lisp b/tests/vector-copy-to-cl-and-back.lisp index a113d16299085b1c28b357cb7cb5a2f69f91b040..27554c7e7a0540a617f36d29487c7d95b57fc60f 100644 --- a/tests/vector-copy-to-cl-and-back.lisp +++ b/tests/vector-copy-to-cl-and-back.lisp @@ -25,7 +25,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29)) 'ARRAY) 'SINGLE-FLOAT)))) @@ -35,7 +35,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0)) 'ARRAY) 'DOUBLE-FLOAT)))) @@ -45,7 +45,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15)) 'ARRAY) @@ -58,7 +58,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0)) @@ -69,7 +69,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71)) @@ -81,7 +81,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -94,7 +94,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -107,7 +107,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -120,7 +120,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -133,7 +133,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -147,7 +147,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -161,7 +161,7 @@ (CL-ARRAY (COPY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-copy.lisp b/tests/vector-copy.lisp index ce8237ffd1c4b9f207fd790fa9907fc60762d5e4..97f34e47c51413d16dd3c47a89edef72b8e78f25 100644 --- a/tests/vector-copy.lisp +++ b/tests/vector-copy.lisp @@ -24,21 +24,21 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29)))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-34.5d0 8.24d0 3.29d0)) (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0)))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15))) (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15)))))) @@ -49,7 +49,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0)))))) @@ -57,7 +57,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 @@ -66,7 +66,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -75,7 +75,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 @@ -84,7 +84,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -93,7 +93,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 @@ -102,7 +102,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -112,7 +112,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 @@ -122,7 +122,7 @@ (MULTIPLE-VALUE-LIST (CL-ARRAY (COPY - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-div.lisp b/tests/vector-div.lisp index b85c325a7aa465244b5c33dd60710d7439fea8eb..7c944c44a5da3001387198ccfdff060f4c5e3155 100644 --- a/tests/vector-div.lisp +++ b/tests/vector-div.lisp @@ -23,10 +23,10 @@ (LIST #(3.8633816 0.24150059 -0.5349593)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (CL-ARRAY (ELT/ V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -35,23 +35,23 @@ -0.5349593495934959d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (CL-ARRAY (ELT/ V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 -1 -7)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -62,14 +62,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 1)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -80,14 +80,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 -1 -7)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -98,14 +98,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 1)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -116,14 +116,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 -1 -7)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -134,14 +134,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 1)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -153,14 +153,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 -1 -7)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -172,14 +172,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 1)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-max-index.lisp b/tests/vector-max-index.lisp index fbf1893b2abd0b1dc8a1a3a2c434c4377d60f172..bf98bb0abc126af57f10bfcb4747445011acebea 100644 --- a/tests/vector-max-index.lisp +++ b/tests/vector-max-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -35,7 +35,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -50,7 +50,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -73,7 +73,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -84,7 +84,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -107,7 +107,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -120,7 +120,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -132,7 +132,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-max.lisp b/tests/vector-max.lisp index 8a8778400749786b73c324d241e3542a9bac0602..130d92fb82db7a543a0de916b36f49520799ad47 100644 --- a/tests/vector-max.lisp +++ b/tests/vector-max.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 8.24) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -31,7 +31,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 8.24d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -41,7 +41,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -51,7 +51,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -71,7 +71,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -81,7 +81,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -91,7 +91,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -102,7 +102,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -113,7 +113,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-mean.lisp b/tests/vector-mean.lisp index 0126877962d46ac77507461a6ede0344a511afb4..257240f90bede5b32ce9705370ccdf3e2809fe74 100644 --- a/tests/vector-mean.lisp +++ b/tests/vector-mean.lisp @@ -23,14 +23,14 @@ (LIST 3.9812498688697815d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (MEAN V1)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3.98125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -45,7 +45,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -5.25d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -56,7 +56,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 136.875d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -68,7 +68,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -5.25d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -79,7 +79,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 136.875d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -91,7 +91,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -5.25d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -102,7 +102,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 136.875d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -115,7 +115,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -5.25d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -127,7 +127,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 136.875d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-min-index.lisp b/tests/vector-min-index.lisp index 35b68f3f2c81d2c0226a54f43926b22d507b1492..61b5bdc0655da436e7ebfc0bc5ca21626b09fc86 100644 --- a/tests/vector-min-index.lisp +++ b/tests/vector-min-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -35,7 +35,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -50,7 +50,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -73,7 +73,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -84,7 +84,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -107,7 +107,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -120,7 +120,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -132,7 +132,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-min.lisp b/tests/vector-min.lisp index de621cc7d6ddb4881f2bb2eb7659301a07720d5c..543313949c8c83c8c10abd80a62c1c7f4965023b 100644 --- a/tests/vector-min.lisp +++ b/tests/vector-min.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -31,7 +31,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -41,7 +41,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -51,7 +51,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -71,7 +71,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -81,7 +81,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -91,7 +91,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -102,7 +102,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -113,7 +113,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-minmax-index.lisp b/tests/vector-minmax-index.lisp index f450f4f874e24bd17b27e67c6aadc1e30086890c..16c0da8efca4d79703ba2cfd87df1324644dfa1b 100644 --- a/tests/vector-minmax-index.lisp +++ b/tests/vector-minmax-index.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -36,7 +36,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -52,7 +52,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -64,7 +64,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -77,7 +77,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -89,7 +89,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -102,7 +102,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -114,7 +114,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -128,7 +128,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3 6) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -141,7 +141,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 7) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-minmax.lisp b/tests/vector-minmax.lisp index 40d53cd7b4d9e1bcd66d4768ee21a319a34f1801..8589a4fef2c268061e167b4e8615d83dc2fd0d38 100644 --- a/tests/vector-minmax.lisp +++ b/tests/vector-minmax.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5 8.24) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -31,7 +31,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -34.5d0 8.24d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 @@ -41,7 +41,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -51,7 +51,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -71,7 +71,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -81,7 +81,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -91,7 +91,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -102,7 +102,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -68 71) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -113,7 +113,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 189) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-mult-scalar.lisp b/tests/vector-mult-scalar.lisp index 6875ef7c689314c248eaf5f5a1af95013ad25bc2..09e0f6ef11b480a239363318b596b5e345bf462a 100644 --- a/tests/vector-mult-scalar.lisp +++ b/tests/vector-mult-scalar.lisp @@ -23,20 +23,20 @@ (LIST #(-47.955 11.4536 4.5731)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29)))) (CL-ARRAY (ELT* V1 1.39d0))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-47.955d0 11.4536d0 4.5731d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0)))) (CL-ARRAY (ELT* V1 1.39d0))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-88 -94 98)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -48,7 +48,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(93 61 6)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -60,7 +60,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-88 -94 98)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -72,7 +72,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(93 61 262)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -84,7 +84,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-88 -94 98)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -96,7 +96,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(93 61 262)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -108,7 +108,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-88 -94 98)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -120,7 +120,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(93 61 262)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-mult.lisp b/tests/vector-mult.lisp index e9a83b2456131b663e5737c6000f2e989febf6c5..69be247832244eb2cc044efe80a7fe6ded0d31af 100644 --- a/tests/vector-mult.lisp +++ b/tests/vector-mult.lisp @@ -23,33 +23,33 @@ (LIST #(308.08502 281.14877 -20.2335)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (CL-ARRAY (ELT* V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(308.085d0 281.1488d0 -20.233500000000003d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (CL-ARRAY (ELT* V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-64 48 58)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -60,14 +60,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(92 4 92)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -79,40 +79,40 @@ (LIST #(5824 -3536 -710)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-91 52 -10)))) (CL-ARRAY (ELT* V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(7772 7172 26460)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT* V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(5824 -3536 -710)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-91 52 -10)))) (CL-ARRAY (ELT* V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(7772 7172 26460)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT* V1 V2))))) #+int64 @@ -120,10 +120,10 @@ (LIST #(5824 -3536 -710)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-91 52 -10)))) (CL-ARRAY (ELT* V1 V2))))) #+int64 @@ -131,10 +131,10 @@ (LIST #(7772 7172 26460)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT* V1 V2)))))) diff --git a/tests/vector-reverse.lisp b/tests/vector-reverse.lisp index c1d5588c472fdb1d4e92ce401716403480f7eb2f..39f0385c5aeac63d56d019ec5935fac07bb04329 100644 --- a/tests/vector-reverse.lisp +++ b/tests/vector-reverse.lisp @@ -24,7 +24,7 @@ #(-13.49 49.27 -6.15 34.12 -8.93 3.29 8.24 -34.5)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -34,7 +34,7 @@ 8.24d0 -34.5d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -46,7 +46,7 @@ #C(3.29 -8.93) #C(-34.5 8.24))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49 32.5 42.73 @@ -61,7 +61,7 @@ #C(3.29d0 -8.93d0) #C(-34.5d0 8.24d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 @@ -73,14 +73,14 @@ (LIST #(-5 73 -10 52 -91 71 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (VECTOR-REVERSE V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(215 161 140 163 116 189 44 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -88,7 +88,7 @@ (LIST #(-5 73 -10 52 -91 71 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -96,7 +96,7 @@ (LIST #(215 161 140 163 116 189 44 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -104,7 +104,7 @@ (LIST #(-5 73 -10 52 -91 71 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -112,7 +112,7 @@ (LIST #(215 161 140 163 116 189 44 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -121,7 +121,7 @@ (LIST #(-5 73 -10 52 -91 71 -68 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (CL-ARRAY (VECTOR-REVERSE V1))))) @@ -130,7 +130,7 @@ (LIST #(215 161 140 163 116 189 44 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (CL-ARRAY (VECTOR-REVERSE V1)))))) diff --git a/tests/vector-set-all.lisp b/tests/vector-set-all.lisp index ac9d218e50191b53d9abe29341ff5adcd08e828b..5c6d0e10d51dee31f78ecd30ce62d9da258dea8e 100644 --- a/tests/vector-set-all.lisp +++ b/tests/vector-set-all.lisp @@ -22,19 +22,19 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-34.5 -34.5 -34.5)) (MULTIPLE-VALUE-LIST - (LET ((V1 (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) + (LET ((V1 (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 -34.5))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-34.5d0 -34.5d0 -34.5d0)) (MULTIPLE-VALUE-LIST - (LET ((V1 (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) + (LET ((V1 (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 -34.5d0))))) #+fsbv (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(#C(-34.5 8.24) #C(-34.5 8.24) #C(-34.5 8.24))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 #C(-34.5 8.24)))))) #+fsbv @@ -44,13 +44,13 @@ #C(-34.5d0 8.24d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 #C(-34.5d0 8.24d0)))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :DIMENSIONS @@ -61,7 +61,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :DIMENSIONS @@ -72,7 +72,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :DIMENSIONS @@ -83,7 +83,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :DIMENSIONS @@ -94,7 +94,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :DIMENSIONS @@ -105,7 +105,7 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS @@ -117,11 +117,11 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (MULTIPLE-VALUE-LIST - (LET ((V1 (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS '3))) + (LET ((V1 (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 -64))))) #+int64 (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (MULTIPLE-VALUE-LIST - (LET ((V1 (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '3))) + (LET ((V1 (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '3))) (CL-ARRAY (SET-ALL V1 67)))))) diff --git a/tests/vector-set-zero.lisp b/tests/vector-set-zero.lisp index 20a9ad0f1f57801a502bec6f25b358be9994d0f0..cb5e579aa6bd186687c5e1b77bfb7115dc979eb0 100644 --- a/tests/vector-set-zero.lisp +++ b/tests/vector-set-zero.lisp @@ -22,7 +22,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0.0 0.0 0.0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 @@ -33,7 +33,7 @@ (LIST #(0.0d0 0.0d0 0.0d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0)))) (SET-ZERO V1) (CL-ARRAY V1)))) @@ -41,7 +41,7 @@ (LIST #(#C(0.0 0.0) #C(0.0 0.0) #C(0.0 0.0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15)))) @@ -52,7 +52,7 @@ #(#C(0.0d0 0.0d0) #C(0.0d0 0.0d0) #C(0.0d0 0.0d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0)))) @@ -61,7 +61,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -72,7 +72,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -83,7 +83,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -94,7 +94,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -105,7 +105,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -116,7 +116,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -128,7 +128,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -140,7 +140,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(0 0 0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-standard-deviation-with-fixed-mean.lisp b/tests/vector-standard-deviation-with-fixed-mean.lisp index a3db69c74991165a579f71a32864b66eb65eadf6..461606835516fe0a43401cdd9bb1142ed0d23685 100644 --- a/tests/vector-standard-deviation-with-fixed-mean.lisp +++ b/tests/vector-standard-deviation-with-fixed-mean.lisp @@ -23,7 +23,7 @@ (LIST 25.08341998337271d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -31,7 +31,7 @@ (LIST 25.08342004068624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -40,14 +40,14 @@ (LIST 61.216317269172606d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 54.81659762334762d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -55,7 +55,7 @@ (LIST 61.216317269172606d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -63,7 +63,7 @@ (LIST 54.81659762334762d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -71,7 +71,7 @@ (LIST 61.216317269172606d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -79,7 +79,7 @@ (LIST 54.81659762334762d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -88,7 +88,7 @@ (LIST 61.216317269172606d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -97,7 +97,7 @@ (LIST 54.81659762334762d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION-WITH-FIXED-MEAN V1 (MEAN V1)))))) diff --git a/tests/vector-standard-deviation-with-mean.lisp b/tests/vector-standard-deviation-with-mean.lisp index c26fda7685836a8e1011fbbd46a19ce481b02171..70861eef49453862a0d292b14f23630d1b74fa7c 100644 --- a/tests/vector-standard-deviation-with-mean.lisp +++ b/tests/vector-standard-deviation-with-mean.lisp @@ -23,7 +23,7 @@ (LIST 26.815303904668458d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -31,7 +31,7 @@ (LIST 26.815303965939197d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -40,14 +40,14 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1 (MEAN V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -55,7 +55,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -63,7 +63,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -71,7 +71,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -79,7 +79,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -88,7 +88,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1 (MEAN V1))))) @@ -97,7 +97,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1 (MEAN V1)))))) diff --git a/tests/vector-standard-deviation.lisp b/tests/vector-standard-deviation.lisp index 05773b407eb876dbf73f08d53f82202d89cfb23b..1fde788bae6930fd73bd77614c2860a6615a4a6d 100644 --- a/tests/vector-standard-deviation.lisp +++ b/tests/vector-standard-deviation.lisp @@ -23,7 +23,7 @@ (LIST 26.815303904668458d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (STANDARD-DEVIATION V1)))) @@ -31,7 +31,7 @@ (LIST 26.815303965939197d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -40,14 +40,14 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1)))) @@ -55,7 +55,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1)))) @@ -63,7 +63,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1)))) @@ -71,7 +71,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1)))) @@ -79,7 +79,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1)))) @@ -88,7 +88,7 @@ (LIST 65.44299591465624d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (STANDARD-DEVIATION V1)))) @@ -97,7 +97,7 @@ (LIST 58.60140783291814d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189 116 163 140 161 215)))) (STANDARD-DEVIATION V1))))) diff --git a/tests/vector-sub.lisp b/tests/vector-sub.lisp index 33597c5e888821a7a7035ddda53cb4f4e97bd95f..a331c77e26addf249c90a78029609c73f97097eb 100644 --- a/tests/vector-sub.lisp +++ b/tests/vector-sub.lisp @@ -23,10 +23,10 @@ (LIST #(-25.57 -25.88 9.440001)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (CL-ARRAY (ELT- V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL @@ -34,23 +34,23 @@ #(-25.57d0 -25.879999999999995d0 9.440000000000001d0)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (CL-ARRAY (ELT- V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(27 -120 81)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,14 +61,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(207 137 49)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -79,14 +79,14 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(27 -120 81)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -98,23 +98,23 @@ (LIST #(65487 65417 49)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT- V1 V2))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(27 -120 81)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -126,24 +126,24 @@ (LIST #(4294967247 4294967177 49)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT- V1 V2))))) #+int64 (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(27 -120 81)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -156,10 +156,10 @@ (LIST #(18446744073709551567 18446744073709551497 49)) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (CL-ARRAY (ELT- V1 V2)))))) diff --git a/tests/vector-swap.lisp b/tests/vector-swap.lisp index 3e268c3b125f20806c2d167968fde7724a12dfc7..73e41e67480f19d6cc9cde0ca8fb023701363b2e 100644 --- a/tests/vector-swap.lisp +++ b/tests/vector-swap.lisp @@ -23,10 +23,10 @@ (LIST (LIST #(-8.93 34.12 -6.15) #(-34.5 8.24 3.29))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29))) (V2 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-8.93 34.12 -6.15)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -36,10 +36,10 @@ #(-34.5d0 8.24d0 3.29d0))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0))) (V2 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -50,12 +50,12 @@ #(#C(-34.5 8.24) #C(3.29 -8.93) #C(34.12 -6.15)))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15))) (V2 - (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX SINGLE-FLOAT) :INITIAL-CONTENTS '(-8.93 34.12 -6.15 49.27 -13.49 32.5)))) @@ -70,12 +70,12 @@ #C(34.12d0 -6.15d0)))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0))) (V2 - (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) + (GRID:MAKE-FOREIGN-ARRAY '(COMPLEX DOUBLE-FLOAT) :INITIAL-CONTENTS '(-8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0 32.5d0)))) @@ -85,10 +85,10 @@ (LIST (LIST #(-91 52 -10) #(-64 -68 71))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-91 52 -10)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -96,10 +96,10 @@ (LIST (LIST #(116 163 140) #(67 44 189))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 8) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS '(116 163 140)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -107,10 +107,10 @@ (LIST (LIST #(-91 52 -10) #(-64 -68 71))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-91 52 -10)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -118,10 +118,10 @@ (LIST (LIST #(116 163 140) #(67 44 189))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS '(116 163 140)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -129,10 +129,10 @@ (LIST (LIST #(-91 52 -10) #(-64 -68 71))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-91 52 -10)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -140,10 +140,10 @@ (LIST (LIST #(116 163 140) #(67 44 189))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS '(116 163 140)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -152,10 +152,10 @@ (LIST (LIST #(-91 52 -10) #(-64 -68 71))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71))) (V2 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-91 52 -10)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2))))) @@ -164,10 +164,10 @@ (LIST (LIST #(116 163 140) #(67 44 189))) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189))) (V2 - (MAKE-MARRAY '(UNSIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(116 163 140)))) (SWAP V2 V1) (LIST (CL-ARRAY V1) (CL-ARRAY V2)))))) diff --git a/tests/vector-variance-with-fixed-mean.lisp b/tests/vector-variance-with-fixed-mean.lisp index 17c262f5cee1920c79bd71b1e98a0ca51eced4e4..17101679afe1f835334ee262d7e5d2a362856375 100644 --- a/tests/vector-variance-with-fixed-mean.lisp +++ b/tests/vector-variance-with-fixed-mean.lisp @@ -23,7 +23,7 @@ (LIST 629.1779580622615d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (VARIANCE-WITH-FIXED-MEAN V1 (MEAN V1))))) @@ -31,7 +31,7 @@ (LIST 629.1779609375001d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -39,7 +39,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3747.4375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS @@ -51,7 +51,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3004.859375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -64,7 +64,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3747.4375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS @@ -76,7 +76,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3004.859375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -89,7 +89,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3747.4375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS @@ -101,7 +101,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3004.859375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -115,7 +115,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3747.4375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS @@ -128,7 +128,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3004.859375d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-variance-with-mean.lisp b/tests/vector-variance-with-mean.lisp index b296417cfbc29dda8714f5bdeb76563fd0174de6..fd2ba2dd1137af8ad41d1e886ef8828d549b6f20 100644 --- a/tests/vector-variance-with-mean.lisp +++ b/tests/vector-variance-with-mean.lisp @@ -23,7 +23,7 @@ (LIST 719.0605234997274d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (VARIANCE V1 (MEAN V1))))) @@ -31,7 +31,7 @@ (LIST 719.0605267857144d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -40,13 +40,13 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1 (MEAN V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -61,14 +61,14 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1 (MEAN V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -83,14 +83,14 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1 (MEAN V1))))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -106,7 +106,7 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1 (MEAN V1))))) @@ -114,7 +114,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/tests/vector-variance.lisp b/tests/vector-variance.lisp index f3a6b79e3089a89fb38ecf1588e4832be07e609a..0d64116a247dea4bcdb00dc18e14085193b68464 100644 --- a/tests/vector-variance.lisp +++ b/tests/vector-variance.lisp @@ -23,7 +23,7 @@ (LIST 719.0605234997274d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS '(-34.5 8.24 3.29 -8.93 34.12 -6.15 49.27 -13.49)))) (VARIANCE V1)))) @@ -31,7 +31,7 @@ (LIST 719.0605267857144d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS '(-34.5d0 8.24d0 3.29d0 -8.93d0 34.12d0 -6.15d0 49.27d0 -13.49d0)))) @@ -40,13 +40,13 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS @@ -59,14 +59,14 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 16) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS @@ -79,14 +79,14 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 32) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1)))) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS @@ -100,7 +100,7 @@ (LIST 4282.785714285714d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY '(SIGNED-BYTE 64) + (GRID:MAKE-FOREIGN-ARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS '(-64 -68 71 -91 52 -10 73 -5)))) (VARIANCE V1)))) @@ -108,7 +108,7 @@ (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 3434.125d0) (MULTIPLE-VALUE-LIST (LET ((V1 - (MAKE-MARRAY + (GRID:MAKE-FOREIGN-ARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS diff --git a/wavelet.lisp b/wavelet.lisp index 294808e6b0f1da7dfb3a9e755f073bb9c981cc02..88d4c720d8d83f9d7cecf7d41cc55b2fabe8f471 100644 --- a/wavelet.lisp +++ b/wavelet.lisp @@ -1,6 +1,6 @@ ;; Wavelet transforms. ;; Liam Healy, Mon Nov 26 2007 - 20:43 -;; Time-stamp: <2010-06-27 18:13:46EDT wavelet.lisp> +;; Time-stamp: <2010-06-29 22:15:19EDT wavelet.lisp> ;; ;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy ;; Distributed under the terms of the GNU General Public License @@ -385,7 +385,7 @@ (wavelet (make-wavelet +daubechies-wavelet+ 4)) (workspace (make-wavelet-workspace n))) (wavelet-transform-forward wavelet vector 1 workspace) - (let ((absvector (make-marray 'double-float :dimensions n)) + (let ((absvector (grid:make-foreign-array 'double-float :dimensions n)) (permutation (make-permutation n))) (dotimes (i n) (setf (maref absvector i) (abs (maref vector i))))