[nfft] 01/16: Merge tag 'upstream/3.3.1_rc1' into debian/sid
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu May 5 14:43:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/master
in repository nfft.
commit f160fb9a60d0708beb1f3ec740def0645418b817
Merge: 9556e83 8f756e7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Apr 11 07:55:10 2016 +0100
Merge tag 'upstream/3.3.1_rc1' into debian/sid
Upstream version 3.3.1~rc1
# gpg: Signature made Mon 11 Apr 2016 07:55:06 BST using RSA key ID DDEB910A
# gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1282 871F 5C7F 0CB6 BBA1 0BD9 A930 D81A 46EC 4F9B
# Subkey fingerprint: F3DB 8E75 2506 0E1B DB84 C20D 6A99 0FB3 DDEB 910A
.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(-)
--
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