Skip to content

Tests for fix scoring 2 - #7

Closed
zcsahok wants to merge 11 commits into
dl1jbe:masterfrom
zcsahok:tests_for_fix_scoring_2
Closed

Tests for fix scoring 2#7
zcsahok wants to merge 11 commits into
dl1jbe:masterfrom
zcsahok:tests_for_fix_scoring_2

Conversation

@zcsahok

@zcsahok zcsahok commented Aug 1, 2026

Copy link
Copy Markdown

In a new branch, adding spdx_sp. It shall fail due to own contry (SP treated as multiplier. Will add a fix for it.

dl1jbe and others added 9 commits July 31, 2026 13:54
Was used for control of point scoring. By leaving all point controlling
keywords (besides COUNTRYLIST_POINTS) undefined the same result can be
achieved.
* Do some further cleanup  and
* adapt test code
* set Cabrillo contest name
* add SERIAL_OR_SECTION to get rid of annoying "section?" question
* remove USE_COUNTRYLIST_ONLY
@zcsahok zcsahok mentioned this pull request Aug 1, 2026
@dl1jbe

dl1jbe commented Aug 1, 2026

Copy link
Copy Markdown
Owner

Try

COUNTRYLIST=SP
EXCLUDE_MULTILIST=COUNTRYLIST

@dl1jbe

dl1jbe commented Aug 1, 2026

Copy link
Copy Markdown
Owner

Just tested:

spdx_sp as provided fails with the master branch and also with the new fix_scoring.
With the additional two lines from last comment it succeeds for the fix_scoring branch.

@zcsahok

zcsahok commented Aug 1, 2026

Copy link
Copy Markdown
Author

Yes, those 2 lines fix mult counting. There is one more issue not covered by the test: the generated Cabrillo contains serial number as sent exchange.

QSO:  7000 CW 2026-07-30 0543 SP0XXX        599 0001           DL1AAA        599 076           
QSO:  7000 CW 2026-07-30 0543 SP0XXX        599 0002           EA2BBB        599 034 

This is caused by SERIAL_EXCHANGE, as it assumes that both rx and tx exchanges are serial numbers.
It also has precedence over CABRILLO-EXCHANGE, so it is not possible to override it.
Dropping SERIAL_EXCHANGE has the minor drawback, that rx serials are not normalized (12 stays 12, instead of getting converted into 012).

@zcsahok

zcsahok commented Aug 2, 2026

Copy link
Copy Markdown
Author

OK-OM scoring and mults are handled by the plugin. The special case of /MM stations can also be covered.
Both local and dx stations can use the same rule file after minor editing.
Test is for dx only, as local would require a copy of the rule file.

@dl1jbe

dl1jbe commented Aug 5, 2026

Copy link
Copy Markdown
Owner

Fine. Merged it into the 'fix_scoring' branch. Dropped the deleted okommults from share/Makefile.am.

@zcsahok

zcsahok commented Aug 10, 2026

Copy link
Copy Markdown
Author

Looking at the other two contests with USE_COUNTRYLIST_ONLY I found that

  1. PACC requires multipliers per mode. It seems not to complicated to add this feature, will open a draft PR for this.
  2. ARRL DX has both hardcoded support for US/DX and also a rule file for the DX side. This shall be reviewed and one of them have to be dropped.

Both of these require further work, so I suggest to finalize Tlf#390 with these topics kept open and addressed in separate PRs.

If that's OK then will close this PR.

@dl1jbe

dl1jbe commented Aug 10, 2026

Copy link
Copy Markdown
Owner

Yes, fine by me. Let us merge Tlf#390 in. I will complete the documentation Tlf#525 in next days.

@zcsahok zcsahok closed this Aug 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants