diff --git a/lib/ftrsd/ftrsd_paper/bmdata-2.dat b/lib/ftrsd/ftrsd_paper/bmdata-2.dat deleted file mode 100644 index 1e882f88c..000000000 --- a/lib/ftrsd/ftrsd_paper/bmdata-2.dat +++ /dev/null @@ -1,8 +0,0 @@ -fspread0 0.2, BM (ntrials=0) --21.5 0.05 --21.0 0.17 --20.5 0.34 --20.0 0.60 --19.5 0.79 --19.0 0.94 --18.5 0.984 diff --git a/lib/ftrsd/ftrsd_paper/fig_psuccess.gnuplot b/lib/ftrsd/ftrsd_paper/fig_psuccess.gnuplot index 5c6d17ed9..93317ff66 100644 --- a/lib/ftrsd/ftrsd_paper/fig_psuccess.gnuplot +++ b/lib/ftrsd/ftrsd_paper/fig_psuccess.gnuplot @@ -2,7 +2,7 @@ # run: gnuplot fig_psuccess.gnuplot # then: pdflatex fig_psuccess.tex # -set term epslatex standalone size 12cm,8cm +set term epslatex standalone size 20cm,10cm set output "fig_psuccess.tex" set xlabel "SNR in 2500 Hz BW (dB)" set ylabel "Percent copy" @@ -12,7 +12,12 @@ set tics in set mxtics 2 set mytics 2 set grid -plot "ftdata-10000-tight.dat" using 1:2 every ::1 with linespoints pt 5 title 'FT-1', \ - "ftdata-100000-loose.dat" using 1:2 every ::1 with linespoints pt 5 title 'FT-2', \ - "bmdata.dat" using 1:2 with linespoints pt 7 title 'BM' -# "mfsk64.dat" using ($1-29.7):(1-$2) every ::2 with linespoints pt 9 title 'symbols' +plot "ftdata-10000.dat" using 1:2 every ::1 with linespoints pt 4 title 'FT-10K', \ + "ftdata-100000.dat" using 1:2 every ::1 with linespoints pt 5 title 'FT-100K', \ + "ftdata-1000-rf.dat" using 1:2 every ::1 with linespoints pt 7 title 'FT-1K-RF', \ + "ftdata-100-rf.dat" using 1:2 every ::1 with linespoints pt 8 title 'FT-100-RF', \ + "bmdata.dat" using 1:2 with linespoints pt 9 title 'BM', \ + "bmdata-rf.dat" using 1:2 with linespoints pt 10 title 'BM-RF', \ + "kvasd-7999-rf.dat" using 1:2 every ::1 with linespoints pt 12 title 'KV-8-RF', \ + "kvasd-11999.dat" using 1:2 every ::1 with linespoints pt 13 title 'KV-12', \ + "kvasd-11999-rf.dat" using 1:2 every ::1 with linespoints pt 14 title 'KV-12-RF' diff --git a/lib/ftrsd/ftrsd_paper/fig_psuccess.pdf b/lib/ftrsd/ftrsd_paper/fig_psuccess.pdf index f841c5ed6..47306d11d 100644 Binary files a/lib/ftrsd/ftrsd_paper/fig_psuccess.pdf and b/lib/ftrsd/ftrsd_paper/fig_psuccess.pdf differ diff --git a/lib/ftrsd/ftrsd_paper/fig_wer.gnuplot b/lib/ftrsd/ftrsd_paper/fig_wer.gnuplot index fcfa6d7d7..83569f07e 100644 --- a/lib/ftrsd/ftrsd_paper/fig_wer.gnuplot +++ b/lib/ftrsd/ftrsd_paper/fig_wer.gnuplot @@ -13,6 +13,7 @@ set mxtics 2 set mytics 10 set grid set logscale y -plot "ftdata-10000-tight.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'FT-1', \ - "ftdata-100000-loose.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'FT-2', \ +plot "ftdata-10000.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'FT-10K', \ + "ftdata-100000.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 7 title 'FT-100K', \ + "kvasd-11999.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 8 title 'KV-11.999', \ "bmdata.dat" using ($1+29.7):(1-$2) with linespoints pt 7 title 'BM' diff --git a/lib/ftrsd/ftrsd_paper/fig_wer2.gnuplot b/lib/ftrsd/ftrsd_paper/fig_wer2.gnuplot index 3f89f7b58..19fcd3142 100644 --- a/lib/ftrsd/ftrsd_paper/fig_wer2.gnuplot +++ b/lib/ftrsd/ftrsd_paper/fig_wer2.gnuplot @@ -2,16 +2,30 @@ # run: gnuplot fig_wer2.gnuplot # then: pdflatex fig_wer2.tex # -set term epslatex standalone size 12cm,8cm +set term epslatex standalone size 16cm,10cm set output "fig_wer2.tex" set xlabel "$E_s/N_o$ (dB)" +set x2label "SNR in 2500 Hz (dB)" set ylabel "WER" +#set autoscale xfix +#set autoscale x2fix set style func linespoints set key on top outside nobox set tics in set mxtics 2 set mytics 10 -set grid +set grid ytics set logscale y -plot "ftdata-2.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 7 title "FT", \ -"bmdata-2.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'BM' +set x2tics out +set xtics nomirror +set mx2tics 2 +#set xrange [3:13] +#set x2range [(3-29.7):(13-29.7)] +set xrange [4:7.5] +set x2range [(4-29.7):(7.5-29.7)] +set yrange [0.001:1.0] +plot "ftdata-1000-rf.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 4 title "FT-1K-RF", \ +"ftdata-100-rf.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'FT-100-RF', \ +"kvasd-7999-rf.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 6 title 'KV-8-RF', \ +"kvasd-11999-rf.dat" using 1:(1-$2) every ::1 with linespoints pt 7 title 'KV-12-RF' axes x2y1 +#"bmdata-rf.dat" using 1:(1-$2) every ::1 with linespoints pt 8 title 'BM-RF' axes x2y1 diff --git a/lib/ftrsd/ftrsd_paper/fig_wer3.gnuplot b/lib/ftrsd/ftrsd_paper/fig_wer3.gnuplot new file mode 100644 index 000000000..f05ecf22c --- /dev/null +++ b/lib/ftrsd/ftrsd_paper/fig_wer3.gnuplot @@ -0,0 +1,18 @@ +# gnuplot script for AWGN vs Rayleigh figure +# +set term epslatex standalone size 16cm,8cm +set output "fig_wer3.tex" +set xlabel "$E_s/N_o$ (dB)" +set ylabel "WER" +set style func linespoints +set key on top outside nobox +set tics in +set mxtics 2 +set mytics 10 +set grid +set logscale y +#set format y "10^{%L}" +plot "ftdata-1000-rf.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 7 title "FT-1K-RF", \ +"bmdata-rf.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 5 title 'BM-RF', \ +"ftdata-10000.dat" using ($1+29.7):(1-$2) every ::1 with linespoints pt 7 title 'FT-10K-AWGN', \ +"bmdata.dat" using ($1+29.7):(1-$2) with linespoints pt 5 title 'BM-AWGN' diff --git a/lib/ftrsd/ftrsd_paper/ftdata-10000-tight.dat b/lib/ftrsd/ftrsd_paper/ftdata-10000-tight.dat deleted file mode 100644 index ff31793ef..000000000 --- a/lib/ftrsd/ftrsd_paper/ftdata-10000-tight.dat +++ /dev/null @@ -1,10 +0,0 @@ - snr psuccess ntrials 10000, ntotal<72, nhard<42 --26.5 0.0 --26.0 0.016 --25.5 0.090 --25.0 0.281 --24.5 0.581 --24.0 0.844 --23.5 0.977 --23.0 0.998 - diff --git a/lib/ftrsd/ftrsd_paper/ftdata-100000-loose.dat b/lib/ftrsd/ftrsd_paper/ftdata-100000-loose.dat deleted file mode 100644 index 710e9abe1..000000000 --- a/lib/ftrsd/ftrsd_paper/ftdata-100000-loose.dat +++ /dev/null @@ -1,11 +0,0 @@ -snr psuccess 100000 trials, ntotal<76, nhard<44 --27.0 0.0 --26.5 0.008 --26.0 0.04 --25.5 0.2 --25.0 0.41 --24.5 0.75 --24.0 0.93700 --23.5 0.99000 --23.0 0.99954 - diff --git a/lib/ftrsd/ftrsd_paper/ftdata-2.dat b/lib/ftrsd/ftrsd_paper/ftdata-2.dat deleted file mode 100644 index f0915c33e..000000000 --- a/lib/ftrsd/ftrsd_paper/ftdata-2.dat +++ /dev/null @@ -1,8 +0,0 @@ -fspread0 0.2, FT (ntrials=1000) --26.0 0.020 --25.5 0.09 --25.0 0.23 --24.5 0.58 --24.0 0.83 --23.5 0.94 --23.0 0.983 diff --git a/lib/ftrsd/ftrsd_paper/mfsk.f90 b/lib/ftrsd/ftrsd_paper/mfsk.f90 index dbf3ea488..72e7b3e70 100644 --- a/lib/ftrsd/ftrsd_paper/mfsk.f90 +++ b/lib/ftrsd/ftrsd_paper/mfsk.f90 @@ -9,8 +9,8 @@ program mfsk nargs=iargc() if(nargs.ne.1) then print*,'Probability of symbol error for noncoherent MFSK' - print*,'Usage: prob M' - print*,'Example: prob 64' + print*,'Usage: mfsk M' + print*,'Example: mfsk 64' go to 999 endif call getarg(1,arg) @@ -19,7 +19,7 @@ program mfsk write(*,1012) 1012 format('Es/No P(symbol error)'/ & '----------------------') - do isnr=0,20 + do isnr=0,40 esno=10**(isnr/2.0/10.0) hsum=0.d0 do k=1,M-1