From 6aec67c2bf8626f3fc391aadc9d8652a978a763a Mon Sep 17 00:00:00 2001 From: Liam Healy <liam@thinkpad.local> Date: Wed, 7 Jul 2010 23:36:46 -0400 Subject: [PATCH] Fix polynomial and numerical-integration tests Fix polynomial and numerical-integration tests by initializing with double-floats. --- tests/numerical-integration.lisp | 9 ++-- tests/polynomial.lisp | 89 ++++++++++++++------------------ 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/tests/numerical-integration.lisp b/tests/numerical-integration.lisp index 36222eb7..66790d8e 100644 --- a/tests/numerical-integration.lisp +++ b/tests/numerical-integration.lisp @@ -222,10 +222,11 @@ (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST 52.740806116727164d0 1.7557038486870624d-4) (MULTIPLE-VALUE-LIST - (INTEGRATION-QAGP 'INTEGRATION-TEST-F454 - (grid:COPY-to - (VECTOR 0.0d0 1.0d0 (SQRT 2.0d0) 3.0d0)) - 0.0d0 0.001d0 1000))) + (INTEGRATION-QAGP + 'INTEGRATION-TEST-F454 + (grid:make-foreign-array + 'double-float :initial-contents (list 0.0d0 1.0d0 (SQRT 2.0d0) 3.0d0)) + 0.0d0 0.001d0 1000))) (let ((lisp-unit:*epsilon* 1.0d-9)) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST -0.08994400695837003d0 1.18529017636488d-6) diff --git a/tests/polynomial.lisp b/tests/polynomial.lisp index c1ce2534..d5033045 100644 --- a/tests/polynomial.lisp +++ b/tests/polynomial.lisp @@ -80,21 +80,21 @@ '(-1.0d0 0.0d0 0.0d0 0.0d0 0.0d0 1.0d0)))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL - (LIST 1.3250000029802322d0) + (LIST 1.325d0) (MULTIPLE-VALUE-LIST (EVALUATE (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS - '(1 0.5 0.3)) + '(1.0d0 0.5d0 0.3d0)) 0.5d0))) - (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST 1.0d0) - (MULTIPLE-VALUE-LIST - (EVALUATE - (GRID:MAKE-FOREIGN-ARRAY - 'DOUBLE-FLOAT - :INITIAL-CONTENTS - '(1 -1 1 -1 1 -1 1 - -1 1 -1 1)) - 1.0d0))) + (LISP-UNIT:ASSERT-NUMERICAL-EQUAL + (LIST 1.0d0) + (MULTIPLE-VALUE-LIST + (EVALUATE + (GRID:MAKE-FOREIGN-ARRAY + 'DOUBLE-FLOAT + :INITIAL-CONTENTS + '(1.0d0 -1.0d0 1.0d0 -1.0d0 1.0d0 -1.0d0 1.0d0 -1.0d0 1.0d0 -1.0d0 1.0d0)) + 1.0d0))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST (LIST) (LIST)) (MULTIPLE-VALUE-LIST (SOLVE-QUADRATIC @@ -226,8 +226,9 @@ (MULTIPLE-VALUE-LIST (grid:COPY-to (POLYNOMIAL-SOLVE - (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS - '(-120 274 -225 85 -15 1.0)))))) + (GRID:MAKE-FOREIGN-ARRAY + 'DOUBLE-FLOAT :INITIAL-CONTENTS + '(-120.0d0 274.0d0 -225.0d0 85.0d0 -15.0d0 1.0d0)))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST #(#C(-0.8660254037844393d0 0.49999999999999983d0) @@ -241,43 +242,31 @@ (MULTIPLE-VALUE-LIST (grid:COPY-to (POLYNOMIAL-SOLVE - (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS - '(1 0 0 0 1 0 0 0 1)))))) + (GRID:MAKE-FOREIGN-ARRAY + 'DOUBLE-FLOAT :INITIAL-CONTENTS + '(1.0d0 0.0d0 0.0d0 0.0d0 1.0d0 0.0d0 0.0d0 0.0d0 1.0d0)))))) (LISP-UNIT:ASSERT-NUMERICAL-EQUAL (LIST - (LIST - #(0.7300000190734863d0 0.4691357779404764d0 - -0.043473715982275014d0 0.026868123371519625d0 - -0.0032293849799736804d0 0.0061276698885453776d0 - -0.006454056591950834d0) - #(0.7300000190734863d0 1.1100000143051147d0 - 1.4900000095367432d0 1.840000033378601d0 - 2.299999952316284d0 2.4100000858306885d0 - 3.069999933242798d0) - #(0.7300000190734866d0 1.110000014305115d0 - 1.4900000095367432d0 1.840000033378601d0 - 2.299999952316284d0 2.4100000858306885d0 - 3.069999933242798d0))) - (MULTIPLE-VALUE-LIST - (LET* ((XA - (GRID:MAKE-FOREIGN-ARRAY 'DOUBLE-FLOAT :INITIAL-CONTENTS - '(0.16 0.97 1.94 2.74 3.58 3.73 - 4.7))) - (YA - (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))) - (LIST (grid:COPY-to DD) - (MAP 'VECTOR - (LAMBDA (X) - (EVALUATE XA X :DIVIDED-DIFFERENCE DD)) - (grid:COPY-to XA)) - (MAP 'VECTOR - (LAMBDA (X) - (EVALUATE - (TAYLOR-DIVIDED-DIFFERENCE 1.5d0 DD - XA) - (- X 1.5d0))) - (grid:COPY-to XA))))))) + #(0.73d0 1.11d0 1.4900000000000002d0 1.84d0 2.3d0 2.41d0 3.07d0) + #(0.73d0 1.11d0 1.49d0 1.84d0 2.3d0 2.41d0 3.069999999999999d0)) + (LET* ((XA + (GRID:MAKE-FOREIGN-ARRAY + 'DOUBLE-FLOAT :INITIAL-CONTENTS + '(0.16d0 0.97d0 1.94d0 2.74d0 3.58d0 3.73d0 4.7d0))) + (YA + (GRID:MAKE-FOREIGN-ARRAY + 'DOUBLE-FLOAT :INITIAL-CONTENTS + '(0.73d0 1.11d0 1.49d0 1.84d0 2.3d0 2.41d0 3.07d0))) + (DD (DIVIDED-DIFFERENCE XA YA))) + (list + (MAP 'VECTOR + (LAMBDA (X) + (EVALUATE XA X :DIVIDED-DIFFERENCE DD)) + (grid:COPY-to XA)) + (MAP 'VECTOR + (LAMBDA (X) + (EVALUATE + (TAYLOR-DIVIDED-DIFFERENCE 1.5d0 DD XA) + (- X 1.5d0))) + (grid:COPY-to XA)))))) -- GitLab