feat: Artistic als eigener Programmtyp prüfen

Die Fachgruppe hat entschieden: die Punktwertung von Artistic ist
zweitrangig, Länge und Begrenzungen sollen geprüft werden. Artistic ist
deshalb ein schmaler Modus, kein zweites Regelwerk.

- Routine.program_type (free/artistic), Schema 8. Kategorie-Lookups
  verlangen den Programmtyp als Parameter, damit "Gold" nicht
  versehentlich gegen die Grenzen der falschen Disziplin läuft.
- adult.json beider Saisons: je fünf Artistic-Kategorien mit
  `scored: false`, Mindestanzahlen (1–2 Sprünge, 1–2 Pirouetten),
  1:30 bzw. 2:00 ±10 s, keine Kombinationen, kein Axel in
  Bronze/Silver/Gold.
- Validator prüft Mindest- und Höchstanzahlen. Level und Features bleiben
  unangetastet, weil sie in Artistic nicht gewertet werden.
- Statusleiste: Programmtyp-Dropdown; Prüfkopf nennt "Gold · Artistic ·
  1:30 ±10 s"; statt der Punktschätzung steht der Hinweis, dass Artistic
  nur über die Programmkomponenten bewertet wird.
- PDF-Kopf nennt Artistic.
- Der Zwischenhinweis "Kategorie-Grenzen gelten nur für die Kür" entfällt.

Nicht modelliert: Pair Artistic, Eistanz und Synchro.
This commit is contained in:
torsten 2026-11-13 11:16:06 +01:00
parent 1b5649e7dd
commit 795d04a05b
20 changed files with 749 additions and 72 deletions

View file

