[nfft] 01/01: Imported Upstream version 3.3.1~rc1
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Apr 11 18:58:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch upstream/latest
in repository nfft.
commit 8f756e75db1fb6245334c292737678970f0de8e3
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Apr 11 07:55:05 2016 +0100
Imported Upstream version 3.3.1~rc1
---
.gitignore | 118 ++++++++++++++++
.travis.yml | 38 ++++++
3rdparty/cstripack/cstripack.c | 2 +-
3rdparty/cstripack/cstripack.h | 2 +-
ChangeLog | 10 ++
Makefile.am | 1 -
README | 119 +---------------
README.md | 150 +++++++++++++++++++++
applications/doxygen.c | 4 +-
applications/fastgauss/Makefile.am | 2 -
applications/fastgauss/fastgauss.c.in | 4 +-
applications/fastgauss/levelplots.m | 4 +-
applications/fastgauss/output_error.m | 4 +-
applications/fastgauss/output_error_p.m | 4 +-
applications/fastgauss/show_results.m | 4 +-
applications/fastsum/Makefile.am | 2 -
applications/fastsum/fastsum.c | 4 +-
applications/fastsum/fastsum.h | 4 +-
applications/fastsum/fastsum.m | 4 +-
applications/fastsum/fastsum_benchomp.c | 32 ++++-
.../fastsum/fastsum_benchomp_createdataset.c | 4 +-
applications/fastsum/fastsum_benchomp_detail.c | 4 +-
applications/fastsum/fastsum_matlab.c | 4 +-
applications/fastsum/fastsum_test.c | 4 +-
applications/fastsum/fastsum_test.m | 4 +-
applications/fastsum/kernels.c | 4 +-
applications/fastsum/kernels.h | 4 +-
applications/fastsumS2/Makefile.am | 2 -
applications/fastsumS2/doxygen.h | 4 +-
applications/fastsumS2/fastsumS2.c | 4 +-
applications/fastsumS2/fastsumS2.m | 6 +-
applications/fastsumS2/readTestcase.m | 4 +-
applications/fastsumS2/writeTestcase.m | 4 +-
applications/iterS2/Makefile.am | 2 -
applications/iterS2/doxygen.h | 4 +-
applications/iterS2/iterS2.c | 11 +-
applications/iterS2/writeImageTestcase.m | 6 +-
applications/iterS2/writeTestcase.m | 6 +-
applications/mri/doxygen.c | 4 +-
applications/mri/mri2d/Makefile.am | 2 -
applications/mri/mri2d/construct_data_2d.c | 4 +-
applications/mri/mri2d/construct_data_inh_2d1d.c | 4 +-
applications/mri/mri2d/construct_data_inh_3d.c | 4 +-
applications/mri/mri2d/construct_inh.m | 4 +-
applications/mri/mri2d/construct_knots_linogram.m | 4 +-
applications/mri/mri2d/construct_knots_radial.m | 4 +-
applications/mri/mri2d/construct_knots_rose.m | 4 +-
applications/mri/mri2d/construct_knots_spiral.m | 4 +-
applications/mri/mri2d/construct_readout_time.m | 3 +-
applications/mri/mri2d/doxygen.h | 4 +-
applications/mri/mri2d/mri.m | 3 +-
applications/mri/mri2d/mri_inh.m | 3 +-
applications/mri/mri2d/phantom.m | 4 +-
applications/mri/mri2d/precompute_weights.m | 4 +-
applications/mri/mri2d/reconstruct_data_2d.c | 4 +-
applications/mri/mri2d/reconstruct_data_gridding.c | 4 +-
applications/mri/mri2d/reconstruct_data_inh_2d1d.c | 4 +-
applications/mri/mri2d/reconstruct_data_inh_3d.c | 4 +-
.../mri/mri2d/reconstruct_data_inh_nnfft.c | 4 +-
applications/mri/mri2d/rms.m | 3 +-
applications/mri/mri2d/verschiebung.m | 4 +-
applications/mri/mri2d/visualize_data.m | 4 +-
applications/mri/mri3d/Makefile.am | 2 -
applications/mri/mri3d/construct_data_2d1d.c | 4 +-
applications/mri/mri3d/construct_data_3d.c | 4 +-
applications/mri/mri3d/construct_knots_linogram.m | 4 +-
applications/mri/mri3d/construct_knots_radial.m | 4 +-
applications/mri/mri3d/construct_knots_radial_3d.m | 4 +-
applications/mri/mri3d/construct_knots_rose.m | 4 +-
applications/mri/mri3d/construct_knots_spiral.m | 4 +-
applications/mri/mri3d/construct_phantom.m | 4 +-
applications/mri/mri3d/doxygen.h | 4 +-
applications/mri/mri3d/mri.m | 3 +-
applications/mri/mri3d/precompute_weights_2d.m | 4 +-
applications/mri/mri3d/reconstruct_data_2d1d.c | 4 +-
applications/mri/mri3d/reconstruct_data_3d.c | 4 +-
applications/mri/mri3d/reconstruct_data_gridding.c | 4 +-
applications/mri/mri3d/rms.m | 3 +-
applications/mri/mri3d/visualize_data.m | 3 +-
applications/polarFFT/Makefile.am | 2 -
applications/polarFFT/doxygen.h | 4 +-
applications/polarFFT/fft_test.m | 4 +-
applications/polarFFT/linogram_fft_test.c.in | 4 +-
applications/polarFFT/mpolar_fft_test.c.in | 4 +-
applications/polarFFT/phantom.m | 4 +-
applications/polarFFT/polar_fft_test.c.in | 4 +-
applications/quadratureS2/Makefile.am | 2 -
applications/quadratureS2/doxygen.h | 4 +-
applications/quadratureS2/lgwt.m | 4 +-
applications/quadratureS2/plotGrid.m | 6 +-
applications/quadratureS2/quadratureS2.c | 4 +-
applications/quadratureS2/quadratureS2.m | 6 +-
applications/quadratureS2/readTestcase.m | 6 +-
applications/quadratureS2/writeTestcase.m | 6 +-
applications/quadratureS2/writeWeights.m | 6 +-
applications/radon/Makefile.am | 2 -
applications/radon/inverse_radon.c.in | 4 +-
applications/radon/phantom.m | 4 +-
applications/radon/radon.c.in | 4 +-
applications/radon/radon.m | 3 +-
applications/radon/ridgelet.m | 3 +-
bootstrap.sh | 2 -
configure.ac | 15 ++-
doxygen.dox | 4 +-
doxygen/Makefile.am | 2 -
examples/doxygen.c | 4 +-
examples/fpt/Makefile.am | 2 -
examples/fpt/simple_test.c | 4 +-
examples/mri/Makefile.am | 2 -
examples/nfct/Makefile.am | 2 -
examples/nfct/simple_test.c.in | 4 +-
examples/nfft/Makefile.am | 2 -
examples/nfft/flags.c | 4 +-
examples/nfft/flags.m | 4 +-
examples/nfft/ndft_fast.c | 4 +-
examples/nfft/ndft_fast.m | 4 +-
examples/nfft/nfft_benchomp.c | 28 +++-
examples/nfft/nfft_benchomp_createdataset.c | 4 +-
examples/nfft/nfft_benchomp_detail.c | 4 +-
examples/nfft/nfft_times.c | 4 +-
examples/nfft/simple_test.c.in | 4 +-
examples/nfft/simple_test_threads.c.in | 4 +-
examples/nfft/taylor_nfft.c | 4 +-
examples/nfft/taylor_nfft.m | 5 +-
examples/nfsft/Makefile.am | 2 -
examples/nfsft/nfsft_benchomp.c | 22 ++-
examples/nfsft/nfsft_benchomp_createdataset.c | 4 +-
examples/nfsft/nfsft_benchomp_detail.c | 4 +-
examples/nfsft/simple_test.c | 4 +-
examples/nfsft/simple_test_threads.c | 4 +-
examples/nfsoft/Makefile.am | 2 -
examples/nfsoft/simple_test.c | 4 +-
examples/nfst/Makefile.am | 2 -
examples/nfst/simple_test.c.in | 4 +-
examples/nnfft/Makefile.am | 2 -
examples/nnfft/accuracy.c | 4 +-
examples/nnfft/accuracy.m | 4 +-
examples/nnfft/simple_test.c | 6 +-
examples/nsfft/Makefile.am | 2 -
examples/nsfft/nsfft_test.c | 4 +-
examples/nsfft/simple_test.c | 4 +-
examples/solver/Makefile.am | 2 -
examples/solver/doxygen.h | 4 +-
examples/solver/glacier.c.in | 4 +-
examples/solver/glacier.m | 4 +-
examples/solver/glacier_cv.m | 4 +-
examples/solver/simple_test.c.in | 4 +-
include/api.h | 4 +-
include/infft.h | 29 ++--
include/nfft3.h | 4 +-
include/nfft3mp.h | 2 -
include/solver_adjoint.h | 4 +-
include/ticks.h.in | 4 +-
kernel/fpt/Makefile.am | 2 -
kernel/fpt/fpt.c | 14 +-
kernel/fpt/fpt.h | 4 +-
kernel/mri/mri.c | 6 +-
kernel/nfct/nfct.c | 4 +-
kernel/nfft/nfft.c | 20 ++-
kernel/nfsft/Makefile.am | 2 -
kernel/nfsft/api.h | 4 +-
kernel/nfsft/legendre.c | 4 +-
kernel/nfsft/legendre.h | 4 +-
kernel/nfsft/nfsft.c | 8 +-
kernel/nfsoft/Makefile.am | 2 -
kernel/nfsoft/nfsoft.c | 4 +-
kernel/nfsoft/wigner.c | 4 +-
kernel/nfsoft/wigner.h | 4 +-
kernel/nfst/nfst.c | 4 +-
kernel/nnfft/nnfft.c | 4 +-
kernel/nsfft/nsfft.c | 4 +-
kernel/solver/solver.c | 4 +-
kernel/util/assert.c | 4 +-
kernel/util/bessel_i0.c | 4 +-
kernel/util/bspline.c | 7 +-
kernel/util/damp.c | 4 +-
kernel/util/error.c | 4 +-
kernel/util/float.c | 4 +-
kernel/util/int.c | 43 +++++-
kernel/util/lambda.c | 4 +-
kernel/util/malloc.c | 4 +-
kernel/util/print.c | 4 +-
kernel/util/rand.c | 4 +-
kernel/util/sinc.c | 4 +-
kernel/util/sort.c | 4 +-
kernel/util/thread.c | 4 +-
kernel/util/time.c | 4 +-
kernel/util/vector1.c | 4 +-
kernel/util/vector2.c | 4 +-
kernel/util/vector3.c | 4 +-
kernel/util/voronoi.c | 4 +-
kernel/util/window.c | 4 +-
m4/ax_lib_fftw3.m4 | 23 +++-
m4/ax_prog_matlab.m4 | 121 +++++++++--------
matlab/Makefile.am | 2 -
matlab/args.c | 4 +-
matlab/imex.h | 4 +-
matlab/malloc.c | 4 +-
matlab/nfft/FFTW_ESTIMATE.m | 6 +-
matlab/nfft/FFTW_MEASURE.m | 6 +-
matlab/nfft/FFT_OUT_OF_PLACE.m | 6 +-
matlab/nfft/FG_PSI.m | 6 +-
matlab/nfft/Makefile.am | 2 -
matlab/nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m | 6 +-
matlab/nfft/PRE_FG_PSI.m | 6 +-
matlab/nfft/PRE_FULL_PSI.m | 6 +-
matlab/nfft/PRE_LIN_PSI.m | 6 +-
matlab/nfft/PRE_PHI_HUT.m | 6 +-
matlab/nfft/PRE_PSI.m | 6 +-
matlab/nfft/ndft_adjoint.m | 6 +-
matlab/nfft/ndft_trafo.m | 6 +-
matlab/nfft/nfft.m | 2 +-
matlab/nfft/nfft_adjoint.m | 6 +-
matlab/nfft/nfft_finalize.m | 6 +-
matlab/nfft/nfft_get_f.m | 6 +-
matlab/nfft/nfft_get_f_hat.m | 6 +-
matlab/nfft/nfft_get_num_threads.m | 6 +-
matlab/nfft/nfft_get_x.m | 6 +-
matlab/nfft/nfft_init_1d.m | 6 +-
matlab/nfft/nfft_init_2d.m | 6 +-
matlab/nfft/nfft_init_3d.m | 6 +-
matlab/nfft/nfft_init_guru.m | 6 +-
matlab/nfft/nfft_precompute_psi.m | 6 +-
matlab/nfft/nfft_set_f.m | 6 +-
matlab/nfft/nfft_set_f_hat.m | 6 +-
matlab/nfft/nfft_set_x.m | 6 +-
matlab/nfft/nfft_trafo.m | 6 +-
matlab/nfft/nfftmex.c | 4 +-
matlab/nfft/nfftmex.m | 6 +-
matlab/nfft/simple_test.m | 6 +-
matlab/nfft/test_nfft1d.m | 2 +-
matlab/nfft/test_nfft2d.m | 2 +-
matlab/nfft/test_nfft3d.m | 2 +-
matlab/nfsft/@f_hat/char.m | 6 +-
matlab/nfsft/@f_hat/display.m | 6 +-
matlab/nfsft/@f_hat/double.m | 6 +-
matlab/nfsft/@f_hat/f_hat.m | 6 +-
matlab/nfsft/@f_hat/get.m | 6 +-
matlab/nfsft/@f_hat/minus.m | 6 +-
matlab/nfsft/@f_hat/mtimes.m | 6 +-
matlab/nfsft/@f_hat/mtimesr.m | 6 +-
matlab/nfsft/@f_hat/norm.m | 6 +-
matlab/nfsft/@f_hat/plus.m | 6 +-
matlab/nfsft/@f_hat/subsasgn.m | 6 +-
matlab/nfsft/@f_hat/subsref.m | 6 +-
matlab/nfsft/Makefile.am | 2 -
matlab/nfsft/NFSFT_NORMALIZED.m | 6 +-
matlab/nfsft/NFSFT_NO_DIRECT_ALGORITHM.m | 6 +-
matlab/nfsft/NFSFT_NO_FAST_ALGORITHM.m | 6 +-
matlab/nfsft/NFSFT_PRESERVE_F_HAT.m | 6 +-
matlab/nfsft/NFSFT_USE_DPT.m | 6 +-
matlab/nfsft/NFSFT_USE_NDFT.m | 6 +-
matlab/nfsft/cc.m | 6 +-
matlab/nfsft/f_hat_index.m | 6 +-
matlab/nfsft/gl.m | 6 +-
matlab/nfsft/ndsft_adjoint.m | 6 +-
matlab/nfsft/ndsft_trafo.m | 6 +-
matlab/nfsft/nfsft_adjoint.m | 6 +-
matlab/nfsft/nfsft_finalize.m | 6 +-
matlab/nfsft/nfsft_forget.m | 6 +-
matlab/nfsft/nfsft_get_f.m | 6 +-
matlab/nfsft/nfsft_get_f_hat.m | 6 +-
matlab/nfsft/nfsft_get_f_hat_linear.m | 6 +-
matlab/nfsft/nfsft_get_num_threads.m | 6 +-
matlab/nfsft/nfsft_get_x.m | 6 +-
matlab/nfsft/nfsft_init.m | 6 +-
matlab/nfsft/nfsft_init_advanced.m | 6 +-
matlab/nfsft/nfsft_init_guru.m | 6 +-
matlab/nfsft/nfsft_precompute.m | 6 +-
matlab/nfsft/nfsft_precompute_x.m | 6 +-
matlab/nfsft/nfsft_set_f.m | 6 +-
matlab/nfsft/nfsft_set_f_hat.m | 6 +-
matlab/nfsft/nfsft_set_f_hat_linear.m | 6 +-
matlab/nfsft/nfsft_set_x.m | 6 +-
matlab/nfsft/nfsft_trafo.m | 6 +-
matlab/nfsft/nfsftmex.c | 4 +-
matlab/nfsft/nfsftmex.m | 7 +-
matlab/nfsft/projection.m | 6 +-
matlab/nfsft/simple_test.m | 8 +-
matlab/nfsoft/Makefile.am | 2 -
matlab/nfsoft/nfsoft_get_num_threads.m | 4 +-
matlab/nfsoft/nfsoftmex.c | 4 +-
matlab/nnfft/Makefile.am | 2 -
matlab/nnfft/PRE_FULL_PSI.m | 6 +-
matlab/nnfft/PRE_LIN_PSI.m | 6 +-
matlab/nnfft/PRE_PHI_HUT.m | 6 +-
matlab/nnfft/PRE_PSI.m | 6 +-
matlab/nnfft/nnfft.m | 2 +-
matlab/nnfft/nnfft_display.m | 6 +-
matlab/nnfft/nnfft_finalize.m | 6 +-
matlab/nnfft/nnfft_get_f.m | 6 +-
matlab/nnfft/nnfft_get_f_hat.m | 6 +-
matlab/nnfft/nnfft_get_num_threads.m | 6 +-
matlab/nnfft/nnfft_get_x.m | 6 +-
matlab/nnfft/nnfft_init.m | 6 +-
matlab/nnfft/nnfft_init_1d.m | 6 +-
matlab/nnfft/nnfft_init_2d.m | 6 +-
matlab/nnfft/nnfft_init_3d.m | 6 +-
matlab/nnfft/nnfft_init_guru.m | 6 +-
matlab/nnfft/nnfft_precompute_psi.m | 6 +-
matlab/nnfft/nnfft_set_f.m | 6 +-
matlab/nnfft/nnfft_set_f_hat.m | 6 +-
matlab/nnfft/nnfft_set_v.m | 6 +-
matlab/nnfft/nnfft_set_x.m | 6 +-
matlab/nnfft/nnfft_trafo.m | 6 +-
matlab/nnfft/nnfft_trafo_direct.m | 6 +-
matlab/nnfft/nnfftmex.c | 4 +-
matlab/nnfft/nnfftmex.m | 6 +-
matlab/nnfft/simple_test.m | 6 +-
matlab/nnfft/test_nnfft1d.m | 2 +-
matlab/nnfft/test_nnfft2d.m | 2 +-
matlab/nnfft/test_nnfft2d_N215.m | 2 +-
nfft3.pc.in | 2 +-
support/Makefile.am | 2 -
support/Portfile | 74 +++++-----
support/copyright.txt | 2 +-
support/copyright_m4.txt | 2 +-
support/copyright_matlab.txt | 2 +-
support/copyright_matlab_single_line.txt | 2 +-
support/fpt.dox | 4 +-
support/mri.dox | 4 +-
support/nfct.dox | 4 +-
support/nfft.dox | 4 +-
support/nfsft.dox | 4 +-
support/nfsoft.dox | 4 +-
support/nfst.dox | 4 +-
support/nnfft.dox | 4 +-
support/nsfft.dox | 4 +-
support/solver.dox | 4 +-
tests/Makefile.am | 6 -
tests/bessel.c | 4 +-
tests/bessel.h | 4 +-
tests/bspline.c | 9 +-
tests/bspline.h | 4 +-
tests/check.c | 10 +-
tests/check_nfsft.c | 4 +-
tests/data/Makefile.am | 2 -
tests/nfct.c | 18 ++-
tests/nfct.h | 4 +-
tests/nfft.c | 18 ++-
tests/nfft.h | 4 +-
tests/nfst.c | 20 ++-
tests/nfst.h | 4 +-
343 files changed, 1031 insertions(+), 1316 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..42a8100
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,118 @@
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
+
+# Log files
+*.log
+
+# Other
+.cproject
+.project
+.settings
+aclocal.m4
+Makefile.in
+INSTALL
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+autom4te.cache/*
+config/*
+include/config.h.in
+configure
+**/.deps/*
+Makefile
+applications/fastgauss/fastgauss.c
+applications/polarFFT/linogram_fft_test.c
+applications/polarFFT/mpolar_fft_test.c
+applications/polarFFT/polar_fft_test.c
+applications/radon/inverse_radon.c
+applications/radon/radon.c
+config.log
+config.status
+doxygen/doxygen.Doxyfile
+examples/nfct/simple_test.c
+examples/nfft/simple_test.c
+examples/nfft/simple_test_threads.c
+examples/nfst/simple_test.c
+examples/solver/glacier.c
+examples/solver/simple_test.c
+include/config.h
+include/stamp-h1
+include/ticks.h
+libtool
+nfft3.pc
+**/.libs/*
+applications/fastgauss/fastgauss
+applications/fastsum/fastsum_matlab
+applications/fastsum/fastsum_test
+applications/fastsumS2/fastsumS2
+applications/iterS2/iterS2
+applications/mri/mri2d/construct_data_2d
+applications/mri/mri2d/construct_data_inh_2d1d
+applications/mri/mri2d/construct_data_inh_3d
+applications/mri/mri2d/reconstruct_data_2d
+applications/mri/mri2d/reconstruct_data_gridding
+applications/mri/mri2d/reconstruct_data_inh_2d1d
+applications/mri/mri2d/reconstruct_data_inh_3d
+applications/mri/mri2d/reconstruct_data_inh_nnfft
+applications/mri/mri3d/construct_data_2d1d
+applications/mri/mri3d/construct_data_3d
+applications/mri/mri3d/reconstruct_data_2d1d
+applications/mri/mri3d/reconstruct_data_3d
+applications/mri/mri3d/reconstruct_data_gridding
+applications/polarFFT/linogram_fft_test
+applications/polarFFT/mpolar_fft_test
+applications/polarFFT/polar_fft_test
+applications/quadratureS2/quadratureS2
+applications/radon/inverse_radon
+applications/radon/radon
+examples/fpt/simple_test
+examples/nfct/simple_test
+examples/nfft/flags
+examples/nfft/ndft_fast
+examples/nfft/nfft_times
+examples/nfft/simple_test
+examples/nfft/taylor_nfft
+examples/nfsft/simple_test
+examples/nfsoft/simple_test
+examples/nfst/simple_test
+examples/nnfft/accuracy
+examples/nnfft/simple_test
+examples/nsfft/nsfft_test
+examples/nsfft/simple_test
+examples/solver/glacier
+examples/solver/simple_test
+tests/checkall
+*.trs
+CUnitAutomated-Results.xml
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..fe4d61e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,38 @@
+language: c
+compiler:
+ - gcc
+ - clang
+os: linux
+
+# Turn off sudo to run on container based infrastructure.
+sudo: false
+
+addons:
+ apt:
+ packages:
+ - libfftw3-dev
+ - libcunit1-dev
+
+env:
+ - WINDOW=kaiserbessel PRECISION=
+ - WINDOW=gaussian PRECISION=
+ - WINDOW=bspline PRECISION=
+ - WINDOW=sinc PRECISION=
+ - WINDOW=kaiserbessel PRECISION=--enable-float
+ - WINDOW=gaussian PRECISION=--enable-float
+ - WINDOW=bspline PRECISION=--enable-float
+ - WINDOW=sinc PRECISION=--enable-float
+ - WINDOW=kaiserbessel PRECISION=--enable-long-double
+ - WINDOW=gaussian PRECISION=--enable-long-double
+ - WINDOW=bspline PRECISION=--enable-long-double
+ - WINDOW=sinc PRECISION=--enable-long-double
+
+# Compile, link, and run tests.
+script: ./bootstrap.sh && ./configure --with-window=$WINDOW $PRECISION --enable-all $(if test "$CC" = "clang"; then echo ""; else echo "--enable-openmp"; fi) && make && make check
+
+## Print config.log for debugging.
+after_failure: "cat config.log"
+
+# Turn off email notifications.
+notifications:
+ email: false
diff --git a/3rdparty/cstripack/cstripack.c b/3rdparty/cstripack/cstripack.c
index 8c35229..9b234c3 100644
--- a/3rdparty/cstripack/cstripack.c
+++ b/3rdparty/cstripack/cstripack.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
diff --git a/3rdparty/cstripack/cstripack.h b/3rdparty/cstripack/cstripack.h
index b6da9ea..9c2fdd5 100644
--- a/3rdparty/cstripack/cstripack.h
+++ b/3rdparty/cstripack/cstripack.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
diff --git a/ChangeLog b/ChangeLog
index 38f0ae9..7a140e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
This file contains the version history for NFFT 3.x.x.
+Changes in version 3.3.1:
+
+ Bugfixes
+ - #11 NFSFT module crashes due to pointer type incompatibility.
+ - #2 NFFT/NFST/NFCT transforms fail when using certain window functions.
+
+ Enhancements
+ - #3 Allow to select scope of unit tests via configure.
+ - #1 Extend Travis CI configuration.
+
Changes in version 3.3.0:
- Added unit tests for some parts of the library. They are invoked via make
check, but only if the CUnit framework was found on the build host.
diff --git a/Makefile.am b/Makefile.am
index 6060d70..893659c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
LIBTOOL_DEPS = @LIBTOOL_DEPS@
libtool: $(LIBTOOL_DEPS)
diff --git a/README b/README
deleted file mode 100644
index 5ac8aa0..0000000
--- a/README
+++ /dev/null
@@ -1,118 +0,0 @@
-NFFT3 - Nonequispaced FFT, generalisations, inversion, and applications
-
-Overview
---------
-NFFT3 is a software library written in C for computing nonequispaced fast Fourier
-and related transformations. In detail, NFFT3 implements
-
- 1) The nonequispaced fast Fourier transform (NFFT)
- - the forward transform (NFFT)
- - the adjoint transform (adjoint NFFT)
- 2) Generalisations of the NFFT
- - to arbitrary knots in time and frequency domain (NNFFT)
- - to the sphere S^2 (NFSFT)
- - to the hyperbolic cross (NSFFT)
- - to real-valued data, i.e. (co)sine transforms, (NFCT, NFST)
- - to the rotation group (NFSOFT)
- 3) Generalised inverses based on iterative methods, e.g. CGNR, CGNE
- 4) Applications in
- - medical imaging
- (i) magnetic resonance imaging
- (ii) computerised tomography
- - summation schemes
- (i) fast Gauss transform (FGT)
- (ii) singular kernels
- (iii) zonal kernels
- - polar FFT, discrete Radon transform, ridgelet transform
-
-Detailed API documentation can be found in HTML format in
-/doc/api/html/index.html.
-
-For installation instructions, you can also refer to the file INSTALL
-in this directory. The installation of NFFT3 follows the typical steps
- ./configure
- make
- make install
-Optionally, some test programs can be built and run with
- make check
-If the file configure is missing, please run
- ./bootstrap.sh
-first.
-
-The most current general paper, and the one that we recommend if you wish
-to cite NFFT, is: The paper by Keiner, J., Kunis, S., and Potts, D.
-''Using NFFT 3 - a software library for various nonequispaced fast Fourier transforms''
-ACM Trans. Math. Software,36, Article 19, 1-30, 2009
-Directory structure
--------------------
-3rdparty (dir) Third-party source code
-aclocal.m4 Macros for configure script
-applications (dir) Application programs (see 4) above)
-AUTHORS Information about the authors of NFFT3
-bootstrap.sh Bootstrap shell script that call Autoconf and friends
-ChangeLog A short version history
-config.guess Used by configure script
-config.sub Used by configure script
-configure Configure script (created by calling ./bootstrap.sh)
-configure.in Autoconf configure script template
-CONVENTIONS Internal coding conventions
-COPYING Information about redistributing NFFT3
-depcomp Used by configure script
-doc (dir) User and developer documentation
-examples (dir) Simple examples for using NFFT3 routines
-include (dir) Header files
-INSTALL Installation instructions
-install-sh Used by configure script
-kernel (dir) Source code for core library routines
-ltmain.sh Used by configure script
-Makefile.am Automake Makefile template
-Makefile.in Makefile template generated from Makefile.am,
- processed by configure script
-matlab (dir) Matlab MEX interfaces for nfft, nfsft, nfsoft, nfft
-missing Used by configure script
-NEWS New and noteworthy
-README This file
-tests (dir) CUnit tests
-TODO Work to be done
-
-Feedback
---------
-Your comments are welcome! This is the third version of the library and may
-not be as robust or well documented as it should be. Please keep track of bugs
-or missing/confusing instructions and report them to
-
- Prof. Dr. Daniel Potts <potts at mathematik.tu-chemnitz.de>
- TU Chemnitz, Fakultaet fuer Mathematik
- Reichenhainer Str. 39
- 09107 Chemnitz, GERMANY
-
-or
-
- Stefan Kunis <stefan.kunis at math.uos.de>
- Jens Keiner <jens at nfft.org>>
-
-If you find NFFT3 useful, we would be delighted to hear about what application
-you are using NFFT3 for!
-
-Legal Information & Credits
----------------------------
-Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
-
-This software was written by Jens Keiner, Stefan Kunis and Daniel Potts.
-It was developed at the Mathematical Institute, University of
-Luebeck, and at the Faculty of Mathematics, Chemnitz University of Technology.
-
-NFFT3 is free software. You can redistribute it and/or modify it under the
-terms of the GNU General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version. If not stated otherwise, this applies to all files contained in this
-package and its sub-directories.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
diff --git a/README b/README
new file mode 120000
index 0000000..42061c0
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..37327cf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,150 @@
+[](https://travis-ci.org/NFFT/nfft)
+
+NFFT - Nonequispaced FFT
+=========================
+
+Overview
+--------
+NFFT is a software library, written in C, for computing non-equispaced fast
+Fourier transforms and related variations. It implements the following
+transforms:
+
+1. Non-equispaced fast Fourier transform (NFFT)
+ - forward transform *(NFFT)*, i.e. frequency to time/space domain
+ - adjoint transform *(adjoint NFFT)*, i.e. time/space to frequency domain
+
+2. Generalisations
+ - to arbitrary nodes in time *and* frequency domain *(NNFFT)*
+ - to real-valued data, i.e. (co)sine transforms, *(NFCT, NFST)*
+ - to the sphere S^2 *(NFSFT)*
+ - to the rotation group *(NFSOFT)*
+ - to the hyperbolic cross *(NSFFT)*
+
+3. Generalised inverse transformations based on iterative methods, e.g. CGNR/CGNE
+
+Some examples for application of these transforms are provided:
+
+1. Medical imaging
+ - magnetic resonance imaging
+ - computerised tomography
+
+2. Summation schemes
+ - fast Gauss transform (FGT)
+ - singular kernels
+ - zonal kernels
+
+3. polar FFT, discrete Radon transform, ridgelet transform
+
+Detailed API documentation in HTML format can be found in
+`doc/api/html/index.html`, if you are working from a release tarball.
+When working from a source repository, the documentation can be
+generated with Doxygen.
+```
+make doc
+```
+
+Building
+--------
+When working from a source repository, your need to run libtoolize and autoreconf first. A bash script to do this is provided.
+```
+./bootstrap.sh
+```
+
+The rest of the build process is standard.
+```
+./configure (add options as necessary)
+make
+make install
+```
+
+Optionally, unit tests may be run.
+```
+make check
+```
+
+Citing
+------
+The most current general paper, the one that we recommend if you wish to cite NFFT, is *Keiner, J., Kunis, S., and Potts, D.
+''Using NFFT 3 - a software library for various nonequispaced fast Fourier transforms''
+ACM Trans. Math. Software,36, Article 19, 1-30, 2009*.
+
+Feedback
+--------
+Your comments are welcome! This is the third version of the library and may
+not be as robust or well documented as it should be. Please keep track of bugs
+or missing/confusing instructions and report them to
+[Daniel Potts](mailto:potts at mathematik.tu-chemnitz.de).
+The postal address is
+
+```
+ Prof. Dr. Daniel Potts
+ TU Chemnitz, Fakultaet fuer Mathematik
+ Reichenhainer Str. 39
+ 09107 Chemnitz
+ GERMANY
+```
+
+Alternatively, you might contact
+[Stefan Kunis](mailto:stefan.kunis at math.uos.de)
+or
+[Jens Keiner](mailto:jens at nfft.org).
+
+If you find NFFT useful, we would be delighted to hear about what application
+you are using NFFT for!
+
+Legal Information & Credits
+---------------------------
+Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
+
+This software was written by Jens Keiner, Stefan Kunis and Daniel Potts.
+It was developed at the Mathematical Institute, University of
+Luebeck, and at the Faculty of Mathematics, Chemnitz University of Technology.
+
+NFFT3 is free software. You can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version. If not stated otherwise, this applies to all files contained in this
+package and its sub-directories.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Directory structure
+-------------------
+
+File/Folder | Purpose
+------------------:| ------------------------------------------------------
+3rdparty (dir) | Third-party source code
+aclocal.m4 | Macros for configure script
+applications (dir) | Application programs (see 4) above)
+AUTHORS | Information about the authors of NFFT
+bootstrap.sh | Bootstrap shell script that call Autoconf and friends
+ChangeLog | A short version history
+config.guess | Used by configure script
+config.sub | Used by configure script
+configure | Configure script (created by calling ./bootstrap.sh)
+configure.in | Autoconf configure script template
+CONVENTIONS | Internal coding conventions
+COPYING | Information about redistributing NFFT
+depcomp | Used by configure script
+doc (dir) | User and developer documentation
+examples (dir) | Simple examples for using NFFT routines
+include (dir) | Header files
+INSTALL | Installation instructions
+install-sh | Used by configure script
+kernel (dir) | Source code for core library routines
+ltmain.sh | Used by configure script
+Makefile.am | Automake Makefile template
+Makefile.in | Makefile template generated from Makefile.am, processed by configure script
+matlab (dir) | Matlab MEX interfaces for nfft, nfsft, nfsoft, nfft
+missing | Used by configure script
+NEWS | New and noteworthy
+README | This file
+tests (dir) | CUnit tests
+TODO | Work to be done
diff --git a/applications/doxygen.c b/applications/doxygen.c
index 028b487..066a664 100644
--- a/applications/doxygen.c
+++ b/applications/doxygen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup applications Applications
*/
diff --git a/applications/fastgauss/Makefile.am b/applications/fastgauss/Makefile.am
index 0f52319..5888f5c 100644
--- a/applications/fastgauss/Makefile.am
+++ b/applications/fastgauss/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = fastgauss
diff --git a/applications/fastgauss/fastgauss.c.in b/applications/fastgauss/fastgauss.c.in
index a77366c..1ccdca8 100644
--- a/applications/fastgauss/fastgauss.c.in
+++ b/applications/fastgauss/fastgauss.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup applications_fastgauss Fast Gauss transfrom with complex parameter
* \ingroup applications
diff --git a/applications/fastgauss/levelplots.m b/applications/fastgauss/levelplots.m
index 9d5b0bb..294a0b1 100644
--- a/applications/fastgauss/levelplots.m
+++ b/applications/fastgauss/levelplots.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
clear;
n=128;
p=1;
diff --git a/applications/fastgauss/output_error.m b/applications/fastgauss/output_error.m
index a97278c..c2f0ac4 100644
--- a/applications/fastgauss/output_error.m
+++ b/applications/fastgauss/output_error.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
N=1000; M=1000;
delta=5.520e+02+i*4.000e+02;
error=[
diff --git a/applications/fastgauss/output_error_p.m b/applications/fastgauss/output_error_p.m
index fb28cd4..e59b887 100644
--- a/applications/fastgauss/output_error_p.m
+++ b/applications/fastgauss/output_error_p.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
N=1000; M=1000;
delta=2.000e+01+i*4.000e+01;
error=[
diff --git a/applications/fastgauss/show_results.m b/applications/fastgauss/show_results.m
index 1e3164e..9471034 100644
--- a/applications/fastgauss/show_results.m
+++ b/applications/fastgauss/show_results.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
output_error
a=real(delta);
diff --git a/applications/fastsum/Makefile.am b/applications/fastsum/Makefile.am
index 2879f86..b8b009b 100644
--- a/applications/fastsum/Makefile.am
+++ b/applications/fastsum/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
if HAVE_THREADS
diff --git a/applications/fastsum/fastsum.c b/applications/fastsum/fastsum.c
index ea21862..dbd23d1 100644
--- a/applications/fastsum/fastsum.c
+++ b/applications/fastsum/fastsum.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file fastsum.c
* \brief Fast NFFT-based summation algorithm.
*
diff --git a/applications/fastsum/fastsum.h b/applications/fastsum/fastsum.h
index 08951dc..1b9d3c0 100644
--- a/applications/fastsum/fastsum.h
+++ b/applications/fastsum/fastsum.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file fastsum.h
* \brief Header file for the fast NFFT-based summation algorithm.
*
diff --git a/applications/fastsum/fastsum.m b/applications/fastsum/fastsum.m
index d1567d1..3cb0136 100644
--- a/applications/fastsum/fastsum.m
+++ b/applications/fastsum/fastsum.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [f,f_direct]=fastsum(x,alpha,y,kernel,c,m,n,p,eps_I,eps_B)
% f=fastsum(x,alpha,y,kernel,c,m,n,p)
diff --git a/applications/fastsum/fastsum_benchomp.c b/applications/fastsum/fastsum_benchomp.c
index 5edc31f..e37a9a4 100644
--- a/applications/fastsum/fastsum_benchomp.c
+++ b/applications/fastsum/fastsum_benchomp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,16 @@
#define NREPEAT 5
+#if defined(_WIN32) || defined(_WIN64)
+const char *CMD_CREATEDATASET = "fastsum_benchomp_createdataset.exe";
+const char *CMD_DETAIL_SINGLE = "fastsum_benchomp_detail_single.exe";
+const char *CMD_DETAIL_THREADS = "fastsum_benchomp_detail_threads.exe";
+#else
+const char *CMD_CREATEDATASET = "./fastsum_benchomp_createdataset";
+const char *CMD_DETAIL_SINGLE = "./fastsum_benchomp_detail_single";
+const char *CMD_DETAIL_THREADS = "./fastsum_benchomp_detail_threads";
+#endif
+
static FILE* file_out_tex = NULL;
int get_nthreads_array(int **arr)
@@ -87,8 +97,8 @@ void run_test_create(int d, int L, int M)
char cmd[1025];
snprintf(cmd, 1024,
- "./fastsum_benchomp_createdataset %d %d %d > fastsum_benchomp_test.data",
- d, L, M);
+ "%s %d %d %d > fastsum_benchomp_test.data",
+ CMD_CREATEDATASET, d, L, M);
fprintf(stderr, "%s\n", cmd);
check_result_value(system(cmd), 0, "createdataset");
}
@@ -149,12 +159,12 @@ void run_test(s_resval *res, int nrepeat, int n, int m, int p,
if (nthreads < 2)
snprintf(cmd, 1024,
- "./fastsum_benchomp_detail_single %d %d %d %s " __FR__ " " __FR__ " " __FR__ " < fastsum_benchomp_test.data > fastsum_benchomp_test.out",
- n, m, p, kernel_name, c, eps_I, eps_B);
+ "%s %d %d %d %s " __FR__ " " __FR__ " " __FR__ " < fastsum_benchomp_test.data > fastsum_benchomp_test.out",
+ CMD_DETAIL_SINGLE, n, m, p, kernel_name, c, eps_I, eps_B);
else
snprintf(cmd, 1024,
- "./fastsum_benchomp_detail_threads %d %d %d %s " __FR__ " " __FR__ " " __FR__ " %d < fastsum_benchomp_test.data > fastsum_benchomp_test.out",
- n, m, p, kernel_name, c, eps_I, eps_B, nthreads);
+ "%s %d %d %d %s " __FR__ " " __FR__ " " __FR__ " %d < fastsum_benchomp_test.data > fastsum_benchomp_test.out",
+ CMD_DETAIL_THREADS, n, m, p, kernel_name, c, eps_I, eps_B, nthreads);
fprintf(stderr, "%s\n", cmd);
check_result_value(system(cmd), 0, cmd);
@@ -398,7 +408,9 @@ void nfft_adjoint_print_output_histo_DFBRT(FILE *out, s_testset testset)
int i, size = testset.nresults;
char hostname[1025];
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fprintf(out, "\\begin{tikzpicture}\n");
@@ -461,7 +473,9 @@ void nfft_trafo_print_output_histo_DFBRT(FILE *out, s_testset testset)
int i, size = testset.nresults;
char hostname[1025];
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fprintf(out, "\\begin{tikzpicture}\n");
@@ -524,7 +538,9 @@ void fastsum_print_output_histo_PreRfNfT(FILE *out, s_testset testset)
char hostname[1025];
char plottitle[1025];
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fastsum_get_plot_title_minus_indep(plottitle, 1024, hostname, testset.param,
@@ -592,7 +608,9 @@ void fastsum_print_output_speedup_total_minus_indep(FILE *out,
unsigned int diff_mask = fastsum_determine_different_parameters(testsets,
ntestsets);
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fastsum_get_plot_title_minus_indep(plottitle, 1024, hostname,
diff --git a/applications/fastsum/fastsum_benchomp_createdataset.c b/applications/fastsum/fastsum_benchomp_createdataset.c
index 271dc2c..e62cb25 100644
--- a/applications/fastsum/fastsum_benchomp_createdataset.c
+++ b/applications/fastsum/fastsum_benchomp_createdataset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/applications/fastsum/fastsum_benchomp_detail.c b/applications/fastsum/fastsum_benchomp_detail.c
index 6ef4b18..df47f8d 100644
--- a/applications/fastsum/fastsum_benchomp_detail.c
+++ b/applications/fastsum/fastsum_benchomp_detail.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/applications/fastsum/fastsum_matlab.c b/applications/fastsum/fastsum_matlab.c
index c7aba85..f8fc1bb 100644
--- a/applications/fastsum/fastsum_matlab.c
+++ b/applications/fastsum/fastsum_matlab.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file fastsum_matlab.c
* \brief Simple test program for the fast NFFT-based summation algorithm, called by fastsum.m.
*
diff --git a/applications/fastsum/fastsum_test.c b/applications/fastsum/fastsum_test.c
index a802bae..cc6e84d 100644
--- a/applications/fastsum/fastsum_test.c
+++ b/applications/fastsum/fastsum_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file fastsum_test.c
* \brief Simple test program for the fast NFFT-based summation algorithm.
*
diff --git a/applications/fastsum/fastsum_test.m b/applications/fastsum/fastsum_test.m
index f041b39..fb46793 100644
--- a/applications/fastsum/fastsum_test.m
+++ b/applications/fastsum/fastsum_test.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-%
% Simple test program for fast NFFT-based summation algorithm.
% Markus Fenn, 2006.
diff --git a/applications/fastsum/kernels.c b/applications/fastsum/kernels.c
index 566c159..e802a03 100644
--- a/applications/fastsum/kernels.c
+++ b/applications/fastsum/kernels.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file kernels.c
* \brief File with predefined kernels for the fast summation algorithm.
*/
diff --git a/applications/fastsum/kernels.h b/applications/fastsum/kernels.h
index edc1753..fcd091a 100644
--- a/applications/fastsum/kernels.h
+++ b/applications/fastsum/kernels.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file kernels.h
* \brief Header file with predefined kernels for the fast summation algorithm.
*/
diff --git a/applications/fastsumS2/Makefile.am b/applications/fastsumS2/Makefile.am
index f881e82..cdeaf5f 100644
--- a/applications/fastsumS2/Makefile.am
+++ b/applications/fastsumS2/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = fastsumS2
diff --git a/applications/fastsumS2/doxygen.h b/applications/fastsumS2/doxygen.h
index defa648..a14e471 100644
--- a/applications/fastsumS2/doxygen.h
+++ b/applications/fastsumS2/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_fastsumS2 Fast summation of radial functions on the sphere
* \ingroup applications
diff --git a/applications/fastsumS2/fastsumS2.c b/applications/fastsumS2/fastsumS2.c
index 6a5c639..2730925 100644
--- a/applications/fastsumS2/fastsumS2.c
+++ b/applications/fastsumS2/fastsumS2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup applications_fastsumS2_test fastsumS2_matlab
* \ingroup applications_fastsumS2
diff --git a/applications/fastsumS2/fastsumS2.m b/applications/fastsumS2/fastsumS2.m
index 3785ec6..21aa9a9 100644
--- a/applications/fastsumS2/fastsumS2.m
+++ b/applications/fastsumS2/fastsumS2.m
@@ -1,9 +1,9 @@
function fastsumS2()
%FASTSUMS2
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -19,8 +19,6 @@ function fastsumS2()
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% The input file's name for fastsumS2.c
infilename = 'data.in';
% The output file name.
diff --git a/applications/fastsumS2/readTestcase.m b/applications/fastsumS2/readTestcase.m
index 6170e66..ca809ae 100644
--- a/applications/fastsumS2/readTestcase.m
+++ b/applications/fastsumS2/readTestcase.m
@@ -48,7 +48,7 @@ function T = readTestcase(file)
% - in the sixth column the error E_infty for the fast summation algorithm
% using the NFSFT algorithm.
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -64,8 +64,6 @@ function T = readTestcase(file)
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Read the number of testcases.
tc_max = fscanf(file,'%d',1);
diff --git a/applications/fastsumS2/writeTestcase.m b/applications/fastsumS2/writeTestcase.m
index 86cd205..d8aec02 100644
--- a/applications/fastsumS2/writeTestcase.m
+++ b/applications/fastsumS2/writeTestcase.m
@@ -36,7 +36,7 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,kernel,...
% - in the fifth column the error E_infty (undefined if direct sum
% evaluation has not been used).
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -52,8 +52,6 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,kernel,...
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Write NFSFT usage flag.
fprintf(file,'nfsft=%d\n',usenfsft);
diff --git a/applications/iterS2/Makefile.am b/applications/iterS2/Makefile.am
index 70de6e6..963d95f 100644
--- a/applications/iterS2/Makefile.am
+++ b/applications/iterS2/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/kernel/nfsft
noinst_PROGRAMS = iterS2
diff --git a/applications/iterS2/doxygen.h b/applications/iterS2/doxygen.h
index cfd60ce..fa01b5e 100644
--- a/applications/iterS2/doxygen.h
+++ b/applications/iterS2/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_iterS2 Iterative reconstruction on the sphere S2
* \ingroup applications
diff --git a/applications/iterS2/iterS2.c b/applications/iterS2/iterS2.c
index 981572d..bc4c593 100644
--- a/applications/iterS2/iterS2.c
+++ b/applications/iterS2/iterS2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* iterS2 - Iterative reconstruction on the sphere S2 */
/**
@@ -202,7 +200,6 @@ int main (int argc, char **argv)
double re;
double im;
double a;
- double *scratch;
double xs;
double *ys;
double *temp;
@@ -283,10 +280,9 @@ int main (int argc, char **argv)
/* */
if ((N+1)*(N+1) > M)
{
- X(next_power_of_2_exp)(N, &npt, &npt_exp);
+ X(next_power_of_2_exp_int)(N, &npt, &npt_exp);
fprintf(stderr, "npt = %d, npt_exp = %d\n", npt, npt_exp);
fprintf(stderr,"Optimal interpolation!\n");
- scratch = (double*) nfft_malloc(4*sizeof(double));
ys = (double*) nfft_malloc((N+1)*sizeof(double));
temp = (double*) nfft_malloc((2*N+1)*sizeof(double));
temp2 = (double _Complex*) nfft_malloc((N+1)*sizeof(double _Complex));
@@ -295,7 +291,7 @@ int main (int argc, char **argv)
for (j = 0; j <= N; j++)
{
xs = 2.0 + (2.0*j)/(N+1);
- ys[j] = (2.0-((j == 0)?(1.0):(0.0)))*4.0*nfft_bspline(4,xs,scratch);
+ ys[j] = (2.0-((j == 0)?(1.0):(0.0)))*4.0*nfft_bsplines(4,xs);
//fprintf(stdout,"%3d: g(%le) = %le\n",j,xs,ys[j]);
a += ys[j];
}
@@ -371,7 +367,6 @@ int main (int argc, char **argv)
fftw_destroy_plan(fplan);
- nfft_free(scratch);
nfft_free(qweights);
nfft_free(ys);
nfft_free(temp);
diff --git a/applications/iterS2/writeImageTestcase.m b/applications/iterS2/writeImageTestcase.m
index ccdd055..c9d3b8c 100644
--- a/applications/iterS2/writeImageTestcase.m
+++ b/applications/iterS2/writeImageTestcase.m
@@ -4,9 +4,9 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
% WRITETESTCASE(FILE, USENFSFT, USENFFT, CUTOFF, USEFPT, THRESHOLD,
% BANDWIDTH, THETA, PHI, F)
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -22,8 +22,6 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Write NFSFT usage flag.
fprintf(file,'nfsft=%d\n',usenfsft);
diff --git a/applications/iterS2/writeTestcase.m b/applications/iterS2/writeTestcase.m
index 28bf177..5d66d2a 100644
--- a/applications/iterS2/writeTestcase.m
+++ b/applications/iterS2/writeTestcase.m
@@ -4,9 +4,9 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
% WRITETESTCASE(FILE, USENFSFT, USENFFT, CUTOFF, USEFPT, THRESHOLD,
% BANDWIDTH, THETA, PHI, F)
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -22,8 +22,6 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Write NFSFT usage flag.
fprintf(file,'nfsft=%d\n',usenfsft);
diff --git a/applications/mri/doxygen.c b/applications/mri/doxygen.c
index 46db4ae..bad2f22 100644
--- a/applications/mri/doxygen.c
+++ b/applications/mri/doxygen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup applications_mri Transforms in magnetic resonance imaging
* \ingroup applications
diff --git a/applications/mri/mri2d/Makefile.am b/applications/mri/mri2d/Makefile.am
index 530f565..c724467 100644
--- a/applications/mri/mri2d/Makefile.am
+++ b/applications/mri/mri2d/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = \
diff --git a/applications/mri/mri2d/construct_data_2d.c b/applications/mri/mri2d/construct_data_2d.c
index ab1546f..72c5094 100644
--- a/applications/mri/mri2d/construct_data_2d.c
+++ b/applications/mri/mri2d/construct_data_2d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri2d/construct_data_inh_2d1d.c b/applications/mri/mri2d/construct_data_inh_2d1d.c
index deccda2..490c914 100644
--- a/applications/mri/mri2d/construct_data_inh_2d1d.c
+++ b/applications/mri/mri2d/construct_data_inh_2d1d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri2d/construct_data_inh_3d.c b/applications/mri/mri2d/construct_data_inh_3d.c
index b0dc66a..934c177 100644
--- a/applications/mri/mri2d/construct_data_inh_3d.c
+++ b/applications/mri/mri2d/construct_data_inh_3d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri2d/construct_inh.m b/applications/mri/mri2d/construct_inh.m
index 7e58b1f..e89f5f7 100644
--- a/applications/mri/mri2d/construct_inh.m
+++ b/applications/mri/mri2d/construct_inh.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [] = construct_inh( N )
out=zeros(N*N,1);
diff --git a/applications/mri/mri2d/construct_knots_linogram.m b/applications/mri/mri2d/construct_knots_linogram.m
index a82380f..78cd147 100644
--- a/applications/mri/mri2d/construct_knots_linogram.m
+++ b/applications/mri/mri2d/construct_knots_linogram.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_linogram ( N )
l=((-N/2):(N/2-1));
diff --git a/applications/mri/mri2d/construct_knots_radial.m b/applications/mri/mri2d/construct_knots_radial.m
index 0a7c331..7cc1a1e 100644
--- a/applications/mri/mri2d/construct_knots_radial.m
+++ b/applications/mri/mri2d/construct_knots_radial.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_radial( N )
A=N*2;
diff --git a/applications/mri/mri2d/construct_knots_rose.m b/applications/mri/mri2d/construct_knots_rose.m
index 5e0ce70..7fa2607 100644
--- a/applications/mri/mri2d/construct_knots_rose.m
+++ b/applications/mri/mri2d/construct_knots_rose.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_rose( N )
N=ceil(1.5*N);
diff --git a/applications/mri/mri2d/construct_knots_spiral.m b/applications/mri/mri2d/construct_knots_spiral.m
index 5474d2d..fbc971b 100644
--- a/applications/mri/mri2d/construct_knots_spiral.m
+++ b/applications/mri/mri2d/construct_knots_spiral.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_spiral ( N,arms )
M=N^2;
file = zeros(M,2);
diff --git a/applications/mri/mri2d/construct_readout_time.m b/applications/mri/mri2d/construct_readout_time.m
index e7f15d4..9192b50 100644
--- a/applications/mri/mri2d/construct_readout_time.m
+++ b/applications/mri/mri2d/construct_readout_time.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% constructs a three dimensional Shepp Logan phantom
function [M] = construct_readout_time( M, Te, arms, increment )
diff --git a/applications/mri/mri2d/doxygen.h b/applications/mri/mri2d/doxygen.h
index 9a535f3..7656647 100644
--- a/applications/mri/mri2d/doxygen.h
+++ b/applications/mri/mri2d/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_mri2d 2D transforms
* \ingroup applications_mri
diff --git a/applications/mri/mri2d/mri.m b/applications/mri/mri2d/mri.m
index 7a83fe6..907fd6a 100644
--- a/applications/mri/mri2d/mri.m
+++ b/applications/mri/mri2d/mri.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% This script file is an example of the usage
N=128; % points per row / column
diff --git a/applications/mri/mri2d/mri_inh.m b/applications/mri/mri2d/mri_inh.m
index a386918..ff8c58e 100644
--- a/applications/mri/mri2d/mri_inh.m
+++ b/applications/mri/mri2d/mri_inh.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% This script file is an example of the usage
N=128; % points per row / column
diff --git a/applications/mri/mri2d/phantom.m b/applications/mri/mri2d/phantom.m
index 2e960ac..2be6d45 100644
--- a/applications/mri/mri2d/phantom.m
+++ b/applications/mri/mri2d/phantom.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function I=phantom(N)
% phantom(N)
% generates the (modified) Shepp-Logan phantom of P. Toft
diff --git a/applications/mri/mri2d/precompute_weights.m b/applications/mri/mri2d/precompute_weights.m
index f22c909..448713f 100644
--- a/applications/mri/mri2d/precompute_weights.m
+++ b/applications/mri/mri2d/precompute_weights.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [] = precompute_weights ( file, M )
input=load(file);
diff --git a/applications/mri/mri2d/reconstruct_data_2d.c b/applications/mri/mri2d/reconstruct_data_2d.c
index d60ef2b..341c67a 100644
--- a/applications/mri/mri2d/reconstruct_data_2d.c
+++ b/applications/mri/mri2d/reconstruct_data_2d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include <math.h>
#include <stdlib.h>
#include <complex.h>
diff --git a/applications/mri/mri2d/reconstruct_data_gridding.c b/applications/mri/mri2d/reconstruct_data_gridding.c
index 671909b..4968533 100644
--- a/applications/mri/mri2d/reconstruct_data_gridding.c
+++ b/applications/mri/mri2d/reconstruct_data_gridding.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri2d/reconstruct_data_inh_2d1d.c b/applications/mri/mri2d/reconstruct_data_inh_2d1d.c
index d91cf2e..cff061b 100644
--- a/applications/mri/mri2d/reconstruct_data_inh_2d1d.c
+++ b/applications/mri/mri2d/reconstruct_data_inh_2d1d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include <stdlib.h>
#include <math.h>
#include <limits.h>
diff --git a/applications/mri/mri2d/reconstruct_data_inh_3d.c b/applications/mri/mri2d/reconstruct_data_inh_3d.c
index dee0f35..4fa5957 100644
--- a/applications/mri/mri2d/reconstruct_data_inh_3d.c
+++ b/applications/mri/mri2d/reconstruct_data_inh_3d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include <stdlib.h>
#include <math.h>
#include <limits.h>
diff --git a/applications/mri/mri2d/reconstruct_data_inh_nnfft.c b/applications/mri/mri2d/reconstruct_data_inh_nnfft.c
index 846866e..bec81f5 100644
--- a/applications/mri/mri2d/reconstruct_data_inh_nnfft.c
+++ b/applications/mri/mri2d/reconstruct_data_inh_nnfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include <stdlib.h>
#include <math.h>
#include <limits.h>
diff --git a/applications/mri/mri2d/rms.m b/applications/mri/mri2d/rms.m
index 0147985..79b444b 100644
--- a/applications/mri/mri2d/rms.m
+++ b/applications/mri/mri2d/rms.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% computes the root mean square
function [] = rms ( file )
% load original data f
diff --git a/applications/mri/mri2d/verschiebung.m b/applications/mri/mri2d/verschiebung.m
index b67d285..abe9521 100644
--- a/applications/mri/mri2d/verschiebung.m
+++ b/applications/mri/mri2d/verschiebung.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
in=load('output_phantom_nfft_600.dat');
out = [in(:,1) in(:,2)];
diff --git a/applications/mri/mri2d/visualize_data.m b/applications/mri/mri2d/visualize_data.m
index 02ec425..92e0ca4 100644
--- a/applications/mri/mri2d/visualize_data.m
+++ b/applications/mri/mri2d/visualize_data.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [] = visualize_data ( file, N, num_fig, caption )
load output_real.dat
diff --git a/applications/mri/mri3d/Makefile.am b/applications/mri/mri3d/Makefile.am
index d167daa..deee70d 100644
--- a/applications/mri/mri3d/Makefile.am
+++ b/applications/mri/mri3d/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = \
diff --git a/applications/mri/mri3d/construct_data_2d1d.c b/applications/mri/mri3d/construct_data_2d1d.c
index 0e981f4..dc3335d 100644
--- a/applications/mri/mri3d/construct_data_2d1d.c
+++ b/applications/mri/mri3d/construct_data_2d1d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri3d/construct_data_3d.c b/applications/mri/mri3d/construct_data_3d.c
index a8ecb4e..5f39c95 100644
--- a/applications/mri/mri3d/construct_data_3d.c
+++ b/applications/mri/mri3d/construct_data_3d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri3d/construct_knots_linogram.m b/applications/mri/mri3d/construct_knots_linogram.m
index ce90ba9..161de34 100644
--- a/applications/mri/mri3d/construct_knots_linogram.m
+++ b/applications/mri/mri3d/construct_knots_linogram.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_linogram ( N,Z )
l=((-N/2):(N/2-1));
diff --git a/applications/mri/mri3d/construct_knots_radial.m b/applications/mri/mri3d/construct_knots_radial.m
index 4824edc..284c6a0 100644
--- a/applications/mri/mri3d/construct_knots_radial.m
+++ b/applications/mri/mri3d/construct_knots_radial.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_radial( N,Z )
A=N*2;
diff --git a/applications/mri/mri3d/construct_knots_radial_3d.m b/applications/mri/mri3d/construct_knots_radial_3d.m
index 4618f81..fc12456 100644
--- a/applications/mri/mri3d/construct_knots_radial_3d.m
+++ b/applications/mri/mri3d/construct_knots_radial_3d.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_radial_3d( N,P )
xk=zeros(N*P^2,4);
counter=1;
diff --git a/applications/mri/mri3d/construct_knots_rose.m b/applications/mri/mri3d/construct_knots_rose.m
index e69acc6..7b31dc0 100644
--- a/applications/mri/mri3d/construct_knots_rose.m
+++ b/applications/mri/mri3d/construct_knots_rose.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_rose( N,Z )
N=ceil(1.5*N);
diff --git a/applications/mri/mri3d/construct_knots_spiral.m b/applications/mri/mri3d/construct_knots_spiral.m
index 13ea027..acafbc7 100644
--- a/applications/mri/mri3d/construct_knots_spiral.m
+++ b/applications/mri/mri3d/construct_knots_spiral.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [M] = construct_knots_spiral ( N,Z )
B=1;
M=N^2*Z;
diff --git a/applications/mri/mri3d/construct_phantom.m b/applications/mri/mri3d/construct_phantom.m
index 45d7d88..77a211b 100644
--- a/applications/mri/mri3d/construct_phantom.m
+++ b/applications/mri/mri3d/construct_phantom.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [] = construct_phantom( N, Z )
% constructs a three dimensional Shepp Logan phantom
diff --git a/applications/mri/mri3d/doxygen.h b/applications/mri/mri3d/doxygen.h
index 7fe53f2..2be6495 100644
--- a/applications/mri/mri3d/doxygen.h
+++ b/applications/mri/mri3d/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_mri3d 3D transforms
* \ingroup applications_mri
diff --git a/applications/mri/mri3d/mri.m b/applications/mri/mri3d/mri.m
index 2443c99..361cc7c 100644
--- a/applications/mri/mri3d/mri.m
+++ b/applications/mri/mri3d/mri.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% This script file is an example of the usage
N=48; % points per row / column
diff --git a/applications/mri/mri3d/precompute_weights_2d.m b/applications/mri/mri3d/precompute_weights_2d.m
index 6858450..5aa4bc2 100644
--- a/applications/mri/mri3d/precompute_weights_2d.m
+++ b/applications/mri/mri3d/precompute_weights_2d.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [] = precompute_weights_2d ( file,M,Z )
input=load(file);
diff --git a/applications/mri/mri3d/reconstruct_data_2d1d.c b/applications/mri/mri3d/reconstruct_data_2d1d.c
index e0e98ff..f64e9e1 100644
--- a/applications/mri/mri3d/reconstruct_data_2d1d.c
+++ b/applications/mri/mri3d/reconstruct_data_2d1d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri3d/reconstruct_data_3d.c b/applications/mri/mri3d/reconstruct_data_3d.c
index b705cad..cf78b23 100644
--- a/applications/mri/mri3d/reconstruct_data_3d.c
+++ b/applications/mri/mri3d/reconstruct_data_3d.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <math.h>
diff --git a/applications/mri/mri3d/reconstruct_data_gridding.c b/applications/mri/mri3d/reconstruct_data_gridding.c
index f5021d2..16f5550 100644
--- a/applications/mri/mri3d/reconstruct_data_gridding.c
+++ b/applications/mri/mri3d/reconstruct_data_gridding.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdlib.h>
diff --git a/applications/mri/mri3d/rms.m b/applications/mri/mri3d/rms.m
index 0147985..79b444b 100644
--- a/applications/mri/mri3d/rms.m
+++ b/applications/mri/mri3d/rms.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% computes the root mean square
function [] = rms ( file )
% load original data f
diff --git a/applications/mri/mri3d/visualize_data.m b/applications/mri/mri3d/visualize_data.m
index 6d0c623..77bd07f 100644
--- a/applications/mri/mri3d/visualize_data.m
+++ b/applications/mri/mri3d/visualize_data.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
% Visualizes the three dimensional phantom. Makes a pic of
% every plane and one plot of the N/2 row of the 10th plane.
function [] = visualize_data ( file, N, Z, num_fig, caption )
diff --git a/applications/polarFFT/Makefile.am b/applications/polarFFT/Makefile.am
index f15c0e1..a57d2a7 100644
--- a/applications/polarFFT/Makefile.am
+++ b/applications/polarFFT/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = polar_fft_test mpolar_fft_test linogram_fft_test
diff --git a/applications/polarFFT/doxygen.h b/applications/polarFFT/doxygen.h
index ff6251c..727bf6a 100644
--- a/applications/polarFFT/doxygen.h
+++ b/applications/polarFFT/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_polarFFT Polar FFT
* \ingroup applications
diff --git a/applications/polarFFT/fft_test.m b/applications/polarFFT/fft_test.m
index 3257ea1..8e96b43 100644
--- a/applications/polarFFT/fft_test.m
+++ b/applications/polarFFT/fft_test.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
N=64;
T=3*N; %T=5*N/2;
R=3*N/2;
diff --git a/applications/polarFFT/linogram_fft_test.c.in b/applications/polarFFT/linogram_fft_test.c.in
index 72fad97..42183b9 100644
--- a/applications/polarFFT/linogram_fft_test.c.in
+++ b/applications/polarFFT/linogram_fft_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file polarFFT/linogram_fft_test.c
* \brief NFFT-based pseudo-polar FFT and inverse.
diff --git a/applications/polarFFT/mpolar_fft_test.c.in b/applications/polarFFT/mpolar_fft_test.c.in
index 827ac22..7011aba 100644
--- a/applications/polarFFT/mpolar_fft_test.c.in
+++ b/applications/polarFFT/mpolar_fft_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file polarFFT/mpolar_fft_test.c
* \brief NFFT-based polar FFT and inverse on modified polar grid.
diff --git a/applications/polarFFT/phantom.m b/applications/polarFFT/phantom.m
index 2e960ac..2be6d45 100644
--- a/applications/polarFFT/phantom.m
+++ b/applications/polarFFT/phantom.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function I=phantom(N)
% phantom(N)
% generates the (modified) Shepp-Logan phantom of P. Toft
diff --git a/applications/polarFFT/polar_fft_test.c.in b/applications/polarFFT/polar_fft_test.c.in
index 3e2c9a4..15217a3 100644
--- a/applications/polarFFT/polar_fft_test.c.in
+++ b/applications/polarFFT/polar_fft_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file polarFFT/polar_fft_test.c
* \brief NFFT-based polar FFT and inverse.
diff --git a/applications/quadratureS2/Makefile.am b/applications/quadratureS2/Makefile.am
index 06f3907..e1cdd12 100644
--- a/applications/quadratureS2/Makefile.am
+++ b/applications/quadratureS2/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = quadratureS2
diff --git a/applications/quadratureS2/doxygen.h b/applications/quadratureS2/doxygen.h
index a3b5e57..538a0fe 100644
--- a/applications/quadratureS2/doxygen.h
+++ b/applications/quadratureS2/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup applications_quadratureS2 Fast evaluation of quadrature formulae on the sphere
* \ingroup applications
diff --git a/applications/quadratureS2/lgwt.m b/applications/quadratureS2/lgwt.m
index 45348c1..ed441ff 100644
--- a/applications/quadratureS2/lgwt.m
+++ b/applications/quadratureS2/lgwt.m
@@ -12,7 +12,7 @@ function [x,w]=lgwt(N,a,b)
%
% Written by Greg von Winckel - 02/25/2004
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -28,8 +28,6 @@ function [x,w]=lgwt(N,a,b)
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
N=N-1;
N1=N+1; N2=N+2;
diff --git a/applications/quadratureS2/plotGrid.m b/applications/quadratureS2/plotGrid.m
index 200c8e3..f174705 100644
--- a/applications/quadratureS2/plotGrid.m
+++ b/applications/quadratureS2/plotGrid.m
@@ -8,9 +8,9 @@ function plotGrid(gridType,p)
% 2: HEALPix point set,
% 3: Equidistribution point set.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -26,8 +26,6 @@ function plotGrid(gridType,p)
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
if (gridType == 0)
[theta,w] = lgwt(p(1)+1,-1,1);
theta = acos(theta);
diff --git a/applications/quadratureS2/quadratureS2.c b/applications/quadratureS2/quadratureS2.c
index 81139a9..18853d1 100644
--- a/applications/quadratureS2/quadratureS2.c
+++ b/applications/quadratureS2/quadratureS2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup applications_quadratureS2_test quadratureS2_test
* \ingroup applications_quadratureS2
diff --git a/applications/quadratureS2/quadratureS2.m b/applications/quadratureS2/quadratureS2.m
index 01f25af..4ba210f 100644
--- a/applications/quadratureS2/quadratureS2.m
+++ b/applications/quadratureS2/quadratureS2.m
@@ -1,9 +1,9 @@
function quadratureS2()
%QUADRATURES2
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -19,8 +19,6 @@ function quadratureS2()
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% The name of the input file
infilename = 'data.in';
% The name of the output file
diff --git a/applications/quadratureS2/readTestcase.m b/applications/quadratureS2/readTestcase.m
index 308036a..d843d8d 100644
--- a/applications/quadratureS2/readTestcase.m
+++ b/applications/quadratureS2/readTestcase.m
@@ -1,9 +1,9 @@
function T = readTestcase(file)
%READTESTCASE - Read quadratureS2.c testcase results from file
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -19,8 +19,6 @@ function T = readTestcase(file)
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Read the number of testcases.
tc_max = fscanf(file,'%d',1);
diff --git a/applications/quadratureS2/writeTestcase.m b/applications/quadratureS2/writeTestcase.m
index d711fc8..e46ade9 100644
--- a/applications/quadratureS2/writeTestcase.m
+++ b/applications/quadratureS2/writeTestcase.m
@@ -2,9 +2,9 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
testmode,gridtype,testfunction,repetitions,mode,bandwidths)
%WRITETESTCASE - Write qudratureS2 testcases
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@ function writeTestcase(file,usenfsft,usenfft,cutoff,usefpt,threshold,...
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
% Write usenfsft
fprintf(file,'nfsft=%d\n',usenfsft);
if (usenfsft == 1)
diff --git a/applications/quadratureS2/writeWeights.m b/applications/quadratureS2/writeWeights.m
index 80b5608..40dc8ee 100644
--- a/applications/quadratureS2/writeWeights.m
+++ b/applications/quadratureS2/writeWeights.m
@@ -1,9 +1,9 @@
function writeWeights(file,m)
%WRITEWEIGHTS
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -19,8 +19,6 @@ function writeWeights(file,m)
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
for k = m
% Generate Gauss-Legendre nodes in co-latitudinal direction.
[theta,w] = lgwt(k+1,-1,1);
diff --git a/applications/radon/Makefile.am b/applications/radon/Makefile.am
index 8ad0f75..7b94c58 100644
--- a/applications/radon/Makefile.am
+++ b/applications/radon/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = radon inverse_radon
diff --git a/applications/radon/inverse_radon.c.in b/applications/radon/inverse_radon.c.in
index 80e4fc0..3c8dcb8 100644
--- a/applications/radon/inverse_radon.c.in
+++ b/applications/radon/inverse_radon.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file inverse_radon.c
* \brief NFFT-based discrete inverse Radon transform.
diff --git a/applications/radon/phantom.m b/applications/radon/phantom.m
index 2e960ac..2be6d45 100644
--- a/applications/radon/phantom.m
+++ b/applications/radon/phantom.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function I=phantom(N)
% phantom(N)
% generates the (modified) Shepp-Logan phantom of P. Toft
diff --git a/applications/radon/radon.c.in b/applications/radon/radon.c.in
index 1956428..0de98ac 100644
--- a/applications/radon/radon.c.in
+++ b/applications/radon/radon.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file radon.c
* \brief NFFT-based discrete Radon transform.
diff --git a/applications/radon/radon.m b/applications/radon/radon.m
index 39c3c35..6220466 100644
--- a/applications/radon/radon.m
+++ b/applications/radon/radon.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
%file: radon.m
%
% Simple test program for NFFT-based discrete
diff --git a/applications/radon/ridgelet.m b/applications/radon/ridgelet.m
index 9682da2..188e957 100644
--- a/applications/radon/ridgelet.m
+++ b/applications/radon/ridgelet.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,7 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
%file: ridgelet.m
%
% Simple test program for denoising an image
diff --git a/bootstrap.sh b/bootstrap.sh
index 7a3789a..3aed96e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,7 +1,5 @@
#!/bin/sh
#
-# $Id$
-#
# Copyright (c) 2003, 2006 Matteo Frigo
# Copyright (c) 2003, 2006 Massachusetts Institute of Technology
# Copyright (c) 2007 Jens Keiner
diff --git a/configure.ac b/configure.ac
index e42b02e..cba7186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
-# $Id$
-#
-# Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+# Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@@ -21,10 +19,7 @@
################################################################################
# autoconf initialization
-AC_INIT([NFFT],[3.3.0],[mail at nfft.org])
-
-# revision id from svn
-AC_REVISION([$Id$])
+AC_INIT([NFFT],[3.3.1],[mail at nfft.org])
# copyright notice
AC_COPYRIGHT([2003, 2012, Jens Keiner, Stefan Kunis, Daniel Potts])
@@ -231,6 +226,11 @@ case "$window" in
esac
AC_MSG_RESULT([$window])
+AC_ARG_ENABLE(exhaustive-unit-tests, [AS_HELP_STRING([--enable-exhaustive-unit-tests],[enable exhaustive unit tests])], ok=$enableval, ok=no)
+if test "$ok" = "yes"; then
+ AC_DEFINE(NFFT_EXHAUSTIVE_UNIT_TESTS,1,[Define to enable exhaustive unit tests.])
+fi
+
################################################################################
# compiler characteristis
################################################################################
@@ -443,6 +443,7 @@ AC_CHECK_FUNCS([memset posix_memalign memalign])
AC_CHECK_FUNCS([_mm_malloc _mm_free sysctl])
AC_CHECK_FUNCS([abort snprintf sqrt])
AC_CHECK_FUNCS([sleep usleep nanosleep drand48 srand48])
+AC_CHECK_FUNCS([gethostname])
AC_CHECK_DECLS([memalign, posix_memalign])
AC_CHECK_DECLS([sleep],[],[],[#include <unistd.h>])
diff --git a/doxygen.dox b/doxygen.dox
index 337d728..3812152 100644
--- a/doxygen.dox
+++ b/doxygen.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/**
* \mainpage notitle
*
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index 9ef2033..1efdaf2 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -1,3 +1 @@
-# $Id: Makefile.am 3086 2009-03-11 07:36:56Z keiner $
-
EXTRA_DIST = doxygen.css doxygen.Doxyfile doxygen.Doxyfile.in footer.html header.html
\ No newline at end of file
diff --git a/examples/doxygen.c b/examples/doxygen.c
index f2962ff..1c33a1f 100644
--- a/examples/doxygen.c
+++ b/examples/doxygen.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \defgroup examples Examples
*/
diff --git a/examples/fpt/Makefile.am b/examples/fpt/Makefile.am
index 0944eb6..f2ddf49 100644
--- a/examples/fpt/Makefile.am
+++ b/examples/fpt/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
# programs
diff --git a/examples/fpt/simple_test.c b/examples/fpt/simple_test.c
index c0be8d1..f085c2b 100644
--- a/examples/fpt/simple_test.c
+++ b/examples/fpt/simple_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* standard headers */
#include <stdlib.h>
#include <stdio.h>
diff --git a/examples/mri/Makefile.am b/examples/mri/Makefile.am
index 02b5f16..e69de29 100644
--- a/examples/mri/Makefile.am
+++ b/examples/mri/Makefile.am
@@ -1,2 +0,0 @@
-# $Id$
-
diff --git a/examples/nfct/Makefile.am b/examples/nfct/Makefile.am
index 26ec994..ba2b265 100644
--- a/examples/nfct/Makefile.am
+++ b/examples/nfct/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = simple_test
diff --git a/examples/nfct/simple_test.c.in b/examples/nfct/simple_test.c.in
index e264f65..9257c8b 100644
--- a/examples/nfct/simple_test.c.in
+++ b/examples/nfct/simple_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfft/Makefile.am b/examples/nfft/Makefile.am
index 835dd18..6ddccdf 100644
--- a/examples/nfft/Makefile.am
+++ b/examples/nfft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
if HAVE_THREADS
diff --git a/examples/nfft/flags.c b/examples/nfft/flags.c
index 7e6a02a..39ab92d 100644
--- a/examples/nfft/flags.c
+++ b/examples/nfft/flags.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file flags.c
*
* \brief Testing the nfft.
diff --git a/examples/nfft/flags.m b/examples/nfft/flags.m
index ae5c7a5..72fe33a 100644
--- a/examples/nfft/flags.m
+++ b/examples/nfft/flags.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
%% File: flags1.m
%%
%% Testing different precomputation schemes for the nfft.
diff --git a/examples/nfft/ndft_fast.c b/examples/nfft/ndft_fast.c
index 3cc17a2..ea49d7a 100644
--- a/examples/nfft/ndft_fast.c
+++ b/examples/nfft/ndft_fast.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file ndft_fast.c
*
* \brief Testing ndft, Horner-like ndft, and fully precomputed ndft.
diff --git a/examples/nfft/ndft_fast.m b/examples/nfft/ndft_fast.m
index 846ce8d..871a8c9 100644
--- a/examples/nfft/ndft_fast.m
+++ b/examples/nfft/ndft_fast.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
%% File: ndft_fast.m
%%
%% Testing ndft, Horner-like ndft, fully precomputed ndft and nfft.
diff --git a/examples/nfft/nfft_benchomp.c b/examples/nfft/nfft_benchomp.c
index 825e154..0c1caca 100644
--- a/examples/nfft/nfft_benchomp.c
+++ b/examples/nfft/nfft_benchomp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,16 @@
#define NREPEAT 5
+#if defined(_WIN32) || defined(_WIN64)
+const char *CMD_CREATEDATASET = "nfft_benchomp_createdataset.exe";
+const char *CMD_DETAIL_SINGLE = "nfft_benchomp_detail_single.exe";
+const char *CMD_DETAIL_THREADS = "nfft_benchomp_detail_threads.exe";
+#else
+const char *CMD_CREATEDATASET = "./nfft_benchomp_createdataset";
+const char *CMD_DETAIL_SINGLE = "./nfft_benchomp_detail_single";
+const char *CMD_DETAIL_THREADS = "./nfft_benchomp_detail_threads";
+#endif
+
static FILE* file_out_tex = NULL;
int get_nthreads_array(int **arr)
@@ -87,13 +97,13 @@ void run_test_create(int d, int trafo_adjoint, int N, int M, double sigma)
char cmd[1025];
if (d==1)
- snprintf(cmd, 1024, "./nfft_benchomp_createdataset %d %d %d %d %lg > nfft_benchomp_test.data", d, trafo_adjoint, N, M, sigma);
+ snprintf(cmd, 1024, "%s %d %d %d %d %lg > nfft_benchomp_test.data", CMD_CREATEDATASET, d, trafo_adjoint, N, M, sigma);
else if (d==2)
- snprintf(cmd, 1024, "./nfft_benchomp_createdataset %d %d %d %d %d %lg > nfft_benchomp_test.data", d, trafo_adjoint, N, N, M, sigma);
+ snprintf(cmd, 1024, "%s %d %d %d %d %d %lg > nfft_benchomp_test.data", CMD_CREATEDATASET, d, trafo_adjoint, N, N, M, sigma);
else if (d==3)
- snprintf(cmd, 1024, "./nfft_benchomp_createdataset %d %d %d %d %d %d %lg > nfft_benchomp_test.data", d, trafo_adjoint, N, N, N, M, sigma);
+ snprintf(cmd, 1024, "%s %d %d %d %d %d %d %lg > nfft_benchomp_test.data", CMD_CREATEDATASET, d, trafo_adjoint, N, N, N, M, sigma);
else if (d==4)
- snprintf(cmd, 1024, "./nfft_benchomp_createdataset %d %d %d %d %d %d %d %lg > nfft_benchomp_test.data", d, trafo_adjoint, N, N, N, N, M, sigma);
+ snprintf(cmd, 1024, "%s %d %d %d %d %d %d %d %lg > nfft_benchomp_test.data", CMD_CREATEDATASET, d, trafo_adjoint, N, N, N, N, M, sigma);
else
exit(1);
fprintf(stderr, "%s\n", cmd);
@@ -149,9 +159,9 @@ void run_test(s_resval *res, int nrepeat, int m, int flags, int nthreads)
}
if (nthreads < 2)
- snprintf(cmd, 1024, "./nfft_benchomp_detail_single %d %d < nfft_benchomp_test.data > nfft_benchomp_test.out", m, flags);
+ snprintf(cmd, 1024, "%s %d %d < nfft_benchomp_test.data > nfft_benchomp_test.out", CMD_DETAIL_SINGLE, m, flags);
else
- snprintf(cmd, 1024, "./nfft_benchomp_detail_threads %d %d %d < nfft_benchomp_test.data > nfft_benchomp_test.out", m, flags, nthreads);
+ snprintf(cmd, 1024, "%s %d %d %d < nfft_benchomp_test.data > nfft_benchomp_test.out", CMD_DETAIL_THREADS, m, flags, nthreads);
fprintf(stderr, "%s\n", cmd);
check_result_value(system(cmd), 0, cmd);
@@ -332,7 +342,9 @@ void print_output_speedup_total_tref(FILE *out, s_testset *testsets, int ntestse
char plottitle[1025];
unsigned int diff_mask = determine_different_parameters(testsets, ntestsets);
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
get_plot_title(plottitle, 1024, hostname, testsets[0].param, diff_mask | MASK_FLAGS_SORT);
@@ -396,7 +408,9 @@ void print_output_histo_DFBRT(FILE *out, s_testset testset)
int i, size = testset.nresults;
char hostname[1025];
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fprintf(out, "\\begin{tikzpicture}\n");
diff --git a/examples/nfft/nfft_benchomp_createdataset.c b/examples/nfft/nfft_benchomp_createdataset.c
index eb768bb..925bebb 100644
--- a/examples/nfft/nfft_benchomp_createdataset.c
+++ b/examples/nfft/nfft_benchomp_createdataset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfft/nfft_benchomp_detail.c b/examples/nfft/nfft_benchomp_detail.c
index 6aa8b84..d7fc341 100644
--- a/examples/nfft/nfft_benchomp_detail.c
+++ b/examples/nfft/nfft_benchomp_detail.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfft/nfft_times.c b/examples/nfft/nfft_times.c
index 766f902..0aad447 100644
--- a/examples/nfft/nfft_times.c
+++ b/examples/nfft/nfft_times.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdio.h>
diff --git a/examples/nfft/simple_test.c.in b/examples/nfft/simple_test.c.in
index 9d6f944..000b5bf 100644
--- a/examples/nfft/simple_test.c.in
+++ b/examples/nfft/simple_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id: simple_test.c.in 4298 2015-01-15 10:24:37Z tovo $ */
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfft/simple_test_threads.c.in b/examples/nfft/simple_test_threads.c.in
index 1688226..a2554e5 100644
--- a/examples/nfft/simple_test_threads.c.in
+++ b/examples/nfft/simple_test_threads.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfft/taylor_nfft.c b/examples/nfft/taylor_nfft.c
index 64e06fa..ab752ce 100644
--- a/examples/nfft/taylor_nfft.c
+++ b/examples/nfft/taylor_nfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file taylor_nfft.c
*
* \brief Testing the nfft againt a Taylor expansion based version.
diff --git a/examples/nfft/taylor_nfft.m b/examples/nfft/taylor_nfft.m
index 6956815..0af3350 100644
--- a/examples/nfft/taylor_nfft.m
+++ b/examples/nfft/taylor_nfft.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,7 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
+
%% File: taylor_nfft.m
%%
%% Testing the nfft againt a Taylor expansion based version.
diff --git a/examples/nfsft/Makefile.am b/examples/nfsft/Makefile.am
index 27aa893..ea11398 100644
--- a/examples/nfsft/Makefile.am
+++ b/examples/nfsft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
if HAVE_THREADS
diff --git a/examples/nfsft/nfsft_benchomp.c b/examples/nfsft/nfsft_benchomp.c
index 559bd2c..d83508a 100644
--- a/examples/nfsft/nfsft_benchomp.c
+++ b/examples/nfsft/nfsft_benchomp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -27,6 +27,16 @@
#define NREPEAT 5
+#if defined(_WIN32) || defined(_WIN64)
+const char *CMD_CREATEDATASET = "nfsft_benchomp_createdataset.exe";
+const char *CMD_DETAIL_SINGLE = "nfsft_benchomp_detail_single.exe";
+const char *CMD_DETAIL_THREADS = "nfsft_benchomp_detail_threads.exe";
+#else
+const char *CMD_CREATEDATASET = "./nfsft_benchomp_createdataset";
+const char *CMD_DETAIL_SINGLE = "./nfsft_benchomp_detail_single";
+const char *CMD_DETAIL_THREADS = "./nfsft_benchomp_detail_threads";
+#endif
+
static FILE* file_out_tex = NULL;
int get_nthreads_array(int **arr)
@@ -86,7 +96,7 @@ void run_test_create(int trafo_adjoint, int N, int M)
{
char cmd[1025];
- snprintf(cmd, 1024, "./nfsft_benchomp_createdataset %d %d %d > nfsft_benchomp_test.data", trafo_adjoint, N, M);
+ snprintf(cmd, 1024, "%s %d %d %d > nfsft_benchomp_test.data", CMD_CREATEDATASET, trafo_adjoint, N, M);
fprintf(stderr, "%s\n", cmd);
check_result_value(system(cmd), 0, "createdataset");
}
@@ -140,9 +150,9 @@ void run_test(s_resval *res, int nrepeat, int m, int nfsft_flags, int psi_flags,
}
if (nthreads < 2)
- snprintf(cmd, 1024, "./nfsft_benchomp_detail_single %d %d %d %d < nfsft_benchomp_test.data > nfsft_benchomp_test.out", m, nfsft_flags, psi_flags, nrepeat);
+ snprintf(cmd, 1024, "%s %d %d %d %d < nfsft_benchomp_test.data > nfsft_benchomp_test.out", CMD_DETAIL_SINGLE, m, nfsft_flags, psi_flags, nrepeat);
else
- snprintf(cmd, 1024, "./nfsft_benchomp_detail_threads %d %d %d %d %d < nfsft_benchomp_test.data > nfsft_benchomp_test.out", m, nfsft_flags, psi_flags, nrepeat, nthreads);
+ snprintf(cmd, 1024, "%s %d %d %d %d %d < nfsft_benchomp_test.data > nfsft_benchomp_test.out", CMD_DETAIL_THREADS, m, nfsft_flags, psi_flags, nrepeat, nthreads);
fprintf(stderr, "%s\n", cmd);
check_result_value(system(cmd), 0, cmd);
@@ -319,7 +329,9 @@ void print_output_speedup_total_tref(FILE *out, s_testset *testsets, int ntestse
char plottitle[1025];
unsigned int diff_mask = determine_different_parameters(testsets, ntestsets);
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
get_plot_title(plottitle, 1024, hostname, testsets[0].param, diff_mask);
@@ -388,7 +400,9 @@ void print_output_histo_PENRT(FILE *out, s_testset testset)
int i, size = testset.nresults;
char hostname[1025];
+#ifdef HAVE_GETHOSTNAME
if (gethostname(hostname, 1024) != 0)
+#endif
strncpy(hostname, "unnamed", 1024);
fprintf(out, "\\begin{tikzpicture}\n");
diff --git a/examples/nfsft/nfsft_benchomp_createdataset.c b/examples/nfsft/nfsft_benchomp_createdataset.c
index 14d80bd..a167a29 100644
--- a/examples/nfsft/nfsft_benchomp_createdataset.c
+++ b/examples/nfsft/nfsft_benchomp_createdataset.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfsft/nfsft_benchomp_detail.c b/examples/nfsft/nfsft_benchomp_detail.c
index 2b94fbe..4635df8 100644
--- a/examples/nfsft/nfsft_benchomp_detail.c
+++ b/examples/nfsft/nfsft_benchomp_detail.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3372 2009-10-21 06:04:05Z skunis $ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nfsft/simple_test.c b/examples/nfsft/simple_test.c
index a8edcd2..ff2051d 100644
--- a/examples/nfsft/simple_test.c
+++ b/examples/nfsft/simple_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* standard headers */
#include <stdio.h>
#include <math.h>
diff --git a/examples/nfsft/simple_test_threads.c b/examples/nfsft/simple_test_threads.c
index 6ca10aa..8a2a762 100644
--- a/examples/nfsft/simple_test_threads.c
+++ b/examples/nfsft/simple_test_threads.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3498 2010-05-07 18:46:08Z keiner $ */
-
/* standard headers */
#include <stdio.h>
#include <math.h>
diff --git a/examples/nfsoft/Makefile.am b/examples/nfsoft/Makefile.am
index 5d536da..11f5e89 100644
--- a/examples/nfsoft/Makefile.am
+++ b/examples/nfsoft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
## The program name
diff --git a/examples/nfsoft/simple_test.c b/examples/nfsoft/simple_test.c
index 094a4c7..0f95a53 100644
--- a/examples/nfsoft/simple_test.c
+++ b/examples/nfsoft/simple_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* Include standard C headers. */
#include <stdio.h>
#include <math.h>
diff --git a/examples/nfst/Makefile.am b/examples/nfst/Makefile.am
index 26ec994..ba2b265 100644
--- a/examples/nfst/Makefile.am
+++ b/examples/nfst/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = simple_test
diff --git a/examples/nfst/simple_test.c.in b/examples/nfst/simple_test.c.in
index 23c85f4..32d746a 100644
--- a/examples/nfst/simple_test.c.in
+++ b/examples/nfst/simple_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nnfft/Makefile.am b/examples/nnfft/Makefile.am
index f1c4ec7..5e4f8d4 100644
--- a/examples/nnfft/Makefile.am
+++ b/examples/nnfft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = simple_test accuracy
diff --git a/examples/nnfft/accuracy.c b/examples/nnfft/accuracy.c
index 32eb91a..2f3344d 100644
--- a/examples/nnfft/accuracy.c
+++ b/examples/nnfft/accuracy.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <math.h>
#include <stdlib.h>
#include <complex.h>
diff --git a/examples/nnfft/accuracy.m b/examples/nnfft/accuracy.m
index df43db3..1cc86a0 100644
--- a/examples/nnfft/accuracy.m
+++ b/examples/nnfft/accuracy.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
m=0:14;
load kaiser_bessel.dat
load sinc_power.dat
diff --git a/examples/nnfft/simple_test.c b/examples/nnfft/simple_test.c
index a56cc4c..a81bb59 100644
--- a/examples/nnfft/simple_test.c
+++ b/examples/nnfft/simple_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdlib.h>
#include <math.h>
#include <complex.h>
@@ -312,7 +310,7 @@ static void measure_time_nnfft_1d(void)
int main(void)
{
system("clear");
- printf("1) computing a one dimensional nndft, nnfft SUSE\n\n");
+ printf("1) computing a one dimensional nndft, nnfft\n\n");
simple_test_nnfft_1d();
/*getc(stdin);
diff --git a/examples/nsfft/Makefile.am b/examples/nsfft/Makefile.am
index 84dfefc..c241b68 100644
--- a/examples/nsfft/Makefile.am
+++ b/examples/nsfft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = simple_test nsfft_test
diff --git a/examples/nsfft/nsfft_test.c b/examples/nsfft/nsfft_test.c
index a005eec..918963f 100644
--- a/examples/nsfft/nsfft_test.c
+++ b/examples/nsfft/nsfft_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/nsfft/simple_test.c b/examples/nsfft/simple_test.c
index 3f751b1..e21cb9d 100644
--- a/examples/nsfft/simple_test.c
+++ b/examples/nsfft/simple_test.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/solver/Makefile.am b/examples/solver/Makefile.am
index d5a7aba..ffaf24d 100644
--- a/examples/solver/Makefile.am
+++ b/examples/solver/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_PROGRAMS = simple_test glacier
diff --git a/examples/solver/doxygen.h b/examples/solver/doxygen.h
index edddb57..07d3a6a 100644
--- a/examples/solver/doxygen.h
+++ b/examples/solver/doxygen.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3100 2009-03-12 08:42:48Z keiner $ */
-
/**
* \defgroup examples_solver Solver component
* \ingroup examples
diff --git a/examples/solver/glacier.c.in b/examples/solver/glacier.c.in
index bfd4769..a33fa63 100644
--- a/examples/solver/glacier.c.in
+++ b/examples/solver/glacier.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/examples/solver/glacier.m b/examples/solver/glacier.m
index e37168b..0251576 100644
--- a/examples/solver/glacier.m
+++ b/examples/solver/glacier.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
N=256;
border_eps=0.1;
diff --git a/examples/solver/glacier_cv.m b/examples/solver/glacier_cv.m
index a8b92bb..40ecf85 100644
--- a/examples/solver/glacier_cv.m
+++ b/examples/solver/glacier_cv.m
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -13,8 +13,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
N=256;
border_eps=0.1;
diff --git a/examples/solver/simple_test.c.in b/examples/solver/simple_test.c.in
index b4010f5..18cd241 100644
--- a/examples/solver/simple_test.c.in
+++ b/examples/solver/simple_test.c.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <stdio.h>
#include <math.h>
#include <string.h>
diff --git a/include/api.h b/include/api.h
index 2906ef2..e77deef 100644
--- a/include/api.h
+++ b/include/api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: infft.h 3483 2010-04-23 19:02:34Z keiner $ */
-
#ifndef __API_H__
#define __API_H__
diff --git a/include/infft.h b/include/infft.h
index 47791a0..e02c281 100644
--- a/include/infft.h
+++ b/include/infft.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file infft3.h
* \brief Internal header file for auxiliary definitions and functions.
*/
@@ -188,13 +186,10 @@ typedef ptrdiff_t INT;
#define PHI_HUT(n,k,d) ((R)(((k) == 0) ? K(1.0) / n : \
POW(SIN((k) * KPI / n) / ((k) * KPI / n), \
K(2.0) * ths->m)/n))
- #define PHI(n,x,d) (Y(bspline)(2*ths->m,((x)*n) + \
- (R)ths->m,ths->spline_coeffs) / n)
- #define WINDOW_HELP_INIT \
- { \
- ths->spline_coeffs= (R*)Y(malloc)(2*ths->m*sizeof(R)); \
- }
- #define WINDOW_HELP_FINALIZE {Y(free)(ths->spline_coeffs);}
+ #define PHI(n,x,d) (Y(bsplines)(2*ths->m,((x)*n) + \
+ (R)ths->m) / n)
+ #define WINDOW_HELP_INIT
+ #define WINDOW_HELP_FINALIZE
#if defined(NFFT_LDOUBLE)
#define WINDOW_HELP_ESTIMATE_m 11
#elif defined(NFFT_SINGLE)
@@ -203,19 +198,16 @@ typedef ptrdiff_t INT;
#define WINDOW_HELP_ESTIMATE_m 11
#endif
#elif defined(SINC_POWER)
- #define PHI_HUT(n,k,d) (Y(bspline)(2 * ths->m, (K(2.0) * ths->m*(k)) / \
+ #define PHI_HUT(n,k,d) (Y(bsplines)(2 * ths->m, (K(2.0) * ths->m*(k)) / \
((K(2.0) * ths->sigma[(d)] - 1) * n / \
- ths->sigma[(d)]) + (R)ths->m, ths->spline_coeffs))
+ ths->sigma[(d)]) + (R)ths->m))
#define PHI(n,x,d) ((R)(n / ths->sigma[(d)] * \
(K(2.0) * ths->sigma[(d)] - K(1.0))/ (K(2.0)*ths->m) * \
POW(Y(sinc)(KPI * n / ths->sigma[(d)] * (x) * \
(K(2.0) * ths->sigma[(d)] - K(1.0)) / (K(2.0)*ths->m)) , 2*ths->m) / \
n))
- #define WINDOW_HELP_INIT \
- { \
- ths->spline_coeffs= (R*)Y(malloc)(2 * ths->m * sizeof(R)); \
- }
- #define WINDOW_HELP_FINALIZE {Y(free)(ths->spline_coeffs);}
+ #define WINDOW_HELP_INIT
+ #define WINDOW_HELP_FINALIZE
#if defined(NFFT_LDOUBLE)
#define WINDOW_HELP_ESTIMATE_m 13
#elif defined(NFFT_SINGLE)
@@ -1441,7 +1433,7 @@ R Y(lambda2)(R mu, R nu);
R Y(bessel_i0)(R x);
/* bspline.c: */
-R Y(bspline)(const INT, const R x, R*);
+R Y(bsplines)(const INT, const R x);
/* float.c: */
typedef enum {NFFT_EPSILON = 0, NFFT_SAFE__MIN = 1, NFFT_BASE = 2,
@@ -1454,6 +1446,7 @@ R Y(prod_real)(R *vec, INT d);
/* int.c: */
INT Y(log2i)(const INT m);
void Y(next_power_of_2_exp)(const INT N, INT *N2, INT *t);
+void Y(next_power_of_2_exp_int)(const int N, int *N2, int *t);
/* error.c: */
/* not used */ R Y(error_l_infty_double)(const R *x, const R *y, const INT n);
diff --git a/include/nfft3.h b/include/nfft3.h
index b4cba63..eade869 100644
--- a/include/nfft3.h
+++ b/include/nfft3.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#ifndef __NFFT3_H__
#define __NFFT3_H__
diff --git a/include/nfft3mp.h b/include/nfft3mp.h
index 7da7754..8222e31 100644
--- a/include/nfft3mp.h
+++ b/include/nfft3mp.h
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#ifndef __NFFT3MP_H__
#define __NFFT3MP_H__
diff --git a/include/solver_adjoint.h b/include/solver_adjoint.h
index 6663169..0d95f4c 100644
--- a/include/solver_adjoint.h
+++ b/include/solver_adjoint.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file solver_adjoint.h
* \brief Header file for adjoint solver.
*/
diff --git a/include/ticks.h.in b/include/ticks.h.in
index 567bbd0..afbf363 100644
--- a/include/ticks.h.in
+++ b/include/ticks.h.in
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: infft.h 3471 2010-04-08 21:43:41Z keiner $ */
-
#ifndef TICKS_H_
#define TICKS_H_
diff --git a/kernel/fpt/Makefile.am b/kernel/fpt/Makefile.am
index a613cca..261789f 100644
--- a/kernel/fpt/Makefile.am
+++ b/kernel/fpt/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
if HAVE_THREADS
diff --git a/kernel/fpt/fpt.c b/kernel/fpt/fpt.c
index 5afdf0a..4ffb47b 100644
--- a/kernel/fpt/fpt.c
+++ b/kernel/fpt/fpt.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file fpt.c
* \brief Implementation file for the FPT module
@@ -1047,7 +1045,7 @@ void fpt_precompute(fpt_set set, const int m, double *alpha, double *beta,
{
/* Stabilize. */
degree_stab = degree*(2*l+1);
- X(next_power_of_2_exp)((l+1)*(1<<(tau+1)),&N_stab,&t_stab);
+ X(next_power_of_2_exp_int)((l+1)*(1<<(tau+1)),&N_stab,&t_stab);
/* Old arrays are to small. */
nfft_free(a11);
@@ -1179,7 +1177,7 @@ void fpt_trafo_direct(fpt_set set, const int m, const double _Complex *x, double
//fprintf(stderr, "Executing dpt.\n");
- X(next_power_of_2_exp)(k_end+1,&Nk,&tk);
+ X(next_power_of_2_exp_int)(k_end+1,&Nk,&tk);
norm = 2.0/(Nk<<1);
//fprintf(stderr, "Norm = %e.\n", norm);
@@ -1277,7 +1275,7 @@ void fpt_trafo(fpt_set set, const int m, const double _Complex *x, double _Compl
return;
}
- X(next_power_of_2_exp)(k_end,&Nk,&tk);
+ X(next_power_of_2_exp_int)(k_end,&Nk,&tk);
k_start_tilde = K_START_TILDE(data->k_start,Nk);
k_end_tilde = K_END_TILDE(k_end,Nk);
@@ -1522,7 +1520,7 @@ void fpt_transposed_direct(fpt_set set, const int m, double _Complex *x,
int tk;
double norm;
- X(next_power_of_2_exp)(k_end+1,&Nk,&tk);
+ X(next_power_of_2_exp_int)(k_end+1,&Nk,&tk);
norm = 2.0/(Nk<<1);
if (set->flags & FPT_NO_DIRECT_ALGORITHM)
@@ -1609,7 +1607,7 @@ void fpt_transposed(fpt_set set, const int m, double _Complex *x,
return;
}
- X(next_power_of_2_exp)(k_end,&Nk,&tk);
+ X(next_power_of_2_exp_int)(k_end,&Nk,&tk);
k_start_tilde = K_START_TILDE(data->k_start,Nk);
k_end_tilde = K_END_TILDE(k_end,Nk);
diff --git a/kernel/fpt/fpt.h b/kernel/fpt/fpt.h
index f10fd3a..ea4ead8 100644
--- a/kernel/fpt/fpt.h
+++ b/kernel/fpt/fpt.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#ifndef _FPT_H_
#define _FPT_H_
diff --git a/kernel/mri/mri.c b/kernel/mri/mri.c
index c117ba8..15218b8 100644
--- a/kernel/mri/mri.c
+++ b/kernel/mri/mri.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include <string.h>
@@ -39,8 +37,6 @@ typedef struct window_funct_plan_ {
int n[1];
double sigma[1];
double *b;
- double *spline_coeffs; /**< input for de Boor algorithm, if
- B_SPLINE or SINC_2m is defined */
} window_funct_plan;
/**
diff --git a/kernel/nfct/nfct.c b/kernel/nfct/nfct.c
index 12a5726..16778d0 100644
--- a/kernel/nfct/nfct.c
+++ b/kernel/nfct/nfct.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* Nonequispaced fast cosine transform */
/* Author: Steffen Klatt 2004-2006, Jens Keiner 2010 */
diff --git a/kernel/nfft/nfft.c b/kernel/nfft/nfft.c
index ed54429..d5d7fe6 100644
--- a/kernel/nfft/nfft.c
+++ b/kernel/nfft/nfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* Nonequispaced FFT */
/* Authors: D. Potts, S. Kunis 2002-2009, Jens Keiner 2009, Toni Volkmer 2012 */
@@ -1442,10 +1440,10 @@ static void nfft_adjoint_B_compute_full_psi(C *g, const INT *psi_index_g,
R *gref_real = (R*) gref;
#pragma omp atomic
- gref_real[0] += creal(val);
+ gref_real[0] += CREAL(val);
#pragma omp atomic
- gref_real[1] += cimag(val);
+ gref_real[1] += CIMAG(val);
#else
g[psi_index_g[j * lprod + l]] += psi[j * lprod + l] * f[j];
#endif
@@ -1883,10 +1881,10 @@ static void nfft_adjoint_1d_compute_omp_atomic(const C f, C *g,
R *lhs_real = (R*)lhs;
C val = psij_const[l] * f;
#pragma omp atomic
- lhs_real[0] += creal(val);
+ lhs_real[0] += CREAL(val);
#pragma omp atomic
- lhs_real[1] += cimag(val);
+ lhs_real[1] += CIMAG(val);
}
}
#endif
@@ -2728,10 +2726,10 @@ static void nfft_adjoint_2d_compute_omp_atomic(const C f, C *g,
C val = psij_const0[l0] * psij_const1[l1] * f;
#pragma omp atomic
- lhs_real[0] += creal(val);
+ lhs_real[0] += CREAL(val);
#pragma omp atomic
- lhs_real[1] += cimag(val);
+ lhs_real[1] += CIMAG(val);
}
}
}
@@ -4134,10 +4132,10 @@ static void nfft_adjoint_3d_compute_omp_atomic(const C f, C *g,
C val = psij_const0[l0] * psij_const1[l1] * psij_const2[l2] * f;
#pragma omp atomic
- lhs_real[0] += creal(val);
+ lhs_real[0] += CREAL(val);
#pragma omp atomic
- lhs_real[1] += cimag(val);
+ lhs_real[1] += CIMAG(val);
}
}
}
diff --git a/kernel/nfsft/Makefile.am b/kernel/nfsft/Makefile.am
index 74cb41a..1785765 100644
--- a/kernel/nfsft/Makefile.am
+++ b/kernel/nfsft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
if HAVE_THREADS
diff --git a/kernel/nfsft/api.h b/kernel/nfsft/api.h
index 46d01df..a43625f 100644
--- a/kernel/nfsft/api.h
+++ b/kernel/nfsft/api.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file api.h
* \brief Header file with internal API of the NFSFT module
diff --git a/kernel/nfsft/legendre.c b/kernel/nfsft/legendre.c
index 7603fdc..10bf76e 100644
--- a/kernel/nfsft/legendre.c
+++ b/kernel/nfsft/legendre.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <math.h>
#include <stdio.h>
#include "infft.h"
diff --git a/kernel/nfsft/legendre.h b/kernel/nfsft/legendre.h
index 0a68db9..7ee17b2 100644
--- a/kernel/nfsft/legendre.h
+++ b/kernel/nfsft/legendre.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file nfsft.h
*
diff --git a/kernel/nfsft/nfsft.c b/kernel/nfsft/nfsft.c
index f02b633..a66de0f 100644
--- a/kernel/nfsft/nfsft.c
+++ b/kernel/nfsft/nfsft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file nfsft.c
* \brief Implementation file for the NFSFT module
@@ -282,7 +280,7 @@ void nfsft_init_guru(nfsft_plan *plan, int N, int M, unsigned int flags,
/* Calculate the next greater power of two with respect to the bandwidth N
* and the corresponding exponent. */
- //next_power_of_2_exp(plan->N,&plan->NPT,&plan->t);
+ //next_power_of_2_exp_int(plan->N,&plan->NPT,&plan->t);
/* Save length of array of Fourier coefficients. Owing to the data layout the
* length is (2N+2)(2N+2) */
@@ -384,7 +382,7 @@ void nfsft_precompute(int N, double kappa, unsigned int nfsft_flags,
/* Compute and save N_max = 2^{\ceil{log_2 N}} as next greater
* power of two with respect to N. */
- X(next_power_of_2_exp)(N,&wisdom.N_MAX,&wisdom.T_MAX);
+ X(next_power_of_2_exp_int)(N,&wisdom.N_MAX,&wisdom.T_MAX);
/* Check, if precomputation for direct algorithms needs to be performed. */
if (wisdom.flags & NFSFT_NO_DIRECT_ALGORITHM)
diff --git a/kernel/nfsoft/Makefile.am b/kernel/nfsoft/Makefile.am
index 367fbcd..6747192 100644
--- a/kernel/nfsoft/Makefile.am
+++ b/kernel/nfsoft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
AM_CPPFLAGS = -I$(top_srcdir)/include
noinst_LTLIBRARIES = libnfsoft.la
diff --git a/kernel/nfsoft/nfsoft.c b/kernel/nfsoft/nfsoft.c
index 2644f14..549257a 100755
--- a/kernel/nfsoft/nfsoft.c
+++ b/kernel/nfsoft/nfsoft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include <stdio.h>
diff --git a/kernel/nfsoft/wigner.c b/kernel/nfsoft/wigner.c
index 1b8a1b2..6649e00 100755
--- a/kernel/nfsoft/wigner.c
+++ b/kernel/nfsoft/wigner.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include <math.h>
#include <stdio.h>
#include "infft.h"
diff --git a/kernel/nfsoft/wigner.h b/kernel/nfsoft/wigner.h
index 3e169a7..4e38d87 100755
--- a/kernel/nfsoft/wigner.h
+++ b/kernel/nfsoft/wigner.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/**
* \file wigner.h
*
diff --git a/kernel/nfst/nfst.c b/kernel/nfst/nfst.c
index 6551957..6c80c49 100644
--- a/kernel/nfst/nfst.c
+++ b/kernel/nfst/nfst.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* Nonequispaced fast cosine transform */
/* Author: Steffen Klatt 2004-2006, Jens Keiner 2010 */
diff --git a/kernel/nnfft/nnfft.c b/kernel/nnfft/nnfft.c
index 6269bbf..5f8a863 100644
--- a/kernel/nnfft/nnfft.c
+++ b/kernel/nnfft/nnfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include <stdio.h>
diff --git a/kernel/nsfft/nsfft.c b/kernel/nsfft/nsfft.c
index 88a875c..516e647 100644
--- a/kernel/nsfft/nsfft.c
+++ b/kernel/nsfft/nsfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#include <stdio.h>
diff --git a/kernel/solver/solver.c b/kernel/solver/solver.c
index 9d9c7bf..084744f 100644
--- a/kernel/solver/solver.c
+++ b/kernel/solver/solver.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/*! \file solver.c
* \brief Implementation file for the solver module
* \author Stefan Kunis
diff --git a/kernel/util/assert.c b/kernel/util/assert.c
index b4df8a9..652098d 100644
--- a/kernel/util/assert.c
+++ b/kernel/util/assert.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/**
diff --git a/kernel/util/bessel_i0.c b/kernel/util/bessel_i0.c
index a6835b6..c6b3e24 100644
--- a/kernel/util/bessel_i0.c
+++ b/kernel/util/bessel_i0.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
#if defined(NFFT_LDOUBLE)
diff --git a/kernel/util/bspline.c b/kernel/util/bspline.c
index 2bd318b..77c5774 100644
--- a/kernel/util/bspline.c
+++ b/kernel/util/bspline.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
static inline void bspline_help(const INT k, const R x, R *scratch, const INT j,
@@ -36,7 +34,7 @@ static inline void bspline_help(const INT k, const R x, R *scratch, const INT j,
}
/* Evaluate the cardinal B-Spline B_{n-1} supported on [0,n]. */
-R Y(bspline)(const INT k, const R _x, R *scratch)
+R Y(bsplines)(const INT k, const R _x)
{
const R kk = (R)k;
R result_value;
@@ -45,6 +43,7 @@ R Y(bspline)(const INT k, const R _x, R *scratch)
INT j, idx, ug, og; /* indices */
R a; /* Alpha of de Boor scheme*/
R x = _x;
+ R scratch[k];
result_value = K(0.0);
diff --git a/kernel/util/damp.c b/kernel/util/damp.c
index 1268bf8..9fbca72 100644
--- a/kernel/util/damp.c
+++ b/kernel/util/damp.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/**
diff --git a/kernel/util/error.c b/kernel/util/error.c
index 5cb7e4b..88cdd41 100644
--- a/kernel/util/error.c
+++ b/kernel/util/error.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
static R cnrm1(const C *x, const INT n)
diff --git a/kernel/util/float.c b/kernel/util/float.c
index 73a0eb0..0e867bc 100644
--- a/kernel/util/float.c
+++ b/kernel/util/float.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
R Y(float_property)(const float_property p)
diff --git a/kernel/util/int.c b/kernel/util/int.c
index 57fb50c..c4cf51a 100644
--- a/kernel/util/int.c
+++ b/kernel/util/int.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
INT Y(exp2i)(const INT a)
@@ -111,3 +109,42 @@ void Y(next_power_of_2_exp)(const INT N, INT *N2, INT *t)
*t = logn+1;
}
}
+
+void Y(next_power_of_2_exp_int)(const int N, int *N2, int *t)
+{
+ int n,i,logn;
+ int N_is_not_power_of_2=0;
+
+ if (N == 0)
+ {
+ *N2 = 1;
+ *t = 0;
+ }
+ else
+ {
+ n = N;
+ logn = 0;
+ while (n != 1)
+ {
+ if (n%2 == 1)
+ {
+ N_is_not_power_of_2=1;
+ }
+ n = n/2;
+ logn++;
+ }
+
+ if (!N_is_not_power_of_2)
+ {
+ logn--;
+ }
+
+ for (i = 0; i <= logn; i++)
+ {
+ n = n*2;
+ }
+
+ *N2 = n;
+ *t = logn+1;
+ }
+}
diff --git a/kernel/util/lambda.c b/kernel/util/lambda.c
index 5271dcb..8688c24 100644
--- a/kernel/util/lambda.c
+++ b/kernel/util/lambda.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/* Coefficients for Lanzcos's approximation to the Gamma function. Can be
diff --git a/kernel/util/malloc.c b/kernel/util/malloc.c
index 683dcb2..554bcd8 100644
--- a/kernel/util/malloc.c
+++ b/kernel/util/malloc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include<stdlib.h>
#include "api.h"
diff --git a/kernel/util/print.c b/kernel/util/print.c
index c3338c2..b2d7997 100644
--- a/kernel/util/print.c
+++ b/kernel/util/print.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include <stdio.h>
#include "infft.h"
diff --git a/kernel/util/rand.c b/kernel/util/rand.c
index b41d17a..113a6cb 100644
--- a/kernel/util/rand.c
+++ b/kernel/util/rand.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
R Y(drand48)(void)
diff --git a/kernel/util/sinc.c b/kernel/util/sinc.c
index a55966e..b9f589f 100644
--- a/kernel/util/sinc.c
+++ b/kernel/util/sinc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
R Y(sinc)(const R x)
diff --git a/kernel/util/sort.c b/kernel/util/sort.c
index 3e8c714..27b1664 100644
--- a/kernel/util/sort.c
+++ b/kernel/util/sort.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#ifdef _OPENMP
#include <omp.h>
diff --git a/kernel/util/thread.c b/kernel/util/thread.c
index b68fca4..fd197f8 100644
--- a/kernel/util/thread.c
+++ b/kernel/util/thread.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
#ifdef _OPENMP
diff --git a/kernel/util/time.c b/kernel/util/time.c
index 1876180..7c68126 100644
--- a/kernel/util/time.c
+++ b/kernel/util/time.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
#ifdef HAVE_TIME_H
diff --git a/kernel/util/vector1.c b/kernel/util/vector1.c
index 706f793..449f3ea 100644
--- a/kernel/util/vector1.c
+++ b/kernel/util/vector1.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/** Computes the inner/dot product \f$x^H x\f$. */
diff --git a/kernel/util/vector2.c b/kernel/util/vector2.c
index 82ccecd..0268cf8 100644
--- a/kernel/util/vector2.c
+++ b/kernel/util/vector2.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/** Copies \f$x \leftarrow y\f$. */
diff --git a/kernel/util/vector3.c b/kernel/util/vector3.c
index 7d3d017..3e7c723 100644
--- a/kernel/util/vector3.c
+++ b/kernel/util/vector3.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
/** Updates \f$x \leftarrow a x + y\f$. */
diff --git a/kernel/util/voronoi.c b/kernel/util/voronoi.c
index 95f28c8..e5b3b76 100644
--- a/kernel/util/voronoi.c
+++ b/kernel/util/voronoi.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "api.h"
#include "cstripack.h"
diff --git a/kernel/util/window.c b/kernel/util/window.c
index 2c701a5..7236e97 100644
--- a/kernel/util/window.c
+++ b/kernel/util/window.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: util.c 3483 2010-04-23 19:02:34Z keiner $ */
-
#include "infft.h"
#if defined(DIRAC_DELTA)
diff --git a/m4/ax_lib_fftw3.m4 b/m4/ax_lib_fftw3.m4
index 8f7cc83..35f7d7e 100644
--- a/m4/ax_lib_fftw3.m4
+++ b/m4/ax_lib_fftw3.m4
@@ -1,6 +1,4 @@
-# $Id: matlab.m4 2652 2008-12-04 13:19:40Z keiner $
-#
-# Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+# Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@@ -75,15 +73,26 @@ AC_DEFUN([AX_LIB_FFTW3],
if test "x$ax_lib_fftw3" = "xyes"; then
saved_LIBS="$LIBS"
- AC_SEARCH_LIBS([fftw${PREC_SUFFIX}_execute], [fftw3${PREC_SUFFIX}], [ax_lib_fftw3=yes], [ax_lib_fftw3=no], [-lm])
- fftw3_LIBS="-lfftw3${PREC_SUFFIX} -lm"
+ AC_SEARCH_LIBS([fftw${PREC_SUFFIX}_execute], [fftw3${PREC_SUFFIX} fftw3${PREC_SUFFIX}-3], [ax_lib_fftw3=yes], [ax_lib_fftw3=no], [-lm])
+ fftw3_libvar=ac_cv_search_fftw${PREC_SUFFIX}_execute
+ fftw3_libname="${!fftw3_libvar:2}"
+ fftw3_LIBS="-l${fftw3_libname} -lm"
LIBS="$saved_LIBS"
fi
if test "x$enable_threads" = "xyes" -a "x$ax_lib_fftw3" = "xyes" -a "x$ax_lib_fftw3_threads" = "xyes"; then
saved_LIBS="$LIBS"
- AC_SEARCH_LIBS([fftw${PREC_SUFFIX}_init_threads], [fftw3${PREC_SUFFIX}_threads], [ax_lib_fftw3_threads=yes], [ax_lib_fftw3_threads=no], [-lfftw3${PREC_SUFFIX} -lpthread -lm])
- fftw3_threads_LIBS="-lfftw3${PREC_SUFFIX}_threads -lfftw3${PREC_SUFFIX} -lpthread -lm"
+
+ # Check for combined fftw threads
+ AC_CHECK_LIB([${fftw3_libname}], [fftw${PREC_SUFFIX}_init_threads], [ax_lib_fftw3_threads=yes], [ax_lib_fftw3_threads=no], [-lpthread -lm])
+ fftw3_threads_LIBS="-l${fftw3_libname} -lpthread -lm"
+
+ # Check for extra fftw threads library
+ if test "x$ax_lib_fftw3_threads" = "xno"; then
+ AC_SEARCH_LIBS([fftw${PREC_SUFFIX}_init_threads], [fftw3${PREC_SUFFIX}_threads], [ax_lib_fftw3_threads=yes], [ax_lib_fftw3_threads=no], [-l${fftw3_libname} -lpthread -lm])
+ fftw3_threads_LIBS="-lfftw3${PREC_SUFFIX}_threads -l${fftw3_libname} -lpthread -lm"
+ fi
+
LIBS="$saved_LIBS"
fi
diff --git a/m4/ax_prog_matlab.m4 b/m4/ax_prog_matlab.m4
index 2d5c9b7..2039196 100644
--- a/m4/ax_prog_matlab.m4
+++ b/m4/ax_prog_matlab.m4
@@ -1,6 +1,4 @@
-# $Id$
-#
-# Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+# Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
@@ -113,8 +111,9 @@ AC_DEFUN([AX_PROG_MATLAB],
[$matlab_bin_dir$PATH_SEPARATOR$PATH$PATH_SEPARATOR$matlab_bin_dir])
if test ! "x${matlab_prog_mexext}" = "xno"; then
AC_MSG_CHECKING([for mex file extension])
- if test "x${host_os}" = "xmingw32"; then
- matlab_mexext=mexw32
+ # Calling mexext.bat from mingw may fail
+ if test "x${host_os}" = "xmingw32" -o "x${host_os}" = "xmingw64"; then
+ matlab_mexext=unknown
else
matlab_mexext=`${matlab_prog_mexext}`
matlab_mexext=`echo ${matlab_mexext} | tr -d '\r\n'`
@@ -133,13 +132,13 @@ AC_DEFUN([AX_PROG_MATLAB],
*powerpc*darwin*) matlab_arch_test="mac mac64";;
*86*darwin*) matlab_arch_test="maci maci64";;
*solaris*) matlab_arch_test="sol sol64";;
- *cygwin*) matlab_arch_test="win32 win64";;
- *mingw*) matlab_arch_test="win32 win64";;
+ *cygwin*) matlab_arch_test="win64 win32";;
+ *mingw*) matlab_arch_test="win64 win32";;
*) AC_MSG_ERROR([Cannot guess Matlab architecture based on host type.]);;
esac
AC_MSG_CHECKING([for architecture])
- for matlab_arch in "$matlab_arch_test"; do
- if test -d "${matlab_bin_dir}/${matlab_arch}" -a -f "${matlab_bin_dir}/${matlab_arch}/MATLAB"; then
+ for matlab_arch in $matlab_arch_test; do
+ if test -d "${matlab_bin_dir}/${matlab_arch}" -a -f "${matlab_bin_dir}/${matlab_arch}/MATLAB$ac_exeext"; then
AC_MSG_RESULT([${matlab_arch}])
break
fi
@@ -242,67 +241,73 @@ AC_DEFUN([AX_PROG_MATLAB],
saved_LIBS="$LIBS"
saved_LDFLAGS="$LDFLAGS"
- matlab_fftw3_LIBS="-lfftw3"
- LIBS="-lfftw3 $LIBS"
- LDFLAGS="-L$matlab_fftw3_lib_dir ${matlab_LDFLAGS} $LDFLAGS"
- AC_MSG_CHECKING([for Matlab fftw3 library])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_execute])], [ax_matlab_lib_fftw3=yes],[ax_matlab_lib_fftw3=no])
- AC_MSG_RESULT([$ax_matlab_lib_fftw3])
-
- if test "x$ax_matlab_lib_fftw3" = "xno"; then
- matlab_fftw3_LIBS="-lfftw3 -lm"
- LIBS="$matlab_fftw3_LIBS $saved_LIBS"
- AC_MSG_CHECKING([for Matlab fftw3 library (-lm set)])
+ for matlab_fftw3_lib_name in mwfftw3 fftw3; do
+ matlab_fftw3_LIBS="-l${matlab_fftw3_lib_name}"
+ LIBS="-l${matlab_fftw3_lib_name} $LIBS"
+ LDFLAGS="-L$matlab_fftw3_lib_dir ${matlab_LDFLAGS} $LDFLAGS"
+ AC_MSG_CHECKING([for Matlab fftw3 library])
AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_execute])], [ax_matlab_lib_fftw3=yes],[ax_matlab_lib_fftw3=no])
AC_MSG_RESULT([$ax_matlab_lib_fftw3])
- fi
-
- if test "x$ax_matlab_lib_fftw3" = "xno"; then
- matlab_fftw3_LIBS="-lfftw3 -pthread -lm"
- LIBS="$matlab_fftw3_LIBS $saved_LIBS"
- AC_MSG_CHECKING([for Matlab fftw3 library (-lpthread -lm set)])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_execute])], [ax_matlab_lib_fftw3=yes],[ax_matlab_lib_fftw3=no])
- AC_MSG_RESULT([$ax_matlab_lib_fftw3])
- fi
- if test "x$ax_matlab_lib_fftw3" = "xno"; then
- AC_MSG_ERROR([You don't seem to have installed installed the FFTW 3 libray for the NFFT Matlab interface.])
- fi
+ if test "x$ax_matlab_lib_fftw3" = "xno"; then
+ matlab_fftw3_LIBS="-l${matlab_fftw3_lib_name} -lm"
+ LIBS="$matlab_fftw3_LIBS $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab fftw3 library (-lm set)])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_execute])], [ax_matlab_lib_fftw3=yes],[ax_matlab_lib_fftw3=no])
+ AC_MSG_RESULT([$ax_matlab_lib_fftw3])
+ fi
- if test "x$matlab_threads" = "xyes"; then
- LIBS="$matlab_fftw3_LIBS $saved_LIBS"
- AC_MSG_CHECKING([for Matlab combined fftw3 library with thread support])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [ax_matlab_lib_fftw3_threads=yes],[ax_matlab_lib_fftw3_threads=no])
- AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
-
- if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
- ax_matlab_lib_fftw3_threads="yes"
- LIBS="$matlab_fftw3_LIBS -lpthread -lm $saved_LIBS"
- AC_MSG_CHECKING([for Matlab combined fftw3 library with thread support (-lpthread -lm set)])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="$matlab_fftw3_LIBS -lpthread -lm"],[ax_matlab_lib_fftw3_threads=no])
- AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+ if test "x$ax_matlab_lib_fftw3" = "xno"; then
+ matlab_fftw3_LIBS="-l${matlab_fftw3_lib_name} -pthread -lm"
+ LIBS="$matlab_fftw3_LIBS $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab fftw3 library (-lpthread -lm set)])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_execute])], [ax_matlab_lib_fftw3=yes],[ax_matlab_lib_fftw3=no])
+ AC_MSG_RESULT([$ax_matlab_lib_fftw3])
fi
- if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
- ax_matlab_lib_fftw3_threads="yes"
- LIBS="-lfftw3_threads $matlab_fftw3_LIBS $saved_LIBS"
- AC_MSG_CHECKING([for Matlab fftw3 library with thread support])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="-lfftw3_threads $matlab_fftw3_LIBS"],[ax_matlab_lib_fftw3_threads=no])
- AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+ if test "x$ax_matlab_lib_fftw3" = "xno"; then
+ AC_MSG_ERROR([You don't seem to have installed the FFTW 3 libray for the NFFT Matlab interface.])
fi
- if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
- ax_matlab_lib_fftw3_threads="yes"
- LIBS="-lfftw3_threads -lpthread $matlab_fftw3_LIBS $saved_LIBS"
- AC_MSG_CHECKING([for Matlab fftw3 library with thread support (-lpthread set)])
- AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="-lfftw3_threads -lpthread $matlab_fftw3_LIBS"],[ax_matlab_lib_fftw3_threads=no])
+ if test "x$matlab_threads" = "xyes"; then
+ LIBS="$matlab_fftw3_LIBS $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab combined fftw3 library with thread support])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [ax_matlab_lib_fftw3_threads=yes],[ax_matlab_lib_fftw3_threads=no])
AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+
+ if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
+ ax_matlab_lib_fftw3_threads="yes"
+ LIBS="$matlab_fftw3_LIBS -lpthread -lm $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab combined fftw3 library with thread support (-lpthread -lm set)])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="$matlab_fftw3_LIBS -lpthread -lm"],[ax_matlab_lib_fftw3_threads=no])
+ AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+ fi
+
+ if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
+ ax_matlab_lib_fftw3_threads="yes"
+ LIBS="-l${matlab_fftw3_lib_name}_threads $matlab_fftw3_LIBS $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab fftw3 library with thread support])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="-l${matlab_fftw3_lib_name}_threads $matlab_fftw3_LIBS"],[ax_matlab_lib_fftw3_threads=no])
+ AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+ fi
+
+ if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
+ ax_matlab_lib_fftw3_threads="yes"
+ LIBS="-l${matlab_fftw3_lib_name}_threads -lpthread $matlab_fftw3_LIBS $saved_LIBS"
+ AC_MSG_CHECKING([for Matlab fftw3 library with thread support (-lpthread set)])
+ AC_LINK_IFELSE([AC_LANG_CALL([], [fftw_init_threads])], [matlab_fftw3_LIBS="-l${matlab_fftw3_lib_name}_threads -lpthread $matlab_fftw3_LIBS"],[ax_matlab_lib_fftw3_threads=no])
+ AC_MSG_RESULT([$ax_matlab_lib_fftw3_threads])
+ fi
+
+ if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
+ AC_MSG_ERROR([You don't seem to have installed the FFTW 3 libray for the NFFT Matlab interface.])
+ fi
fi
- if test "x$ax_matlab_lib_fftw3_threads" = "xno"; then
- AC_MSG_ERROR([You don't seem to have installed the FFTW 3 libray for the NFFT Matlab interface.])
+ if test "x$ax_matlab_lib_fftw3" != "xno"; then
+ break
fi
- fi
+ done
LIBS="$saved_LIBS"
LDFLAGS="$saved_LDFLAGS"
diff --git a/matlab/Makefile.am b/matlab/Makefile.am
index 3c15a61..0ef0918 100644
--- a/matlab/Makefile.am
+++ b/matlab/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
if HAVE_NFSFT
DIR_NFSFT=nfsft
else
diff --git a/matlab/args.c b/matlab/args.c
index c731b46..cc048a6 100644
--- a/matlab/args.c
+++ b/matlab/args.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include "imex.h"
diff --git a/matlab/imex.h b/matlab/imex.h
index 335f4f6..694dfc5 100644
--- a/matlab/imex.h
+++ b/matlab/imex.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
/* NFFT mex internal header file */
#ifndef MEXUTIL_H
#define MEXUTIL_H
diff --git a/matlab/malloc.c b/matlab/malloc.c
index 2653a00..753724b 100644
--- a/matlab/malloc.c
+++ b/matlab/malloc.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id$ */
-
#include "config.h"
#include "imex.h"
#include "nfft3.h"
diff --git a/matlab/nfft/FFTW_ESTIMATE.m b/matlab/nfft/FFTW_ESTIMATE.m
index 23d18e3..ea4848b 100644
--- a/matlab/nfft/FFTW_ESTIMATE.m
+++ b/matlab/nfft/FFTW_ESTIMATE.m
@@ -1,9 +1,9 @@
% FFTW_ESTIMATE FFT flag
% Valid for FFTW3
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = FFTW_ESTIMATE()
f = bitshift(1, 6);
diff --git a/matlab/nfft/FFTW_MEASURE.m b/matlab/nfft/FFTW_MEASURE.m
index c77e92a..bbdd8c8 100644
--- a/matlab/nfft/FFTW_MEASURE.m
+++ b/matlab/nfft/FFTW_MEASURE.m
@@ -1,9 +1,9 @@
%FFTW_MEASURE FFT flag
% Valid for FFTW3
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = FFTW_MEASURE()
f = 0;
diff --git a/matlab/nfft/FFT_OUT_OF_PLACE.m b/matlab/nfft/FFT_OUT_OF_PLACE.m
index 056ae99..2bb217e 100644
--- a/matlab/nfft/FFT_OUT_OF_PLACE.m
+++ b/matlab/nfft/FFT_OUT_OF_PLACE.m
@@ -1,9 +1,9 @@
%FFT_OUT_OF_PLACE FFT flag
% If this flag is set, FFTW uses disjoint input/output vectors.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = FFT_OUT_OF_PLACE()
f = bitshift(1, 9);
diff --git a/matlab/nfft/FG_PSI.m b/matlab/nfft/FG_PSI.m
index 8afd218..d892abd 100644
--- a/matlab/nfft/FG_PSI.m
+++ b/matlab/nfft/FG_PSI.m
@@ -3,9 +3,9 @@
% sparse matrix B) uses particular properties of the Gaussian window function
% to trade multiplications for direct calls to exponential function.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = FG_PSI()
f = bitshift(1, 1);
diff --git a/matlab/nfft/Makefile.am b/matlab/nfft/Makefile.am
index 98e9952..fc12b9a 100644
--- a/matlab/nfft/Makefile.am
+++ b/matlab/nfft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
# compiler flags
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/matlab $(matlab_CPPFLAGS)
diff --git a/matlab/nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m b/matlab/nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m
index b95d6e5..2468be1 100644
--- a/matlab/nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m
+++ b/matlab/nfft/NFFT_OMP_BLOCKWISE_ADJOINT.m
@@ -1,9 +1,9 @@
%NFFT_OMP_BLOCKWISE_ADJOINT Flag which results in usage of (probably) faster algorithm in adjoint NFFT with OpenMP support.
% If this flag is set, additionally the nonequispaced nodes are sorted
% which may also accelerate the standard NFFT trafo due to cache effects.
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: PRE_PSI.m 4272 2015-01-10 19:39:35Z keiner $
function f = NFFT_OMP_BLOCKWISE_ADJOINT()
f = bitshift(1, 12);
diff --git a/matlab/nfft/PRE_FG_PSI.m b/matlab/nfft/PRE_FG_PSI.m
index c82a094..6824e44 100644
--- a/matlab/nfft/PRE_FG_PSI.m
+++ b/matlab/nfft/PRE_FG_PSI.m
@@ -4,9 +4,9 @@
% multiplications for direct calls to exponential function (the remaining 2dM
% direct calls are precomputed).
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -21,8 +21,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = PRE_FG_PSI()
f = bitshift(1, 3);
diff --git a/matlab/nfft/PRE_FULL_PSI.m b/matlab/nfft/PRE_FULL_PSI.m
index 3a1befb..ad6761e 100644
--- a/matlab/nfft/PRE_FULL_PSI.m
+++ b/matlab/nfft/PRE_FULL_PSI.m
@@ -3,9 +3,9 @@
% matrix B) uses (2m+2)^dM precomputed values of the window function, in
% addition indices of source and target vectors are stored.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = PRE_FULL_PSI()
f = bitshift(1, 5);
diff --git a/matlab/nfft/PRE_LIN_PSI.m b/matlab/nfft/PRE_LIN_PSI.m
index 25c7cdd..dfab51c 100644
--- a/matlab/nfft/PRE_LIN_PSI.m
+++ b/matlab/nfft/PRE_LIN_PSI.m
@@ -3,9 +3,9 @@
% matrix B) uses linear interpolation from a lookup table of equispaced samples
% of the window function instead of exact values of the window function.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = PRE_LIN_PSI()
f = bitshift(1, 2);
diff --git a/matlab/nfft/PRE_PHI_HUT.m b/matlab/nfft/PRE_PHI_HUT.m
index 2d7ae41..a66ae1d 100644
--- a/matlab/nfft/PRE_PHI_HUT.m
+++ b/matlab/nfft/PRE_PHI_HUT.m
@@ -3,9 +3,9 @@
% diagonal matrix D) uses precomputed values of the Fourier transformed window
% function.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = PRE_PHI_HUT()
f = bitshift(1, 0);
diff --git a/matlab/nfft/PRE_PSI.m b/matlab/nfft/PRE_PSI.m
index 7f68148..482b8fc 100644
--- a/matlab/nfft/PRE_PSI.m
+++ b/matlab/nfft/PRE_PSI.m
@@ -1,9 +1,9 @@
%PRE_PSI Precomputation flag
% If this flag is set, the convolution step (the multiplication with the sparse
% matrix B uses (2m+2)dM precomputed values of the window function.
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = PRE_PSI()
f = bitshift(1, 4);
diff --git a/matlab/nfft/ndft_adjoint.m b/matlab/nfft/ndft_adjoint.m
index 04ee829..e834c0f 100644
--- a/matlab/nfft/ndft_adjoint.m
+++ b/matlab/nfft/ndft_adjoint.m
@@ -1,7 +1,7 @@
%NDFT_ADJOINT Adjoint nonequispaced discrete Fourier transform (direct algorithm)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function ndft_adjoint(p)
nfftmex('adjoint_direct',p)
diff --git a/matlab/nfft/ndft_trafo.m b/matlab/nfft/ndft_trafo.m
index 683771e..f72517d 100644
--- a/matlab/nfft/ndft_trafo.m
+++ b/matlab/nfft/ndft_trafo.m
@@ -1,7 +1,7 @@
%NDFT_TRAFO Nonequispaced discrete Fourier transformation (direct algorithm)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function ndft_trafo(p)
nfftmex('trafo_direct',p)
diff --git a/matlab/nfft/nfft.m b/matlab/nfft/nfft.m
index b1870df..16f5ae9 100644
--- a/matlab/nfft/nfft.m
+++ b/matlab/nfft/nfft.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nfft/nfft_adjoint.m b/matlab/nfft/nfft_adjoint.m
index 9487982..3272b5d 100644
--- a/matlab/nfft/nfft_adjoint.m
+++ b/matlab/nfft/nfft_adjoint.m
@@ -1,7 +1,7 @@
%NFFT_ADJOINT Adjoint nonequispaced fast Fourier transform
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_adjoint(p)
nfftmex('adjoint',p)
diff --git a/matlab/nfft/nfft_finalize.m b/matlab/nfft/nfft_finalize.m
index 18cf573..e8816a2 100644
--- a/matlab/nfft/nfft_finalize.m
+++ b/matlab/nfft/nfft_finalize.m
@@ -1,7 +1,7 @@
%NFFT_FINALIZE Finalize plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_finalize(p)
nfftmex('finalize',p)
diff --git a/matlab/nfft/nfft_get_f.m b/matlab/nfft/nfft_get_f.m
index bd48dc8..02aed96 100644
--- a/matlab/nfft/nfft_get_f.m
+++ b/matlab/nfft/nfft_get_f.m
@@ -1,7 +1,7 @@
%NFFT_GET_F Get function values from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = nfft_get_f(p)
f = nfftmex('get_f',p);
diff --git a/matlab/nfft/nfft_get_f_hat.m b/matlab/nfft/nfft_get_f_hat.m
index 1e07725..13307ac 100644
--- a/matlab/nfft/nfft_get_f_hat.m
+++ b/matlab/nfft/nfft_get_f_hat.m
@@ -1,7 +1,7 @@
%NFFT_GET_F_HAT Get Fourier coefficients from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f_hat = nfft_get_f_hat(p)
f_hat = nfftmex('get_f_hat',p);
diff --git a/matlab/nfft/nfft_get_num_threads.m b/matlab/nfft/nfft_get_num_threads.m
index ae55429..14495fc 100644
--- a/matlab/nfft/nfft_get_num_threads.m
+++ b/matlab/nfft/nfft_get_num_threads.m
@@ -1,7 +1,7 @@
%NFFT_GET_NUM_THREADS Get number of threads (at most) used for computation
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_x.m 3124 2009-03-18 13:44:27Z kunis $
function nthreads = nfft_get_num_threads()
nthreads = nfftmex('get_num_threads');
diff --git a/matlab/nfft/nfft_get_x.m b/matlab/nfft/nfft_get_x.m
index 44549a6..897aa86 100644
--- a/matlab/nfft/nfft_get_x.m
+++ b/matlab/nfft/nfft_get_x.m
@@ -1,7 +1,7 @@
%NFFT_GET_X Get nodes from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function x = nfft_get_x(p)
x = nfftmex('get_x',p);
diff --git a/matlab/nfft/nfft_init_1d.m b/matlab/nfft/nfft_init_1d.m
index 488b389..29167f9 100644
--- a/matlab/nfft/nfft_init_1d.m
+++ b/matlab/nfft/nfft_init_1d.m
@@ -1,7 +1,7 @@
%NFFT_INIT_1D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfft_init_1d(N,M)
p = nfftmex('init_1d',N,M);
diff --git a/matlab/nfft/nfft_init_2d.m b/matlab/nfft/nfft_init_2d.m
index 5b8b402..59025b6 100644
--- a/matlab/nfft/nfft_init_2d.m
+++ b/matlab/nfft/nfft_init_2d.m
@@ -1,7 +1,7 @@
%NFFT_INIT_2D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfft_init_2d(N1,N2,M)
p = nfftmex('init_2d',N1,N2,M);
diff --git a/matlab/nfft/nfft_init_3d.m b/matlab/nfft/nfft_init_3d.m
index 8c10ec0..03685ed 100644
--- a/matlab/nfft/nfft_init_3d.m
+++ b/matlab/nfft/nfft_init_3d.m
@@ -1,7 +1,7 @@
%NFFT_INIT_3D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfft_init_3d(N1,N2,N3,M)
p = nfftmex('init_3d',N1,N2,N3,M);
diff --git a/matlab/nfft/nfft_init_guru.m b/matlab/nfft/nfft_init_guru.m
index 1c913c1..65806d7 100644
--- a/matlab/nfft/nfft_init_guru.m
+++ b/matlab/nfft/nfft_init_guru.m
@@ -12,9 +12,9 @@
% PRE_FULL_PSI} | FFT_OUT_OF_PLACE
% fftw_flags {FFTW_ESTIMATE, FFTW_MEASURE}
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -29,8 +29,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfft_init_guru(varargin)
p = nfftmex('init_guru',varargin);
diff --git a/matlab/nfft/nfft_precompute_psi.m b/matlab/nfft/nfft_precompute_psi.m
index c912638..ed3edcd 100644
--- a/matlab/nfft/nfft_precompute_psi.m
+++ b/matlab/nfft/nfft_precompute_psi.m
@@ -1,7 +1,7 @@
%NFFT_PRECOMPUTE_PSI Precompute psi, dependent on nodes x
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_precompute_psi(p)
nfftmex('precompute_psi',p)
diff --git a/matlab/nfft/nfft_set_f.m b/matlab/nfft/nfft_set_f.m
index bc9333d..ada43fc 100644
--- a/matlab/nfft/nfft_set_f.m
+++ b/matlab/nfft/nfft_set_f.m
@@ -1,7 +1,7 @@
%NFFT_SET_F Set function values in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_set_f(p,f)
nfftmex('set_f',p,f)
diff --git a/matlab/nfft/nfft_set_f_hat.m b/matlab/nfft/nfft_set_f_hat.m
index f73cafa..8b22904 100644
--- a/matlab/nfft/nfft_set_f_hat.m
+++ b/matlab/nfft/nfft_set_f_hat.m
@@ -1,7 +1,7 @@
%NFFT_SET_F_HAT Set Fourier coefficients in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_set_f_hat(p,f_hat)
nfftmex('set_f_hat',p,f_hat)
diff --git a/matlab/nfft/nfft_set_x.m b/matlab/nfft/nfft_set_x.m
index bd3637c..997620e 100644
--- a/matlab/nfft/nfft_set_x.m
+++ b/matlab/nfft/nfft_set_x.m
@@ -1,7 +1,7 @@
%NFFT_SET_X Set nodes in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_set_x(p,x)
nfftmex('set_x',p,x)
diff --git a/matlab/nfft/nfft_trafo.m b/matlab/nfft/nfft_trafo.m
index 0196085..0b46095 100644
--- a/matlab/nfft/nfft_trafo.m
+++ b/matlab/nfft/nfft_trafo.m
@@ -1,7 +1,7 @@
%NFFT_TRAFO nonequispaced fast Fourier transformat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfft_trafo(p)
nfftmex('trafo',p)
diff --git a/matlab/nfft/nfftmex.c b/matlab/nfft/nfftmex.c
index a5f37b6..bde8cb3 100644
--- a/matlab/nfft/nfftmex.c
+++ b/matlab/nfft/nfftmex.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#ifdef HAVE_COMPLEX_H
diff --git a/matlab/nfft/nfftmex.m b/matlab/nfft/nfftmex.m
index edd4ad9..55c8b9a 100644
--- a/matlab/nfft/nfftmex.m
+++ b/matlab/nfft/nfftmex.m
@@ -1,7 +1,7 @@
%NFFTMEX Gateway function to NFFT module from NFFT3
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,5 +17,3 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
diff --git a/matlab/nfft/simple_test.m b/matlab/nfft/simple_test.m
index b8edb0f..6f76120 100644
--- a/matlab/nfft/simple_test.m
+++ b/matlab/nfft/simple_test.m
@@ -1,8 +1,8 @@
%SIMPLE_TEST Example program: Basic usage principles
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
disp(sprintf('Number of threads: %d\n', nfft_get_num_threads()));
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
disp('A simple one dimensional example');
diff --git a/matlab/nfft/test_nfft1d.m b/matlab/nfft/test_nfft1d.m
index d93f371..173210d 100644
--- a/matlab/nfft/test_nfft1d.m
+++ b/matlab/nfft/test_nfft1d.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nfft/test_nfft2d.m b/matlab/nfft/test_nfft2d.m
index e8543c4..962d873 100644
--- a/matlab/nfft/test_nfft2d.m
+++ b/matlab/nfft/test_nfft2d.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nfft/test_nfft3d.m b/matlab/nfft/test_nfft3d.m
index f43a105..c97eee9 100644
--- a/matlab/nfft/test_nfft3d.m
+++ b/matlab/nfft/test_nfft3d.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nfsft/@f_hat/char.m b/matlab/nfsft/@f_hat/char.m
index c949c64..30871cf 100644
--- a/matlab/nfsft/@f_hat/char.m
+++ b/matlab/nfsft/@f_hat/char.m
@@ -1,7 +1,7 @@
%CHAR Conversion to string for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function s = char(p)
if (p.N == -1)
diff --git a/matlab/nfsft/@f_hat/display.m b/matlab/nfsft/@f_hat/display.m
index 35b3c63..7cf8a5e 100644
--- a/matlab/nfsft/@f_hat/display.m
+++ b/matlab/nfsft/@f_hat/display.m
@@ -1,7 +1,7 @@
%DISPLAY Display function for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function display(p)
if (p.N == -1)
diff --git a/matlab/nfsft/@f_hat/double.m b/matlab/nfsft/@f_hat/double.m
index 1efde39..5c3c9a3 100644
--- a/matlab/nfsft/@f_hat/double.m
+++ b/matlab/nfsft/@f_hat/double.m
@@ -1,7 +1,7 @@
%DOUBLE Double conversion for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function d = double(p)
d = zeros(2*p.N+1,p.N+1);
diff --git a/matlab/nfsft/@f_hat/f_hat.m b/matlab/nfsft/@f_hat/f_hat.m
index aed40a4..e2fa3b8 100644
--- a/matlab/nfsft/@f_hat/f_hat.m
+++ b/matlab/nfsft/@f_hat/f_hat.m
@@ -1,7 +1,7 @@
%F_HAT Constructor for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = f_hat(a)
if (nargin == 0)
diff --git a/matlab/nfsft/@f_hat/get.m b/matlab/nfsft/@f_hat/get.m
index d1a4c6d..a139fa1 100644
--- a/matlab/nfsft/@f_hat/get.m
+++ b/matlab/nfsft/@f_hat/get.m
@@ -1,7 +1,7 @@
%GET Get f_hat properties from the specified object
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function val = get(p, propName)
switch propName
case 'Data'
diff --git a/matlab/nfsft/@f_hat/minus.m b/matlab/nfsft/@f_hat/minus.m
index d2e1365..c8b7cef 100644
--- a/matlab/nfsft/@f_hat/minus.m
+++ b/matlab/nfsft/@f_hat/minus.m
@@ -1,8 +1,8 @@
%MINUS Minus for f_hat
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,8 +17,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function r = minus(p,q)
p = f_hat(p);
q = f_hat(q);
diff --git a/matlab/nfsft/@f_hat/mtimes.m b/matlab/nfsft/@f_hat/mtimes.m
index 68380b9..dc6929a 100644
--- a/matlab/nfsft/@f_hat/mtimes.m
+++ b/matlab/nfsft/@f_hat/mtimes.m
@@ -1,7 +1,7 @@
%MTIMES Multiply for f_hat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function r = mtimes(p,q)
p = f_hat(p);
diff --git a/matlab/nfsft/@f_hat/mtimesr.m b/matlab/nfsft/@f_hat/mtimesr.m
index c63a6f3..2a629dd 100644
--- a/matlab/nfsft/@f_hat/mtimesr.m
+++ b/matlab/nfsft/@f_hat/mtimesr.m
@@ -1,7 +1,7 @@
%MTIMESR Multiply for f_hat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function r = mtimesr(p,q)
if (isa(p,'f_hat') && isnumeric(q))
p = f_hat(p);
diff --git a/matlab/nfsft/@f_hat/norm.m b/matlab/nfsft/@f_hat/norm.m
index 3d3cbf5..359cf87 100644
--- a/matlab/nfsft/@f_hat/norm.m
+++ b/matlab/nfsft/@f_hat/norm.m
@@ -1,7 +1,7 @@
%NORM Norm for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function y = norm(p,n)
% Norm for f_hat class
p = f_hat(p);
diff --git a/matlab/nfsft/@f_hat/plus.m b/matlab/nfsft/@f_hat/plus.m
index 6b97ad2..fd10b6e 100644
--- a/matlab/nfsft/@f_hat/plus.m
+++ b/matlab/nfsft/@f_hat/plus.m
@@ -1,7 +1,7 @@
%PLUS Plus for f_hat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function r = plus(p,q)
p = f_hat(p);
q = f_hat(q);
diff --git a/matlab/nfsft/@f_hat/subsasgn.m b/matlab/nfsft/@f_hat/subsasgn.m
index 19f4587..7e2011f 100644
--- a/matlab/nfsft/@f_hat/subsasgn.m
+++ b/matlab/nfsft/@f_hat/subsasgn.m
@@ -1,7 +1,7 @@
%SUBSASGN Index assignment function for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = subsasgn(p,s,v)
switch s.type
case '()'
diff --git a/matlab/nfsft/@f_hat/subsref.m b/matlab/nfsft/@f_hat/subsref.m
index 0363e28..ba35ac8 100644
--- a/matlab/nfsft/@f_hat/subsref.m
+++ b/matlab/nfsft/@f_hat/subsref.m
@@ -1,7 +1,7 @@
%SUBSREF Indexing funcction for f_hat class
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function b = subsref(p,s)
switch s.type
case '()'
diff --git a/matlab/nfsft/Makefile.am b/matlab/nfsft/Makefile.am
index ade0fe2..3d3d8e5 100644
--- a/matlab/nfsft/Makefile.am
+++ b/matlab/nfsft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
SUBDIRS = @f_hat
# compiler flags
diff --git a/matlab/nfsft/NFSFT_NORMALIZED.m b/matlab/nfsft/NFSFT_NORMALIZED.m
index a416dec..a476e6f 100644
--- a/matlab/nfsft/NFSFT_NORMALIZED.m
+++ b/matlab/nfsft/NFSFT_NORMALIZED.m
@@ -1,7 +1,7 @@
%NFSFT_NORMALIZED Flag for using L^2-normalized Spherical harmonics
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_NORMALIZED()
f = 1;
diff --git a/matlab/nfsft/NFSFT_NO_DIRECT_ALGORITHM.m b/matlab/nfsft/NFSFT_NO_DIRECT_ALGORITHM.m
index 61568a0..21a7838 100644
--- a/matlab/nfsft/NFSFT_NO_DIRECT_ALGORITHM.m
+++ b/matlab/nfsft/NFSFT_NO_DIRECT_ALGORITHM.m
@@ -1,7 +1,7 @@
%NFSFT_NO_DIRECT_ALGORITHM Flag for not precomputing for the direct algorithm
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_NO_DIRECT_ALGORITHM()
f = 8192;
diff --git a/matlab/nfsft/NFSFT_NO_FAST_ALGORITHM.m b/matlab/nfsft/NFSFT_NO_FAST_ALGORITHM.m
index c404b26..16fab4a 100644
--- a/matlab/nfsft/NFSFT_NO_FAST_ALGORITHM.m
+++ b/matlab/nfsft/NFSFT_NO_FAST_ALGORITHM.m
@@ -1,7 +1,7 @@
%NFSFT_NO_FAST_ALGORITHM Flag for not precomputing for the fast algorithm
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_NO_FAST_ALGORITHM()
f = 16384;
diff --git a/matlab/nfsft/NFSFT_PRESERVE_F_HAT.m b/matlab/nfsft/NFSFT_PRESERVE_F_HAT.m
index 89589e9..d93fb4e 100644
--- a/matlab/nfsft/NFSFT_PRESERVE_F_HAT.m
+++ b/matlab/nfsft/NFSFT_PRESERVE_F_HAT.m
@@ -1,7 +1,7 @@
%NFSFT_PRESERVE_F_HAT Flag for NFSFT not destroying input in f_hat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_PRESERVE_F_HAT()
f = 128;
diff --git a/matlab/nfsft/NFSFT_USE_DPT.m b/matlab/nfsft/NFSFT_USE_DPT.m
index 6fe6e53..33f3943 100644
--- a/matlab/nfsft/NFSFT_USE_DPT.m
+++ b/matlab/nfsft/NFSFT_USE_DPT.m
@@ -1,7 +1,7 @@
%NFSFT_USE_DPT Flag for using the DPT algorithm internally
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_USE_DPT()
f = 4;
diff --git a/matlab/nfsft/NFSFT_USE_NDFT.m b/matlab/nfsft/NFSFT_USE_NDFT.m
index 9f3e57e..05068e9 100644
--- a/matlab/nfsft/NFSFT_USE_NDFT.m
+++ b/matlab/nfsft/NFSFT_USE_NDFT.m
@@ -1,7 +1,7 @@
%NFSFT_USE_NDFT Flag for using the NDFT algorithm internally
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = NFSFT_USE_NDFT()
f = 2;
diff --git a/matlab/nfsft/cc.m b/matlab/nfsft/cc.m
index 3da6186..cc5ba6d 100755
--- a/matlab/nfsft/cc.m
+++ b/matlab/nfsft/cc.m
@@ -28,9 +28,9 @@
% References
% TODO Add references.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -45,8 +45,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [x,w] = cc(n)
% correctness conditions
diff --git a/matlab/nfsft/f_hat_index.m b/matlab/nfsft/f_hat_index.m
index 58fc66f..4930b59 100644
--- a/matlab/nfsft/f_hat_index.m
+++ b/matlab/nfsft/f_hat_index.m
@@ -1,7 +1,7 @@
%F_HAT_INDEX Return indices of Fourier coefficients
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function ind = f_hat_index(f_hat,j,k)
[m,n] = size(f_hat);
N = (m-1)/2;
diff --git a/matlab/nfsft/gl.m b/matlab/nfsft/gl.m
index 80685b8..4e21cc3 100644
--- a/matlab/nfsft/gl.m
+++ b/matlab/nfsft/gl.m
@@ -22,9 +22,9 @@
% References
% TODO Add references.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -39,8 +39,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function [x,w] = gl(n)
% correctness conditions
diff --git a/matlab/nfsft/ndsft_adjoint.m b/matlab/nfsft/ndsft_adjoint.m
index d2ef2a0..3467283 100644
--- a/matlab/nfsft/ndsft_adjoint.m
+++ b/matlab/nfsft/ndsft_adjoint.m
@@ -1,7 +1,7 @@
%NDSFT_ADJOINT Adjoint discrete spherical Fourier transform (direct alg.)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function ndsft_adjoint(p)
nfsftmex('adjoint_direct',p)
diff --git a/matlab/nfsft/ndsft_trafo.m b/matlab/nfsft/ndsft_trafo.m
index 2daca13..6237954 100644
--- a/matlab/nfsft/ndsft_trafo.m
+++ b/matlab/nfsft/ndsft_trafo.m
@@ -1,7 +1,7 @@
%NDSFT_TRAFO Discrete spherical Fourier transform (direct algorithm)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function ndsft_trafo(p)
nfsftmex('trafo_direct',p)
diff --git a/matlab/nfsft/nfsft_adjoint.m b/matlab/nfsft/nfsft_adjoint.m
index 87954ae..a5d17b3 100644
--- a/matlab/nfsft/nfsft_adjoint.m
+++ b/matlab/nfsft/nfsft_adjoint.m
@@ -1,7 +1,7 @@
%NFSFT_ADJOINT Adjoint fast spherical Fourier transform
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_adjoint(p)
nfsftmex('adjoint',p)
diff --git a/matlab/nfsft/nfsft_finalize.m b/matlab/nfsft/nfsft_finalize.m
index 627b4cd..66b9f2a 100644
--- a/matlab/nfsft/nfsft_finalize.m
+++ b/matlab/nfsft/nfsft_finalize.m
@@ -1,7 +1,7 @@
%NFSFT_FINALIZE Finalize plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_finalize(p)
nfsftmex('finalize',p)
diff --git a/matlab/nfsft/nfsft_forget.m b/matlab/nfsft/nfsft_forget.m
index 0e6d59c..3916fd4 100644
--- a/matlab/nfsft/nfsft_forget.m
+++ b/matlab/nfsft/nfsft_forget.m
@@ -1,7 +1,7 @@
%NFSFT_FORGET Forget precomputed data
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_forget
nfsftmex('forget');
diff --git a/matlab/nfsft/nfsft_get_f.m b/matlab/nfsft/nfsft_get_f.m
index 421ea55..8f98fdb 100644
--- a/matlab/nfsft/nfsft_get_f.m
+++ b/matlab/nfsft/nfsft_get_f.m
@@ -1,7 +1,7 @@
%NFSFT_GET_F Get function values from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f = nfsft_get_f(p)
f = nfsftmex('get_f',p);
diff --git a/matlab/nfsft/nfsft_get_f_hat.m b/matlab/nfsft/nfsft_get_f_hat.m
index 8eb0318..937275d 100644
--- a/matlab/nfsft/nfsft_get_f_hat.m
+++ b/matlab/nfsft/nfsft_get_f_hat.m
@@ -1,7 +1,7 @@
%NFSFT_GET_F_HAT Get Fourier coefficients in a matrix from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f_hat = nfsft_get_f_hat(p)
f_hat = nfsftmex('get_f_hat',p);
diff --git a/matlab/nfsft/nfsft_get_f_hat_linear.m b/matlab/nfsft/nfsft_get_f_hat_linear.m
index 5edf218..ed07834 100644
--- a/matlab/nfsft/nfsft_get_f_hat_linear.m
+++ b/matlab/nfsft/nfsft_get_f_hat_linear.m
@@ -1,7 +1,7 @@
%NFSFT_GET_F_HAT_LINEAR Get Fourier coefficients in a linear vector from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function f_hat = nfsft_get_f_hat_linear(p)
f_hat = nfsftmex('get_f_hat_linear',p);
diff --git a/matlab/nfsft/nfsft_get_num_threads.m b/matlab/nfsft/nfsft_get_num_threads.m
index abbae65..10d204a 100644
--- a/matlab/nfsft/nfsft_get_num_threads.m
+++ b/matlab/nfsft/nfsft_get_num_threads.m
@@ -1,7 +1,7 @@
%NFSFT_GET_NUM_THREADS Get number of threads (at most) used for computation
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_x.m 3124 2009-03-18 13:44:27Z kunis $
function nthreads = nfsft_get_num_threads()
nthreads = nfsftmex('get_num_threads');
diff --git a/matlab/nfsft/nfsft_get_x.m b/matlab/nfsft/nfsft_get_x.m
index 8fa6088..2c75843 100644
--- a/matlab/nfsft/nfsft_get_x.m
+++ b/matlab/nfsft/nfsft_get_x.m
@@ -1,7 +1,7 @@
%NFSFT_GET_X Get nodes from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function x = nfsft_get_x(p)
x = nfsftmex('get_x',p);
diff --git a/matlab/nfsft/nfsft_init.m b/matlab/nfsft/nfsft_init.m
index 6eb6a50..411f4e1 100644
--- a/matlab/nfsft/nfsft_init.m
+++ b/matlab/nfsft/nfsft_init.m
@@ -1,7 +1,7 @@
%NFSFT_INIT Plan initialization
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfsft_init(N,M)
p = nfsftmex('init',N,M);
diff --git a/matlab/nfsft/nfsft_init_advanced.m b/matlab/nfsft/nfsft_init_advanced.m
index e970a39..fea958c 100644
--- a/matlab/nfsft/nfsft_init_advanced.m
+++ b/matlab/nfsft/nfsft_init_advanced.m
@@ -1,7 +1,7 @@
%NFSFT_INIT_ADVANCED Advanced plan initialization routine
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfsft_init_advanced(N,M,flags)
p = nfsftmex('init_advanced',N,M,flags);
diff --git a/matlab/nfsft/nfsft_init_guru.m b/matlab/nfsft/nfsft_init_guru.m
index 6d53152..d483488 100644
--- a/matlab/nfsft/nfsft_init_guru.m
+++ b/matlab/nfsft/nfsft_init_guru.m
@@ -1,7 +1,7 @@
%NFSFT_INIT_GURU Guru plan initialization
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function p = nfsft_init_guru(N,M,flags,nfft_flags,nfft_cutoff)
p = nfsftmex('init_guru',N,M,flags,nfft_flags,nfft_cutoff);
diff --git a/matlab/nfsft/nfsft_precompute.m b/matlab/nfsft/nfsft_precompute.m
index bf9940f..81dae6f 100644
--- a/matlab/nfsft/nfsft_precompute.m
+++ b/matlab/nfsft/nfsft_precompute.m
@@ -1,7 +1,7 @@
%NFSFT_PRECOMPUTE Node-independent precomputation (for FPT)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_precompute(N,kappa,nfsft_flags,fpt_flags)
if ~exist('nfsft_flags','var')
nfsft_flags = 0;
diff --git a/matlab/nfsft/nfsft_precompute_x.m b/matlab/nfsft/nfsft_precompute_x.m
index 16405c1..47ea057 100644
--- a/matlab/nfsft/nfsft_precompute_x.m
+++ b/matlab/nfsft/nfsft_precompute_x.m
@@ -1,7 +1,7 @@
%NFSFT_PRECOMPUTE_X Node-dependent precomputation (for NFFT)
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_precompute_x(p)
nfsftmex('precompute_x',p)
diff --git a/matlab/nfsft/nfsft_set_f.m b/matlab/nfsft/nfsft_set_f.m
index 2663c02..0c8326c 100644
--- a/matlab/nfsft/nfsft_set_f.m
+++ b/matlab/nfsft/nfsft_set_f.m
@@ -1,7 +1,7 @@
%NFSFT_SET_F Set function values in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_set_f(p,f)
nfsftmex('set_f',p,f)
diff --git a/matlab/nfsft/nfsft_set_f_hat.m b/matlab/nfsft/nfsft_set_f_hat.m
index efd9c7c..83f2fb0 100644
--- a/matlab/nfsft/nfsft_set_f_hat.m
+++ b/matlab/nfsft/nfsft_set_f_hat.m
@@ -1,7 +1,7 @@
%NFSFT_SET_F_HAT Set Fourier coefficients in plan from a matrix
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_set_f_hat(p,f_hat)
nfsftmex('set_f_hat',p,f_hat)
diff --git a/matlab/nfsft/nfsft_set_f_hat_linear.m b/matlab/nfsft/nfsft_set_f_hat_linear.m
index de92ca4..0fb0175 100644
--- a/matlab/nfsft/nfsft_set_f_hat_linear.m
+++ b/matlab/nfsft/nfsft_set_f_hat_linear.m
@@ -1,7 +1,7 @@
%NFSFT_SET_F_HAT_LINEAR Set Fourier coefficients in plan from a linear vector
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_set_f_hat_linear(p,f_hat)
nfsftmex('set_f_hat_linear',p,f_hat)
diff --git a/matlab/nfsft/nfsft_set_x.m b/matlab/nfsft/nfsft_set_x.m
index 6bcbbcc..95b9a64 100644
--- a/matlab/nfsft/nfsft_set_x.m
+++ b/matlab/nfsft/nfsft_set_x.m
@@ -1,7 +1,7 @@
%NFSFT_SET_X Set nodes in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_set_x(p,x)
nfsftmex('set_x',p,x)
diff --git a/matlab/nfsft/nfsft_trafo.m b/matlab/nfsft/nfsft_trafo.m
index 698338a..082d1a7 100644
--- a/matlab/nfsft/nfsft_trafo.m
+++ b/matlab/nfsft/nfsft_trafo.m
@@ -1,7 +1,7 @@
%NFSFT_TRAFO Fast spherical Fourier transform
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,7 +16,5 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nfsft_trafo(p)
nfsftmex('trafo',p)
diff --git a/matlab/nfsft/nfsftmex.c b/matlab/nfsft/nfsftmex.c
index da3b517..346a860 100644
--- a/matlab/nfsft/nfsftmex.c
+++ b/matlab/nfsft/nfsftmex.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#ifdef HAVE_COMPLEX_H
diff --git a/matlab/nfsft/nfsftmex.m b/matlab/nfsft/nfsftmex.m
index 612a921..4e08606 100644
--- a/matlab/nfsft/nfsftmex.m
+++ b/matlab/nfsft/nfsftmex.m
@@ -1,7 +1,7 @@
%NFSFTMEX Gateway routine to the NFSFT module
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,5 +16,4 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
+%
\ No newline at end of file
diff --git a/matlab/nfsft/projection.m b/matlab/nfsft/projection.m
index 6559e38..c48cd73 100644
--- a/matlab/nfsft/projection.m
+++ b/matlab/nfsft/projection.m
@@ -1,8 +1,8 @@
%PROJECTION Example program: Project a function onto spherical harmonics.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,8 +17,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function err = projection()
disp(sprintf('Number of threads: %d\n', nfsft_get_num_threads()));
% threshold
diff --git a/matlab/nfsft/simple_test.m b/matlab/nfsft/simple_test.m
index 03689b0..741f3c8 100644
--- a/matlab/nfsft/simple_test.m
+++ b/matlab/nfsft/simple_test.m
@@ -1,7 +1,7 @@
%SIMPLE_TEST Example program: Basic usage principles
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,8 +17,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id$
-
disp(sprintf('Number of threads: %d\n', nfsft_get_num_threads()));
% maximum degree (bandwidth) of spherical harmonics expansions
@@ -30,7 +28,7 @@ kappa = 1000;
% precomputation
nfsft_precompute(N,kappa);
-% Gau�-Legendre interpolatory quadrature nodes for N. See gl.m
+% Gauß-Legendre interpolatory quadrature nodes for N. See gl.m
[X,W] = gl(N);
% number of nodes
diff --git a/matlab/nfsoft/Makefile.am b/matlab/nfsoft/Makefile.am
index a0b4f79..58dd3a3 100644
--- a/matlab/nfsoft/Makefile.am
+++ b/matlab/nfsoft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
#SUBDIRS = @f_hat
# compiler flags
diff --git a/matlab/nfsoft/nfsoft_get_num_threads.m b/matlab/nfsoft/nfsoft_get_num_threads.m
index d62797c..446f59a 100644
--- a/matlab/nfsoft/nfsoft_get_num_threads.m
+++ b/matlab/nfsoft/nfsoft_get_num_threads.m
@@ -1,5 +1,5 @@
%NFSOFT_GET_NUM_THREADS Get number of threads (at most) used for computation
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -14,8 +14,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id$
function nthreads = nfsoft_get_num_threads()
nthreads = nfsoftmex('get_num_threads');
diff --git a/matlab/nfsoft/nfsoftmex.c b/matlab/nfsoft/nfsoftmex.c
index bcf2244..43ff5b8 100644
--- a/matlab/nfsoft/nfsoftmex.c
+++ b/matlab/nfsoft/nfsoftmex.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id$ */
#include "config.h"
#ifdef HAVE_COMPLEX_H
diff --git a/matlab/nnfft/Makefile.am b/matlab/nnfft/Makefile.am
index c662f07..3115c4d 100644
--- a/matlab/nnfft/Makefile.am
+++ b/matlab/nnfft/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 3842 2012-07-18 12:14:23Z tovo $
-
# compiler flags
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/matlab $(matlab_CPPFLAGS)
diff --git a/matlab/nnfft/PRE_FULL_PSI.m b/matlab/nnfft/PRE_FULL_PSI.m
index af2d219..ad6761e 100644
--- a/matlab/nnfft/PRE_FULL_PSI.m
+++ b/matlab/nnfft/PRE_FULL_PSI.m
@@ -3,9 +3,9 @@
% matrix B) uses (2m+2)^dM precomputed values of the window function, in
% addition indices of source and target vectors are stored.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: PRE_FULL_PSI.m 3776 2012-06-03 13:29:25Z keiner $
function f = PRE_FULL_PSI()
f = bitshift(1, 5);
diff --git a/matlab/nnfft/PRE_LIN_PSI.m b/matlab/nnfft/PRE_LIN_PSI.m
index c9ca933..dfab51c 100644
--- a/matlab/nnfft/PRE_LIN_PSI.m
+++ b/matlab/nnfft/PRE_LIN_PSI.m
@@ -3,9 +3,9 @@
% matrix B) uses linear interpolation from a lookup table of equispaced samples
% of the window function instead of exact values of the window function.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: PRE_LIN_PSI.m 3776 2012-06-03 13:29:25Z keiner $
function f = PRE_LIN_PSI()
f = bitshift(1, 2);
diff --git a/matlab/nnfft/PRE_PHI_HUT.m b/matlab/nnfft/PRE_PHI_HUT.m
index 4839bbc..a66ae1d 100644
--- a/matlab/nnfft/PRE_PHI_HUT.m
+++ b/matlab/nnfft/PRE_PHI_HUT.m
@@ -3,9 +3,9 @@
% diagonal matrix D) uses precomputed values of the Fourier transformed window
% function.
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -20,8 +20,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: PRE_PHI_HUT.m 3776 2012-06-03 13:29:25Z keiner $
function f = PRE_PHI_HUT()
f = bitshift(1, 0);
diff --git a/matlab/nnfft/PRE_PSI.m b/matlab/nnfft/PRE_PSI.m
index bd80755..482b8fc 100644
--- a/matlab/nnfft/PRE_PSI.m
+++ b/matlab/nnfft/PRE_PSI.m
@@ -1,9 +1,9 @@
%PRE_PSI Precomputation flag
% If this flag is set, the convolution step (the multiplication with the sparse
% matrix B uses (2m+2)dM precomputed values of the window function.
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: PRE_PSI.m 3776 2012-06-03 13:29:25Z keiner $
function f = PRE_PSI()
f = bitshift(1, 4);
diff --git a/matlab/nnfft/nnfft.m b/matlab/nnfft/nnfft.m
index cb3486b..750ee2d 100644
--- a/matlab/nnfft/nnfft.m
+++ b/matlab/nnfft/nnfft.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nnfft/nnfft_display.m b/matlab/nnfft/nnfft_display.m
index 1267ec4..14468f7 100644
--- a/matlab/nnfft/nnfft_display.m
+++ b/matlab/nnfft/nnfft_display.m
@@ -12,9 +12,9 @@
% PRE_FULL_PSI} | FFT_OUT_OF_PLACE
% fftw_flags {FFTW_ESTIMATE, FFTW_MEASURE}
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -29,8 +29,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_init_guru.m 4086 2014-03-12 19:09:50Z keiner $
function p = nnfft_display(p)
p = nnfftmex('display',p);
diff --git a/matlab/nnfft/nnfft_finalize.m b/matlab/nnfft/nnfft_finalize.m
index 6855885..2606d9a 100644
--- a/matlab/nnfft/nnfft_finalize.m
+++ b/matlab/nnfft/nnfft_finalize.m
@@ -1,7 +1,7 @@
%NFFT_FINALIZE Finalize plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_finalize.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_finalize(p)
nnfftmex('finalize',p)
diff --git a/matlab/nnfft/nnfft_get_f.m b/matlab/nnfft/nnfft_get_f.m
index bea307c..391ba59 100644
--- a/matlab/nnfft/nnfft_get_f.m
+++ b/matlab/nnfft/nnfft_get_f.m
@@ -1,7 +1,7 @@
%NFFT_GET_F Get function values from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_f.m 3776 2012-06-03 13:29:25Z keiner $
function f = nnfft_get_f(p)
f = nnfftmex('get_f',p);
diff --git a/matlab/nnfft/nnfft_get_f_hat.m b/matlab/nnfft/nnfft_get_f_hat.m
index 5225a98..c5b99ff 100644
--- a/matlab/nnfft/nnfft_get_f_hat.m
+++ b/matlab/nnfft/nnfft_get_f_hat.m
@@ -1,7 +1,7 @@
%NFFT_GET_F_HAT Get Fourier coefficients from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_f_hat.m 3776 2012-06-03 13:29:25Z keiner $
function f_hat = nnfft_get_f_hat(p)
f_hat = nnfftmex('get_f_hat',p);
diff --git a/matlab/nnfft/nnfft_get_num_threads.m b/matlab/nnfft/nnfft_get_num_threads.m
index 36c499c..a6315db 100644
--- a/matlab/nnfft/nnfft_get_num_threads.m
+++ b/matlab/nnfft/nnfft_get_num_threads.m
@@ -1,7 +1,7 @@
%NFFT_GET_NUM_THREADS Get number of threads (at most) used for computation
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_x.m 3124 2009-03-18 13:44:27Z kunis $
function nthreads = nnfft_get_num_threads()
nthreads = nnfftmex('get_num_threads');
diff --git a/matlab/nnfft/nnfft_get_x.m b/matlab/nnfft/nnfft_get_x.m
index 119a417..7085dcb 100644
--- a/matlab/nnfft/nnfft_get_x.m
+++ b/matlab/nnfft/nnfft_get_x.m
@@ -1,7 +1,7 @@
%NFFT_GET_X Get nodes from plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_get_x.m 3776 2012-06-03 13:29:25Z keiner $
function x = nnfft_get_x(p)
x = nnfftmex('get_x',p);
diff --git a/matlab/nnfft/nnfft_init.m b/matlab/nnfft/nnfft_init.m
index 2b70d2e..afb7233 100644
--- a/matlab/nnfft/nnfft_init.m
+++ b/matlab/nnfft/nnfft_init.m
@@ -1,7 +1,7 @@
%NFFT_INIT Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_init_1d.m 3776 2012-06-03 13:29:25Z keiner $
function p = nnfft_init(varargin)
p = nnfftmex('init',varargin);
diff --git a/matlab/nnfft/nnfft_init_1d.m b/matlab/nnfft/nnfft_init_1d.m
index 5dd56d0..cc143a5 100644
--- a/matlab/nnfft/nnfft_init_1d.m
+++ b/matlab/nnfft/nnfft_init_1d.m
@@ -1,7 +1,7 @@
%NNFFT_INIT_1D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nnfft_init_1d.m 4229 2014-12-14 sukunis $
function p = nnfft_init_1d(N_total,M,N)
p = nnfftmex('init_1d',N_total,M,N);
diff --git a/matlab/nnfft/nnfft_init_2d.m b/matlab/nnfft/nnfft_init_2d.m
index ceb490d..5fde238 100644
--- a/matlab/nnfft/nnfft_init_2d.m
+++ b/matlab/nnfft/nnfft_init_2d.m
@@ -1,7 +1,7 @@
%NNFFT_INIT_2D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nnfft_init_3d.m 4229 2014-12-14 sukunis $
function p = nnfft_init_2d(N_total,M,N1,N2)
p = nnfftmex('init_2d',N_total,M,N1,N2);
diff --git a/matlab/nnfft/nnfft_init_3d.m b/matlab/nnfft/nnfft_init_3d.m
index 7699edf..ac7dfa8 100644
--- a/matlab/nnfft/nnfft_init_3d.m
+++ b/matlab/nnfft/nnfft_init_3d.m
@@ -1,7 +1,7 @@
%NNFFT_INIT_3D Initialise plans
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nnfft_init_3d.m 4229 2014-12-14 sukunis $
function p = nnfft_init_3d(N_total,M,N1,N2,N3)
p = nnfftmex('init_3d',N_total,M,N1,N2,N3);
diff --git a/matlab/nnfft/nnfft_init_guru.m b/matlab/nnfft/nnfft_init_guru.m
index 405482c..eb1eb9f 100644
--- a/matlab/nnfft/nnfft_init_guru.m
+++ b/matlab/nnfft/nnfft_init_guru.m
@@ -11,9 +11,9 @@
% flags PRE_PHI_HUT | {FG_PSI, PRE_LIN_PSI, PRE_FG_PSI, PRE_PSI,
% PRE_FULL_PSI} | FFT_OUT_OF_PLACE
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -28,8 +28,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nnfft_init_guru.m 4086 2014-12-11 19:09:50Z kunis $
function p = nnfft_init_guru(varargin)
p = nnfftmex('init_guru',varargin);
diff --git a/matlab/nnfft/nnfft_precompute_psi.m b/matlab/nnfft/nnfft_precompute_psi.m
index 07987e9..873c61d 100644
--- a/matlab/nnfft/nnfft_precompute_psi.m
+++ b/matlab/nnfft/nnfft_precompute_psi.m
@@ -1,7 +1,7 @@
%NFFT_PRECOMPUTE_PSI Precompute one psi, dependent on nodes x
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_precompute_psi.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_precompute_psi(p)
nnfftmex('precompute_psi',p)
diff --git a/matlab/nnfft/nnfft_set_f.m b/matlab/nnfft/nnfft_set_f.m
index ef94c37..2370cad 100644
--- a/matlab/nnfft/nnfft_set_f.m
+++ b/matlab/nnfft/nnfft_set_f.m
@@ -1,7 +1,7 @@
%NFFT_SET_F Set function values in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_set_f.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_set_f(p,f)
nnfftmex('set_f',p,f)
diff --git a/matlab/nnfft/nnfft_set_f_hat.m b/matlab/nnfft/nnfft_set_f_hat.m
index 97b426c..149912c 100644
--- a/matlab/nnfft/nnfft_set_f_hat.m
+++ b/matlab/nnfft/nnfft_set_f_hat.m
@@ -1,7 +1,7 @@
%NFFT_SET_F_HAT Set Fourier coefficients in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_set_f_hat.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_set_f_hat(p,f_hat)
nnfftmex('set_f_hat',p,f_hat)
diff --git a/matlab/nnfft/nnfft_set_v.m b/matlab/nnfft/nnfft_set_v.m
index e61a3b6..c3fea09 100644
--- a/matlab/nnfft/nnfft_set_v.m
+++ b/matlab/nnfft/nnfft_set_v.m
@@ -1,8 +1,8 @@
%NFFT_SET_X Set nodes in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,8 +17,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_set_x.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_set_v(p,v)
nnfftmex('set_v',p,v)
diff --git a/matlab/nnfft/nnfft_set_x.m b/matlab/nnfft/nnfft_set_x.m
index 119ad14..cc79094 100644
--- a/matlab/nnfft/nnfft_set_x.m
+++ b/matlab/nnfft/nnfft_set_x.m
@@ -1,7 +1,7 @@
%NFFT_SET_X Set nodes in plan
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_set_x.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_set_x(p,x)
nnfftmex('set_x',p,x)
diff --git a/matlab/nnfft/nnfft_trafo.m b/matlab/nnfft/nnfft_trafo.m
index 0338e14..9ce2bd5 100644
--- a/matlab/nnfft/nnfft_trafo.m
+++ b/matlab/nnfft/nnfft_trafo.m
@@ -1,7 +1,7 @@
%NFFT_TRAFO nonequispaced fast Fourier transformat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_trafo.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_trafo(p)
nnfftmex('trafo',p)
diff --git a/matlab/nnfft/nnfft_trafo_direct.m b/matlab/nnfft/nnfft_trafo_direct.m
index b344bd2..a38058c 100644
--- a/matlab/nnfft/nnfft_trafo_direct.m
+++ b/matlab/nnfft/nnfft_trafo_direct.m
@@ -1,8 +1,8 @@
%NFFT_TRAFO nonequispaced fast Fourier transformat
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,8 +17,6 @@
% You should have received a copy of the GNU General Public License along with
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-%
-% $Id: nfft_trafo.m 3776 2012-06-03 13:29:25Z keiner $
function nnfft_trafo_direct(p)
nnfftmex('trafo_direct',p)
diff --git a/matlab/nnfft/nnfftmex.c b/matlab/nnfft/nnfftmex.c
index ba8c617..7c41529 100644
--- a/matlab/nnfft/nnfftmex.c
+++ b/matlab/nnfft/nnfftmex.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -15,8 +15,6 @@
* this program; if not, write to the Free Software Foundation, Inc., 51
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-
-/* $Id: nnfftmex.c 4086 2014-06-23 19:09:50Z sukunis $ */
#include "config.h"
#ifdef HAVE_COMPLEX_H
diff --git a/matlab/nnfft/nnfftmex.m b/matlab/nnfft/nnfftmex.m
index 1e38d01..55c8b9a 100644
--- a/matlab/nnfft/nnfftmex.m
+++ b/matlab/nnfft/nnfftmex.m
@@ -1,7 +1,7 @@
%NFFTMEX Gateway function to NFFT module from NFFT3
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -17,5 +17,3 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id: nfftmex.m 3776 2012-06-03 13:29:25Z keiner $
-
diff --git a/matlab/nnfft/simple_test.m b/matlab/nnfft/simple_test.m
index 8c98d89..96ef23b 100644
--- a/matlab/nnfft/simple_test.m
+++ b/matlab/nnfft/simple_test.m
@@ -1,8 +1,8 @@
%SIMPLE_TEST Example program: Basic usage principles
%
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
@@ -18,8 +18,6 @@
% this program; if not, write to the Free Software Foundation, Inc., 51
% Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%
-% $Id: simple_test.m 3776 2012-06-03 13:29:25Z keiner $
-
disp(sprintf('Number of threads: %d\n', nnfft_get_num_threads()));
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
disp('A simple one dimensional example');
diff --git a/matlab/nnfft/test_nnfft1d.m b/matlab/nnfft/test_nnfft1d.m
index 667a297..a8723df 100644
--- a/matlab/nnfft/test_nnfft1d.m
+++ b/matlab/nnfft/test_nnfft1d.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nnfft/test_nnfft2d.m b/matlab/nnfft/test_nnfft2d.m
index 7eab4be..cbb1d37 100644
--- a/matlab/nnfft/test_nnfft2d.m
+++ b/matlab/nnfft/test_nnfft2d.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/matlab/nnfft/test_nnfft2d_N215.m b/matlab/nnfft/test_nnfft2d_N215.m
index 98deda1..bef9eca 100644
--- a/matlab/nnfft/test_nnfft2d_N215.m
+++ b/matlab/nnfft/test_nnfft2d_N215.m
@@ -1,5 +1,5 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/nfft3.pc.in b/nfft3.pc.in
index 2c9c89d..a7c7237 100644
--- a/nfft3.pc.in
+++ b/nfft3.pc.in
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
includedir=${prefix}/include
Name: NFFT
diff --git a/support/Makefile.am b/support/Makefile.am
index 9a76401..952266d 100644
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -1,3 +1 @@
-# $Id: Makefile.am 3086 2009-03-11 07:36:56Z keiner $
-
EXTRA_DIST = rem.sed toc.sed
\ No newline at end of file
diff --git a/support/Portfile b/support/Portfile
index c3e2502..9a6632d 100644
--- a/support/Portfile
+++ b/support/Portfile
@@ -2,58 +2,66 @@
# $Id$
PortSystem 1.0
-PortGroup github 1.0
-
-github.setup NFFT nfft 3.3.0.alpha4
-github.tarball_from releases
name nfft-3
+version 3.3.1
categories math
license GPL-2+
platforms darwin
-maintainers nfft.org:jens
+maintainers nfft.org:jens openmaintainer
homepage http://www.nfft.org/
-distname ${version}
+distname nfft-${version}
worksrcdir nfft-${version}
description Fast C routines to compute the Non-equispaced Discrete Fourier Transform
-long_description NFFT3 is a software library written in C for computing nonequispaced fast Fourier \
- and related transformations. In detail, NFFT3 implements \
- 1) The nonequispaced fast Fourier transform (NFFT) \
- - the forward transform (NFFT) \
- - the adjoint transform (adjoint NFFT) \
- 2) Generalisations of the NFFT \
- - to arbitrary knots in time and frequency domain (NNFFT) \
- - to the sphere S^2 (NFSFT) \
- - to the hyperbolic cross (NSFFT) \
- - to real-valued data, i.e. (co)sine transforms, (NFCT, NFST) \
- - to the rotation group (NFSOFT) \
- 3) Generalised inverses based on iterative methods, e.g. CGNR, CGNE \
- 4) Applications in \
- - medical imaging \
- (i) magnetic resonance imaging \
- (ii) computerised tomography \
- - summation schemes \
- (i) fast Gauss transform (FGT) \
- (ii) singular kernels \
- (iii) zonal kernels \
+long_description NFFT3 is a software library written in C for computing nonequispaced fast Fourier \n\
+ and related transformations. In detail, NFFT3 implements \n\
+ 1) The nonequispaced fast Fourier transform (NFFT) \n\
+ - the forward transform (NFFT) \n\
+ - the adjoint transform (adjoint NFFT) \n\
+ 2) Generalisations of the NFFT \n\
+ - to arbitrary knots in time and frequency domain (NNFFT) \n\
+ - to the sphere S^2 (NFSFT) \n\
+ - to the hyperbolic cross (NSFFT) \n\
+ - to real-valued data, i.e. (co)sine transforms, (NFCT, NFST) \n\
+ - to the rotation group (NFSOFT) \n\
+ 3) Generalised inverses based on iterative methods, e.g. CGNR, CGNE \n\
+ 4) Applications in \n\
+ - medical imaging \n\
+ * magnetic resonance imaging \n\
+ * computerised tomography \n\
+ - summation schemes \n\
+ * fast Gauss transform (FGT) \n\
+ * singular kernels \n\
+ * zonal kernels \n\
- polar FFT, discrete Radon transform, ridgelet transform
homepage http://www.nfft.org
-master_sites https://github.com/NFFT/nfft/archive/
-checksums rmd160 619d92a96e3037b918de0da87da78acf5fe35ca3 \
- sha256 dd61562cca1345871aa847b70ecc256bd65c3c2d88476a14a17fea80285c3034
+master_sites https://www-user.tu-chemnitz.de/~potts/nfft/download/
+checksums rmd160 52cac61a90a72bb25a91b3aa0d1b1692d1895e26 \
+ sha256 bb844b762896b17b7bf8245511a6372fcef82e55c2552f2f7ee7c65a8d746f30
depends_lib port:fftw-3
-use_autoreconf yes
+use_autoreconf no
configure.args --enable-shared --enable-static --enable-all
use_parallel_build yes
-variant gaussian description {compile NFFT with Gaussian window} conflicts bspline sinc {
+test.run yes
+test.target check
+
+variant kaiserbessel description {compile with Kaiser-Bessel window (default)} conflicts gaussian bspline sinc {
+ configure.args-append --with-window=kaiserbessel
+}
+
+variant gaussian description {compile with Gaussian window} conflicts kaiserbessel bspline sinc {
configure.args-append --with-window=gaussian
}
-variant bspline description {compile NFFT with B-Spline window} conflicts gaussian sinc {
+variant bspline description {compile with B-Spline window} conflicts kaiserbessel gaussian sinc {
configure.args-append --with-window=bspline
}
-variant sinc description {compile NFFT with Sinc window} conflicts gaussian bspline {
+variant sinc description {compile with Sinc window} conflicts kaiserbessel gaussian bspline {
configure.args-append --with-window=sinc
}
+
+if {![variant_isset gaussian] && ![variant_isset bspline] && ![variant_isset sinc]} {
+ default_variants-append +kaiserbessel
+}
diff --git a/support/copyright.txt b/support/copyright.txt
index eeeae38..e0c6958 100644
--- a/support/copyright.txt
+++ b/support/copyright.txt
@@ -1,4 +1,4 @@
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
diff --git a/support/copyright_m4.txt b/support/copyright_m4.txt
index f15ef98..1fffac3 100644
--- a/support/copyright_m4.txt
+++ b/support/copyright_m4.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+# Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
diff --git a/support/copyright_matlab.txt b/support/copyright_matlab.txt
index f451e70..573205c 100644
--- a/support/copyright_matlab.txt
+++ b/support/copyright_matlab.txt
@@ -1,4 +1,4 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
%
% This program is free software; you can redistribute it and/or modify it under
% the terms of the GNU General Public License as published by the Free Software
diff --git a/support/copyright_matlab_single_line.txt b/support/copyright_matlab_single_line.txt
index 2bd39e3..324d40f 100644
--- a/support/copyright_matlab_single_line.txt
+++ b/support/copyright_matlab_single_line.txt
@@ -1 +1 @@
-% Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+% Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
diff --git a/support/fpt.dox b/support/fpt.dox
index 4b026c4..899f5f0 100644
--- a/support/fpt.dox
+++ b/support/fpt.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/**
* @defgroup fpt FPT - Fast polynomial transform
* @{
diff --git a/support/mri.dox b/support/mri.dox
index b7dd98e..276b2a1 100644
--- a/support/mri.dox
+++ b/support/mri.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup mri MRI - Transforms in magnetic resonance imaging
* @{
*/
diff --git a/support/nfct.dox b/support/nfct.dox
index c8bb878..1d0d11a 100644
--- a/support/nfct.dox
+++ b/support/nfct.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup nfct NFCT - Nonequispaced fast cosine transform
* Direct and fast computation of the discrete nonequispaced cosine
* transform.
diff --git a/support/nfft.dox b/support/nfft.dox
index f904275..ef75176 100644
--- a/support/nfft.dox
+++ b/support/nfft.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/*! \file nfft3.h
* \brief Header file for the nfft3 library.
*/
diff --git a/support/nfsft.dox b/support/nfsft.dox
index 8f2ea20..43ec828 100644
--- a/support/nfsft.dox
+++ b/support/nfsft.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/**
* @defgroup nfsft NFSFT - Nonequispaced fast spherical Fourier transform
* @{
diff --git a/support/nfsoft.dox b/support/nfsoft.dox
index f97fdc7..9f157a7 100644
--- a/support/nfsoft.dox
+++ b/support/nfsoft.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/**
* @defgroup nfsoft NFSOFT - Nonequispaced fast SO(3) Fourier transform
* @{
diff --git a/support/nfst.dox b/support/nfst.dox
index ba88ae9..80832af 100644
--- a/support/nfst.dox
+++ b/support/nfst.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup nfst NFST - Nonequispaced fast sine transform
* Direct and fast computation of the discrete nonequispaced sine
* transform.
diff --git a/support/nnfft.dox b/support/nnfft.dox
index 6fdadc5..22500c3 100644
--- a/support/nnfft.dox
+++ b/support/nnfft.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup nnfft NNFFT - Nonequispaced in time and frequency FFT
* Direct and fast computation of the discrete nonequispaced in time and
* frequency Fourier transform.
diff --git a/support/nsfft.dox b/support/nsfft.dox
index 51c959f..abbceb4 100644
--- a/support/nsfft.dox
+++ b/support/nsfft.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup nsfft NSFFT - Nonequispaced sparse FFT
* Direct and fast computation of the nonequispaced FFT on the hyperbolic
* cross.
diff --git a/support/solver.dox b/support/solver.dox
index f2a1b26..81a2a4b 100644
--- a/support/solver.dox
+++ b/support/solver.dox
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: doxygen.c 3475 2010-04-11 14:58:03Z keiner $ */
-
/** @defgroup solver Solver - Inverse transforms
* @{
*/
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6eeef77..bb18ae3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 3456 2010-03-17 19:25:47Z keiner $
-
AM_CPPFLAGS = -I$(top_srcdir)/include -DSRCDIR=@abs_srcdir@
SUBDIRS= data
@@ -21,7 +19,6 @@ else
endif
check_PROGRAMS = $(CHECK) $(CHECK_THREADS)
-#debug
TESTS = $(check_PROGRAMS)
@@ -48,8 +45,5 @@ if HAVE_OPENMP
endif
endif
-#debug_SOURCES = debug.c nfct.c nfst.c nfct.h nfst.h
-#debug_LDADD = $(top_builddir)/libnfft3 at PREC_SUFFIX@.la -lcunit -lncurses
-
clean-local:
rm -f CUnitAutomated-Results.xml CUnitAutomated_threads-Results.xml checkall.log checkall.trs checkall_threads.log checkall_threads.trs
diff --git a/tests/bessel.c b/tests/bessel.c
index 778c1db..72a4fc3 100644
--- a/tests/bessel.c
+++ b/tests/bessel.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/bessel.h b/tests/bessel.h
index a8649e3..060e21c 100644
--- a/tests/bessel.h
+++ b/tests/bessel.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
#include "infft.h"
void X(check_bessel_i0)(void);
diff --git a/tests/bspline.c b/tests/bspline.c
index 7435cad..ee012ca 100644
--- a/tests/bspline.c
+++ b/tests/bspline.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
@@ -6325,7 +6323,7 @@ static const R b30[] =
#define ERR(x,y) IF(ABS(x - y) == K(0.0), ABS(x - y), ABS(x - y) / ABS(y))
#if defined(NFFT_LDOUBLE)
-static const R bound = K(15.0) * EPSILON;
+static const R bound = K(16.0) * EPSILON;
#elif defined(NFFT_SINGLE)
static const R bound = K(20.0) * EPSILON;
#else
@@ -6335,14 +6333,13 @@ static const R bound = K(16.0) * EPSILON;
static int check_bspline(const unsigned n, const unsigned int m, const R *r)
{
unsigned int j;
- R scratch[100];
R err = K(0.0);
int ok;
for (j = 0; j < m; j++)
{
const R x = r[2*j], yr = r[2*j+1];
- R y = X(bspline)((INT)(n + 1), x, scratch);
+ R y = X(bsplines)((INT)(n + 1), x);
/*printf("x = " __FE__ ", err = " __FE__ "\n", x, ERR(y,yr));*/
err = FMAX(err, ERR(y, yr));
}
diff --git a/tests/bspline.h b/tests/bspline.h
index 04fa7a3..fe00ad8 100644
--- a/tests/bspline.h
+++ b/tests/bspline.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
#include "infft.h"
void X(check_bspline)(void);
diff --git a/tests/check.c b/tests/check.c
index be9582b..d77d933 100644
--- a/tests/check.c
+++ b/tests/check.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <CUnit/CUnit.h>
#include <CUnit/TestRun.h>
@@ -60,11 +58,13 @@ int main(void)
CU_add_test(nfft, "nfft_3d_fast_file", X(check_3d_fast_file));
CU_add_test(nfft, "nfft_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
CU_add_test(nfft, "nfft_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
CU_add_test(nfft, "nfft_3d_online", X(check_3d_online));
CU_add_test(nfft, "nfft_adjoint_3d_online", X(check_adjoint_3d_online));
CU_add_test(nfft, "nfft_4d_online", X(check_4d_online));
CU_add_test(nfft, "nfft_adjoint_4d_online", X(check_adjoint_4d_online));
+#endif
#ifdef HAVE_NFCT
#undef X
#define X(name) NFCT(name)
@@ -88,6 +88,7 @@ int main(void)
CU_add_test(nfct, "nfct_3d_fast_file", X(check_3d_fast_file));
CU_add_test(nfct, "nfct_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
CU_add_test(nfct, "nfct_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
CU_add_test(nfct, "nfct_3d_online", X(check_3d_online));
CU_add_test(nfct, "nfct_adjoint_3d_online", X(check_adjoint_3d_online));
@@ -95,6 +96,7 @@ int main(void)
CU_add_test(nfct, "nfct_adjoint_4d_online", X(check_adjoint_4d_online));
#endif
#endif
+#endif
#ifdef HAVE_NFST
#undef X
#define X(name) NFST(name)
@@ -118,6 +120,7 @@ int main(void)
CU_add_test(nfst, "nfst_3d_fast_file", X(check_3d_fast_file));
CU_add_test(nfst, "nfst_adjoint_3d_direct_file", X(check_adjoint_3d_direct_file));
CU_add_test(nfst, "nfst_adjoint_3d_fast_file", X(check_adjoint_3d_fast_file));
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
CU_add_test(nfst, "nfst_3d_online", X(check_3d_online));
CU_add_test(nfst, "nfst_adjoint_3d_online", X(check_adjoint_3d_online));
@@ -125,6 +128,7 @@ int main(void)
CU_add_test(nfst, "nfst_adjoint_4d_online", X(check_adjoint_4d_online));
#endif
#endif
+#endif
#undef X
#define X(name) Y(name)
util = CU_add_suite("util", 0, 0);
diff --git a/tests/check_nfsft.c b/tests/check_nfsft.c
index a5da20c..455476e 100644
--- a/tests/check_nfsft.c
+++ b/tests/check_nfsft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 81a5c99..5da7432 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -1,5 +1,3 @@
-# $Id: Makefile.am 3456 2010-03-17 19:25:47Z keiner $
-
EXTRA_DIST = nfct_1d_10_1.txt \
nfct_1d_10_10.txt \
nfct_1d_10_20.txt \
diff --git a/tests/nfct.c b/tests/nfct.c
index 9b4c096..475bb34 100644
--- a/tests/nfct.c
+++ b/tests/nfct.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
@@ -234,7 +232,7 @@ static R err_trafo(X(plan) *p)
a = K(0.4);
b = K(9500.0);
#else
- a = K(1.5);
+ a = K(1.9);
b = K(50.0);
#endif
err = EXP(-m*KPI*(K(1.0)-K(1.0)/(K(2.0)*K(2.0) - K(1.0))));
@@ -941,10 +939,12 @@ static const testcase_delegate_online_t *testcases_1d_online[] =
&nfct_online_1d_100_50,
&nfct_online_1d_200_50,
&nfct_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfct_online_1d_1000_50,
&nfct_online_1d_2000_50,
&nfct_online_1d_5000_50,
&nfct_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_1d_online[] = {&trafo/*, &trafo_1d*/};
@@ -970,10 +970,12 @@ static const testcase_delegate_online_t *testcases_adjoint_1d_online[] =
&nfct_adjoint_online_1d_100_50,
&nfct_adjoint_online_1d_200_50,
&nfct_adjoint_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfct_adjoint_online_1d_1000_50,
&nfct_adjoint_online_1d_2000_50,
&nfct_adjoint_online_1d_5000_50,
&nfct_adjoint_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_1d_online[] = {&adjoint/*, &adjoint_1d*/};
@@ -1088,8 +1090,10 @@ static const testcase_delegate_online_t *testcases_2d_online[] =
&nfct_online_2d_50_50,
&nfct_online_2d_100_50,
&nfct_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfct_online_2d_500_50,
&nfct_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_2d_online[] = {&trafo/*, &trafo_2d*/};
@@ -1111,8 +1115,10 @@ static const testcase_delegate_online_t *testcases_adjoint_2d_online[] =
&nfct_adjoint_online_2d_50_50,
&nfct_adjoint_online_2d_100_50,
&nfct_adjoint_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfct_adjoint_online_2d_500_50,
&nfct_adjoint_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_2d_online[] = {&adjoint/*, &adjoint_2d*/};
@@ -1188,6 +1194,7 @@ void X(check_adjoint_3d_fast_file)(void)
testcases_adjoint_3d_file, initializers_3d, &check_adjoint, trafos_adjoint_3d_fast_file);
}
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfct_online_3d_50_50 = {setup_online, destroy_online, 3, 50 ,50};
static const testcase_delegate_online_t *testcases_3d_online[] =
@@ -1217,6 +1224,7 @@ void X(check_adjoint_3d_online)(void)
check_many(SIZE(testcases_adjoint_3d_online), SIZE(initializers_3d), SIZE(trafos_adjoint_3d_online),
testcases_adjoint_3d_online, initializers_3d, &check_adjoint, trafos_adjoint_3d_online);
}
+#endif
/* 4D. */
@@ -1232,6 +1240,7 @@ static const init_delegate_t* initializers_4d[] =
#endif
};
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfct_online_4d_28_50 = {setup_online, destroy_online, 4, 28 ,50};
static const testcase_delegate_online_t *testcases_4d_online[] =
@@ -1261,3 +1270,4 @@ void X(check_adjoint_4d_online)(void)
check_many(SIZE(testcases_adjoint_4d_online), SIZE(initializers_4d), SIZE(trafos_adjoint_4d_online),
testcases_adjoint_4d_online, initializers_4d, &check_adjoint, trafos_adjoint_4d_online);
}
+#endif
diff --git a/tests/nfct.h b/tests/nfct.h
index e57f02e..b5a5f18 100644
--- a/tests/nfct.h
+++ b/tests/nfct.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
#include "infft.h"
#undef X
diff --git a/tests/nfft.c b/tests/nfft.c
index 4407142..1a26bdc 100644
--- a/tests/nfft.c
+++ b/tests/nfft.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
@@ -235,7 +233,7 @@ static R err_trafo(X(plan) *p)
a = K(0.4);
b = K(2000.0);
#else
- a = K(0.4);
+ a = K(0.41);
b = K(50.0);
#endif
err = EXP(-m*KPI*(K(1.0)-K(1.0)/(K(2.0)*K(2.0) - K(1.0))));
@@ -980,10 +978,12 @@ static const testcase_delegate_online_t *testcases_1d_online[] =
&nfft_online_1d_100_50,
&nfft_online_1d_200_50,
&nfft_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfft_online_1d_1000_50,
&nfft_online_1d_2000_50,
&nfft_online_1d_5000_50,
&nfft_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_1d_online[] = {&trafo, &trafo_1d};
@@ -1009,10 +1009,12 @@ static const testcase_delegate_online_t *testcases_adjoint_1d_online[] =
&nfft_adjoint_online_1d_100_50,
&nfft_adjoint_online_1d_200_50,
&nfft_adjoint_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfft_adjoint_online_1d_1000_50,
&nfft_adjoint_online_1d_2000_50,
&nfft_adjoint_online_1d_5000_50,
&nfft_adjoint_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_1d_online[] = {&adjoint, &adjoint_1d};
@@ -1134,8 +1136,10 @@ static const testcase_delegate_online_t *testcases_2d_online[] =
&nfft_online_2d_50_50,
&nfft_online_2d_100_50,
&nfft_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfft_online_2d_500_50,
&nfft_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_2d_online[] = {&trafo, &trafo_2d};
@@ -1157,8 +1161,10 @@ static const testcase_delegate_online_t *testcases_adjoint_2d_online[] =
&nfft_adjoint_online_2d_50_50,
&nfft_adjoint_online_2d_100_50,
&nfft_adjoint_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfft_adjoint_online_2d_500_50,
&nfft_adjoint_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_2d_online[] = {&adjoint, &adjoint_2d};
@@ -1241,6 +1247,7 @@ void X(check_adjoint_3d_fast_file)(void)
testcases_adjoint_3d_file, initializers_3d, &check_adjoint, trafos_adjoint_3d_fast_file);
}
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfft_online_3d_50_50 = {setup_online, destroy_online, 3, 50 ,50};
static const testcase_delegate_online_t *testcases_3d_online[] =
@@ -1270,6 +1277,7 @@ void X(check_adjoint_3d_online)(void)
check_many(SIZE(testcases_adjoint_3d_online), SIZE(initializers_3d), SIZE(trafos_adjoint_3d_online),
testcases_adjoint_3d_online, initializers_3d, &check_adjoint, trafos_adjoint_3d_online);
}
+#endif
/* 4D. */
@@ -1292,6 +1300,7 @@ static const init_delegate_t* initializers_4d[] =
#endif
};
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfft_online_4d_28_50 = {setup_online, destroy_online, 4, 28 ,50};
static const testcase_delegate_online_t *testcases_4d_online[] =
@@ -1321,6 +1330,7 @@ void X(check_adjoint_4d_online)(void)
check_many(SIZE(testcases_adjoint_4d_online), SIZE(initializers_4d), SIZE(trafos_adjoint_4d_online),
testcases_adjoint_4d_online, initializers_4d, &check_adjoint, trafos_adjoint_4d_online);
}
+#endif
/* accuracy */
diff --git a/tests/nfft.h b/tests/nfft.h
index 7dfc99c..1b26162 100644
--- a/tests/nfft.h
+++ b/tests/nfft.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
#include "infft.h"
#undef X
diff --git a/tests/nfst.c b/tests/nfst.c
index 837cc9a..44d7bec 100644
--- a/tests/nfst.c
+++ b/tests/nfst.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
/* Standard headers. */
#include <stdio.h>
#include <stdlib.h>
@@ -228,11 +226,11 @@ static R err_trafo(X(plan) *p)
s = FMIN(s, ((R)p->sigma[i]));
#if defined(GAUSSIAN)
#if defined(NFFT_LDOUBLE)
- a = K(3.0);
+ a = K(3.4);
b = K(50.0);
#elif defined(NFFT_SINGLE)
a = K(0.4);
- b = K(9500.0);
+ b = K(11700.0);
#else
a = K(1.95);
b = K(50.0);
@@ -933,10 +931,12 @@ static const testcase_delegate_online_t *testcases_1d_online[] =
&nfst_online_1d_100_50,
&nfst_online_1d_200_50,
&nfst_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfst_online_1d_1000_50,
&nfst_online_1d_2000_50,
&nfst_online_1d_5000_50,
&nfst_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_1d_online[] = {&trafo/*, &trafo_1d*/};
@@ -962,10 +962,12 @@ static const testcase_delegate_online_t *testcases_adjoint_1d_online[] =
&nfst_adjoint_online_1d_100_50,
&nfst_adjoint_online_1d_200_50,
&nfst_adjoint_online_1d_500_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfst_adjoint_online_1d_1000_50,
&nfst_adjoint_online_1d_2000_50,
&nfst_adjoint_online_1d_5000_50,
&nfst_adjoint_online_1d_10000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_1d_online[] = {&adjoint/*, &adjoint_1d*/};
@@ -1080,8 +1082,10 @@ static const testcase_delegate_online_t *testcases_2d_online[] =
&nfst_online_2d_50_50,
&nfst_online_2d_100_50,
&nfst_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfst_online_2d_500_50,
&nfst_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_2d_online[] = {&trafo/*, &trafo_2d*/};
@@ -1103,8 +1107,10 @@ static const testcase_delegate_online_t *testcases_adjoint_2d_online[] =
&nfst_adjoint_online_2d_50_50,
&nfst_adjoint_online_2d_100_50,
&nfst_adjoint_online_2d_200_50,
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
&nfst_adjoint_online_2d_500_50,
&nfst_adjoint_online_2d_1000_50,
+#endif
};
static const trafo_delegate_t* trafos_adjoint_2d_online[] = {&adjoint/*, &adjoint_2d*/};
@@ -1180,6 +1186,7 @@ void X(check_adjoint_3d_fast_file)(void)
testcases_adjoint_3d_file, initializers_3d, &check_adjoint, trafos_adjoint_3d_fast_file);
}
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfst_online_3d_50_50 = {setup_online, destroy_online, 3, 50 ,50};
static const testcase_delegate_online_t *testcases_3d_online[] =
@@ -1209,6 +1216,7 @@ void X(check_adjoint_3d_online)(void)
check_many(SIZE(testcases_adjoint_3d_online), SIZE(initializers_3d), SIZE(trafos_adjoint_3d_online),
testcases_adjoint_3d_online, initializers_3d, &check_adjoint, trafos_adjoint_3d_online);
}
+#endif
/* 4D. */
@@ -1224,6 +1232,7 @@ static const init_delegate_t* initializers_4d[] =
#endif
};
+#ifdef NFFT_EXHAUSTIVE_UNIT_TESTS
static const testcase_delegate_online_t nfst_online_4d_28_50 = {setup_online, destroy_online, 4, 28 ,50};
static const testcase_delegate_online_t *testcases_4d_online[] =
@@ -1253,3 +1262,4 @@ void X(check_adjoint_4d_online)(void)
check_many(SIZE(testcases_adjoint_4d_online), SIZE(initializers_4d), SIZE(trafos_adjoint_4d_online),
testcases_adjoint_4d_online, initializers_4d, &check_adjoint, trafos_adjoint_4d_online);
}
+#endif
diff --git a/tests/nfst.h b/tests/nfst.h
index 7bf9321..1bd5717 100644
--- a/tests/nfst.h
+++ b/tests/nfst.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015 Jens Keiner, Stefan Kunis, Daniel Potts
+ * Copyright (c) 2002, 2016 Jens Keiner, Stefan Kunis, Daniel Potts
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free Software
@@ -16,8 +16,6 @@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-/* $Id: simple_test.c 3509 2010-05-25 19:00:59Z keiner $ */
-
#include "infft.h"
#undef X
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nfft.git
More information about the debian-science-commits
mailing list