diff options
| author | anastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-26 00:29:51 +0000 |
|---|---|---|
| committer | anastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5> | 2009-02-26 00:29:51 +0000 |
| commit | 436f3744f211b396b68fd58699063047899b7281 (patch) | |
| tree | 2505fb981bc452f867b4633a11e57b188a565d01 /gr-trellis/src/lib/trellis_calc_metric.cc | |
| parent | 4d192c227e6c7a00b82aef4aca71a3a77ac0dbd1 (diff) | |
Added support for Continuous Phase Modulation in gr-trellis + an example
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10514 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib/trellis_calc_metric.cc')
| -rw-r--r-- | gr-trellis/src/lib/trellis_calc_metric.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-trellis/src/lib/trellis_calc_metric.cc b/gr-trellis/src/lib/trellis_calc_metric.cc index 676f53fd7c..0d03fd1a7e 100644 --- a/gr-trellis/src/lib/trellis_calc_metric.cc +++ b/gr-trellis/src/lib/trellis_calc_metric.cc @@ -31,6 +31,7 @@ void calc_metric(int O, int D, const std::vector<T> &TABLE, const T *in, float * { float minm = FLT_MAX; int minmi = 0; + switch (type){ case TRELLIS_EUCLIDEAN: @@ -213,6 +214,7 @@ void calc_metric(int O, int D, const std::vector<gr_complex> &TABLE, const gr_co float minm = FLT_MAX; int minmi = 0; + switch (type){ case TRELLIS_EUCLIDEAN: for(int o=0;o<O;o++) { @@ -222,6 +224,7 @@ void calc_metric(int O, int D, const std::vector<gr_complex> &TABLE, const gr_co metric[o]+=s.real()*s.real()+s.imag()*s.imag(); } } + break; case TRELLIS_HARD_SYMBOL: for(int o=0;o<O;o++) { metric[o]=0.0; |