diff options
| author | anastas | 2006-08-16 20:07:36 +0000 |
|---|---|---|
| committer | anastas | 2006-08-16 20:07:36 +0000 |
| commit | d5c192f9e3cde58589845b7b51057afc45d3bc79 (patch) | |
| tree | 04dc746388bb19f66bae93d110e4f2a5ca14c64b /gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t | |
| parent | 1f0a124c68a40b2eee063267d4f7aeba4ed87619 (diff) | |
| download | gnuradio-d5c192f9e3cde58589845b7b51057afc45d3bc79.tar.gz gnuradio-d5c192f9e3cde58589845b7b51057afc45d3bc79.tar.bz2 gnuradio-d5c192f9e3cde58589845b7b51057afc45d3bc79.zip | |
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
Diffstat (limited to 'gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t')
| -rw-r--r-- | gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t index 52e01026b..de2079ad0 100644 --- a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t +++ b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t @@ -34,24 +34,24 @@ static const float INF = 1.0e9; @SPTR_NAME@ trellis_make_@BASE_NAME@ ( const fsm &FSM, - const int D, + int D, const std::vector<float> &TABLE, - const int K, - const int S0, - const int SK, - const trellis_metric_type_t TYPE) + int K, + int S0, + int SK, + trellis_metric_type_t TYPE) { return @SPTR_NAME@ (new @NAME@ (FSM,D,TABLE,K,S0,SK,TYPE)); } @NAME@::@NAME@ ( const fsm &FSM, - const int D, + int D, const std::vector<float> &TABLE, - const int K, - const int S0, - const int SK, - const trellis_metric_type_t TYPE) + int K, + int S0, + int SK, + trellis_metric_type_t TYPE) : gr_block ("@BASE_NAME@", gr_make_io_signature (1, -1, sizeof (float)), gr_make_io_signature (1, -1, sizeof (@TYPE@))), @@ -83,16 +83,16 @@ void -void viterbi_algorithm_combined(const int I, const int S, const int O, +void viterbi_algorithm_combined(int I, int S, int O, const std::vector<int> &NS, const std::vector<int> &OS, const std::vector<int> &PS, const std::vector<int> &PI, - const int D, + int D, const std::vector<float> &TABLE, - const int K, - const int S0,const int SK, - const trellis_metric_type_t TYPE, + int K, + int S0,int SK, + trellis_metric_type_t TYPE, const float *in, @TYPE@ *out, std::vector<int> &trace) { |