diff options
| author | Achilleas Anastasopoulos <anastas@umich.edu> | 2014-10-14 10:51:31 -0400 |
|---|---|---|
| committer | Achilleas Anastasopoulos <anastas@umich.edu> | 2014-10-15 19:01:05 -0400 |
| commit | 79d55f173046d87ae31f04ad1e6dbafe1c9ae5ca (patch) | |
| tree | c3efe8e25da8d13b99bb5cdf8b4234ef8cf54d07 /gr-trellis/lib/core_algorithms.cc | |
| parent | be8e888f80934a884287f0ec9eb62dd0d2b7f5e5 (diff) | |
fixed a bug in pccc encoder/decoder, and added fsm files.
Also added locks in the set_ methods
Diffstat (limited to 'gr-trellis/lib/core_algorithms.cc')
| -rw-r--r-- | gr-trellis/lib/core_algorithms.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gr-trellis/lib/core_algorithms.cc b/gr-trellis/lib/core_algorithms.cc index eb32b65de7..b26ee331f2 100644 --- a/gr-trellis/lib/core_algorithms.cc +++ b/gr-trellis/lib/core_algorithms.cc @@ -1216,17 +1216,17 @@ namespace gr { for(int k=0;k<blocklength;k++) { //std::cout << k << std::endl; for(int i=0;i<FSM1.O();i++) { - float x=cprioro[k*FSM1.O()*FSM2.O()+i*FSM1.O()+0]; + float x=cprioro[k*O+i*FSM2.O()+0]; for(int j=1;j<FSM2.O();j++) - x = (*p2mymin)(x,cprioro[k*FSM1.O()*FSM2.O()+i*FSM1.O()+j]); + x = (*p2mymin)(x,cprioro[k*O+i*FSM2.O()+j]); prioro1[k*FSM1.O()+i]=x; //std::cout << prioro1[k*FSM1.O()+i] << ", "; } //std::cout << std::endl; for(int i=0;i<FSM2.O();i++) { - float x=cprioro[k*FSM1.O()*FSM2.O()+0*FSM1.O()+i]; + float x=cprioro[k*O+0*FSM2.O()+i]; for(int j=1;j<FSM1.O();j++) - x = (*p2mymin)(x,cprioro[k*FSM1.O()*FSM2.O()+j*FSM1.O()+i]); + x = (*p2mymin)(x,cprioro[k*O+j*FSM2.O()+i]); prioro2[k*FSM2.O()+i]=x; } } |