summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blossom2010-11-14 13:15:26 -0800
committerEric Blossom2010-11-14 13:15:26 -0800
commiteedcd7145c20403dcd0dcc44d15efb5d82beb7ec (patch)
treeae742fd56396f11ca9e1cc2dbfafdcda88a28377
parent48f6c8b4c398b7ee18ee4292ae20d4f4c1dd3087 (diff)
downloadgnuradio-eedcd7145c20403dcd0dcc44d15efb5d82beb7ec.tar.gz
gnuradio-eedcd7145c20403dcd0dcc44d15efb5d82beb7ec.tar.bz2
gnuradio-eedcd7145c20403dcd0dcc44d15efb5d82beb7ec.zip
Make cma-equalizer-cc test work
-rw-r--r--gnuradio-core/src/guile/tests/filter_ctors.test6
-rw-r--r--gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc3
2 files changed, 5 insertions, 4 deletions
diff --git a/gnuradio-core/src/guile/tests/filter_ctors.test b/gnuradio-core/src/guile/tests/filter_ctors.test
index 8618890fa..6a35bd296 100644
--- a/gnuradio-core/src/guile/tests/filter_ctors.test
+++ b/gnuradio-core/src/guile/tests/filter_ctors.test
@@ -32,12 +32,12 @@
;;; Add test code for all constructors in these files
;;;
-;;; ./filter/gr_adaptive_fir_ccf.h FIXME: not found
+;;; ./filter/gr_adaptive_fir_ccf.h WONTFIX: not wrapped
;; gr_adaptive_fir_ccf(char *name, int decimation, const std::vector<float> &taps);
;; (pass-if (true? (gr:adaptive-fir-ccf "foo" 0 #(1.0 2.0 3.0 4.0))))
-;;; ./filter/gr_cma_equalizer_cc.h FIXME: not found
-;; (pass-if (true? (gr:cma-equalizer-cc 0 0 0)))
+;;; ./filter/gr_cma_equalizer_cc.h
+(pass-if (true? (gr:cma-equalizer-cc 0 0 0)))
;;; ./filter/gr_fft_filter_ccc.h FIXME: not found
;; (pass-if (true? (gr:fft-filter-ccc 0 #(1+3i 23+5i))))
diff --git a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc
index 8252509bb..f80bfd518 100644
--- a/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc
+++ b/gnuradio-core/src/lib/filter/gr_cma_equalizer_cc.cc
@@ -36,6 +36,7 @@ gr_cma_equalizer_cc::gr_cma_equalizer_cc(int num_taps, float modulus, float mu)
: gr_adaptive_fir_ccf("cma_equalizer_cc", 1, std::vector<float>(num_taps)),
d_modulus(modulus), d_mu(mu)
{
- d_taps[0] = 1.0;
+ if (num_taps > 0)
+ d_taps[0] = 1.0;
}