summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib/trellis_metrics_i.h
diff options
context:
space:
mode:
authoranastas2006-08-16 20:07:36 +0000
committeranastas2006-08-16 20:07:36 +0000
commitd5c192f9e3cde58589845b7b51057afc45d3bc79 (patch)
tree04dc746388bb19f66bae93d110e4f2a5ca14c64b /gr-trellis/src/lib/trellis_metrics_i.h
parent1f0a124c68a40b2eee063267d4f7aeba4ed87619 (diff)
downloadgnuradio-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_metrics_i.h')
-rw-r--r--gr-trellis/src/lib/trellis_metrics_i.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-trellis/src/lib/trellis_metrics_i.h b/gr-trellis/src/lib/trellis_metrics_i.h
index c51e377e7..6e46eef60 100644
--- a/gr-trellis/src/lib/trellis_metrics_i.h
+++ b/gr-trellis/src/lib/trellis_metrics_i.h
@@ -31,7 +31,7 @@
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.
@@ -45,8 +45,8 @@ 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; }