Commit 82a7833d authored by Florian Kaltenberger's avatar Florian Kaltenberger

hardcoding all to BG1

parent 283c5678
...@@ -111,14 +111,14 @@ int test_ldpc(short No_iteration, ...@@ -111,14 +111,14 @@ int test_ldpc(short No_iteration,
} }
//determine number of bits in codeword //determine number of bits in codeword
if (block_length>3840) //if (block_length>3840)
{ {
BG=1; BG=1;
Kb = 22; Kb = 22;
nrows=46; //parity check bits nrows=46; //parity check bits
ncols=22; //info bits ncols=22; //info bits
} }
else if (block_length<=3840) /*else if (block_length<=3840)
{ {
BG=2; BG=2;
nrows=42; //parity check bits nrows=42; //parity check bits
...@@ -132,7 +132,7 @@ int test_ldpc(short No_iteration, ...@@ -132,7 +132,7 @@ int test_ldpc(short No_iteration,
Kb = 8; Kb = 8;
else else
Kb = 6; Kb = 6;
} }*/
//find minimum value in all sets of lifting size //find minimum value in all sets of lifting size
Zc=0; Zc=0;
......
...@@ -17,14 +17,14 @@ int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,sh ...@@ -17,14 +17,14 @@ int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,sh
int i1,i2,i3,i4,i5,temp_prime; int i1,i2,i3,i4,i5,temp_prime;
unsigned char channel_temp,temp; unsigned char channel_temp,temp;
if (BG==1) //if (BG==1)
{ {
no_shift_values=(short *) no_shift_values_BG1; no_shift_values=(short *) no_shift_values_BG1;
pointer_shift_values=(short *) pointer_shift_values_BG1; pointer_shift_values=(short *) pointer_shift_values_BG1;
nrows=46; //parity check bits nrows=46; //parity check bits
ncols=22; //info bits ncols=22; //info bits
} }
else if (BG==2) /*else if (BG==2)
{ {
no_shift_values=(short *) no_shift_values_BG2; no_shift_values=(short *) no_shift_values_BG2;
pointer_shift_values=(short *) pointer_shift_values_BG2; pointer_shift_values=(short *) pointer_shift_values_BG2;
...@@ -35,6 +35,7 @@ int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,sh ...@@ -35,6 +35,7 @@ int encode_parity_check_part_orig(unsigned char *c,unsigned char *d, short BG,sh
printf("problem with BG\n"); printf("problem with BG\n");
return(-1); return(-1);
} }
*/
no_punctured_columns=(int)((nrows-2)*Zc+block_length-block_length*3)/Zc; no_punctured_columns=(int)((nrows-2)*Zc+block_length-block_length*3)/Zc;
......
...@@ -212,6 +212,8 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh ...@@ -212,6 +212,8 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh
} }
AssertFatal(Zc>0,"no valid Zc found for block length %d\n",block_length); AssertFatal(Zc>0,"no valid Zc found for block length %d\n",block_length);
printf("ldpc_encoder_optim: BG %d, Zc %d, Kb %d, block_length %d\n",BG,Zc,Kb,block_length);
if ((Zc&31) > 0) simd_size = 16; if ((Zc&31) > 0) simd_size = 16;
else simd_size = 32; else simd_size = 32;
...@@ -238,7 +240,7 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh ...@@ -238,7 +240,7 @@ int ldpc_encoder_optim(unsigned char *test_input,unsigned char *channel_input,sh
} }
stop_meas(tinput); stop_meas(tinput);
if ((BG==1) || (BG==2 && Zc>64)) { if ((BG==1 && Zc>176) || (BG==2 && Zc>64)) {
// extend matrix // extend matrix
start_meas(tprep); start_meas(tprep);
for (i1=0; i1 < ncols; i1++) for (i1=0; i1 < ncols; i1++)
......
...@@ -347,14 +347,14 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho ...@@ -347,14 +347,14 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
int indlist2[1000]; int indlist2[1000];
//determine number of bits in codeword //determine number of bits in codeword
if (block_length>3840) //if (block_length>3840)
{ {
BG=1; BG=1;
Kb = 22; Kb = 22;
nrows=46; //parity check bits nrows=46; //parity check bits
ncols=22; //info bits ncols=22; //info bits
} }
else if (block_length<=3840) /*else if (block_length<=3840)
{ {
BG=2; BG=2;
nrows=42; //parity check bits nrows=42; //parity check bits
...@@ -368,7 +368,7 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho ...@@ -368,7 +368,7 @@ int ldpc_encoder_orig(unsigned char *test_input,unsigned char *channel_input,sho
Kb = 8; Kb = 8;
else else
Kb = 6; Kb = 6;
} }*/
//find minimum value in all sets of lifting size //find minimum value in all sets of lifting size
Zc=0; Zc=0;
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
#include "UTIL/LOG/log.h" #include "UTIL/LOG/log.h"
#include <syscall.h> #include <syscall.h>
//#define DEBUG_DLSCH_CODING #define DEBUG_DLSCH_CODING
//#define DEBUG_DLSCH_FREE 1 //#define DEBUG_DLSCH_FREE 1
//#define TD_DECODING //#define TD_DECODING
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment