summaryrefslogtreecommitdiff
path: root/gr-trellis/src/lib/trellis_viterbi_combined_X.h.t
diff options
context:
space:
mode:
authoranastas2006-08-23 05:18:04 +0000
committeranastas2006-08-23 05:18:04 +0000
commit979ae071d508762513981a063961551b59199081 (patch)
tree672f7711baf0404b3304c86f93f76fd263afe80c /gr-trellis/src/lib/trellis_viterbi_combined_X.h.t
parent180347e40854f865a1592af729a00236f061d039 (diff)
downloadgnuradio-979ae071d508762513981a063961551b59199081.tar.gz
gnuradio-979ae071d508762513981a063961551b59199081.tar.bz2
gnuradio-979ae071d508762513981a063961551b59199081.zip
clean-up of Viterbi blocks: d_trace is not a private variable anymore but a local variable
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3382 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-trellis/src/lib/trellis_viterbi_combined_X.h.t')
-rw-r--r--gr-trellis/src/lib/trellis_viterbi_combined_X.h.t22
1 files changed, 11 insertions, 11 deletions
diff --git a/gr-trellis/src/lib/trellis_viterbi_combined_X.h.t b/gr-trellis/src/lib/trellis_viterbi_combined_X.h.t
index 14f565202..172a710d7 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_X.h.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_X.h.t
@@ -34,52 +34,52 @@ typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
@SPTR_NAME@ trellis_make_@BASE_NAME@ (
const fsm &FSM,
- int D,
- const std::vector<float> &TABLE,
int K,
int S0,
int SK,
+ int D,
+ const std::vector<float> &TABLE,
trellis_metric_type_t TYPE);
class @NAME@ : public gr_block
{
fsm d_FSM;
- int d_D;
- std::vector<float> d_TABLE;
int d_K;
int d_S0;
int d_SK;
+ int d_D;
+ std::vector<float> d_TABLE;
trellis_metric_type_t d_TYPE;
- std::vector<int> d_trace;
+ //std::vector<int> d_trace;
friend @SPTR_NAME@ trellis_make_@BASE_NAME@ (
const fsm &FSM,
- int D,
- const std::vector<float> &TABLE,
int K,
int S0,
int SK,
+ int D,
+ const std::vector<float> &TABLE,
trellis_metric_type_t TYPE);
@NAME@ (
const fsm &FSM,
- int D,
- const std::vector<float> &TABLE,
int K,
int S0,
int SK,
+ int D,
+ const std::vector<float> &TABLE,
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; }
+ int D () const { return d_D; }
+ std::vector<float> TABLE () const { return d_TABLE; }
trellis_metric_type_t TYPE () const { return d_TYPE; }
//std::vector<int> trace () const { return d_trace; }
void forecast (int noutput_items,