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

Separate variables for the decoding parameters that had been packed into ndepth.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6170 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2015-11-24 15:05:45 +00:00
parent 9a8560cd84
commit 4680817a93
8 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Configuration.ui
View File

@ -2491,12 +2491,12 @@ soundcard changes</string>
</connection>
</connections>
<buttongroups>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="split_mode_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
<buttongroup name="TX_mode_button_group"/>
<buttongroup name="PTT_method_button_group"/>
<buttongroup name="TX_audio_source_button_group"/>
<buttongroup name="CAT_stop_bits_button_group"/>
<buttongroup name="CAT_handshake_button_group"/>
<buttongroup name="CAT_data_bits_button_group"/>
</buttongroups>
</ui>

5
commons.h
View File

@ -33,6 +33,11 @@ extern struct FortranCommon {
float dttol;
int nlist;
int listutc[10];
int n2pass;
int nranera;
int naggressive;
int nrobust;
int nspare[10];
char datetime[20];
char mycall[12];
char mygrid[6];

17
lib/decoder.f90
View File

@ -11,24 +11,17 @@ subroutine decoder(ss,id2,nfsample)
character datetime*20,mycall*12,mygrid*6,hiscall*12,hisgrid*6
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfsplit,nfb, &
ntol,kin,nzhsym,nsubmode,nagain,ndepth,ntxmode,nmode,minw,nclearave, &
minsync,emedelay,dttol,nlist,listutc(10),datetime,mycall,mygrid, &
hiscall,hisgrid
minsync,emedelay,dttol,nlist,listutc(10),n2pass,nranera,naggressive, &
nrobust,nspare(10),datetime,mycall,mygrid,hiscall,hisgrid
common/tracer/limtrace,lu
integer onlevel(0:10)
common/tracer_priv/level,onlevel
!$omp threadprivate(/tracer_priv/)
save
n2pass=ndepth/100000
ndepth=ndepth-n2pass*100000
nrobust=ndepth/10000
ndepth=ndepth-nrobust*10000
n=ndepth/1000
if(mod(n,2).eq.0) ntrials=10**(n/2)
if(mod(n,2).eq.1) ntrials=3*10**(n/2)
if(n.eq.0) ntrials=0
naggressive=(ndepth - (n*1000))/10
ndepth=mod(ndepth,10)
if(mod(n,2).eq.0) ntrials=10**(nranera/2)
if(mod(n,2).eq.1) ntrials=3*10**(nranera/2)
if(nranera.eq.0) ntrials=0
rms=sqrt(dot_product(float(id2(300000:310000)), &
float(id2(300000:310000)))/10000.0)

1
lib/extract.f90
View File

@ -62,6 +62,7 @@ subroutine extract(s3,nadd,nqd,ntrials,naggressive,ndepth,ncount,nhist, &
call interleave63(mr2sym,-1) !from second-most-reliable symbols
call interleave63(mr2prob,-1)
write(71) mrsym,mrprob,mr2sym,mr2prob
nverbose=0
ntry=0
call timer('sfrsd ',0)

4
lib/fillcom.f90
View File

@ -5,8 +5,8 @@ subroutine fillcom(nutc0,ndepth0,nrxfreq,mode,tx9,flow,fsplit,fhigh)
character datetime*20,mycall*12,mygrid*6,hiscall*12,hisgrid*6
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfsplit,nfb, &
ntol,kin,nzhsym,nsubmode,nagain,ndepth,ntxmode,nmode,minw,nclearave, &
minsync,emedelay,dttol,nlist,listutc(10),datetime,mycall,mygrid, &
hiscall,hisgrid
minsync,emedelay,dttol,nlist,listutc(10),n2pass,nranera,naggressive, &
nrobust,nspare(10),datetime,mycall,mygrid,hiscall,hisgrid
save
nutc=nutc0

4
lib/jt9.f90
View File

@ -53,8 +53,8 @@ program jt9
common/jt9com/ss(184,NSMAX),savg(NSMAX),id2(NMAX),nutc,ndiskdat, &
ntr,mousefqso,newdat,npts8a,nfa,nfsplit,nfb,ntol,kin,nzhsym, &
nsubmode,nagain,ndepth,ntxmode,nmode,minw,nclearave,minsync, &
emedelay,dttol,nlist,listutc(10),datetime,mycall,mygrid, &
hiscall,hisgrid
emedelay,dttol,nlist,listutc(10),n2pass,nranera,naggressive, &
nrobust,nspare(10),datetime,mycall,mygrid,hiscall,hisgrid
common/tracer/limtrace,lu
common/patience/npatience,nthreads

6
lib/jt9c.f90
View File

@ -4,12 +4,12 @@ subroutine jt9c(ss,savg,id2,nparams0)
real*4 ss(184*NSMAX),savg(NSMAX)
integer*2 id2(NTMAX*12000)
integer nparams0(47),nparams(47)
integer nparams0(61),nparams(61)
character datetime*20,mycall*12,mygrid*6,hiscall*12,hisgrid*6
common/npar/nutc,ndiskdat,ntrperiod,nfqso,newdat,npts8,nfa,nfsplit,nfb, &
ntol,kin,nzhsym,nsave,nagain,ndepth,ntxmode,nmode,minw,nclearave, &
minsync,emedelay,dttol,nlist,listutc(10),datetime,mycall,mygrid, &
hiscall,hisgrid
minsync,emedelay,dttol,nlist,listutc(10),n2pass,nranera, &
naggressive,nrobust,nspare(10),datetime,mycall,mygrid,hiscall,hisgrid
common/patience/npatience,nthreads
equivalence (nparams,nutc)

10
mainwindow.cpp
View File

@ -1660,9 +1660,13 @@ void MainWindow::decode() //decode()
}
jt9com_.nfqso=m_wideGraph->rxFreq();
jt9com_.ndepth=100000 + 1000*m_config.ntrials() + 10*m_config.aggressive() + m_ndepth;
if(m_config.twoPass()) jt9com_.ndepth += 100000;
if(m_config.sync1Bit()) jt9com_.ndepth += 10000;
jt9com_.ndepth=m_ndepth;
jt9com_.n2pass=1;
if(m_config.twoPass()) jt9com_.n2pass=2;
jt9com_.nranera=m_config.ntrials();
jt9com_.naggressive=m_config.aggressive();
jt9com_.nrobust=0;
if(m_config.sync1Bit()) jt9com_.nrobust=1;
jt9com_.ndiskdat=0;
if(m_diskData) jt9com_.ndiskdat=1;
jt9com_.nfa=m_wideGraph->nStartFreq();