Refactored some common functions for metric calculations. Updated the documentation.

[debian/gnuradio] / gr-trellis / src / lib / trellis_metrics_f.cc

diff --git a/gr-trellis/src/lib/trellis_metrics_f.cc b/gr-trellis/src/lib/trellis_metrics_f.cc
index 69e4a99df692a7ed63e9277cc7b4fb46c5734e86..58d4d41c2296563aa07788b6af592d890ee41881 100644 (file)
--- a/gr-trellis/src/lib/trellis_metrics_f.cc
+++ b/gr-trellis/src/lib/trellis_metrics_f.cc
@@ -83,6 +83,7 @@ for (int m=0;m<nstreams;m++) {
   float *out = (float *) output_items[m];
 
   for (int i = 0; i < noutput_items / d_O ; i++){
+/*
 #if 0
     calc_metric_s(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
 #elif 0
@@ -92,6 +93,8 @@ for (int m=0;m<nstreams;m++) {
 #elif 0
     calc_metric_c(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
 #endif
+*/
+    calc_metric(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
   } 
 }