summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib/trellis_metrics_c.cc
diff options
context:
space:
mode:
authoranastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-03 20:27:42 +0000
committeranastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5>2006-09-03 20:27:42 +0000
commitd4697a07812be9e1f91a03b0a2dd61b1948f9925 (patch)
tree28a75b0693f92d044d8d33284da7e8cc0708fc62 /gr-trellis/src/lib/trellis_metrics_c.cc
parent21abdfb3f1ba6520a7911a0787adab664d9a790f (diff)
Refactored some common functions for metric calculations. Updated the documentation.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3469 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib/trellis_metrics_c.cc')
-rw-r--r--gr-trellis/src/lib/trellis_metrics_c.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/gr-trellis/src/lib/trellis_metrics_c.cc b/gr-trellis/src/lib/trellis_metrics_c.cc
index d80f2e7d7b..59d35bd6d8 100644
--- a/gr-trellis/src/lib/trellis_metrics_c.cc
+++ b/gr-trellis/src/lib/trellis_metrics_c.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 1
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);
}
}