diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-11 11:03:21 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-11 11:03:21 -0400 |
| commit | af0a5780201c71c8f2d682cdab2274942e5771d5 (patch) | |
| tree | e27eb179f63c4b910a20599781d2d5b21062ad1b /gr-digital | |
| parent | 5aaea26d457b7ed4c19096072b46b15b4e3f54b4 (diff) | |
digital: fixed formatting of code to properly comply with new standard.
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/include/digital/binary_slicer_fb.h | 2 | ||||
| -rw-r--r-- | gr-digital/include/digital/clock_recovery_mm_cc.h | 6 | ||||
| -rw-r--r-- | gr-digital/include/digital/clock_recovery_mm_ff.h | 6 | ||||
| -rw-r--r-- | gr-digital/include/digital/cma_equalizer_cc.h | 2 | ||||
| -rwxr-xr-x | gr-digital/python/qa_binary_slicer_fb.py | 20 | ||||
| -rwxr-xr-x | gr-digital/python/qa_clock_recovery_mm.py | 28 |
6 files changed, 32 insertions, 32 deletions
diff --git a/gr-digital/include/digital/binary_slicer_fb.h b/gr-digital/include/digital/binary_slicer_fb.h index 7a3a1e9a0a..f56b48a633 100644 --- a/gr-digital/include/digital/binary_slicer_fb.h +++ b/gr-digital/include/digital/binary_slicer_fb.h @@ -46,7 +46,7 @@ namespace gr { /*! * \brief Make binary symbol slicer block. */ - sptr make(); + static sptr make(); }; } /* namespace digital */ diff --git a/gr-digital/include/digital/clock_recovery_mm_cc.h b/gr-digital/include/digital/clock_recovery_mm_cc.h index 783e7e6ad9..61499988d5 100644 --- a/gr-digital/include/digital/clock_recovery_mm_cc.h +++ b/gr-digital/include/digital/clock_recovery_mm_cc.h @@ -50,9 +50,9 @@ namespace gr { // gr::digital::clock_recovery_mm_cc::sptr typedef boost::shared_ptr<clock_recovery_mm_cc> sptr; - sptr make(float omega, float gain_omega, - float mu, float gain_mu, - float omega_relative_limi); + static sptr make(float omega, float gain_omega, + float mu, float gain_mu, + float omega_relative_limi); virtual float mu() const = 0; virtual float omega() const = 0; diff --git a/gr-digital/include/digital/clock_recovery_mm_ff.h b/gr-digital/include/digital/clock_recovery_mm_ff.h index 3ef9590e60..35ff80527c 100644 --- a/gr-digital/include/digital/clock_recovery_mm_ff.h +++ b/gr-digital/include/digital/clock_recovery_mm_ff.h @@ -47,9 +47,9 @@ namespace gr { // gr::digital::clock_recovery_mm_ff::sptr typedef boost::shared_ptr<clock_recovery_mm_ff> sptr; - sptr make(float omega, float gain_omega, - float mu, float gain_mu, - float omega_relative_limit); + static sptr make(float omega, float gain_omega, + float mu, float gain_mu, + float omega_relative_limit); virtual float mu() const = 0; virtual float omega() const = 0; diff --git a/gr-digital/include/digital/cma_equalizer_cc.h b/gr-digital/include/digital/cma_equalizer_cc.h index 0d939d6d05..6d6be0f2aa 100644 --- a/gr-digital/include/digital/cma_equalizer_cc.h +++ b/gr-digital/include/digital/cma_equalizer_cc.h @@ -51,7 +51,7 @@ namespace gr { // gr::digital::cma_equalizer_cc::sptr typedef boost::shared_ptr<cma_equalizer_cc> sptr; - sptr make(int num_taps, float modulus, float mu, int sps); + static sptr make(int num_taps, float modulus, float mu, int sps); virtual float gain() = 0; virtual void set_gain(float mu) = 0; diff --git a/gr-digital/python/qa_binary_slicer_fb.py b/gr-digital/python/qa_binary_slicer_fb.py index 60d92c5d19..f3cc944e54 100755 --- a/gr-digital/python/qa_binary_slicer_fb.py +++ b/gr-digital/python/qa_binary_slicer_fb.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -import digital_swig +import digital_swig as digital import math, random class test_binary_slicer_fb (gr_unittest.TestCase): @@ -36,18 +36,18 @@ class test_binary_slicer_fb (gr_unittest.TestCase): expected_result = ( 0, 1, 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1) src_data = (-1, 1, -1, -1, 1, 1, -1, -1, -1, 1, 1, 1, -1, 1, 1, 1, 1) src_data = [s + (1 - random.random()) for s in src_data] # add some noise - src = gr.vector_source_f (src_data) - op = digital_swig.binary_slicer_fb () - dst = gr.vector_sink_b () + src = gr.vector_source_f(src_data) + op = digital.binary_slicer_fb() + dst = gr.vector_sink_b() - self.tb.connect (src, op) - self.tb.connect (op, dst) - self.tb.run () # run the graph and wait for it to finish + self.tb.connect(src, op) + self.tb.connect(op, dst) + self.tb.run() # run the graph and wait for it to finish - actual_result = dst.data () # fetch the contents of the sink + actual_result = dst.data() # fetch the contents of the sink #print "actual result", actual_result #print "expected result", expected_result - self.assertFloatTuplesAlmostEqual (expected_result, actual_result) + self.assertFloatTuplesAlmostEqual(expected_result, actual_result) if __name__ == '__main__': diff --git a/gr-digital/python/qa_clock_recovery_mm.py b/gr-digital/python/qa_clock_recovery_mm.py index f4c345b034..2f7bfde39d 100755 --- a/gr-digital/python/qa_clock_recovery_mm.py +++ b/gr-digital/python/qa_clock_recovery_mm.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2012 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -import digital_swig +import digital_swig as digital import random, cmath class test_clock_recovery_mm(gr_unittest.TestCase): @@ -40,9 +40,9 @@ class test_clock_recovery_mm(gr_unittest.TestCase): gain_mu = 0.01 omega_rel_lim = 0.001 - self.test = digital_swig.clock_recovery_mm_cc(omega, gain_omega, - mu, gain_mu, - omega_rel_lim) + self.test = digital.clock_recovery_mm_cc(omega, gain_omega, + mu, gain_mu, + omega_rel_lim) data = 100*[complex(1, 1),] self.src = gr.vector_source_c(data, False) @@ -75,9 +75,9 @@ class test_clock_recovery_mm(gr_unittest.TestCase): gain_mu = 0.01 omega_rel_lim = 0.001 - self.test = digital_swig.clock_recovery_mm_ff(omega, gain_omega, - mu, gain_mu, - omega_rel_lim) + self.test = digital.clock_recovery_mm_ff(omega, gain_omega, + mu, gain_mu, + omega_rel_lim) data = 100*[1,] self.src = gr.vector_source_f(data, False) @@ -110,9 +110,9 @@ class test_clock_recovery_mm(gr_unittest.TestCase): gain_mu = 0.1 omega_rel_lim = 0.0001 - self.test = digital_swig.clock_recovery_mm_cc(omega, gain_omega, - mu, gain_mu, - omega_rel_lim) + self.test = digital.clock_recovery_mm_cc(omega, gain_omega, + mu, gain_mu, + omega_rel_lim) data = 1000*[complex(1, 1), complex(1, 1), complex(-1, -1), complex(-1, -1)] self.src = gr.vector_source_c(data, False) @@ -145,9 +145,9 @@ class test_clock_recovery_mm(gr_unittest.TestCase): gain_mu = 0.1 omega_rel_lim = 0.001 - self.test = digital_swig.clock_recovery_mm_ff(omega, gain_omega, - mu, gain_mu, - omega_rel_lim) + self.test = digital.clock_recovery_mm_ff(omega, gain_omega, + mu, gain_mu, + omega_rel_lim) data = 1000*[1, 1, -1, -1] self.src = gr.vector_source_f(data, False) |