diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-07 12:18:00 -0400 |
| commit | 597b93798a804cde1783d6d2ab53b348d57c44cd (patch) | |
| tree | b65e73bb0de634ff5d209b15971ebdabf369a45c /gr-wavelet/lib | |
| parent | 1151e5502ccd440ebd89599cf7e4be4fb5ed8334 (diff) | |
Removing trailing/extra whitespaces before release.
We should be more careful about letting these into the code in the future. In emacs, we can use (add-hook 'before-save-hook 'delete-trailing-whitespace).
Diffstat (limited to 'gr-wavelet/lib')
| -rw-r--r-- | gr-wavelet/lib/squash_ff_impl.cc | 14 | ||||
| -rw-r--r-- | gr-wavelet/lib/squash_ff_impl.h | 2 | ||||
| -rw-r--r-- | gr-wavelet/lib/wavelet_ff_impl.cc | 14 | ||||
| -rw-r--r-- | gr-wavelet/lib/wvps_ff_impl.cc | 24 |
4 files changed, 27 insertions, 27 deletions
diff --git a/gr-wavelet/lib/squash_ff_impl.cc b/gr-wavelet/lib/squash_ff_impl.cc index 47f8c616d5..97c0cd240f 100644 --- a/gr-wavelet/lib/squash_ff_impl.cc +++ b/gr-wavelet/lib/squash_ff_impl.cc @@ -31,7 +31,7 @@ // expect input vector of igrid.size y-values, // produce output vector of ogrid.size y-values -namespace gr { +namespace gr { namespace wavelet { squash_ff::sptr squash_ff::make(const std::vector<float> &igrid, @@ -55,7 +55,7 @@ namespace gr { d_igrid[i] = igrid[i]; for (unsigned int i = 0; i < d_onum; i++) d_ogrid[i] = ogrid[i]; - + d_accel = gsl_interp_accel_alloc(); d_spline = gsl_spline_alloc(gsl_interp_cspline, d_inum); // FIXME check w/ Frank } @@ -76,17 +76,17 @@ namespace gr { { const float *in = (const float *) input_items[0]; float *out = (float *) output_items[0]; - + for (int count = 0; count < noutput_items; count++) { - + for (unsigned int i = 0; i < d_inum; i++) d_iwork[i] = in[i]; - + gsl_spline_init(d_spline, d_igrid, d_iwork, d_inum); - + for (unsigned int i = 0; i < d_onum; i++) out[i] = gsl_spline_eval(d_spline, d_ogrid[i], d_accel); - + in += d_inum; out += d_onum; } diff --git a/gr-wavelet/lib/squash_ff_impl.h b/gr-wavelet/lib/squash_ff_impl.h index b9ab994558..933ee5288c 100644 --- a/gr-wavelet/lib/squash_ff_impl.h +++ b/gr-wavelet/lib/squash_ff_impl.h @@ -31,7 +31,7 @@ namespace gr { namespace wavelet { - + class WAVELET_API squash_ff_impl : public squash_ff { size_t d_inum; diff --git a/gr-wavelet/lib/wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_ff_impl.cc index 6b313574b3..f05b1e3ce2 100644 --- a/gr-wavelet/lib/wavelet_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_ff_impl.cc @@ -43,8 +43,8 @@ namespace gr { return gnuradio::get_initial_sptr(new wavelet_ff_impl(size, order, forward)); } - wavelet_ff_impl::wavelet_ff_impl(int size, - int order, + wavelet_ff_impl::wavelet_ff_impl(int size, + int order, bool forward) : sync_block("wavelet_ff", io_signature::make(1, 1, size * sizeof(float)), @@ -78,11 +78,11 @@ namespace gr { { const float *in = (const float *) input_items[0]; float *out = (float *) output_items[0]; - + for (int count = 0; count < noutput_items; count++) { for (int i = 0; i < d_size; i++) d_temp[i] = in[i]; - + if (d_forward) gsl_wavelet_transform_forward(d_wavelet, d_temp, @@ -95,14 +95,14 @@ namespace gr { 1, d_size, d_workspace); - + for (int i = 0; i < d_size; i++) out[i] = d_temp[i]; - + in += d_size; out += d_size; } - + return noutput_items; } diff --git a/gr-wavelet/lib/wvps_ff_impl.cc b/gr-wavelet/lib/wvps_ff_impl.cc index 3dd6bf4ba9..40dcfe2a9d 100644 --- a/gr-wavelet/lib/wvps_ff_impl.cc +++ b/gr-wavelet/lib/wvps_ff_impl.cc @@ -61,41 +61,41 @@ namespace gr { { const float *in = (const float *) input_items[0]; float *out = (float *) output_items[0]; - + for (int count = 0; count < noutput_items; count++) { - + // any power? - + if (in[0] == 0.0) { for (int i = 0; i < d_olen; i++) out[i] = 0.0; - + } else { - + // get power normalization from 0-th wavelet coefficient - + float scl = 1.0/(in[0]*in[0]); int k = 1; - + // sum powers over sequences of bins, // sequence lengths in increasing powers of 2 - + for (int e = 0; e < d_olen; e++) { int m = 01<<e; float sum = 0.0; - + for (int l = 0; l < m; l++) sum += (in[k+l]*in[k+l]); - + out[e] = scl*sum; k += m; } } - + in += d_ilen; out += d_olen; } - + return noutput_items; } |