← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gnuradio/trusty

« back to all changes in this revision

Viewing changes to gr-trellis/src/lib/trellis_siso_f.cc

  • Committer: Bazaar Package Importer
  • Author(s): Kamal Mostafa
  • Date: 2010-03-13 07:46:01 UTC
  • mfrom: (2.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20100313074601-zjsa893a87bozyh7
Tags: 3.2.2.dfsg-1ubuntu1
https://launchpad.net/bugs/260406
* Fix build for Ubuntu lucid (LP: #260406)
  - add binary package dep for libusrp0, libusrp2-0: adduser
  - debian/rules clean: remove pre-built Qt moc files

Show diffs side-by-side

added added

removed removed

Lines of Context:
gr-trellis/src/lib/trellis_siso_f.cc
129
129
void siso_algorithm(int I, int S, int O, 
130
130
             const std::vector<int> &NS,
131
131
             const std::vector<int> &OS,
132
 
             const std::vector<int> &PS,
133
 
             const std::vector<int> &PI,
 
132
             const std::vector< std::vector<int> > &PS,
 
133
             const std::vector< std::vector<int> > &PI,
134
134
             int K,
135
135
             int S0,int SK,
136
136
             bool POSTI, bool POSTO,
157
157
      norm=INF;
158
158
      for(int j=0;j<S;j++) {
159
159
          minm=INF;
160
 
          for(int i=0;i<I;i++) {
161
 
              int i0 = j*I+i;
162
 
              mm=alpha[k*S+PS[i0]]+priori[k*I+PI[i0]]+prioro[k*O+OS[PS[i0]*I+PI[i0]]];
 
160
          for(unsigned int i=0;i<PS[j].size();i++) {
 
161
              //int i0 = j*I+i;
 
162
              mm=alpha[k*S+PS[j][i]]+priori[k*I+PI[j][i]]+prioro[k*O+OS[PS[j][i]*I+PI[j][i]]];
163
163
              minm=(*p2mymin)(minm,mm);
164
164
          }
165
165
          alpha[(k+1)*S+j]=minm;