diff options
| author | Achilleas Anastasopoulos <anastas@umich.edu> | 2014-10-01 17:51:12 -0400 |
|---|---|---|
| committer | anastas <anastas@umich.edu> | 2014-10-08 00:05:33 -0400 |
| commit | 46e9dfed237990da20b5fb054b7fd33b1c152b4a (patch) | |
| tree | f39ec7c3a4c89ad46989667962f493f5ab3da49a /gr-trellis/lib/calc_metric.cc | |
| parent | d598e49b4ca0a63985c675a12dc78cbc2a8931ee (diff) | |
Added set_ methods for most parameters in (almost) all gr-trellis blocks
Added FSM functionality + minor fixes
Diffstat (limited to 'gr-trellis/lib/calc_metric.cc')
| -rw-r--r-- | gr-trellis/lib/calc_metric.cc | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/gr-trellis/lib/calc_metric.cc b/gr-trellis/lib/calc_metric.cc index b95899940a..bdbb13ea08 100644 --- a/gr-trellis/lib/calc_metric.cc +++ b/gr-trellis/lib/calc_metric.cc @@ -73,19 +73,17 @@ namespace gr { } template - void calc_metric<short>(int O, int D, const std::vector<short> &TABLE, const short *input, - float *metric, digital::trellis_metric_type_t type); + void calc_metric<char>(int O, int D, const std::vector<char> &TABLE, const char *input, float *metric, digital::trellis_metric_type_t type); template - void calc_metric<int>(int O, int D, const std::vector<int> &TABLE, const int *input, - float *metric, digital::trellis_metric_type_t type); + void calc_metric<short>(int O, int D, const std::vector<short> &TABLE, const short *input, float *metric, digital::trellis_metric_type_t type); - template - void calc_metric<float>(int O, int D, const std::vector<float> &TABLE, const float *input, - float *metric, digital::trellis_metric_type_t type); + template void calc_metric<int>(int O, int D, const std::vector<int> &TABLE, const int *input, float *metric, digital::trellis_metric_type_t type); - void calc_metric(int O, int D, const std::vector<short> &TABLE, const short *input, - float *metric, digital::trellis_metric_type_t type) + template void calc_metric<float>(int O, int D, const std::vector<float> &TABLE, const float *input, float *metric, digital::trellis_metric_type_t type); + + /* + void calc_metric(int O, int D, const std::vector<short> &TABLE, const short *input, float *metric, digital::trellis_metric_type_t type) { float minm = FLT_MAX; int minmi = 0; @@ -124,7 +122,6 @@ namespace gr { } } - /* void calc_metric(int O, int D, const std::vector<int> &TABLE, const int *input, float *metric, digital::trellis_metric_type_t type) { |