mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-01 08:07:10 -04:00
Working toward best hinted decoding for submodes JT65B and C.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6508 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
9582f9c76d
commit
57bbacfc6c
@ -105,9 +105,11 @@ subroutine decode65a(dd,npts,newdat,nqd,f0,nflip,mode65,ntrials, &
|
||||
call decode65b(s2,nflip,mode65,ntrials,naggressive,ndepth, &
|
||||
mycall,hiscall,hisgrid,nexp_decode,nqd,nft,qual,nhist,decoded)
|
||||
if(nft.eq.1) then
|
||||
!### Should also deal with nft=2 solutions, if no nft=1.
|
||||
nsmo=ismo
|
||||
exit
|
||||
else if(nft.eq.2) then
|
||||
!### Should also deal with nft=2 solutions
|
||||
|
||||
endif
|
||||
enddo
|
||||
|
||||
|
@ -24,8 +24,8 @@ subroutine decode65b(s2,nflip,mode65,ntrials,naggressive,ndepth, &
|
||||
enddo
|
||||
|
||||
nadd=mode65
|
||||
call extract(s3,nadd,ntrials,naggressive,ndepth,mycall,hiscall,hisgrid, &
|
||||
nexp_decode,ncount,nhist,decoded,ltext,nft,qual) !Extract the message
|
||||
call extract(s3,nadd,mode65,ntrials,naggressive,ndepth,mycall,hiscall, &
|
||||
hisgrid,nexp_decode,ncount,nhist,decoded,ltext,nft,qual)
|
||||
|
||||
! Suppress "birdie messages" and other garbage decodes:
|
||||
if(decoded(1:7).eq.'000AAA ') ncount=-1
|
||||
|
@ -1,4 +1,4 @@
|
||||
subroutine extract(s3,nadd,ntrials,naggressive,ndepth,mycall_12, &
|
||||
subroutine extract(s3,nadd,mode65,ntrials,naggressive,ndepth,mycall_12, &
|
||||
hiscall_12,hisgrid,nexp_decode,ncount,nhist,decoded,ltext,nft,qual)
|
||||
|
||||
! Input:
|
||||
@ -93,11 +93,10 @@ subroutine extract(s3,nadd,ntrials,naggressive,ndepth,mycall_12, &
|
||||
if(ntotal.le.nd0 .and. rtt.le.r0) nft=1
|
||||
|
||||
if(nft.eq.0 .and. ndepth.ge.5) then
|
||||
mode65=1
|
||||
flip=1.0
|
||||
qmin=1.0
|
||||
call timer('hint65 ',0)
|
||||
call hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
call timer('hint65 ',0)
|
||||
call hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,nadd,flip, &
|
||||
mycall,hiscall,hisgrid,nexp_decode,qual,decoded)
|
||||
if(qual.ge.qmin) then
|
||||
nft=2
|
||||
|
@ -1,4 +1,4 @@
|
||||
subroutine hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,mode65,flip, &
|
||||
subroutine hint65(s3,mrs,mrs2,mrsym,mr2sym,mrprob,nadd,flip, &
|
||||
mycall,hiscall0,hisgrid0,nexp_decode,qual,decoded)
|
||||
|
||||
use packjt
|
||||
|
Loading…
Reference in New Issue
Block a user