w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No need to examine every entry in the hash table. Just calculate the hash of OSD-produced callsigns and see if they are in the table. Add OSD decoding to the deep setting for wspr decoding.

This commit is contained in:
Steve Franke 2018-09-10 17:01:50 -05:00
parent 0c60db50d3
commit af7feaf65a
5 changed files with 412 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -521,7 +521,7 @@ set (wsjt_FSRCS
lib/fsk4hf/msksoftsymw.f90
lib/ft8/osd174.f90
lib/fsk4hf/osd300.f90
lib/fsk4hf/osdwspr.f90
lib/wsprd/osdwspr.f90
lib/pctile.f90
lib/peakdt9.f90
lib/peakup.f90
@ -1196,7 +1196,7 @@ add_executable (wsprcode lib/wsprcode/wsprcode.f90 lib/wsprcode/nhash.c
wsjtx.rc)
target_link_libraries (wsprcode wsjt_fort wsjt_cxx)
add_executable (wsprd ${wsprd_CSRCS} lib/indexx.f90 lib/fsk4hf/osdwspr.f90)
add_executable (wsprd ${wsprd_CSRCS} lib/indexx.f90 lib/wsprd/osdwspr.f90)
target_include_directories (wsprd PRIVATE ${FFTW3_INCLUDE_DIRS})
target_link_libraries (wsprd ${FFTW3_LIBRARIES})

58
lib/fsk4hf/tccsim.f90
View File

@ -13,14 +13,14 @@ program tccsim
integer*4 mettab(-128:127,0:1)
parameter (NSYM=162)
parameter (MAXSYM=220)
parameter (MAXSYM=162)
character*12 arg
character*22 msg,msg2
integer*1 data0(11)
integer*1 data1(11)
integer*1 dat(162)
integer*1 data0(13)
integer*1 data1(13)
integer*1 dat(206)
integer*1 softsym(162)
integer*1 apmask(162),cw(162)
integer*1 apmask(162),cw0(162),cw(162)
real*4 xx0(0:255)
real ss(162)
@ -93,12 +93,8 @@ program tccsim
limit=20000
data0=0
! call wqencode(msg,ntype0,data0) !Source encoding
data0(1:7)=1
write(*,1002) data0(1:7),data0(1:6),data0(7)/64
1002 format(/'Source-encoded message, 50 bits:'/'Hex: ',7z3.2/ &
'Binary: ',6b9.8,b3.2)
call wqencode(msg,ntype0,data0) !Source encoding
write(*,*) 'data0 ',data0
! Demonstrates how to create the generator matrix from a string that contains the interleaved
! polynomial coefficients
gen=0
@ -121,18 +117,21 @@ data0(1:7)=1
enddo
enddo
write(*,*) 'Source encoded message bits: '
write(*,'(6(8i1,1x),2i1)') mbits
! Encode message bits using the generator matrix, generating a 162-bit codeword.
cw=0
cw0=0
do i=1,50
if(mbits(i).eq.1) cw=mod(cw+gen(i,:),2)
if(mbits(i).eq.1) cw0=mod(cw0+gen(i,:),2)
enddo
write(*,*) 'Codeword from generator matrix: '
write(*,'(162i1)') cw
write(*,'(162i1)') cw0
call encode232(data0,nbytes,dat,MAXSYM) !Convolutional encoding
write(*,*) 'Codeword from encode232: '
write(*,'(162i1)') dat
! call encode232(data0,nbytes,dat) !Convolutional encoding
! write(*,*) 'Codeword from encode232: '
! write(*,'(162i2)') dat
! call inter_mept(dat,1) !Interleaving
@ -149,7 +148,7 @@ data0(1:7)=1
nbad=0
do i=1,ntrials
do j=1,162
ss(j)=-(2*dat(j)-1)+sigma*gran() !Simulate soft symbols
ss(j)=-(2*cw0(j)-1)+sigma*gran() !Simulate soft symbols
enddo
rms=sqrt(sum(ss**2))
@ -160,7 +159,8 @@ data0(1:7)=1
! Call the sequential (Fano algorithm) decoder
nbits=50+31
call fano232(softsym,nbits,mettab,ndelta,limit,data1,ncycles,metric,nerr)
! call fano232(softsym,nbits,mettab,ndelta,limit,data1,ncycles,metric,nerr)
nerr=1
iflag=0
nhardmin=0
dmin=0.0
@ -169,20 +169,20 @@ data0(1:7)=1
if(nerr.ne.0 .and. ndepth.ge.0) then
apmask=0
cw=0
call osdwspr(-ss/127,apmask,ndepth,cw,nhardmin,dmin)
call osdwspr(softsym,apmask,ndepth,cw,nhardmin,dmin)
! OSD produces a codeword, but code is not systematic
! Use Fano with hard decisions to retrieve the message from the codeword
cw=-(2*cw-1)*64
nbits=50+31
call fano232(cw,nbits,mettab,ndelta,limit,data1,ncycles,metric,nerr)
iflag=1
! cw=-(2*cw-1)*64
! nbits=50+31
!dat=0
!dat(1:162)=cw
! call fano232(dat,nbits,mettab,ndelta,limit,data1,ncycles,metric,nerr)
! iflag=1
endif
! call wqdecode(data1,msg2,ntype1)
! write(*,*) msg2,iflag,nhardmin,dmin
if(nerr.eq.0 .and. any(data1.ne.data0)) nbad=nbad+1
if(nerr.eq.0 .and. all(data1.eq.data0)) ngood=ngood+1
if(any(cw.ne.cw0)) nbad=nbad+1
if(all(cw.eq.cw0)) ngood=ngood+1
enddo
write(*,'(f4.1,i8,i8)') isnr/2.0,ngood,nbad
@ -190,5 +190,5 @@ data0(1:7)=1
999 end program tccsim
include '../wsprcode/wspr_old_subs.f90'
#include '../wsprcode/wspr_old_subs.f90'

373
lib/wsprd/osdwspr.f90 Normal file
View File

@ -0,0 +1,373 @@
subroutine osdwspr(ss,apmask,ndeep,cw,nhardmin,dmin)
!
use iso_c_binding
parameter (N=162, K=50, L=32)
!integer*1 p1(L),p2(L),p3(L),p4(L)
integer*1 gg(64)
real ss(N)
integer*1 apmask(N),apmaskr(N)
integer*1 gen(K,N)
integer*1 genmrb(K,N),g2(N,K)
integer*1 temp(K),m0(K),me(K),mi(K),misub(K),e2sub(N-K),e2(N-K),ui(N-K)
integer*1 r2pat(N-K)
integer indices(N),nxor(N)
integer*1 cw(N),ce(N),c0(N),hdec(N)
integer indx(N),ndeep,nhardmin
real rx(N),absrx(N),dmin
logical first,reset
data first/.true./
!data p1/1,0,0,0,1,1,0,0,0,0,1,0,0,0,1,0,1,1,0,0,1,1,1,0,1/
!data p2/1,0,1,0,1,0,1,1,0,0,1,0,0,1,0,1,0,0,1,0,0,1,1,1,1/
!data p3/1,1,0,1,0,1,0,1,1,0,1,0,0,1,1,0,1,1,1,1,1,1,0,1,1/
!data p4/1,1,1,0,1,1,1,1,0,1,1,1,0,0,0,1,1,1,1,1,1,0,0,0,1/
!data p1/1,0,1,0,1,1,0,0,1,1,0,1,1,1,1,1/
!data p2/1,0,1,1,0,1,0,0,1,1,1,1,1,0,0,1/
!data p3/1,1,0,0,1,0,1,1,0,1,1,1,0,0,1,1/
!data p4/1,1,1,0,1,1,0,1,1,1,1,0,0,1,0,1/
data gg/1,1,0,1,0,1,0,0,1,0,0,0,1,1,0,0,1,0,1,0,0,1,0,1,1,1,0,1,1,0,0,0, &
0,1,0,0,0,0,0,0,1,0,0,1,1,1,1,0,0,0,1,0,0,1,0,0,1,0,1,1,1,1,1,1/
save first,gen
if( first ) then ! fill the generator matrix
! gg=0
! gg(1:L)=p1
! gg(L+1:2*L)=p2
! gg(2*L+1:3*L)=p3
! gg(3*L+1:4*L)=p4
gen=0
gen(1,1:2*L)=gg(1:2*L)
do i=2,K
gen(i,:)=cshift(gen(i-1,:),-2)
enddo
first=.false.
endif
! Re-order received vector to place systematic msg bits at the end.
rx=ss/127.0
apmaskr=apmask
! Hard decisions on the received word.
hdec=0
where(rx .ge. 0) hdec=1
! Use magnitude of received symbols as a measure of reliability.
absrx=abs(rx)
call indexx(absrx,N,indx)
! Re-order the columns of the generator matrix in order of decreasing reliability.
do i=1,N
genmrb(1:K,i)=gen(1:K,indx(N+1-i))
indices(i)=indx(N+1-i)
enddo
! Do gaussian elimination to create a generator matrix with the most reliable
! received bits in positions 1:K in order of decreasing reliability (more or less).
do id=1,K ! diagonal element indices
do icol=id,K+20 ! The 20 is ad hoc - beware
iflag=0
if( genmrb(id,icol) .eq. 1 ) then
iflag=1
if( icol .ne. id ) then ! reorder column
temp(1:K)=genmrb(1:K,id)
genmrb(1:K,id)=genmrb(1:K,icol)
genmrb(1:K,icol)=temp(1:K)
itmp=indices(id)
indices(id)=indices(icol)
indices(icol)=itmp
endif
do ii=1,K
if( ii .ne. id .and. genmrb(ii,id) .eq. 1 ) then
genmrb(ii,1:N)=ieor(genmrb(ii,1:N),genmrb(id,1:N))
endif
enddo
exit
endif
enddo
enddo
g2=transpose(genmrb)
! The hard decisions for the K MRB bits define the order 0 message, m0.
! Encode m0 using the modified generator matrix to find the "order 0" codeword.
! Flip various combinations of bits in m0 and re-encode to generate a list of
! codewords. Return the member of the list that has the smallest Euclidean
! distance to the received word.
hdec=hdec(indices) ! hard decisions from received symbols
m0=hdec(1:K) ! zero'th order message
absrx=absrx(indices)
rx=rx(indices)
apmaskr=apmaskr(indices)
call mrbencode(m0,c0,g2,N,K)
nxor=ieor(c0,hdec)
nhardmin=sum(nxor)
dmin=sum(nxor*absrx)
cw=c0
ntotal=0
nrejected=0
if(ndeep.eq.0) goto 998 ! norder=0
if(ndeep.gt.5) ndeep=5
if( ndeep.eq. 1) then
nord=1
npre1=0
npre2=0
nt=60
ntheta=12
elseif(ndeep.eq.2) then
nord=1
npre1=1
npre2=0
nt=60
ntheta=12
elseif(ndeep.eq.3) then
nord=1
npre1=1
npre2=1
nt=60
ntheta=22
ntau=16
elseif(ndeep.eq.4) then
nord=2
npre1=1
npre2=0
nt=60
ntheta=22
ntau=16
elseif(ndeep.eq.5) then
nord=3
npre1=1
npre2=1
nt=60
ntheta=22
ntau=16
endif
do iorder=1,nord
misub(1:K-iorder)=0
misub(K-iorder+1:K)=1
iflag=K-iorder+1
do while(iflag .ge.0)
if(iorder.eq.nord .and. npre1.eq.0) then
iend=iflag
else
iend=1
endif
do n1=iflag,iend,-1
mi=misub
mi(n1)=1
if(any(iand(apmaskr(1:K),mi).eq.1)) cycle
ntotal=ntotal+1
me=ieor(m0,mi)
if(n1.eq.iflag) then
call mrbencode(me,ce,g2,N,K)
e2sub=ieor(ce(K+1:N),hdec(K+1:N))
e2=e2sub
nd1Kpt=sum(e2sub(1:nt))+1
d1=sum(ieor(me(1:K),hdec(1:K))*absrx(1:K))
else
e2=ieor(e2sub,g2(K+1:N,n1))
nd1Kpt=sum(e2(1:nt))+2
endif
if(nd1Kpt .le. ntheta) then
call mrbencode(me,ce,g2,N,K)
nxor=ieor(ce,hdec)
if(n1.eq.iflag) then
dd=d1+sum(e2sub*absrx(K+1:N))
else
dd=d1+ieor(ce(n1),hdec(n1))*absrx(n1)+sum(e2*absrx(K+1:N))
endif
if( dd .lt. dmin ) then
dmin=dd
cw=ce
nhardmin=sum(nxor)
nd1Kptbest=nd1Kpt
endif
else
nrejected=nrejected+1
endif
enddo
! Get the next test error pattern, iflag will go negative
! when the last pattern with weight iorder has been generated.
call nextpat(misub,k,iorder,iflag)
enddo
enddo
if(npre2.eq.1) then
reset=.true.
ntotal=0
do i1=K,1,-1
do i2=i1-1,1,-1
ntotal=ntotal+1
mi(1:ntau)=ieor(g2(K+1:K+ntau,i1),g2(K+1:K+ntau,i2))
call boxit(reset,mi(1:ntau),ntau,ntotal,i1,i2)
enddo
enddo
ncount2=0
ntotal2=0
reset=.true.
! Now run through again and do the second pre-processing rule
misub(1:K-nord)=0
misub(K-nord+1:K)=1
iflag=K-nord+1
do while(iflag .ge.0)
me=ieor(m0,misub)
call mrbencode(me,ce,g2,N,K)
e2sub=ieor(ce(K+1:N),hdec(K+1:N))
do i2=0,ntau
ntotal2=ntotal2+1
ui=0
if(i2.gt.0) ui(i2)=1
r2pat=ieor(e2sub,ui)
778 continue
call fetchit(reset,r2pat(1:ntau),ntau,in1,in2)
if(in1.gt.0.and.in2.gt.0) then
ncount2=ncount2+1
mi=misub
mi(in1)=1
mi(in2)=1
if(sum(mi).lt.nord+npre1+npre2.or.any(iand(apmaskr(1:K),mi).eq.1)) cycle
me=ieor(m0,mi)
call mrbencode(me,ce,g2,N,K)
nxor=ieor(ce,hdec)
dd=sum(nxor*absrx)
if( dd .lt. dmin ) then
dmin=dd
cw=ce
nhardmin=sum(nxor)
endif
goto 778
endif
enddo
call nextpat(misub,K,nord,iflag)
enddo
endif
998 continue
! Re-order the codeword to as-received order.
cw(indices)=cw
hdec(indices)=hdec
return
end subroutine osdwspr
subroutine mrbencode(me,codeword,g2,N,K)
integer*1 me(K),codeword(N),g2(N,K)
! fast encoding for low-weight test patterns
codeword=0
do i=1,K
if( me(i) .eq. 1 ) then
codeword=ieor(codeword,g2(1:N,i))
endif
enddo
return
end subroutine mrbencode
subroutine nextpat(mi,k,iorder,iflag)
integer*1 mi(k),ms(k)
! generate the next test error pattern
ind=-1
do i=1,k-1
if( mi(i).eq.0 .and. mi(i+1).eq.1) ind=i
enddo
if( ind .lt. 0 ) then ! no more patterns of this order
iflag=ind
return
endif
ms=0
ms(1:ind-1)=mi(1:ind-1)
ms(ind)=1
ms(ind+1)=0
if( ind+1 .lt. k ) then
nz=iorder-sum(ms)
ms(k-nz+1:k)=1
endif
mi=ms
do i=1,k ! iflag will point to the lowest-index 1 in mi
if(mi(i).eq.1) then
iflag=i
exit
endif
enddo
return
end subroutine nextpat
subroutine boxit(reset,e2,ntau,npindex,i1,i2)
integer*1 e2(1:ntau)
integer indexes(4000,2),fp(0:525000),np(4000)
logical reset
common/boxes/indexes,fp,np
if(reset) then
patterns=-1
fp=-1
np=-1
sc=-1
indexes=-1
reset=.false.
endif
indexes(npindex,1)=i1
indexes(npindex,2)=i2
ipat=0
do i=1,ntau
if(e2(i).eq.1) then
ipat=ipat+ishft(1,ntau-i)
endif
enddo
ip=fp(ipat) ! see what's currently stored in fp(ipat)
if(ip.eq.-1) then
fp(ipat)=npindex
else
do while (np(ip).ne.-1)
ip=np(ip)
enddo
np(ip)=npindex
endif
return
end subroutine boxit
subroutine fetchit(reset,e2,ntau,i1,i2)
integer indexes(4000,2),fp(0:525000),np(4000)
integer lastpat
integer*1 e2(ntau)
logical reset
common/boxes/indexes,fp,np
save lastpat,inext
if(reset) then
lastpat=-1
reset=.false.
endif
ipat=0
do i=1,ntau
if(e2(i).eq.1) then
ipat=ipat+ishft(1,ntau-i)
endif
enddo
index=fp(ipat)
if(lastpat.ne.ipat .and. index.gt.0) then ! return first set of indices
i1=indexes(index,1)
i2=indexes(index,2)
inext=np(index)
elseif(lastpat.eq.ipat .and. inext.gt.0) then
i1=indexes(inext,1)
i2=indexes(inext,2)
inext=np(inext)
else
i1=-1
i2=-1
inext=-1
endif
lastpat=ipat
return
end subroutine fetchit

14
lib/wsprd/wsprd.c
View File

@ -718,7 +718,7 @@ int main(int argc, char *argv[])
char uttime[5],date[7];
int c,delta,maxpts=65536,verbose=0,quickmode=0,more_candidates=0, stackdecoder=0;
int writenoise=0,usehashtable=1,wspr_type=2, ipass, nblocksize,use_osd=0;
int nhardmin;
int nhardmin,ihash;
int writec2=0,maxdrift;
int shift1, lagmin, lagmax, lagstep, ifmin, ifmax, worth_a_try, not_decoded;
unsigned int nbits=81, stacksize=200000;
@ -1290,6 +1290,7 @@ int main(int argc, char *argv[])
}
tfano += (float)(clock()-t0)/CLOCKS_PER_SEC;
if( use_osd && not_decoded ) {
int ndeep=5;
for(i=0; i<162; i++) {
@ -1311,12 +1312,11 @@ int main(int argc, char *argv[])
unpack50(message,&n1,&n2);
if( !unpackcall(n1,callsign) ) break;
callsign[12]=0;
for(i=0;i<32768;i++) {
if(strncmp(hashtab+i*13,callsign,13)==0) {
not_decoded=0;
osd_decode =1;
break;
}
ihash=nhash(callsign,strlen(callsign),(uint32_t)146);
if(strncmp(hashtab+ihash*13,callsign,13)==0) {
not_decoded=0;
osd_decode =1;
break;
}
}

2
mainwindow.cpp
View File

@ -1379,7 +1379,7 @@ void MainWindow::dataSink(qint64 frames)
t2.sprintf(" -f %.6f ",f0m1500);
if((m_ndepth&7)==1) depth_string=" -qB "; //2 pass w subtract, no Block detection, no shift jittering
if((m_ndepth&7)==2) depth_string=" -B "; //2 pass w subtract, no Block detection
if((m_ndepth&7)==3) depth_string=" "; //2 pass w subtract, Block detection
if((m_ndepth&7)==3) depth_string=" -o"; //2 pass w subtract, Block detection and OSD.
QString degrade;
degrade.sprintf("-d %4.1f ",m_config.degrade());