From 79d55f173046d87ae31f04ad1e6dbafe1c9ae5ca Mon Sep 17 00:00:00 2001
From: Achilleas Anastasopoulos <anastas@umich.edu>
Date: Tue, 14 Oct 2014 10:51:31 -0400
Subject: fixed a bug in pccc encoder/decoder, and added fsm files. Also added
locks in the set_ methods
---
gr-trellis/lib/core_algorithms.cc | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'gr-trellis/lib/core_algorithms.cc')
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;
}
}
--
cgit v1.2.3