w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-03-26 14:08:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make Normal decode the same as Deep except no DT refinement at nearly=47.

Browse Source
This commit is contained in:
Steven Franke 2020-03-06 11:54:28 -06:00
parent f2266c3c54
commit 3467ee7924
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ft8/ft8b.f90
View File

@ -405,7 +405,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,nzhsym,lapon, &
niterations) niterations)
call timer('bpd174_91 ',1) call timer('bpd174_91 ',1)
dmin=0.0 dmin=0.0
if(ndepth.eq.3 .and. nharderrors.lt.0) then if(ndepth.ge.2 .and. nharderrors.lt.0) then
ndeep=3 ndeep=3
if(abs(nfqso-f1).le.napwid .or. abs(nftx-f1).le.napwid .or. ncontest.eq.7) then if(abs(nfqso-f1).le.napwid .or. abs(nftx-f1).le.napwid .or. ncontest.eq.7) then
ndeep=4 ndeep=4

8
lib/ft8_decode.f90
View File

@ -46,7 +46,7 @@ contains
real candidate(3,MAXCAND) real candidate(3,MAXCAND)
real dd(15*12000),dd1(15*12000) real dd(15*12000),dd1(15*12000)
logical, intent(in) :: lft8apon,lapcqonly,nagain logical, intent(in) :: lft8apon,lapcqonly,nagain
logical newdat,lsubtract,ldupe logical newdat,lsubtract,ldupe,lrefinedt
logical lsubtracted(MAX_EARLY) logical lsubtracted(MAX_EARLY)
character*12 mycall12,hiscall12 character*12 mycall12,hiscall12
character*6 hisgrid6 character*6 hisgrid6
@ -77,10 +77,12 @@ contains
endif endif
if(nzhsym.eq.47 .and. ndec_early.ge.1) then if(nzhsym.eq.47 .and. ndec_early.ge.1) then
lsubtracted=.false. lsubtracted=.false.
lrefinedt=.true.
if(ndepth.le.2) lrefinedt=.false.
call timer('sub_ft8b',0) call timer('sub_ft8b',0)
do i=1,ndec_early do i=1,ndec_early
if(xdt_save(i)-0.5.lt.0.396) then if(xdt_save(i)-0.5.lt.0.396) then
call subtractft8(dd,itone_save(1,i),f1_save(i),xdt_save(i),.true.) call subtractft8(dd,itone_save(1,i),f1_save(i),xdt_save(i),lrefinedt)
lsubtracted(i)=.true. lsubtracted(i)=.true.
endif endif
enddo enddo
@ -108,7 +110,7 @@ contains
! For now: ! For now:
! ndepth=1: no subtraction, 1 pass, belief propagation only ! ndepth=1: no subtraction, 1 pass, belief propagation only
! ndepth=2: subtraction, 3 passes, belief propagation only ! ndepth=2: subtraction, 3 passes, bp+osd (no subtract refinement)
! ndepth=3: subtraction, 3 passes, bp+osd ! ndepth=3: subtraction, 3 passes, bp+osd
if(ndepth.eq.1) npass=1 if(ndepth.eq.1) npass=1
if(ndepth.ge.2) npass=3 if(ndepth.ge.2) npass=3