Commit Graph

2212 Commits

Author SHA1 Message Date
Joe Taylor
76d4393537 Commit several tentative attempts (now commented out) addressing
a possible JT9 decoding issue.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6366 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:55:17 +00:00
Joe Taylor
a864cbfdeb Integrate the latest algorithm for hinted decoding.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6365 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:51:13 +00:00
Joe Taylor
92479967c7 A few more edits to oo 8-11, the sections on algorithms.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6364 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:43:47 +00:00
Joe Taylor
ff54b5d595 Fix the FT algorithm description. Add hinted algorithm, and a few edits.
Still needed: Updated Figure 4, and text for Section 7.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6363 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-08 20:27:21 +00:00
Bill Somerville
1268600497 Fix a settings key character case issue
Settings keys are scase sensitive on non-Windows platforms.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6362 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-07 16:42:24 +00:00
Bill Somerville
c4b9ee6e97 Improve OS X install documentation.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6361 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-07 15:15:30 +00:00
Joe Taylor
20381b971a Use u_i, sigma_i for Eqs 10 and 11, and other edits.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6360 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 19:04:42 +00:00
Bill Somerville
cf5f3916c7 Add facility to reset split mode when closing a rig connection
This option defaults to on but may be unchecked in settings.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6359 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 17:24:17 +00:00
Bill Somerville
a6ec80c08a Fix installation instructions typo
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6357 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 10:44:53 +00:00
Steven Franke
ea4fe95151 Edits to description of KV/FT comparison.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6356 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 05:03:04 +00:00
Steven Franke
b52e099326 Minor edits.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6355 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 02:03:26 +00:00
Joe Taylor
8ba09d5175 A few more editorial tweaks, and more text.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6354 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-06 00:10:54 +00:00
Joe Taylor
b22f1c6d2e More polishing of text, fixed typo's, etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6353 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 20:54:29 +00:00
Joe Taylor
0f62680559 Another set of additions to the paper, both text and figures.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6352 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 20:13:13 +00:00
Joe Taylor
3576e0b868 UPdate several of the figures; add the .lab files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6351 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 20:12:29 +00:00
Joe Taylor
ccef778b02 Another incremental draft of the FTRSD paper. Expect more changes fairly soon!
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6350 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 17:36:15 +00:00
Bill Somerville
6595c329a8 Do not try to open a missing Hamlib settings file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6349 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 17:29:24 +00:00
Bill Somerville
da7fbe947b Silence some noisy debug trace messages
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6348 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 17:29:16 +00:00
Bill Somerville
9fc5568e32 Ensure that the temporary directory is usable
Cooperating applications that use file watchers can inadvertently lock
the  temporary  directory which  defers  deletion  of it  when  WSJT-X
exits.  This  is OK  until  WSJT-X  is  restarted  when it  finds  the
directory but  it is  locked for  all access  by the  operating system
since it  is pending deletion.  There is no  way around this  short of
closing the offending application so a message to that effect is given
with a retry option.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6347 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-05 16:43:41 +00:00
Steven Franke
59e093032e Updated frame/word-error-rate script.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6346 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-03 23:14:17 +00:00
Steven Franke
5ed629a252 Update wer data and figure.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6345 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-03 23:10:17 +00:00
Bill Somerville
4d399f619e Updated build instructions on OS X to cover new CMake install process
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6344 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-03 17:39:19 +00:00
Steven Franke
ca9e75f1fc Set ntol=10 for single-signal mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6343 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-03 01:33:15 +00:00
Bill Somerville
c88d401169 Correct links in User Guide for new language subdir
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6342 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 22:38:06 +00:00
Bill Somerville
0ba0977aa2 User Guide localization
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6341 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 22:30:12 +00:00
Bill Somerville
7b7ef610b5 Fix integer size and sign issues
WAV files use 32-bit sizes so casts are needed on 64-bit files systems

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6340 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 19:10:16 +00:00
Joe Taylor
1a0cbd4d9d Oops! Did not intend to commit decoder.f90 with diagnostic "write(79..." activated.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6339 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 18:41:41 +00:00
Joe Taylor
4aca6bb594 Clarify text for labels 'Auto-Tx-Enable Armed', etc.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6338 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 18:36:07 +00:00
Bill Somerville
58aacc590e Class to read and write WAV format files
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6337 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 17:19:49 +00:00
Bill Somerville
92e1f70b8f Some docs and enhancements for WAV reading
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6336 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 15:04:26 +00:00
Bill Somerville
26e5ea963e Make WAV file reading correct so that optional chunks can be tolerated
The WAV file format allows for optional header content, allow for this
in preparation for adding some metadata to WSJT-X recorded WAV files.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6335 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 14:29:02 +00:00
Steven Franke
0cf18c445f Update wer simulation results and figures to reflect improvements implemented in r6330.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6334 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-02 02:27:05 +00:00
Steven Franke
ca02a5841a Add -a (aggressiveness) command line option and make ntol=1000 the default.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6333 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-01 16:34:55 +00:00
Joe Taylor
c7e3fa09e3 Comment out the "write(79)..." lines.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6332 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-01 15:35:00 +00:00
Joe Taylor
fecffe8ed8 Force naggressive=0 when in JT9+JT65 mode.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6331 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-01-01 15:33:48 +00:00
Joe Taylor
0e15a4cd5c Default parameter settings for JT65 decoding set for HF conditions.
More aggressive parameters are selected with higher values of 
"Aggressive decoding level" on the "Advanced" tab.  With settings
greater than 0, be sure to set Ftol=1000 if you want to decode over 
the whole passband.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6330 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 16:22:27 +00:00
Joe Taylor
696f633bf6 Oops! Forgot to back out a temporary change in jt65_test.f90.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6329 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 01:47:44 +00:00
Joe Taylor
5bfa43f46f Merge improvements to the FT algorithm into Bill's new structure for
the Fortran routines.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6328 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 01:30:31 +00:00
Steven Franke
9e2fd2e11a More refined kvasd stats.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6327 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-31 00:34:57 +00:00
Bill Somerville
0bc01a19b1 Fix JT4 averaging regression
Fell  into the  Fortran  trap for  C/C++  programmers, automatic  SAVE
attribute on default initialized variables.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6326 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-30 14:57:50 +00:00
Bill Somerville
e94f7c0c05 Add missing new file
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6325 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:54:40 +00:00
Bill Somerville
d431e2cecd Restructuring in preparation for direct decoder invocation from wsjtx
Re-factor the JT4, JT65 and JT9 decoders as Fortran modules using type
bound  procedures, the  decoder types  implement a  callback procedure
such that he client of the decoder can interpret the decode results as
they need.

