w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-26 14:18:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor change to sfrsd2 to cause nhard to be calculated even when decode is done by BM. Fix ntrials off-by-one issue.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6215 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2015-12-02 00:22:13 +00:00
parent ffc43bd353
commit 27a6e3ac60
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/sfrsd2/sfrsd2.c
View File

@ -146,13 +146,17 @@ void sfrsd2_(int mrsym[], int mrprob[], int mr2sym[], int mr2prob[],
memcpy(workdat,rxdat,sizeof(rxdat)); memcpy(workdat,rxdat,sizeof(rxdat));
nerr=decode_rs_int(rs,workdat,era_pos,numera,1); nerr=decode_rs_int(rs,workdat,era_pos,numera,1);
if( nerr >= 0 ) { if( nerr >= 0 ) {
nhard=0;
for (i=0; i<63; i++) {
if( workdat[i] != rxdat[i] ) nhard=nhard+1;
}
if(logfile) { if(logfile) {
fprintf(logfile,"BM decode nerrors= %3d : \n",nerr); fprintf(logfile,"BM decode nerrors= %3d : \n",nerr);
fclose(logfile); fclose(logfile);
} }
memcpy(correct,workdat,63*sizeof(int)); memcpy(correct,workdat,63*sizeof(int));
param[0]=0; param[0]=0;
param[1]=0; param[1]=nhard;
param[2]=0; param[2]=0;
param[3]=0; param[3]=0;
param[4]=0; param[4]=0;
@ -185,7 +189,7 @@ used to decide which codeword is "best".
} }
if(nsum==0) return; if(nsum==0) return;
for (k=0; k<ntrials; k++) { for (k=1; k<=ntrials; k++) {
memset(era_pos,0,51*sizeof(int)); memset(era_pos,0,51*sizeof(int));
memcpy(workdat,rxdat,sizeof(rxdat)); memcpy(workdat,rxdat,sizeof(rxdat));
@ -246,7 +250,7 @@ NB: j is the symbol-vector index of the symbol with rank i.
} }
if(ntotal_min<72 && nhard_min<42) break; if(ntotal_min<72 && nhard_min<42) break;
} }
if(k == ntrials-1) ntry[0]=k+1; if(k == ntrials) ntry[0]=k;
} }
if( ntotal_min>=76 || nhard>=44 ) { if( ntotal_min>=76 || nhard>=44 ) {