X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-trellis%2Fsrc%2Flib%2Ftrellis_metrics_X.cc.t;h=bced13c0cf58ec7b88392c2bc0f7884f815d964d;hb=HEAD;hp=d5347e12d33bf1e4e177a51ca7e2e375601e140c;hpb=e9a821632def12c450110e164d0d1c0275d41946;p=debian%2Fgnuradio

diff --git a/gr-trellis/src/lib/trellis_metrics_X.cc.t b/gr-trellis/src/lib/trellis_metrics_X.cc.t
index d5347e12..bced13c0 100644
--- a/gr-trellis/src/lib/trellis_metrics_X.cc.t
+++ b/gr-trellis/src/lib/trellis_metrics_X.cc.t
@@ -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,
@@ -16,10 +16,12 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with GNU Radio; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
  */
 
+// @WARNING@
+
 #ifndef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -32,14 +34,14 @@
 
 
 @SPTR_NAME@
-trellis_make_@BASE_NAME@ (const int O, const int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE)
+trellis_make_@BASE_NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE)
 {
   return @SPTR_NAME@ (new @NAME@ (O,D,TABLE,TYPE));
 }
 
 
 
-@NAME@::@NAME@ (const int O, const int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE)
+@NAME@::@NAME@ (int O, int D,  const std::vector<@I_TYPE@> &TABLE, trellis_metric_type_t TYPE)
   : gr_block ("@BASE_NAME@",
 	      gr_make_io_signature (1, -1, sizeof (@I_TYPE@)),
 	      gr_make_io_signature (1, -1, sizeof (float))),
@@ -52,7 +54,10 @@ trellis_make_@BASE_NAME@ (const int O, const int D,  const std::vector<@I_TYPE@>
   set_output_multiple ((int)d_O);
 }
 
-
+void @NAME@::set_TABLE (const std::vector<@I_TYPE@> &table)
+{
+  d_TABLE = table;
+}
 
 
 void
@@ -83,11 +88,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 @IS_FLOAT@
-    calc_metric_f(d_O, d_D, d_TABLE,&(in[i*d_D]),&(out[i*d_O]), d_TYPE);
-#elif @IS_COMPLEX@
-    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);
   } 
 }