From d5c192f9e3cde58589845b7b51057afc45d3bc79 Mon Sep 17 00:00:00 2001 From: anastas Date: Wed, 16 Aug 2006 20:07:36 +0000 Subject: Several enhancements to gr-trellis and gnuradio-examples/python/channel-coding: -Added fsm constructor for generating FSM directly from the generator matrix of binary convolutional codes. -Added functionality to fsm class to compute the best way to go from any state to any other state (useful for termination) -Added soft-in-soft-out (SISO) block for turbo processing -Added turbo decoding examples git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3322 221aa14e-8319-0410-a670-987f0aec2ac5 --- gr-trellis/src/lib/trellis_viterbi_s.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gr-trellis/src/lib/trellis_viterbi_s.cc') diff --git a/gr-trellis/src/lib/trellis_viterbi_s.cc b/gr-trellis/src/lib/trellis_viterbi_s.cc index f5a0705c2..bb3dafa61 100644 --- a/gr-trellis/src/lib/trellis_viterbi_s.cc +++ b/gr-trellis/src/lib/trellis_viterbi_s.cc @@ -34,18 +34,18 @@ static const float INF = 1.0e9; trellis_viterbi_s_sptr trellis_make_viterbi_s ( const fsm &FSM, - const int K, - const int S0, - const int SK) + int K, + int S0, + int SK) { return trellis_viterbi_s_sptr (new trellis_viterbi_s (FSM,K,S0,SK)); } trellis_viterbi_s::trellis_viterbi_s ( const fsm &FSM, - const int K, - const int S0, - const int SK) + int K, + int S0, + int SK) : gr_block ("viterbi_s", gr_make_io_signature (1, -1, sizeof (float)), gr_make_io_signature (1, -1, sizeof (short))), @@ -74,13 +74,13 @@ trellis_viterbi_s::forecast (int noutput_items, gr_vector_int &ninput_items_requ -void viterbi_algorithm(const int I, const int S, const int O, +void viterbi_algorithm(int I, int S, int O, const std::vector &NS, const std::vector &OS, const std::vector &PS, const std::vector &PI, - const int K, - const int S0,const int SK, + int K, + int S0,int SK, const float *in, short *out, std::vector &trace) { -- cgit