Commit 8e694be0 authored by Sumant Oemrawsingh's avatar Sumant Oemrawsingh
Browse files

Fixed FFT tests, both on- and off-stride.

For stride > 1 elements, the results are compared only on-stride, while
(for complex only) it is verified that off-stride elements are left alone.

Tests are still disabled due to time it takes to complete tests.

Tests are not yet complete wrt GSL's FFT tests.
parent 36517928
......@@ -22,6 +22,7 @@
(defvar *allowed-ticks* 1000000)
(defun off-stride (array stride)
"Make a grid that is all of the original array except that the
stride points are excluded."
......@@ -32,7 +33,19 @@
unless (zerop (mod i stride))
collect (grid:gref* array i))))
(defmacro fft-complex-result-check (form element-component-type)
(defun fft-complex-off-stride-check (vector stride offset)
(loop with size = (size vector)
for i from 0 below size
unless (zerop (mod i stride))
unless (lisp-unit:assert-numerical-equal
(complex (+ offset (* 2 i))
(+ offset (* 2 i) 1))
(grid:gref vector i))
return nil
(return t)))
(defmacro fft-complex-result-check (form element-component-type stride)
"T if all FFT tests pass."
(dft fft original fft-roundtrip fft-reverse)
......@@ -43,15 +56,29 @@
(lisp-unit:*measure* :infinity))
(when (> ,stride 1)
(fft-complex-off-stride-check fft ,stride 2000)
(fft-complex-off-stride-check fft-roundtrip ,stride 2000)
(fft-complex-off-stride-check fft-reverse ,stride 2000)
(setf dft (grid:stride dft ,stride)
fft (grid:stride fft ,stride)
original (grid:stride original ,stride)
fft-roundtrip (grid:stride fft-roundtrip ,stride)
fft-reverse (grid:stride fft-reverse ,stride)))
(lisp-unit:assert-norm-equal dft fft)
(lisp-unit:assert-norm-equal original fft-roundtrip)
(lisp-unit:assert-norm-equal original fft-reverse))))
(defmacro fft-real-result-check (form element-type)
(defmacro fft-real-result-check (form element-type stride)
"T if all FFT tests pass."
(dft fft original fft-roundtrip)
(progn (reset-urand) ,form)
(when (> ,stride 1)
(setf dft (grid:stride dft ,stride)
fft (grid:stride fft ,stride)
original (grid:stride original ,stride)
fft-roundtrip (grid:stride fft-roundtrip ,stride)))
(let ((lisp-unit:*epsilon*
(* *allowed-ticks*
,(if (eq element-type 'single-float)
......@@ -64,15 +91,15 @@
(eval-when (:compile-toplevel :load-toplevel :execute)
(defun fft-test-forms (size stride)
(test-fft-noise 'double-float ,size :stride ,stride) double-float)
(test-fft-noise 'double-float ,size :stride ,stride) double-float ,stride)
(test-fft-noise 'single-float ,size :stride ,stride) single-float)
(test-fft-noise 'single-float ,size :stride ,stride) single-float ,stride)
'(complex double-float) ,size :stride ,stride) double-float)
'(complex double-float) ,size :stride ,stride) double-float ,stride)
'(complex single-float) ,size :stride ,stride) single-float))))
'(complex single-float) ,size :stride ,stride) single-float ,stride))))
(defmacro all-fft-test-forms (size-max stride-max &optional additional-single-stride)
`(lisp-unit:define-test fast-fourier-transform
......@@ -86,5 +113,5 @@
(fft-test-forms size 1)))))
;;; (all-fft-test-forms 9 3 (64 99))
;;; (all-fft-test-forms 20 3)
;;; Tests commented out because they come out not so good.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment