Commit c057c7f3 authored by Liam Healy's avatar Liam Healy

No 64 bit integers on 32 bit platforms

Both CLISP and SBCL fail when making arrays of 64 bit integers,
despite cffi-features:no-long-long being absent for either.
Therefore, conditionalize away these types in *array-element-types* on
32 bit platforms in general, and conditionalize away all the 64 bit
tests as well.  Separated out integer size check into types.lisp.
Restored tests vector-min and vector-max which fail in SBCL for
(signed-integer 8) and (signed-integer 16) for unknown reasons. 
Test results:
64 bit SBCL:   TOTAL: 1223 assertions passed, 5 failed, 0 execution errors.
64 bit CCL:    TOTAL: 1228 assertions passed, 0 failed, 0 execution errors.
32 bit SBCL:   TOTAL: 1069 assertions passed, 31 failed, 0 execution errors.
32 bit CLISP:  TOTAL: 1051 assertions passed, 27 failed, 5 execution errors.
parent 26ad3502
;; Tests of array functions ;; Tests of array functions
;; Liam Healy 2008-10-20 22:41:48EDT array-tests.lisp ;; Liam Healy 2008-10-20 22:41:48EDT array-tests.lisp
;; Time-stamp: <2008-12-26 12:23:58EST array-tests.lisp> ;; Time-stamp: <2008-12-31 21:40:17EST array-tests.lisp>
;; $Id: $ ;; $Id: $
;;; Generate each file with #'write-test-to-file, e.g. ;;; Generate each file with #'write-test-to-file, e.g.
...@@ -141,7 +141,6 @@ ...@@ -141,7 +141,6 @@
(let ((m1 (array-default '(3 3)))) (let ((m1 (array-default '(3 3))))
(mmax m1))) (mmax m1)))
#| Temporarily commented out twos-complement answer for SIGNED-BYTE-8 and SIGNED-BYTE-16
(generate-all-array-tests vector-min :no-complex (generate-all-array-tests vector-min :no-complex
(let ((v1 (array-default 3))) (let ((v1 (array-default 3)))
(mmin v1))) (mmin v1)))
...@@ -149,7 +148,6 @@ ...@@ -149,7 +148,6 @@
(generate-all-array-tests matrix-min :no-complex (generate-all-array-tests matrix-min :no-complex
(let ((m1 (array-default '(3 3)))) (let ((m1 (array-default '(3 3))))
(mmin m1))) (mmin m1)))
|#
(generate-all-array-tests vector-minmax :no-complex (generate-all-array-tests vector-minmax :no-complex
(let ((v1 (array-default 3))) (let ((v1 (array-default 3)))
......
;; Combinations ;; Combinations
;; Liam Healy, Sun Mar 26 2006 - 11:51 ;; Liam Healy, Sun Mar 26 2006 - 11:51
;; Time-stamp: <2008-12-28 16:36:24EST combination.lisp> ;; Time-stamp: <2008-12-31 21:10:06EST combination.lisp>
;; $Id$ ;; $Id$
(in-package :gsl) (in-package :gsl)
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
(defclass combination (mobject foreign-array) (defclass combination (mobject foreign-array)
((element-type ((element-type
:initform :initform
#+sizet-64 '(unsigned-byte 64) #+int64 '(unsigned-byte 64)
#+sizet-32 '(unsigned-byte 32) #+int32 '(unsigned-byte 32)
:reader element-type :allocation :class) :reader element-type :allocation :class)
(choice-of :initarg :choice-of :reader choice-of :type (integer 0) (choice-of :initarg :choice-of :reader choice-of :type (integer 0)
:documentation "Maximum possible value; n in the (n k) notation.")) :documentation "Maximum possible value; n in the (n k) notation."))
......
;; Permutations ;; Permutations
;; Liam Healy, Sun Mar 26 2006 - 11:51 ;; Liam Healy, Sun Mar 26 2006 - 11:51
;; Time-stamp: <2008-12-28 16:40:35EST permutation.lisp> ;; Time-stamp: <2008-12-31 21:10:05EST permutation.lisp>
;; $Id$ ;; $Id$
(in-package :gsl) (in-package :gsl)
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
(defclass permutation (mobject foreign-array) (defclass permutation (mobject foreign-array)
((element-type ((element-type
:initform :initform
#+sizet-64 '(unsigned-byte 64) #+int64 '(unsigned-byte 64)
#+sizet-32 '(unsigned-byte 32) #+int32 '(unsigned-byte 32)
:reader element-type :allocation :class)) :reader element-type :allocation :class))
(:documentation "GSL permutations.")) (:documentation "GSL permutations."))
......
;; IEEE 754 Modes and masks ;; IEEE 754 Modes and masks
;; Liam Healy 2008-01-29 21:35:50EST ieee-modes.lisp ;; Liam Healy 2008-01-29 21:35:50EST ieee-modes.lisp
;; Time-stamp: <2008-12-28 20:59:16EST ieee-modes.lisp> ;; Time-stamp: <2008-12-31 18:36:26EST ieee-modes.lisp>
;; $Id$ ;; $Id$
(in-package :gsl) (in-package :gsl)
...@@ -30,6 +30,3 @@ ...@@ -30,6 +30,3 @@
((cffi:foreign-enum-value 'ieee-mask exception-mask) :int)) ((cffi:foreign-enum-value 'ieee-mask exception-mask) :int))
:documentation :documentation
"Set the IEEE 754 precision, rounding mode, and exception mask.") "Set the IEEE 754 precision, rounding mode, and exception mask.")
#+clisp
(setf sys::*inhibit-floating-point-underflow* t)
;; Definition of GSLL system ;; Definition of GSLL system
;; Liam Healy ;; Liam Healy
;; Time-stamp: <2008-11-16 13:29:58EST gsll-tests.asd> ;; Time-stamp: <2008-12-31 21:53:55EST gsll-tests.asd>
;; $Id$ ;; $Id$
(asdf:defsystem "gsll-tests" (asdf:defsystem "gsll-tests"
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
(:file "matrix-max-index") (:file "matrix-max-index")
(:file "matrix-max") (:file "matrix-max")
(:file "matrix-mean") (:file "matrix-mean")
(:file "matrix-min")
(:file "matrix-min-index") (:file "matrix-min-index")
(:file "matrix-minmax-index") (:file "matrix-minmax-index")
(:file "matrix-minmax") (:file "matrix-minmax")
...@@ -159,6 +160,7 @@ ...@@ -159,6 +160,7 @@
(:file "vector-max-index") (:file "vector-max-index")
(:file "vector-max") (:file "vector-max")
(:file "vector-mean") (:file "vector-mean")
(:file "vector-min")
(:file "vector-min-index") (:file "vector-min-index")
(:file "vector-minmax-index") (:file "vector-minmax-index")
(:file "vector-minmax") (:file "vector-minmax")
......
;; Definition of GSLL system ;; Definition of GSLL system
;; Liam Healy ;; Liam Healy
;; Time-stamp: <2008-12-29 13:35:30EST gsll.asd> ;; Time-stamp: <2008-12-31 21:10:22EST gsll.asd>
;; $Id$ ;; $Id$
(asdf:defsystem "gsll" (asdf:defsystem "gsll"
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
((:file "init") ((:file "init")
(:file "conditions" :depends-on (init)) (:file "conditions" :depends-on (init))
(:file "mobject" :depends-on (init)) (:file "mobject" :depends-on (init))
(:file "element-types" :depends-on (init)) (:file "types" :depends-on (init))
(:file "element-types" :depends-on (init types))
(:file "number-conversion" :depends-on (init)) (:file "number-conversion" :depends-on (init))
(:file "interface" (:file "interface"
:depends-on (init conditions element-types number-conversion)) :depends-on (init conditions element-types number-conversion))
......
;; GSL errors ;; GSL errors
;; Liam Healy Sat Mar 4 2006 - 18:33 ;; Liam Healy Sat Mar 4 2006 - 18:33
;; Time-stamp: <2008-12-27 16:42:45EST conditions.lisp> ;; Time-stamp: <2008-12-31 18:32:09EST conditions.lisp>
;; $Id$ ;; $Id$
(in-package :gsl) (in-package :gsl)
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
(defmacro define-gsl-condition (keyword number text &rest superclasses) (defmacro define-gsl-condition (keyword number text &rest superclasses)
`(progn `(progn
(define-condition ,keyword (gsl-condition ,@superclasses) (define-condition
,keyword ,(or superclasses '(gsl-condition))
((error-number :initform ,number :reader error-number :allocation :class) ((error-number :initform ,number :reader error-number :allocation :class)
(error-text :initform ,text :reader error-text :allocation :class)) (error-text :initform ,text :reader error-text :allocation :class))
(:documentation (:documentation
...@@ -64,7 +65,7 @@ ...@@ -64,7 +65,7 @@
(define-gsl-condition exceeded-maximum-iterations (define-gsl-condition exceeded-maximum-iterations
11 "Exceeded max number of iterations") 11 "Exceeded max number of iterations")
(define-gsl-condition gsl-division-by-zero (define-gsl-condition gsl-division-by-zero
12 "Tried to divide by zero" division-by-zero) 12 "Tried to divide by zero" gsl-condition division-by-zero)
(define-gsl-condition invalid-tolerance 13 "User specified an invalid tolerance") (define-gsl-condition invalid-tolerance 13 "User specified an invalid tolerance")
(define-gsl-condition failure-to-reach-tolerance (define-gsl-condition failure-to-reach-tolerance
14 "Failed to reach the specified tolerance") 14 "Failed to reach the specified tolerance")
...@@ -93,6 +94,7 @@ ...@@ -93,6 +94,7 @@
30 "Cannot reach the specified tolerance in X") 30 "Cannot reach the specified tolerance in X")
(define-gsl-condition failure-to-reach-tolerance-g (define-gsl-condition failure-to-reach-tolerance-g
31 "Cannot reach the specified tolerance in gradient") 31 "Cannot reach the specified tolerance in gradient")
;; not a subclass of gsl-condition
(define-gsl-condition gsl-eof 32 "End of file" end-of-file) (define-gsl-condition gsl-eof 32 "End of file" end-of-file)
;;; It is possible to return +positive-infinity+ ;;; It is possible to return +positive-infinity+
;;; by defining a handler for 'overflow. ;;; by defining a handler for 'overflow.
......
;; Mapping of element type names ;; Mapping of element type names
;; Liam Healy 2008-04-13 11:22:46EDT element-types.lisp ;; Liam Healy 2008-04-13 11:22:46EDT element-types.lisp
;; Time-stamp: <2008-11-11 21:34:47EST element-types.lisp> ;; Time-stamp: <2008-12-31 21:10:07EST element-types.lisp>
;; $Id$ ;; $Id$
;;; The different element type forms: ;;; The different element type forms:
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
:short :unsigned-short :short :unsigned-short
:int :unsigned-int :int :unsigned-int
:long :unsigned-long :long :unsigned-long
#-cffi-features:no-long-long #+int64
:long-long :long-long
#-cffi-features:no-long-long #+int64
:unsigned-long-long) :unsigned-long-long)
;; http://common-lisp.net/project/cffi/manual/html_node/Built_002dIn-Types.html ;; http://common-lisp.net/project/cffi/manual/html_node/Built_002dIn-Types.html
"List of integer types supported by CFFI, from the CFFI docs.") "List of integer types supported by CFFI, from the CFFI docs.")
...@@ -313,21 +313,3 @@ ...@@ -313,21 +313,3 @@
(:doubles *double-types*) (:doubles *double-types*)
(t element-types))) (t element-types)))
;;;;****************************************************************************
;;;; Types for CFFI (will eventually be in CFFI)
;;;;****************************************************************************
(defvar *sizet-type* nil
"The CL type for size_t.")
(case
(cffi:foreign-type-size :long)
(8
(push :sizet-64 *features*)
(setf *sizet-type* '(unsigned-byte 64))
(cffi:defctype sizet :uint64))
(4
(push :sizet-32 *features*)
(setf *sizet-type* '(unsigned-byte 32))
(cffi:defctype sizet :uint32))
(t (error "Size of :long unrecognized")))
;; Permissible types
;; Liam Healy 2008-12-31 21:06:34EST types.lisp
;; Time-stamp: <2008-12-31 21:52:33EST types.lisp>
;; $Id: $
(in-package :gsl)
;;;;****************************************************************************
;;;; Types for CFFI (will eventually be in CFFI)
;;;;****************************************************************************
(defvar *sizet-type* nil
"The CL type for size_t.")
(case
(cffi:foreign-type-size :long)
(8
(push :int64 *features*)
(setf *sizet-type* '(unsigned-byte 64))
(cffi:defctype sizet :uint64))
(4
(push :int32 *features*)
(setf *sizet-type* '(unsigned-byte 32))
(cffi:defctype sizet :uint32))
(t (error "Size of :long unrecognized")))
;; cffi-features:no-long-long doesn't work for me, but ought to be checked?
;; Mathematical functions ;; Mathematical functions
;; Liam Healy, Wed Mar 8 2006 - 22:09 ;; Liam Healy, Wed Mar 8 2006 - 22:09
;; Time-stamp: <2008-10-25 19:09:09EDT mathematical.lisp> ;; Time-stamp: <2008-12-31 18:44:26EST mathematical.lisp>
;; $Id$ ;; $Id$
(in-package :gsl) (in-package :gsl)
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
;;; Maximum and Minimum functions ;;; Maximum and Minimum functions
;;; Does CL need the small integer powers? ;;; Does CL need the small integer powers?
#+clisp (setf sys::*inhibit-floating-point-underflow* t)
;;;;**************************************************************************** ;;;;****************************************************************************
;;; Infinities and Not-a-number ;;; Infinities and Not-a-number
;;;;**************************************************************************** ;;;;****************************************************************************
......
...@@ -189,6 +189,7 @@ ...@@ -189,6 +189,7 @@
(CL-ARRAY (CL-ARRAY
(COLUMN COL M1 (COLUMN COL M1
1))))) 1)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(-68 52 -5))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -211,6 +212,7 @@ ...@@ -211,6 +212,7 @@
(CL-ARRAY (CL-ARRAY
(COLUMN COL M1 (COLUMN COL M1
1))))) 1)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215)) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST #(44 163 215))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))))) (161 215 98)))))
(CL-ARRAY (M+C M1 18.19d0))))) (CL-ARRAY (M+C M1 18.19d0)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-45 -49 89) (-72 70 8) (91 13 141))) (LIST #2A((-45 -49 89) (-72 70 8) (91 13 141)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -90,6 +91,7 @@ ...@@ -90,6 +91,7 @@
'((-64 -68 71) (-91 52 -10) '((-64 -68 71) (-91 52 -10)
(73 -5 123))))) (73 -5 123)))))
(CL-ARRAY (M+C M1 18.19d0))))) (CL-ARRAY (M+C M1 18.19d0)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((85 62 207) (134 181 158) (179 233 116))) (LIST #2A((85 62 207) (134 181 158) (179 233 116)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -154,6 +154,7 @@ ...@@ -154,6 +154,7 @@
'(3 3)))) '(3 3))))
(COPY M2 M1) (COPY M2 M1)
(CL-ARRAY M2)))) (CL-ARRAY M2))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123))) (LIST #2A((-64 -68 71) (-91 52 -10) (73 -5 123)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -167,6 +168,7 @@ ...@@ -167,6 +168,7 @@
'(3 3)))) '(3 3))))
(COPY M2 M1) (COPY M2 M1)
(CL-ARRAY M2)))) (CL-ARRAY M2))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((67 44 189) (116 163 140) (161 215 98))) (LIST #2A((67 44 189) (116 163 140) (161 215 98)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
'((28 10 19) (28 178 217) '((28 10 19) (28 178 217)
(36 109 222))))) (36 109 222)))))
(CL-ARRAY (M/ M1 M2))))) (CL-ARRAY (M/ M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1))) (LIST #2A((-2 -2 2) (-2 0 1) (-4 0 1)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -136,6 +137,7 @@ ...@@ -136,6 +137,7 @@
'((32 28 30) (37 -73 -8) '((32 28 30) (37 -73 -8)
(-15 -22 68))))) (-15 -22 68)))))
(CL-ARRAY (M/ M1 M2))))) (CL-ARRAY (M/ M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((2 4 9) (4 0 0) (4 1 0))) (LIST #2A((2 4 9) (4 0 0) (4 1 0)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
'((28 10 19) (28 178 217) '((28 10 19) (28 178 217)
(36 109 222))))) (36 109 222)))))
(CL-ARRAY (M+ M1 M2))))) (CL-ARRAY (M+ M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 191))) (LIST #2A((-32 -40 101) (-54 -21 -18) (58 -27 191)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -134,6 +135,7 @@ ...@@ -134,6 +135,7 @@
'((32 28 30) (37 -73 -8) '((32 28 30) (37 -73 -8)
(-15 -22 68))))) (-15 -22 68)))))
(CL-ARRAY (M+ M1 M2))))) (CL-ARRAY (M+ M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((95 54 208) (144 341 357) (197 324 320))) (LIST #2A((95 54 208) (144 341 357) (197 324 320)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -126,6 +126,7 @@ ...@@ -126,6 +126,7 @@
'((28 10 19) (28 178 217) '((28 10 19) (28 178 217)
(36 109 222))))) (36 109 222)))))
(CL-ARRAY (M- M1 M2))))) (CL-ARRAY (M- M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55))) (LIST #2A((-96 -96 41) (-128 125 -2) (88 17 55)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -140,6 +141,7 @@ ...@@ -140,6 +141,7 @@
'((32 28 30) (37 -73 -8) '((32 28 30) (37 -73 -8)
(-15 -22 68))))) (-15 -22 68)))))
(CL-ARRAY (M- M1 M2))))) (CL-ARRAY (M- M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((39 34 170) #2A((39 34 170)
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
(161 215 (161 215
98))))) 98)))))
(MAX-INDEX M1)))) (MAX-INDEX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 2)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -133,6 +134,7 @@ ...@@ -133,6 +134,7 @@
(73 -5 (73 -5
123))))) 123)))))
(MAX-INDEX M1)))) (MAX-INDEX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 2 1)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
(161 215 (161 215
98))))) 98)))))
(MMAX M1)))) (MMAX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 123)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -133,6 +134,7 @@ ...@@ -133,6 +134,7 @@
(73 -5 (73 -5
123))))) 123)))))
(MMAX M1)))) (MMAX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 215)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
...@@ -97,6 +97,7 @@ ...@@ -97,6 +97,7 @@
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))))) (161 215 98)))))
(MEAN M1)))) (MEAN M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 9.0d0)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -111,6 +112,7 @@ ...@@ -111,6 +112,7 @@
(73 -5 (73 -5
123))))) 123)))))
(MEAN M1)))) (MEAN M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST 132.55555555555554d0) (LIST 132.55555555555554d0)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
(161 215 (161 215
98))))) 98)))))
(MIN-INDEX M1)))) (MIN-INDEX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -133,6 +134,7 @@ ...@@ -133,6 +134,7 @@
(73 -5 (73 -5
123))))) 123)))))
(MIN-INDEX M1)))) (MIN-INDEX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
This diff is collapsed.
...@@ -127,6 +127,7 @@ ...@@ -127,6 +127,7 @@
98))))) 98)))))
(MINMAX-INDEX (MINMAX-INDEX
M1)))) M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 1 0 2 2)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -142,6 +143,7 @@ ...@@ -142,6 +143,7 @@
123))))) 123)))))
(MINMAX-INDEX (MINMAX-INDEX
M1)))) M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 0 1 2 1)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
(161 215 (161 215
98))))) 98)))))
(MINMAX M1)))) (MINMAX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST -91 123)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
...@@ -126,6 +127,7 @@ ...@@ -126,6 +127,7 @@
(73 -5 (73 -5
123))))) 123)))))
(MINMAX M1)))) (MINMAX M1))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215) (LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LIST 44 215)
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((M1 (LET ((M1
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
'((67 44 189) (116 163 140) '((67 44 189) (116 163 140)
(161 215 98))))) (161 215 98)))))
(CL-ARRAY (M*C M1 1.39d0))))) (CL-ARRAY (M*C M1 1.39d0)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 170))) (LIST #2A((-88 -94 98) (-126 72 -13) (101 -6 170)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -89,6 +90,7 @@ ...@@ -89,6 +90,7 @@
'((-64 -68 71) (-91 52 -10) '((-64 -68 71) (-91 52 -10)
(73 -5 123))))) (73 -5 123)))))
(CL-ARRAY (M*C M1 1.39d0))))) (CL-ARRAY (M*C M1 1.39d0)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST #2A((93 61 262) (161 226 194) (223 298 136))) (LIST #2A((93 61 262) (161 226 194) (223 298 136)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
'((28 10 19) (28 178 217) '((28 10 19) (28 178 217)
(36 109 222))))) (36 109 222)))))
(CL-ARRAY (M* M1 M2))))) (CL-ARRAY (M* M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((-2048 -1904 2130) #2A((-2048 -1904 2130)
...@@ -149,6 +150,7 @@ ...@@ -149,6 +150,7 @@
'((32 28 30) (37 -73 -8) '((32 28 30) (37 -73 -8)
(-15 -22 68))))) (-15 -22 68)))))
(CL-ARRAY (M* M1 M2))))) (CL-ARRAY (M* M1 M2)))))
#+int64
(LISP-UNIT::ASSERT-NUMERICAL-EQUAL (LISP-UNIT::ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#2A((1876 440 3591) #2A((1876 440 3591)
......
...@@ -111,6 +111,7 @@ ...@@ -111,6 +111,7 @@
(161 215 98))))) (161 215 98)))))
(SET-ALL M1 28) (SET-ALL M1 28)
(CL-ARRAY (M+ M1 M2))))) (CL-ARRAY (M+ M1 M2)))))