Merged anastas/wip changes r3156:3218 into trunk.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3219 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 58 insertions, 0 deletions

diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_s.i b/gr-trellis/src/lib/trellis_viterbi_combined_s.i
new file mode 100644
index 000000000..ddac52692
--- /dev/null
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_s.i
@@ -0,0 +1,58 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * 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)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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.
+ */
+
+// WARNING: this file is machine generated.  Edits will be over written
+
+GR_SWIG_BLOCK_MAGIC(trellis,viterbi_combined_s);
+
+trellis_viterbi_combined_s_sptr trellis_make_viterbi_combined_s (
+    const fsm &FSM,
+    const int D,
+    const std::vector<float> &TABLE,
+    const int K,
+    const int S0,
+    const int SK,
+    const trellis_metric_type_t TYPE);
+
+
+class trellis_viterbi_combined_s : public gr_block
+{
+private:
+  trellis_viterbi_combined_s (
+    const fsm &FSM,
+    const int D,
+    const std::vector<float> &TABLE,
+    const int K,
+    const int S0,
+    const int SK,
+    const trellis_metric_type_t TYPE);
+
+public:
+    fsm FSM () const { return d_FSM; }
+    int D () const { return d_D; }
+    std::vector<float> TABLE () const { return d_TABLE; }
+    int K () const { return d_K; }
+    int S0 () const { return d_S0; }
+    int SK () const { return d_SK; }
+    trellis_metric_type_t TYPE () const { return d_TYPE; }
+    //std::vector<short> trace () const { return d_trace; }
+};