diff options
Diffstat (limited to 'gr-trellis/src/lib/trellis_constellation_metrics_cf.h')
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h index 2c2070522c..91ab30986b 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h @@ -25,13 +25,17 @@ #include <trellis_api.h> #include <gr_block.h> -#include <digital_constellation.h> -#include <digital_metric_type.h> +#include <digital/constellation.h> +#include <digital/metric_type.h> + +using namespace gr::digital; class trellis_constellation_metrics_cf; typedef boost::shared_ptr<trellis_constellation_metrics_cf> trellis_constellation_metrics_cf_sptr; -TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); +TRELLIS_API trellis_constellation_metrics_cf_sptr + trellis_make_constellation_metrics_cf(constellation_sptr constellation, + trellis_metric_type_t TYPE); /*! * \brief Evaluate metrics for use by the Viterbi algorithm. @@ -40,21 +44,24 @@ TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_met class TRELLIS_API trellis_constellation_metrics_cf : public gr_block { public: - void forecast (int noutput_items, - gr_vector_int &ninput_items_required); - int general_work (int noutput_items, - gr_vector_int &ninput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items); + void forecast(int noutput_items, + gr_vector_int &ninput_items_required); + int general_work(int noutput_items, + gr_vector_int &ninput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items); protected: - trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); + trellis_constellation_metrics_cf(constellation_sptr constellation, + trellis_metric_type_t TYPE); private: - digital_constellation_sptr d_constellation; + constellation_sptr d_constellation; trellis_metric_type_t d_TYPE; unsigned int d_O; unsigned int d_D; - friend TRELLIS_API trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); + friend TRELLIS_API trellis_constellation_metrics_cf_sptr + trellis_make_constellation_metrics_cf(constellation_sptr constellation, + trellis_metric_type_t TYPE); }; |