add Vcs entries to control file

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

diff --git a/gr-trellis/src/lib/trellis_metrics_c.cc b/gr-trellis/src/lib/trellis_metrics_c.cc
index 1dc3d137d8b1a50fcbf4ac3dd49a0b14a469042f..4fac9f6d2a6f3845811943c9050899597519b3e7 100644 (file)
--- a/gr-trellis/src/lib/trellis_metrics_c.cc
+++ b/gr-trellis/src/lib/trellis_metrics_c.cc
@@ -6,7 +6,7 @@
  * 
  * GNU Radio is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
+ * the Free Software Foundation; either version 3, or (at your option)
  * any later version.
  * 
  * GNU Radio is distributed in the hope that it will be useful,
@@ -54,7 +54,10 @@ trellis_metrics_c::trellis_metrics_c (int O, int D,  const std::vector<gr_comple
   set_output_multiple ((int)d_O);
 }
 
-
+void trellis_metrics_c::set_TABLE (const std::vector<gr_complex> &table)
+{
+  d_TABLE = table;
+}
 
 
 void
@@ -85,17 +88,6 @@ 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
-    calc_metric_i(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
-#elif 0
-    calc_metric_f(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
-#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);
   } 
 }