diff options
| author | Nick Foster <nick@ettus.com> | 2011-05-23 21:49:28 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-14 17:27:46 -0700 |
| commit | 3dca19a3e7f56c64423789ee025f16150b1a2cdb (patch) | |
| tree | 6d168b13e0a73c9606dc168752879ee8bbb86498 /host/tests/convert_test.cpp | |
| parent | 75d0a41c3a7a2c7cd62a6c6b27e648d5617d488e (diff) | |
| download | uhd-3dca19a3e7f56c64423789ee025f16150b1a2cdb.tar.gz uhd-3dca19a3e7f56c64423789ee025f16150b1a2cdb.tar.bz2 uhd-3dca19a3e7f56c64423789ee025f16150b1a2cdb.zip | |
UHD: Fixed convert_test (scalars backwards), fixed Orc conversions (endianness backwards).
Diffstat (limited to 'host/tests/convert_test.cpp')
| -rw-r--r-- | host/tests/convert_test.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/host/tests/convert_test.cpp b/host/tests/convert_test.cpp index ff37d4a0a..d828ed64a 100644 --- a/host/tests/convert_test.cpp +++ b/host/tests/convert_test.cpp @@ -31,7 +31,7 @@ typedef std::complex<boost::int16_t> sc16_t; typedef std::complex<float> fc32_t; typedef std::complex<double> fc64_t; -#define MY_CHECK_CLOSE(a, b, f) if ((std::abs(a) > (f) and std::abs(b) > (f))) \ +#define MY_CHECK_CLOSE(a, b, f) if ((std::abs(a) > (f))) \ BOOST_CHECK_CLOSE_FRACTION(a, b, f) /*********************************************************************** @@ -55,12 +55,12 @@ template <typename Range> static void loopback( //convert to intermediate type convert::get_converter_cpu_to_otw( io_type, otw_type, input0.size(), output0.size() - )(input0, output0, nsamps, 1/32767.); + )(input0, output0, nsamps, 32767.); //convert back to host type convert::get_converter_otw_to_cpu( io_type, otw_type, input1.size(), output1.size() - )(input1, output1, nsamps, 32767.); + )(input1, output1, nsamps, 1/32767.); } /*********************************************************************** @@ -207,12 +207,12 @@ BOOST_AUTO_TEST_CASE(test_convert_types_fc32_to_sc16){ //convert float to intermediate convert::get_converter_cpu_to_otw( io_type_in, otw_type, input0.size(), output0.size() - )(input0, output0, nsamps, 1/32767.); + )(input0, output0, nsamps, 32767.); //convert intermediate to short convert::get_converter_otw_to_cpu( io_type_out, otw_type, input1.size(), output1.size() - )(input1, output1, nsamps, 32767.); + )(input1, output1, nsamps, 1/32767.); //test that the inputs and outputs match for (size_t i = 0; i < nsamps; i++){ |