diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-08-14 19:39:08 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-08-14 19:39:08 -0400 |
| commit | 29a019d2761f8001f2c132968c67b060a0ba24bc (patch) | |
| tree | 1e532c72134af3070ff6f7b4e6df62645bd17a8b /gr-trellis | |
| parent | ab479e3d5b5d77eb4133dd06ea3ffc51551fccd6 (diff) | |
digital: moved metric_type.h to digital include dir. Fixed gr-trellis to work with this.
Diffstat (limited to 'gr-trellis')
| -rw-r--r-- | gr-trellis/src/lib/calc_metric.h | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/core_algorithms.h | 2 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis.i | 6 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.cc | 4 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.h | 12 | ||||
| -rw-r--r-- | gr-trellis/src/lib/trellis_constellation_metrics_cf.i | 4 |
6 files changed, 15 insertions, 15 deletions
diff --git a/gr-trellis/src/lib/calc_metric.h b/gr-trellis/src/lib/calc_metric.h index 7cad6160aa..489d148317 100644 --- a/gr-trellis/src/lib/calc_metric.h +++ b/gr-trellis/src/lib/calc_metric.h @@ -25,7 +25,7 @@ #include <vector> #include <gr_complex.h> -#include <digital_metric_type.h> +#include <digital/metric_type.h> template <class T> diff --git a/gr-trellis/src/lib/core_algorithms.h b/gr-trellis/src/lib/core_algorithms.h index a8765225bf..f1e1fc9c22 100644 --- a/gr-trellis/src/lib/core_algorithms.h +++ b/gr-trellis/src/lib/core_algorithms.h @@ -26,7 +26,7 @@ #include <cmath> #include <vector> //#include <gr_complex.h> -#include "digital_metric_type.h" +#include "digital/metric_type.h" #include "fsm.h" #include "interleaver.h" diff --git a/gr-trellis/src/lib/trellis.i b/gr-trellis/src/lib/trellis.i index 0debf5e5da..3a364802da 100644 --- a/gr-trellis/src/lib/trellis.i +++ b/gr-trellis/src/lib/trellis.i @@ -32,7 +32,7 @@ #include "trellis_siso_f.h" #include "trellis_siso_combined_f.h" #include "trellis_constellation_metrics_cf.h" -#include "digital_constellation.h" +#include "digital/constellation.h" %} @@ -50,8 +50,8 @@ %include "trellis_generated.i" -%import "digital_metric_type.h" -%import "digital_constellation.i" +%import "digital/metric_type.h" +%import "constellation.i" //%pythoncode %{ // from gnuradio.gr import TRELLIS_EUCLIDEAN, TRELLIS_HARD_SYMBOL, TRELLIS_HARD_BIT diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc index 6e6aa2dd03..8658b7e9e1 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.cc @@ -33,14 +33,14 @@ trellis_constellation_metrics_cf_sptr -trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE) +trellis_make_constellation_metrics_cf (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE) { return gnuradio::get_initial_sptr (new trellis_constellation_metrics_cf (constellation, TYPE)); } -trellis_constellation_metrics_cf::trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE) +trellis_constellation_metrics_cf::trellis_constellation_metrics_cf (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE) : gr_block ("constellation_metrics_cf", gr_make_io_signature (1, -1, sizeof (gr_complex)), gr_make_io_signature (1, -1, sizeof (float))), diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h index 2c2070522c..6896489e6e 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.h +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.h @@ -25,13 +25,13 @@ #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> 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 (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE); /*! * \brief Evaluate metrics for use by the Viterbi algorithm. @@ -47,14 +47,14 @@ class TRELLIS_API trellis_constellation_metrics_cf : public gr_block 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 (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE); private: - digital_constellation_sptr d_constellation; + gr::digital::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 (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE); }; diff --git a/gr-trellis/src/lib/trellis_constellation_metrics_cf.i b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i index c17522b113..861c55566a 100644 --- a/gr-trellis/src/lib/trellis_constellation_metrics_cf.i +++ b/gr-trellis/src/lib/trellis_constellation_metrics_cf.i @@ -24,10 +24,10 @@ GR_SWIG_BLOCK_MAGIC(trellis,constellation_metrics_cf); -trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); +trellis_constellation_metrics_cf_sptr trellis_make_constellation_metrics_cf (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE); class trellis_constellation_metrics_cf : public gr_block { private: - trellis_constellation_metrics_cf (digital_constellation_sptr constellation, trellis_metric_type_t TYPE); + trellis_constellation_metrics_cf (gr::digital::constellation_sptr constellation, trellis_metric_type_t TYPE); }; |