[Commit-gnuradio] r4384 - gnuradio/trunk/gr-trellis/src/lib

[anastas]

Author: anastas
Date: 2007-02-05 11:56:43 -0700 (Mon, 05 Feb 2007)
New Revision: 4384

Modified:
   gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_XX.cc.t
   gnuradio/trunk/gr-trellis/src/lib/trellis_siso_combined_f.cc
   gnuradio/trunk/gr-trellis/src/lib/trellis_siso_f.cc
   gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t
   gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
Log:
minor fixes so that there are no warnings when making gr-trellis

Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_XX.cc.t
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_XX.cc.t   2007-02-05 
18:34:49 UTC (rev 4383)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_encoder_XX.cc.t   2007-02-05 
18:56:43 UTC (rev 4384)
@@ -52,7 +52,7 @@
                        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();

Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_siso_combined_f.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_siso_combined_f.cc        
2007-02-05 18:34:49 UTC (rev 4383)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_siso_combined_f.cc        
2007-02-05 18:56:43 UTC (rev 4384)
@@ -171,8 +171,8 @@
       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);
           }

Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_siso_f.cc
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_siso_f.cc 2007-02-05 18:34:49 UTC 
(rev 4383)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_siso_f.cc 2007-02-05 18:56:43 UTC 
(rev 4384)
@@ -157,7 +157,7 @@
       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);

Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t    2007-02-05 
18:34:49 UTC (rev 4383)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_X.cc.t    2007-02-05 
18:56:43 UTC (rev 4384)
@@ -108,7 +108,7 @@
       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;

Modified: gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
===================================================================
--- gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t   
2007-02-05 18:34:49 UTC (rev 4383)
+++ gnuradio/trunk/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t   
2007-02-05 18:56:43 UTC (rev 4384)
@@ -121,8 +121,8 @@
       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;
           }