Skip to content
Snippets Groups Projects
Commit 7e3732ef authored by Liam Healy's avatar Liam Healy
Browse files

Conditionalize some 64 bit tests

Some 64 bit vector and matrix tests were not conditionalized; add the
#+int64 conditionals.
parent 2e40d74e
Branches
Tags
No related merge requests found
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
(MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS (MAKE-MARRAY '(UNSIGNED-BYTE 32) :DIMENSIONS
'(3 3)))) '(3 3))))
(CL-ARRAY (SET-ALL M1 67))))) (CL-ARRAY (SET-ALL M1 67)))))
#+int64
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64))) (LIST #2A((-64 -64 -64) (-64 -64 -64) (-64 -64 -64)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
...@@ -95,6 +96,7 @@ ...@@ -95,6 +96,7 @@
(MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS
'(3 3)))) '(3 3))))
(CL-ARRAY (SET-ALL M1 -64))))) (CL-ARRAY (SET-ALL M1 -64)))))
#+int64
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST #2A((67 67 67) (67 67 67) (67 67 67))) (LIST #2A((67 67 67) (67 67 67) (67 67 67)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
......
...@@ -3,125 +3,127 @@ ...@@ -3,125 +3,127 @@
(in-package :gsl) (in-package :gsl)
(LISP-UNIT:DEFINE-TEST VECTOR-ADD (LISP-UNIT:DEFINE-TEST VECTOR-ADD
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS
'(-43.43 42.36 -2.8600001))) '(-43.43 42.36 -2.8600001)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS
'(-34.5 8.24 3.29))) '(-34.5 8.24 3.29)))
(V2 (V2
(MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'SINGLE-FLOAT :INITIAL-CONTENTS
'(-8.93 34.12 -6.15)))) '(-8.93 34.12 -6.15))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
'(-43.43d0 42.36d0 '(-43.43d0 42.36d0
-2.8600000000000003d0))) -2.8600000000000003d0)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
'(-34.5d0 8.24d0 3.29d0))) '(-34.5d0 8.24d0 3.29d0)))
(V2 (V2
(MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS (MAKE-MARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS
'(-8.93d0 34.12d0 -6.15d0)))) '(-8.93d0 34.12d0 -6.15d0))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS
'(101 -16 61))) '(101 -16 61)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS
'(-64 -68 71))) '(-64 -68 71)))
(V2 (V2
(MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 8) :INITIAL-CONTENTS
'(-91 52 -10)))) '(-91 52 -10))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 8) :INITIAL-CONTENTS
'(183 207 73))) '(183 207 73)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(UNSIGNED-BYTE 8) (MAKE-MARRAY '(UNSIGNED-BYTE 8)
:INITIAL-CONTENTS '(67 44 189))) :INITIAL-CONTENTS '(67 44 189)))
(V2 (V2
(MAKE-MARRAY '(UNSIGNED-BYTE 8) (MAKE-MARRAY '(UNSIGNED-BYTE 8)
:INITIAL-CONTENTS '(116 163 140)))) :INITIAL-CONTENTS '(116 163 140))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 16) :INITIAL-CONTENTS
'(-155 -16 61))) '(-155 -16 61)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(SIGNED-BYTE 16) (MAKE-MARRAY '(SIGNED-BYTE 16)
:INITIAL-CONTENTS '(-64 -68 71))) :INITIAL-CONTENTS '(-64 -68 71)))
(V2 (V2
(MAKE-MARRAY '(SIGNED-BYTE 16) (MAKE-MARRAY '(SIGNED-BYTE 16)
:INITIAL-CONTENTS '(-91 52 -10)))) :INITIAL-CONTENTS '(-91 52 -10))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 16) :INITIAL-CONTENTS
'(183 207 329))) '(183 207 329)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(UNSIGNED-BYTE 16) (MAKE-MARRAY '(UNSIGNED-BYTE 16)
:INITIAL-CONTENTS '(67 44 189))) :INITIAL-CONTENTS '(67 44 189)))
(V2 (V2
(MAKE-MARRAY '(UNSIGNED-BYTE 16) (MAKE-MARRAY '(UNSIGNED-BYTE 16)
:INITIAL-CONTENTS '(116 163 140)))) :INITIAL-CONTENTS '(116 163 140))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS (MAKE-MARRAY '(SIGNED-BYTE 32) :INITIAL-CONTENTS
'(-155 -16 61))) '(-155 -16 61)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(SIGNED-BYTE 32) (MAKE-MARRAY '(SIGNED-BYTE 32)
:INITIAL-CONTENTS '(-64 -68 71))) :INITIAL-CONTENTS '(-64 -68 71)))
(V2 (V2
(MAKE-MARRAY '(SIGNED-BYTE 32) (MAKE-MARRAY '(SIGNED-BYTE 32)
:INITIAL-CONTENTS '(-91 52 -10)))) :INITIAL-CONTENTS '(-91 52 -10))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
(MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS (MAKE-MARRAY '(UNSIGNED-BYTE 32) :INITIAL-CONTENTS
'(183 207 329))) '(183 207 329)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(UNSIGNED-BYTE 32) (MAKE-MARRAY '(UNSIGNED-BYTE 32)
:INITIAL-CONTENTS '(67 44 189))) :INITIAL-CONTENTS '(67 44 189)))
(V2 (V2
(MAKE-MARRAY '(UNSIGNED-BYTE 32) (MAKE-MARRAY '(UNSIGNED-BYTE 32)
:INITIAL-CONTENTS '(116 163 140)))) :INITIAL-CONTENTS '(116 163 140))))
(ELT+ V1 V2)))) (ELT+ V1 V2))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL #+int64
(LIST (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS (LIST
'(-155 -16 61))) (MAKE-MARRAY '(SIGNED-BYTE 64) :INITIAL-CONTENTS
(MULTIPLE-VALUE-LIST '(-155 -16 61)))
(LET ((V1 (MULTIPLE-VALUE-LIST
(MAKE-MARRAY '(SIGNED-BYTE 64) (LET ((V1
:INITIAL-CONTENTS '(-64 -68 71))) (MAKE-MARRAY '(SIGNED-BYTE 64)
(V2 :INITIAL-CONTENTS '(-64 -68 71)))
(MAKE-MARRAY '(SIGNED-BYTE 64) (V2
:INITIAL-CONTENTS '(-91 52 -10)))) (MAKE-MARRAY '(SIGNED-BYTE 64)
(ELT+ V1 V2)))) :INITIAL-CONTENTS '(-91 52 -10))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (ELT+ V1 V2))))
(LIST #+int64
(MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
'(183 207 329))) (LIST
(MULTIPLE-VALUE-LIST (MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS
(LET ((V1 '(183 207 329)))
(MAKE-MARRAY '(UNSIGNED-BYTE 64) (MULTIPLE-VALUE-LIST
:INITIAL-CONTENTS '(67 44 189))) (LET ((V1
(V2 (MAKE-MARRAY '(UNSIGNED-BYTE 64)
(MAKE-MARRAY '(UNSIGNED-BYTE 64) :INITIAL-CONTENTS '(67 44 189)))
:INITIAL-CONTENTS '(116 163 140)))) (V2
(ELT+ V1 V2))))) (MAKE-MARRAY '(UNSIGNED-BYTE 64)
:INITIAL-CONTENTS '(116 163 140))))
(ELT+ V1 V2)))))
...@@ -3,120 +3,109 @@ ...@@ -3,120 +3,109 @@
(in-package :gsl) (in-package :gsl)
(LISP-UNIT:DEFINE-TEST VECTOR-SET-ALL (LISP-UNIT:DEFINE-TEST VECTOR-SET-ALL
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST #(-34.5 -34.5 -34.5)) (LIST #(-34.5 -34.5 -34.5))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3))) (LET ((V1 (MAKE-MARRAY 'SINGLE-FLOAT :DIMENSIONS '3)))
(CL-ARRAY (SET-ALL V1 -34.5))))) (CL-ARRAY (SET-ALL V1 -34.5)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST #(-34.5d0 -34.5d0 -34.5d0)) (LIST #(-34.5d0 -34.5d0 -34.5d0))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3))) (LET ((V1 (MAKE-MARRAY 'DOUBLE-FLOAT :DIMENSIONS '3)))
(CL-ARRAY (SET-ALL V1 -34.5d0))))) (CL-ARRAY (SET-ALL V1 -34.5d0)))))
#+fsbv #+fsbv
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST #(#C(-34.5 8.24) #C(-34.5 8.24) #C(-34.5 8.24))) (LIST #(#C(-34.5 8.24) #C(-34.5 8.24) #C(-34.5 8.24)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(COMPLEX SINGLE-FLOAT) (MAKE-MARRAY '(COMPLEX SINGLE-FLOAT)
:DIMENSIONS '3))) :DIMENSIONS '3)))
(CL-ARRAY (SET-ALL V1 #C(-34.5 8.24)))))) (CL-ARRAY (SET-ALL V1 #C(-34.5 8.24))))))
#+fsbv #+fsbv
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LIST (LIST
#(#C(-34.5d0 8.24d0) #C(-34.5d0 8.24d0) #(#C(-34.5d0 8.24d0) #C(-34.5d0 8.24d0)
#C(-34.5d0 8.24d0))) #C(-34.5d0 8.24d0)))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT) (MAKE-MARRAY '(COMPLEX DOUBLE-FLOAT)
:DIMENSIONS '3))) :DIMENSIONS '3)))
(CL-ARRAY (SET-ALL V1 #C(-34.5d0 8.24d0)))))) (CL-ARRAY (SET-ALL V1 #C(-34.5d0 8.24d0))))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE '(SIGNED-BYTE
8) 8)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
-64))))) -64)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
8) 8)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
67))))) 67)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE '(SIGNED-BYTE
16) 16)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
-64))))) -64)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
16) 16)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
67))))) 67)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(SIGNED-BYTE '(SIGNED-BYTE
32) 32)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
-64))))) -64)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67))
(MULTIPLE-VALUE-LIST (MULTIPLE-VALUE-LIST
(LET ((V1 (LET ((V1
(MAKE-MARRAY (MAKE-MARRAY
'(UNSIGNED-BYTE '(UNSIGNED-BYTE
32) 32)
:DIMENSIONS :DIMENSIONS
'3))) '3)))
(CL-ARRAY (CL-ARRAY
(SET-ALL V1 (SET-ALL V1
67))))) 67)))))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(-64 -64 -64)) #+int64
(MULTIPLE-VALUE-LIST (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(LET ((V1 (LIST #(-64 -64 -64))
(MAKE-MARRAY (MULTIPLE-VALUE-LIST
'(SIGNED-BYTE (LET ((V1 (MAKE-MARRAY '(SIGNED-BYTE 64) :DIMENSIONS '3)))
64) (CL-ARRAY (SET-ALL V1 -64)))))
:DIMENSIONS #+int64
'3))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL
(CL-ARRAY (LIST #(67 67 67))
(SET-ALL V1 (MULTIPLE-VALUE-LIST
-64))))) (LET ((V1 (MAKE-MARRAY '(UNSIGNED-BYTE 64) :DIMENSIONS '3)))
(LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(67 67 67)) (CL-ARRAY (SET-ALL V1 67))))))
(MULTIPLE-VALUE-LIST
(LET ((V1
(MAKE-MARRAY
'(UNSIGNED-BYTE
64)
:DIMENSIONS
'3)))
(CL-ARRAY
(SET-ALL V1
67))))))
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment