summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib/fsm.i
diff options
context:
space:
mode:
authoranastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5>2008-11-13 15:24:59 +0000
committeranastas <anastas@221aa14e-8319-0410-a670-987f0aec2ac5>2008-11-13 15:24:59 +0000
commitd2b06e6769d7500aa06239f693de8d6cb43eff29 (patch)
tree08ec8828eb1efbffbd1b07422047ed321786f6cf /gr-trellis/src/lib/fsm.i
parent4f8ca94b8375ff482f43a143c0055d583986e3bf (diff)
Several updates on gr-trellis: 1) new fsm constructor for a joint trellis, 2) Corresponding fsm file examples, 3) added set_TABLE method in viterbi_combined and metrics
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@9985 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib/fsm.i')
-rw-r--r--gr-trellis/src/lib/fsm.i1
1 files changed, 1 insertions, 0 deletions
diff --git a/gr-trellis/src/lib/fsm.i b/gr-trellis/src/lib/fsm.i
index b566f8aa3a..ac00d40e37 100644
--- a/gr-trellis/src/lib/fsm.i
+++ b/gr-trellis/src/lib/fsm.i
@@ -40,6 +40,7 @@ public:
fsm(const char *name);
fsm(int k, int n, const std::vector<int> &G);
fsm(int mod_size, int ch_length);
+ fsm(const fsm &FSM1, const fsm &FSM2);
int I () const { return d_I; }
int S () const { return d_S; }
int O () const { return d_O; }