@ -32,6 +32,8 @@ func _init() -> void:
_validator = RoutineValidatorScript.new(_catalog, _rules, _adult)
_test_metadata()
_test_artistic_categories()
_test_artistic_validation()
_test_category_fields()
_test_jump_permissions()
_test_gold_limits()
@ -48,16 +50,118 @@ func _test_metadata() -> void:
_check(_adult.season == "2026/27", "adult rules season is 2026/27")
_check(_adult.source.contains("Adult"), "adult rules name the adult announcement")
_check(
_adult.get_categories().size() == 5,
_adult.get_categories("free").size() == 5,
"five adult categories are available"
)
_check(_adult.has_category("gold"), "Gold category exists")
_check(_adult.has_category("silver"), "Silver category exists")
_check(_adult.has_category("bronze"), "Bronze category exists")
_check(_adult.has_category("gold", "free"), "Gold category exists")
_check(_adult.has_category("silver", "free"), "Silver category exists")
_check(_adult.has_category("bronze", "free"), "Bronze category exists")
func _test_artistic_categories() -> void:
_check(
_adult.get_categories("artistic").size() == 5,
"five artistic categories are available"
)
var gold := _adult.get_category("gold", "artistic")
_check(gold != null, "artistic Gold exists")
if gold == null:
return
_check(not gold.scored, "artistic is not scored")
_check(gold.duration_seconds == 90, "artistic Gold lasts 1:30")
_check(
gold.min_jump_elements == 1 and gold.max_jump_elements == 2,
"artistic Gold allows one or two jumps"
)
_check(
gold.min_spins == 1 and gold.max_spins == 2,
"artistic Gold allows one or two spins"
)
_check(not gold.allow_axel, "artistic Gold forbids the axel")
_check(
gold.max_jump_combinations == 0,
"artistic Gold forbids combinations"
)
var masters := _adult.get_category("masters", "artistic")
_check(masters != null, "artistic Masters exists")
if masters != null:
_check(masters.allow_axel, "artistic Masters allows the axel")
_check(masters.duration_seconds == 120, "artistic Masters lasts 2:00")
var free_gold := _adult.get_category("gold", "free")
_check(
free_gold != null and free_gold.scored and free_gold.duration_seconds == 170,
"the free-skating Gold is unchanged"
)
_check(gold != free_gold, "the two Gold categories are distinct")
func _test_artistic_validation() -> void:
# A routine without elements misses the required jump and spin.
var empty := _make_routine("gold")
empty.program_type = "artistic"
_check(
_has_message(_validator.validate_report(empty), "mindestens 1"),
"artistic requires at least one jump and one spin"
)
# One or two single jumps and spins are fine.
var valid := _make_routine("gold")
valid.program_type = "artistic"
_add_jump(valid.sections[0], "1T")
_add_jump(valid.sections[0], "1S")
_add_spin(valid.sections[0], "spin-1", "USp", 0)
_add_spin(valid.sections[0], "spin-2", "LSp", 0)
var valid_report := _validator.validate_report(valid)
_check(
not _has_message(valid_report, "nicht erlaubt"),
"artistic Gold allows single jumps"
)
_check(
not _has_message(valid_report, "erlaubt sind max. 2"),
"two jumps and two spins stay within the limit"
)
var axel := _make_routine("gold")
axel.program_type = "artistic"
_add_jump(axel.sections[0], "1A")
_check(
_has_message(_validator.validate_report(axel), "nicht erlaubt"),
"artistic Gold forbids the axel"
)
var doubled := _make_routine("gold")
doubled.program_type = "artistic"
_add_jump(doubled.sections[0], "2T")
_check(
_has_message(_validator.validate_report(doubled), "nicht erlaubt"),
"artistic forbids double jumps"
)
var combination := _make_routine("gold")
combination.program_type = "artistic"
_add_jump(
combination.sections[0],
"1T",
PathSegment.JumpKind.COMBINATION,
["1S"]
)
_check(
_has_message(_validator.validate_report(combination), "Sprungkombinationen"),
"artistic forbids jump combinations"
)
var masters := _make_routine("masters")
masters.program_type = "artistic"
_add_jump(masters.sections[0], "1A")
_add_spin(masters.sections[0], "spin-1", "USp", 0)
_check(
not _has_message(_validator.validate_report(masters), "nicht erlaubt"),
"artistic Masters allows the axel"
)
func _test_category_fields() -> void:
var gold := _adult.get_category("gold")
var gold := _adult.get_category("gold", "free")
_check(gold.duration_seconds == 170, "Gold lasts 2:50")
_check(gold.max_jump_elements == 5, "Gold allows five jump elements")
_check(gold.max_spins == 3, "Gold allows three spins")
@ -69,7 +173,7 @@ func _test_category_fields() -> void:
_check_approx(gold.pcs_factor, 2.67, "Gold PCS factor")
_check_approx(gold.fall_deduction, 1.0, "Gold fall deduction")
var silver := _adult.get_category("silver")
var silver := _adult.get_category("silver", "free")
_check(silver.duration_seconds == 120, "Silver lasts 2:00")
_check(silver.max_spins == 2, "Silver allows two spins")
_check(silver.max_choreographic_sequences == 1, "Silver uses a choreo sequence")
@ -77,7 +181,7 @@ func _test_category_fields() -> void:
_check(silver.max_spin_level == 2, "Silver caps spins at Level 2")
_check_approx(silver.pcs_factor, 2.0, "Silver PCS factor")
var bronze := _adult.get_category("bronze")
var bronze := _adult.get_category("bronze", "free")
_check(bronze.duration_seconds == 100, "Bronze lasts 1:40")
_check(not bronze.allow_axel, "Bronze forbids Axel jumps")
_check(bronze.max_jump_combinations == 1, "Bronze allows one jump combination")
@ -85,27 +189,27 @@ func _test_category_fields() -> void:
func _test_jump_permissions() -> void:
var bronze := _adult.get_category("bronze")
var bronze := _adult.get_category("bronze", "free")
_check(bronze.is_jump_allowed("1T"), "Bronze allows 1T")
_check(not bronze.is_jump_allowed("1A"), "Bronze forbids 1A")
_check(not bronze.is_jump_allowed("2T"), "Bronze forbids doubles")
var silver := _adult.get_category("silver")
var silver := _adult.get_category("silver", "free")
_check(silver.is_jump_allowed("1A"), "Silver allows 1A")
_check(not silver.is_jump_allowed("2T"), "Silver forbids doubles")
var gold := _adult.get_category("gold")
var gold := _adult.get_category("gold", "free")
_check(gold.is_jump_allowed("1A"), "Gold allows 1A")
_check(gold.is_jump_allowed("2T"), "Gold allows 2T")
_check(not gold.is_jump_allowed("2Lz"), "Gold forbids 2Lz")
_check(not gold.is_jump_allowed("2A"), "Gold forbids 2A")
_check(not gold.is_jump_allowed("3T"), "Gold forbids triples")
var masters := _adult.get_category("masters")
var masters := _adult.get_category("masters", "free")
_check(masters.is_jump_allowed("2A"), "Masters allows 2A")
_check(not masters.is_jump_allowed("3T"), "Masters forbids triples")
var elite := _adult.get_category("masters_elite")
var elite := _adult.get_category("masters_elite", "free")
_check(elite.is_jump_allowed("3T"), "Masters Elite allows triples")
_check(not elite.is_jump_allowed("4T"), "Masters Elite forbids quads")

