From f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Fri, 13 Apr 2012 18:36:53 -0400 Subject: Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future. The sed script was provided by Moritz Fischer. --- gr-wavelet/CMakeLists.txt | 8 ++++---- gr-wavelet/include/wavelet/wavelet_squash_ff.h | 8 ++++---- gr-wavelet/include/wavelet/wavelet_wavelet_ff.h | 8 ++++---- gr-wavelet/include/wavelet/wavelet_wvps_ff.h | 10 +++++----- gr-wavelet/lib/CMakeLists.txt | 8 ++++---- gr-wavelet/lib/wavelet_squash_ff_impl.cc | 10 +++++----- gr-wavelet/lib/wavelet_squash_ff_impl.h | 12 ++++++------ gr-wavelet/lib/wavelet_wavelet_ff_impl.cc | 12 ++++++------ gr-wavelet/lib/wavelet_wavelet_ff_impl.h | 8 ++++---- gr-wavelet/lib/wavelet_wvps_ff_impl.cc | 18 +++++++++--------- gr-wavelet/lib/wavelet_wvps_ff_impl.h | 8 ++++---- gr-wavelet/python/CMakeLists.txt | 8 ++++---- gr-wavelet/python/__init__.py | 10 +++++----- gr-wavelet/python/qa_classify.py | 12 ++++++------ gr-wavelet/swig/wavelet_swig.i | 8 ++++---- 15 files changed, 74 insertions(+), 74 deletions(-) (limited to 'gr-wavelet') diff --git a/gr-wavelet/CMakeLists.txt b/gr-wavelet/CMakeLists.txt index c37e55282..555c326d1 100644 --- a/gr-wavelet/CMakeLists.txt +++ b/gr-wavelet/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free 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 3, or (at your option) # any later version. -# +# # GNU Radio 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 GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-wavelet/include/wavelet/wavelet_squash_ff.h b/gr-wavelet/include/wavelet/wavelet_squash_ff.h index c79f513c6..582496916 100644 --- a/gr-wavelet/include/wavelet/wavelet_squash_ff.h +++ b/gr-wavelet/include/wavelet/wavelet_squash_ff.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h b/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h index ef920f163..7d60dbdad 100644 --- a/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h +++ b/gr-wavelet/include/wavelet/wavelet_wavelet_ff.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-wavelet/include/wavelet/wavelet_wvps_ff.h b/gr-wavelet/include/wavelet/wavelet_wvps_ff.h index 061f42323..4e2889b52 100644 --- a/gr-wavelet/include/wavelet/wavelet_wvps_ff.h +++ b/gr-wavelet/include/wavelet/wavelet_wvps_ff.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -29,7 +29,7 @@ class wavelet_wvps_ff; typedef boost::shared_ptr wavelet_wvps_ff_sptr; -WAVELET_API wavelet_wvps_ff_sptr +WAVELET_API wavelet_wvps_ff_sptr wavelet_make_wvps_ff(int ilen); /*! diff --git a/gr-wavelet/lib/CMakeLists.txt b/gr-wavelet/lib/CMakeLists.txt index 01171956c..f0d9068b7 100644 --- a/gr-wavelet/lib/CMakeLists.txt +++ b/gr-wavelet/lib/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2012 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free 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 3, or (at your option) # any later version. -# +# # GNU Radio 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 GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-wavelet/lib/wavelet_squash_ff_impl.cc b/gr-wavelet/lib/wavelet_squash_ff_impl.cc index 23f1a5e2f..89494a9c3 100644 --- a/gr-wavelet/lib/wavelet_squash_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_squash_ff_impl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2010,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -81,7 +81,7 @@ wavelet_squash_ff_impl::work(int noutput_items, 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); diff --git a/gr-wavelet/lib/wavelet_squash_ff_impl.h b/gr-wavelet/lib/wavelet_squash_ff_impl.h index 806f13e40..dac50ddf2 100644 --- a/gr-wavelet/lib/wavelet_squash_ff_impl.h +++ b/gr-wavelet/lib/wavelet_squash_ff_impl.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -39,11 +39,11 @@ class WAVELET_API wavelet_squash_ff_impl : public wavelet_squash_ff gsl_interp_accel *d_accel; gsl_spline *d_spline; - + wavelet_squash_ff_impl(const std::vector &igrid, const std::vector &ogrid); - friend WAVELET_API wavelet_squash_ff_sptr + friend WAVELET_API wavelet_squash_ff_sptr wavelet_make_squash_ff(const std::vector &igrid, const std::vector &ogrid); diff --git a/gr-wavelet/lib/wavelet_wavelet_ff_impl.cc b/gr-wavelet/lib/wavelet_wavelet_ff_impl.cc index 719f4b53f..ccc1a6d8f 100644 --- a/gr-wavelet/lib/wavelet_wavelet_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_wavelet_ff_impl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2010,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the tewavelet of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -78,7 +78,7 @@ wavelet_wavelet_ff_impl::work(int noutput_items, 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, @@ -91,7 +91,7 @@ wavelet_wavelet_ff_impl::work(int noutput_items, 1, d_size, d_workspace); - + for (int i = 0; i < d_size; i++) out[i] = d_temp[i]; diff --git a/gr-wavelet/lib/wavelet_wavelet_ff_impl.h b/gr-wavelet/lib/wavelet_wavelet_ff_impl.h index 8ad3ef0bf..dc33a4184 100644 --- a/gr-wavelet/lib/wavelet_wavelet_ff_impl.h +++ b/gr-wavelet/lib/wavelet_wavelet_ff_impl.h @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2008,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-wavelet/lib/wavelet_wvps_ff_impl.cc b/gr-wavelet/lib/wavelet_wvps_ff_impl.cc index f2507adc8..b86859b0a 100644 --- a/gr-wavelet/lib/wavelet_wvps_ff_impl.cc +++ b/gr-wavelet/lib/wavelet_wvps_ff_impl.cc @@ -1,19 +1,19 @@ /* -*- c++ -*- */ /* * Copyright 2004,2010,2012 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free 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 3, or (at your option) * any later version. - * + * * GNU Radio 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 GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -69,22 +69,22 @@ wavelet_wvps_ff_impl::work(int noutput_items, 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<