diff options
Diffstat (limited to 'gr-trellis/src/lib')
-rw-r--r-- | gr-trellis/src/lib/trellis_encoder_XX.cc.t | 2 | ||||
-rw-r--r-- | gr-trellis/src/lib/trellis_siso_combined_f.cc | 4 | ||||
-rw-r--r-- | gr-trellis/src/lib/trellis_siso_f.cc | 2 | ||||
-rw-r--r-- | gr-trellis/src/lib/trellis_viterbi_X.cc.t | 2 | ||||
-rw-r--r-- | gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/gr-trellis/src/lib/trellis_encoder_XX.cc.t b/gr-trellis/src/lib/trellis_encoder_XX.cc.t index efc55a4b7..30dd1208e 100644 --- a/gr-trellis/src/lib/trellis_encoder_XX.cc.t +++ b/gr-trellis/src/lib/trellis_encoder_XX.cc.t @@ -52,7 +52,7 @@ int gr_vector_const_void_star &input_items, gr_vector_void_star &output_items) { - int ST_tmp; + int ST_tmp=0; assert (input_items.size() == output_items.size()); int nstreams = input_items.size(); diff --git a/gr-trellis/src/lib/trellis_siso_combined_f.cc b/gr-trellis/src/lib/trellis_siso_combined_f.cc index 293c42e15..e1ae3bcd4 100644 --- a/gr-trellis/src/lib/trellis_siso_combined_f.cc +++ b/gr-trellis/src/lib/trellis_siso_combined_f.cc @@ -171,8 +171,8 @@ void siso_algorithm_combined(int I, int S, int O, norm=INF; for(int j=0;j<S;j++) { minm=INF; - for(int i=0;i<PS[j].size();i++) { - int i0 = j*I+i; + for(unsigned int i=0;i<PS[j].size();i++) { + //int i0 = j*I+i; mm=alpha[k*S+PS[j][i]]+priori[k*I+PI[j][i]]+prioro[k*O+OS[PS[j][i]*I+PI[j][i]]]; minm=(*p2mymin)(minm,mm); } diff --git a/gr-trellis/src/lib/trellis_siso_f.cc b/gr-trellis/src/lib/trellis_siso_f.cc index 9fe503eea..4d2fd9712 100644 --- a/gr-trellis/src/lib/trellis_siso_f.cc +++ b/gr-trellis/src/lib/trellis_siso_f.cc @@ -157,7 +157,7 @@ void siso_algorithm(int I, int S, int O, norm=INF; for(int j=0;j<S;j++) { minm=INF; - for(int i=0;i<PS[j].size();i++) { + for(unsigned int i=0;i<PS[j].size();i++) { //int i0 = j*I+i; mm=alpha[k*S+PS[j][i]]+priori[k*I+PI[j][i]]+prioro[k*O+OS[PS[j][i]*I+PI[j][i]]]; minm=(*p2mymin)(minm,mm); diff --git a/gr-trellis/src/lib/trellis_viterbi_X.cc.t b/gr-trellis/src/lib/trellis_viterbi_X.cc.t index 4450609b6..19a6680a4 100644 --- a/gr-trellis/src/lib/trellis_viterbi_X.cc.t +++ b/gr-trellis/src/lib/trellis_viterbi_X.cc.t @@ -108,7 +108,7 @@ void viterbi_algorithm(int I, int S, int O, for(int j=0;j<S;j++) { // for each next state do ACS minm=INF; minmi=0; - for(int i=0;i<PS[j].size();i++) { + for(unsigned int i=0;i<PS[j].size();i++) { //int i0 = j*I+i; if((mm=alpha[alphai*S+PS[j][i]]+in[k*O+OS[PS[j][i]*I+PI[j][i]]])<minm) minm=mm,minmi=i; 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 3fc51bf97..b50fd8396 100644 --- a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t +++ b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t @@ -121,8 +121,8 @@ void viterbi_algorithm_combined(int I, int S, int O, for(int j=0;j<S;j++) { // for each next state do ACS minm=INF; minmi=0; - for(int i=0;i<PS[j].size();i++) { - int i0 = j*I+i; + for(unsigned int i=0;i<PS[j].size();i++) { + //int i0 = j*I+i; if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm) minm=mm,minmi=i; } |