View file

@ -73,6 +73,7 @@ func _test_json_roundtrip() -> void:
)
_check(loaded.adult_category == routine.adult_category, "category survives")
_check(loaded.season == routine.season, "season survives")
_check(loaded.program_type == routine.program_type, "programme type survives")
_check_approx(
loaded.assumed_pcs_average,
routine.assumed_pcs_average,
@ -380,6 +381,7 @@ func _make_routine() -> Routine:
]
routine.adult_category = "gold"
routine.season = "2026/27"
routine.program_type = "artistic"
routine.assumed_pcs_average = 4.75
routine.assumed_falls = 1
routine.rink = RinkDimensions.new()

View file

@ -192,8 +192,8 @@ func _test_season_pair_difference() -> void:
)
# The two documented adult differences between the seasons.
var old_gold := older.adult.get_category("gold")
var new_gold := newer.adult.get_category("gold")
var old_gold := older.adult.get_category("gold", "free")
var new_gold := newer.adult.get_category("gold", "free")
_check(
old_gold != null and not old_gold.requires_choreographic_spin,
"2025/26 Gold does not require a choreographic spin"

View file

@ -1791,6 +1791,50 @@ func _run() -> void:
controller.upgrade_dialog.hide()
controller.validation_dialog.hide()
# Programmtyp: Artistic hat eigene Grenzen und keine Punktschätzung.
controller.new_routine()
_check(
controller.get_program_type() == "free",
"a new routine is a free-skating programme"
)
_check(
controller.set_adult_category("gold"),
"Gold is available for free skating"
)
controller.open_validation_dialog()
_check(
controller.validation_text.text.contains("Geschätzte Summe"),
"free skating shows a score estimate"
)
controller.validation_dialog.hide()
_check(
controller.set_program_type("artistic"),
"the programme type can be switched to artistic"
)
_check(
controller.get_program_type() == "artistic",
"the routine stores the programme type"
)
controller.open_validation_dialog()
_check(
controller.validation_text.text.contains("keine Punktschätzung"),
"artistic shows no score estimate"
)
_check(
controller.validation_text.text.contains("Gold · Artistic"),
"the header names the programme type"
)
_check(
controller.validation_text.text.contains("mindestens 1"),
"artistic reports the required minimum"
)
controller.validation_dialog.hide()
_check(
not controller.set_program_type("ballett"),
"unknown programme types are rejected"
)
controller.new_routine()
# Structured jump combination in the element dialog.