The JT4 decoder has a  second callback that delivers message averaging
status.  Also the  previously separate  source files  lib/jt4a.f90 and
lib/avg4.f90 have been merged  into lib/jt4_decode.f90 as private type
bound procedures of the new jt4_decoder type.

Re-factored the lib/decoder.f90 subroutine  to utilize the new decoder
types. Added local procedures to process decodes and averaging results
including the necessary OpenMP synchronization directives for parallel
JT9+JT65 decoding.

Added the  jt65_test module  which is  a basic  test harness  for JT65
decoding. Re-factored  the jt65 utility  to utilize the  new jt65_test
module.

Changed a  few integers  to logical variables  where their  meaning is
clearly binary.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6324 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:52:55 +00:00
Bill Somerville
d6457af36e Rename some sources in prep for decode callback implementation
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6323 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-29 23:52:46 +00:00
Steven Franke
509cb9efd6 Add ftdata-100 and ftdata-10 and update fig_wer2 and associated text.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6322 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-28 21:20:10 +00:00
Steven Franke
fc06ec952f Edits to section 1 and corrections to n-k+1 stuff.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6321 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-28 03:02:05 +00:00
Bill Somerville
f416a52def Make Fortran profiling timer function a callback with a default null implementation
Groundwork for calling the decoders directly from C/C++ threads.

To  access   the  timer   module  timer_module   must  now   be  used.
Instrumented code need  only use the module function  'timer' which is
now a  procedure pointer that  is guaranteed to be  associated (unless
null()  is assigned  to it,  which should  not be  done). The  default
behaviour of 'timer' is to do nothing.

If a  Fortran program  wishes to  profile code it  should now  use the
timer_impl module  which contains a default  timer implementation. The
main program should call 'init_timer([filename])' before using 'timer'
or     calling     routines     that     are     instrumented.      If
'init_timer([filename])'.  If it is called  then an optional file name
may  be  provided  with  'timer.out'  being used  as  a  default.  The
procedure 'fini_timer()' may be called to close the file.

The default  timer implementation is  thread safe if used  with OpenMP
multi-threaded code  so long as  the OpenMP  thread team is  given the
copyin(/timer_private/) attribute  for correct operation.   The common
block /timer_private/ should  be included for OpenMP  use by including
the file 'timer_common.inc'.

The module 'lib/timer_C_wrapper.f90' provides  a Fortran wrapper along
with 'init' and 'fini' subroutines  which allow a C/C++ application to
call timer instrumented  Fortran code and for it  to receive callbacks
of 'timer()' subroutine invocations.  No C/C++ timer implementation is
provided at this stage.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6320 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-27 15:40:57 +00:00
Steven Franke
29f309bbc0 some more progress.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6319 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-27 00:17:20 +00:00
Steven Franke
b04a73e157 Add discussion of sync losses.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6318 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-26 21:43:07 +00:00
Steven Franke
b12290871d More refinements to section 7 and figs.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-26 20:13:12 +00:00
Steven Franke
f838755ae6 Restructure ftrsd, update WER data, delete some old files.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6316 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-12-26 15:47:49 +00:00