diff options
Diffstat (limited to 'gnuradio-runtime/lib/math/qa_fxpt_vco.cc')
| -rw-r--r-- | gnuradio-runtime/lib/math/qa_fxpt_vco.cc | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc index 49af65609d..2cd8a4733b 100644 --- a/gnuradio-runtime/lib/math/qa_fxpt_vco.cc +++ b/gnuradio-runtime/lib/math/qa_fxpt_vco.cc @@ -64,17 +64,19 @@ BOOST_AUTO_TEST_CASE(t1) { gr::vco<float, float> ref_vco; gr::fxpt_vco new_vco; - float* ref_block = new float[SIN_COS_BLOCK_SIZE]; - float* new_block = new float[SIN_COS_BLOCK_SIZE]; - float* input = new float[SIN_COS_BLOCK_SIZE]; + std::vector<float> ref_block(SIN_COS_BLOCK_SIZE); + std::vector<float> new_block(SIN_COS_BLOCK_SIZE); + std::vector<float> input(SIN_COS_BLOCK_SIZE); double max_error = 0; for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++) { input[i] = sin(double(i)); } - ref_vco.cos(ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); - new_vco.cos(new_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); + ref_vco.cos( + ref_block.data(), input.data(), SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); + new_vco.cos( + new_block.data(), input.data(), SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++) { BOOST_CHECK(std::abs(ref_block[i] - new_block[i]) <= SIN_COS_TOLERANCE); @@ -83,9 +85,6 @@ BOOST_AUTO_TEST_CASE(t1) BOOST_CHECK(std::abs(ref_vco.get_phase() - new_vco.get_phase()) <= SIN_COS_TOLERANCE); // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, // ref_vco.get_phase()-new_vco.get_phase()); - delete[] ref_block; - delete[] new_block; - delete[] input; } @@ -93,17 +92,19 @@ BOOST_AUTO_TEST_CASE(t2) { gr::vco<gr_complex, float> ref_vco; gr::fxpt_vco new_vco; - gr_complex* ref_block = new gr_complex[SIN_COS_BLOCK_SIZE]; - gr_complex* new_block = new gr_complex[SIN_COS_BLOCK_SIZE]; - float* input = new float[SIN_COS_BLOCK_SIZE]; + std::vector<gr_complex> ref_block(SIN_COS_BLOCK_SIZE); + std::vector<gr_complex> new_block(SIN_COS_BLOCK_SIZE); + std::vector<float> input(SIN_COS_BLOCK_SIZE); double max_error = 0; for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++) { input[i] = sin(double(i)); } - ref_vco.sincos(ref_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); - new_vco.sincos(new_block, input, SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); + ref_vco.sincos( + ref_block.data(), input.data(), SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); + new_vco.sincos( + new_block.data(), input.data(), SIN_COS_BLOCK_SIZE, SIN_COS_K, SIN_COS_AMPL); for (int i = 0; i < SIN_COS_BLOCK_SIZE; i++) { BOOST_CHECK(std::abs(ref_block[i] - new_block[i]) <= SIN_COS_TOLERANCE); @@ -112,7 +113,4 @@ BOOST_AUTO_TEST_CASE(t2) BOOST_CHECK(std::abs(ref_vco.get_phase() - new_vco.get_phase()) <= SIN_COS_TOLERANCE); // printf ("Fxpt max error %.9f, max phase error %.9f\n", max_error, // ref_vco.get_phase()-new_vco.get_phase()); - delete[] ref_block; - delete[] new_block; - delete[] input; } |