diff options
| author | Martin Braun <martin.braun@kit.edu> | 2010-12-09 13:54:22 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@kit.edu> | 2010-12-09 13:54:22 +0100 |
| commit | 144ef2dbe12de3f1f784fb2e76771b1e174deb41 (patch) | |
| tree | 9f8d741a271e967495a45c978fe11078355e560a /gnuradio-core/src/lib/general | |
| parent | dd35f129cc0ecbbf092a25a60414fef133e6dc04 (diff) | |
All CPM stuff included (C++/GRC/Python), tests pass
Diffstat (limited to 'gnuradio-core/src/lib/general')
| -rw-r--r-- | gnuradio-core/src/lib/general/general.i | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/qa_gr_cpm.cc | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/gnuradio-core/src/lib/general/general.i b/gnuradio-core/src/lib/general/general.i index 68cafce2e6..8c7f31c626 100644 --- a/gnuradio-core/src/lib/general/general.i +++ b/gnuradio-core/src/lib/general/general.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc. + * Copyright 2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -141,6 +141,7 @@ #include <gr_copy.h> #include <gr_fll_band_edge_cc.h> #include <gr_additive_scrambler_bb.h> +#include <gr_cpm.h> %} %include "gr_nop.i" @@ -262,3 +263,4 @@ %include "gr_copy.i" %include "gr_fll_band_edge_cc.i" %include "gr_additive_scrambler_bb.i" +%include "gr_cpm.i" diff --git a/gnuradio-core/src/lib/general/qa_gr_cpm.cc b/gnuradio-core/src/lib/general/qa_gr_cpm.cc index fe76feadd4..ae391c48ca 100644 --- a/gnuradio-core/src/lib/general/qa_gr_cpm.cc +++ b/gnuradio-core/src/lib/general/qa_gr_cpm.cc @@ -24,10 +24,6 @@ #include <gr_cpm.h> #include <cppunit/TestAssert.h> -#include <iostream> -using std::cout; -using std::endl; - const double DELTA = 1e-5; const int L = 5; const int samples_per_sym = 4; @@ -118,9 +114,7 @@ qa_gr_cpm::t4 () std::vector<float> taps(gr_cpm::phase_response(gr_cpm::TFM, samples_per_sym, L)); float sum = 0; - cout << "TFM" << endl; for (int i = 0; i < L * samples_per_sym; i++) { - cout << "i=" << i << " " << taps[i] << "?=" << taps_tfm[i] << endl; CPPUNIT_ASSERT_DOUBLES_EQUAL(taps[i], taps_tfm[i], DELTA); sum += taps[i]; } |