summaryrefslogtreecommitdiff
path: root/gr-wavelet
diff options
context:
space:
mode:
authorTom Rondeau2012-04-13 18:36:53 -0400
committerTom Rondeau2012-04-13 18:36:53 -0400
commitf919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch)
tree7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gr-wavelet
parent6a1e9783fec6ed827f49db27c171591d30f32933 (diff)
downloadgnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.gz
gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.bz2
gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.zip
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.
Diffstat (limited to 'gr-wavelet')
-rw-r--r--gr-wavelet/CMakeLists.txt8
-rw-r--r--gr-wavelet/include/wavelet/wavelet_squash_ff.h8
-rw-r--r--gr-wavelet/include/wavelet/wavelet_wavelet_ff.h8
-rw-r--r--gr-wavelet/include/wavelet/wavelet_wvps_ff.h10
-rw-r--r--gr-wavelet/lib/CMakeLists.txt8
-rw-r--r--gr-wavelet/lib/wavelet_squash_ff_impl.cc10
-rw-r--r--gr-wavelet/lib/wavelet_squash_ff_impl.h12
-rw-r--r--gr-wavelet/lib/wavelet_wavelet_ff_impl.cc12
-rw-r--r--gr-wavelet/lib/wavelet_wavelet_ff_impl.h8
-rw-r--r--gr-wavelet/lib/wavelet_wvps_ff_impl.cc18
-rw-r--r--gr-wavelet/lib/wavelet_wvps_ff_impl.h8
-rw-r--r--gr-wavelet/python/CMakeLists.txt8
-rw-r--r--gr-wavelet/python/__init__.py10
-rwxr-xr-xgr-wavelet/python/qa_classify.py12
-rw-r--r--gr-wavelet/swig/wavelet_swig.i8
15 files changed, 74 insertions, 74 deletions
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> 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<float> &igrid,
const std::vector<float> &ogrid);
- friend WAVELET_API wavelet_squash_ff_sptr
+ friend WAVELET_API wavelet_squash_ff_sptr
wavelet_make_squash_ff(const std::vector<float> &igrid,
const std::vector<float> &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<<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;
}
diff --git a/gr-wavelet/lib/wavelet_wvps_ff_impl.h b/gr-wavelet/lib/wavelet_wvps_ff_impl.h
index 30877e3fd..553469fde 100644
--- a/gr-wavelet/lib/wavelet_wvps_ff_impl.h
+++ b/gr-wavelet/lib/wavelet_wvps_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/python/CMakeLists.txt b/gr-wavelet/python/CMakeLists.txt
index 9ddcb7ea9..650299672 100644
--- a/gr-wavelet/python/CMakeLists.txt
+++ b/gr-wavelet/python/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/python/__init__.py b/gr-wavelet/python/__init__.py
index ce63ed37c..77e2ac7c2 100644
--- a/gr-wavelet/python/__init__.py
+++ b/gr-wavelet/python/__init__.py
@@ -1,23 +1,23 @@
#
# Copyright 2011 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,
# Boston, MA 02110-1301, USA.
-#
+#
'''
This is the gr-wavelet package. This package provides GNU Radio
diff --git a/gr-wavelet/python/qa_classify.py b/gr-wavelet/python/qa_classify.py
index 157d6b8c6..5701bce8c 100755
--- a/gr-wavelet/python/qa_classify.py
+++ b/gr-wavelet/python/qa_classify.py
@@ -1,24 +1,24 @@
#!/usr/bin/env python
#
# Copyright 2008,2010 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,
# Boston, MA 02110-1301, USA.
-#
+#
import numpy
from gnuradio import gr, gr_unittest
@@ -99,7 +99,7 @@ class test_classify(gr_unittest.TestCase):
sum += w * w
sum /= float(len(trg_data))
assert sum < 1e-6
-
+
def test_003_(self):
src_grid = (0.0, 1.0, 2.0, 3.0, 4.0)
trg_grid = copy.deepcopy(src_grid)
diff --git a/gr-wavelet/swig/wavelet_swig.i b/gr-wavelet/swig/wavelet_swig.i
index 577bd04df..b04efc508 100644
--- a/gr-wavelet/swig/wavelet_swig.i
+++ b/gr-wavelet/swig/wavelet_swig.i
@@ -1,19 +1,19 @@
/* -*- c++ -*- */
/*
* 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,