X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gr-trellis%2Fsrc%2Flib%2Ftrellis_viterbi_combined_X.cc.t;h=3fc51bf97377ad836628bcafecd381663500df52;hb=a597c1caaf0e95545cce87cbb2670d36819b5937;hp=e693c1d682036a0f8211c61c74ec8ad50a39c5e6;hpb=86f5c92427b3f4bb30536d76cf63c3fca388fb2f;p=debian%2Fgnuradio

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 e693c1d6..3fc51bf9 100644
--- a/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
+++ b/gr-trellis/src/lib/trellis_viterbi_combined_X.cc.t
@@ -20,6 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+// @WARNING@
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -86,8 +88,8 @@ void
 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 std::vector< std::vector<int> > &PS,
+             const std::vector< std::vector<int> > &PI,
              int K,
              int S0,int SK,
              int D,
@@ -119,9 +121,9 @@ 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<I;i++) {
+          for(int i=0;i<PS[j].size();i++) {
               int i0 = j*I+i;
-              if((mm=alpha[alphai*S+PS[i0]]+metric[OS[PS[i0]*I+PI[i0]]])<minm)
+              if((mm=alpha[alphai*S+PS[j][i]]+metric[OS[PS[j][i]*I+PI[j][i]]])<minm)
                   minm=mm,minmi=i;
           }
           trace[k*S+j]=minmi;
@@ -145,9 +147,9 @@ void viterbi_algorithm_combined(int I, int S, int O,
   }
 
   for(int k=K-1;k>=0;k--) { // traceback
-      int i0=st*I+trace[k*S+st];
-      out[k]= (@TYPE@) PI[i0];
-      st=PS[i0];
+      int i0=trace[k*S+st];
+      out[k]= (@TYPE@) PI[st][i0];
+      st=PS[st][i0];
   }
   
   delete [] metric;