Merge branch 'upstream' into dfsg-orig

[debian/gnuradio] / gr-trellis / src / lib / trellis_metrics_i.h

diff --git a/gr-trellis/src/lib/trellis_metrics_i.h b/gr-trellis/src/lib/trellis_metrics_i.h
index c51e377e7055138406be24f68e9b549b88a154b9..1dc8101760edf3d3abe4176999eeb9c7c5332f39 100644 (file)
--- a/gr-trellis/src/lib/trellis_metrics_i.h
+++ b/gr-trellis/src/lib/trellis_metrics_i.h
@@ -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,8 +16,8 @@
  * 
  * 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: this file is machine generated.  Edits will be over written
@@ -31,12 +31,11 @@
 class trellis_metrics_i;
 typedef boost::shared_ptr<trellis_metrics_i> trellis_metrics_i_sptr;
 
-trellis_metrics_i_sptr trellis_make_metrics_i (const int O, const int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
+trellis_metrics_i_sptr trellis_make_metrics_i (int O, int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
 
 /*!
  * \brief Evaluate metrics for use by the Viterbi algorithm.
- * \ingroup block
- *
+ * \ingroup coding_blk
  */
 class trellis_metrics_i : public gr_block
 {
@@ -45,14 +44,15 @@ class trellis_metrics_i : public gr_block
   trellis_metric_type_t d_TYPE;
   std::vector<int> d_TABLE;
 
-  friend trellis_metrics_i_sptr trellis_make_metrics_i (const int O, const int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
-  trellis_metrics_i (const int O, const int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
+  friend trellis_metrics_i_sptr trellis_make_metrics_i (int O, int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
+  trellis_metrics_i (int O, int D,  const std::vector<int> &TABLE, trellis_metric_type_t TYPE);
 
 public:
   int O () const { return d_O; }
   int D () const { return d_D; }
   trellis_metric_type_t TYPE () const { return d_TYPE; }
   std::vector<int> TABLE () const { return d_TABLE; }
+  void set_TABLE (const std::vector<int> &table);
   void forecast (int noutput_items,
                 gr_vector_int &ninput_items_required);
   int general_work (int noutput_items,