re-added radix 3 butterfly

This commit is contained in:
Mark Borgerding
2003-10-30 02:02:29 +00:00
parent ca4c74e07c
commit d4f87befda
4 changed files with 81 additions and 25 deletions

View File

@ -1,11 +1,10 @@
ifeq "$(NFFT)" ""
NFFT=1024
NFFT=1024
endif
ifeq "$(NUMFFTS)" ""
NUMFFTS=10000
NUMFFTS=10000
endif
UTILSRC=../kiss_fft.c fftutil.c
@ -13,7 +12,7 @@ UTILSRC=../kiss_fft.c fftutil.c
CFLAGS=-Wall -O3 -lm -I.. -ansi -pedantic
ifeq "$(DATATYPE)" ""
DATATYPE=float
DATATYPE=float
endif
UTIL=fftutil_$(DATATYPE)
@ -21,9 +20,9 @@ UTIL=fftutil_$(DATATYPE)
all: $(UTIL)
ifeq "$(DATATYPE)" "short"
TYPEFLAGS=-DFIXED_POINT -Dkiss_fft_scalar=short
TYPEFLAGS=-DFIXED_POINT -Dkiss_fft_scalar=short
else
TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE)
TYPEFLAGS=-Dkiss_fft_scalar=$(DATATYPE)
endif
$(UTIL): $(UTILSRC)
@ -47,7 +46,7 @@ time: all $(RANDDAT)
POW2=256 512 1024 2048
POW3=243 729 2187
mtime: all
@for n in $(POW2) $(POW3) ;do \
@for n in $(POW3) ;do \
export NFFT=$$n;make time; \
done
@ -56,7 +55,7 @@ snr: all
@echo
@echo "### testing SNR for $(NFFT) point FFTs"
@echo "#### $(DATATYPE)"
@echo "testkiss($(NFFT),'$(DATATYPE)',1,1/$(NFFT));" | octave -q
@echo "testkiss( $(NFFT) , '$(DATATYPE)' );" | octave -q
test: snr time

View File

@ -1,11 +1,11 @@
function snr= testkiss( nfft , prec ,scale_t2f ,scale_f2t )
if nargin<1, nfft=1024
endif
if nargin<2, prec='float'
endif
if nargin<3, scale_t2f=1
endif
if nargin<4, scale_f2t=1
function snr= testkiss( nfft , prec )
if strcmp( prec ,'short')
scale_t2f=nfft;
scale_f2t=nfft;
else
scale_t2f=1;
scale_f2t=1/nfft;
endif
kfft= sprintf('./fftutil_%s',prec);