diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-01-22 15:23:51 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-01-22 15:23:51 -0500 |
| commit | f54dde22e71bf393ad4519d099384af38d43ee72 (patch) | |
| tree | a38eed0332586e457ce4b7c8f586fa9ce74b6d3e /gr-atsc | |
| parent | 85759ff0f893b9377b156609d68c6453feb304c9 (diff) | |
| parent | 48f9ca90e0cbcbfe67b0e10889c60928d9be5c49 (diff) | |
Merge branch 'mergeme/math/gr_math_simplification' into next
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/atsci_equalizer_lms2.cc | 5 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsci_sssr.cc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/gr-atsc/src/lib/atsci_equalizer_lms2.cc b/gr-atsc/src/lib/atsci_equalizer_lms2.cc index 345f6209fb..f9fb57c7b8 100644 --- a/gr-atsc/src/lib/atsci_equalizer_lms2.cc +++ b/gr-atsc/src/lib/atsci_equalizer_lms2.cc @@ -28,6 +28,7 @@ #include <stdlib.h> #include <gr_math.h> #include <stdio.h> +#include <boost/math/special_functions/fpclassify.hpp> using std::min; using std::max; @@ -55,7 +56,7 @@ wrap (int d) static inline float slice (float d) { - if (gr_isnan (d)) + if (boost::math::isnan (d)) return 0.0; if (d >= 0.0){ @@ -247,7 +248,7 @@ atsci_equalizer_lms2::filter1 (const float input[]) acc -= d_taps_fb[i] * d_old_output[wrap(i + d_output_ptr)]; } - if (gr_isnan (acc)){ + if (boost::math::isnan (acc)){ abort (); } diff --git a/gr-atsc/src/lib/atsci_sssr.cc b/gr-atsc/src/lib/atsci_sssr.cc index dc5c01b0d2..4ccee85dec 100644 --- a/gr-atsc/src/lib/atsci_sssr.cc +++ b/gr-atsc/src/lib/atsci_sssr.cc @@ -28,6 +28,7 @@ #include <atsci_diag_output.h> #include <gr_math.h> #include <stdio.h> +#include <boost/math/special_functions/sign.hpp> /* * ---------------------------------------------------------------- @@ -141,7 +142,7 @@ atsci_sssr::update (sssr::sample_t sample_in, // input double qo = d_quad_filter.update (sample_in); d_quad_output[d_counter] = qo; - int bit = gr_signbit (sample_in) ^ 1; // slice on sign: + => 1, - => 0 + int bit = boost::math::signbit (sample_in) ^ 1; // slice on sign: + => 1, - => 0 int corr_out = d_correlator.update (bit); int weight = sipp (corr_out); int corr_value = d_integrator.update (weight, d_counter); |