Commit 43f24411 authored by Liam Healy's avatar Liam Healy
Browse files

New size-vector-scalar replaces size-vector-real

New function size-vector-scalar replaces size-vector-real, and gives
the size as a double float if the array is real, and as the element
type if it is complex, in order to be acceptable to the elt* interface
to GSL's _scale routines.
parent 70390e05
;; Example FFT: transform a pulse (using the "clean" fft interface)
;; Sumant Oemrawsingh, Sat Oct 31 2009 - 00:24
;; Time-stamp: <2010-08-14 16:08:02EDT example.lisp>
;; Time-stamp: <2010-08-21 17:25:00EDT example.lisp>
;; Copyright 2009 Sumant Oemrawsingh, Liam M. Healy
;; Distributed under the terms of the GNU General Public License
......@@ -97,12 +97,15 @@
(realpart (grid:gref complex-vector i))))
(defun size-vector-real (vector &key (stride 1))
(defun size-vector-scalar (vector &key (stride 1))
"Return the size of a vector while taking the stride into account."
(coerce (floor (size vector) stride) 'double-float))
(coerce (floor (size vector) stride)
(if (subtypep (element-type vector) 'complex)
(element-type vector)
(defun vector/length (vector stride)
(elt/ vector (size-vector-real vector :stride stride)))
(elt/ vector (size-vector-scalar vector :stride stride)))
(defun test-real-fft-noise (vector &key (stride 1))
"Test forward and inverse FFT for a real vector, and return both results in unpacked form."
......@@ -139,7 +142,7 @@
random-vector ; The original vector for reference
inverse ; The inverse FFT applied to the forward result
(if (and (have-at-least-gsl-version '(1 12)) #+fsbv t #-fsbv nil)
(elt/ (copy backward) (size-vector-real backward :stride stride))
(elt/ (copy backward) (size-vector-scalar backward :stride stride))
;; Hack for old GSL version without complex vector math
(element-type backward)
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