feat(trekninger): read parameter file 1.1 and store the new draws

The loader knows the new checksum and the units of the new quantities
(g CO2 per kWh, cubic metres per MWh). 10 000 draws of 91 quantities with the
same seed; the four new ones are the last columns. All columns have new
numbers, because the random numbers are laid out row by row. The stream for
yearly events is byte for byte the same; only its description records the new
checksum. Tests for the counts, the new quantities and the checksum in the
pre-registration. README, CHANGELOG and CLAUDE.md updated.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
Kjell Tore Guttormsen 2026-11-12 23:07:09 +01:00
commit ea26cd4226
Signed by: ktg
SSH key fingerprint: SHA256:JakMjO6FTBBzN0Bhfj9saOoEjaFxlSdYuZQQpM/lF9Q
9 changed files with 100 additions and 25 deletions

View file

@ -8,7 +8,7 @@ import re
import statistics
from collections import Counter
from pathlib import Path
from typing import Any
from typing import Any, cast
import pytest
@ -39,10 +39,12 @@ def _endret(raa: dict[str, Any], parameter_id: str) -> tuple[dict[str, Any], dic
def test_sjekksummen_er_den_i_forhaandsregistreringen() -> None:
"""The freeze section lists the first checksum, then one per deviation; the last applies."""
tekst = (ROT / "FORHANDSREGISTRERING.md").read_text(encoding="utf-8")
funnet = re.search(r"SHA-256: `([0-9a-f]{64})`", tekst)
assert funnet is not None
assert funnet.group(1) == pm.FROSSEN_SHA256
avsnitt = tekst.split("## Parameterfrys")[1].split("\n## ")[0]
funnet = re.findall(r"SHA-256: `([0-9a-f]{64})`", avsnitt)
assert len(funnet) == 2
assert funnet[-1] == pm.FROSSEN_SHA256
assert pm.sjekksum() == pm.FROSSEN_SHA256
@ -55,13 +57,13 @@ def test_en_endret_fil_avvises(tmp_path: Path) -> None:
def test_antall_og_status_som_i_forhaandsregistreringen(sett: pm.Parametersett) -> None:
"""124 parameters: 80 with source, 1 derived, 35 open assumptions, 8 choices of set-up."""
assert len(sett.parametere) == 124
"""137 parameters: 87 with source, 1 derived, 40 open assumptions, 9 choices of set-up."""
assert len(sett.parametere) == 137
assert Counter(p.status for p in sett.parametere) == {
"kilde": 80,
"kilde": 87,
"avledet": 1,
"åpen forutsetning": 35,
"modellvalg": 8,
"åpen forutsetning": 40,
"modellvalg": 9,
}
@ -271,15 +273,56 @@ def test_prisene_regnes_om_til_2025_kroner_per_mwh(sett: pm.Parametersett) -> No
assert set(svakest.pris) == {"NO1", "NO2", "NO3", "NO4", "NO5", "Norge"}
def test_storrelsene_i_tillegget_til_retningen(sett: pm.Parametersett) -> None:
"""The quantities of chapter 17.8, added in the deviation from the freeze of 2026-11-12."""
assert [p.id for p in sett.parametere[124:]] == [
"P_m", "tau_1", "n_1", "eps_d", "d_kilde", "s_flytt", "s_trening", "u_alt",
"w_D_uttak", "w_N_uttak", "w_N_forbruk", "w_N_taarn", "w_D_sjo",
] # fmt: skip
assert sett.fast("P_m") == 100
assert sett.fast("eps_d") == 1
assert sett.fast("w_N_forbruk") == 0
assert sett.fast("w_D_sjo") == 98
spenn = {
n: sett.storrelse(n).fordeling.tall for n in ("tau_1", "n_1", "w_D_uttak", "w_N_uttak")
}
assert spenn == {
"tau_1": {"lav": 3, "hoy": 7},
"n_1": {"lav": 18, "hoy": 268},
"w_D_uttak": {"lav": 0.07, "hoy": 0.10},
"w_N_uttak": {"lav": 119, "hoy": 168},
}
assert sett.tabell("d_kilde") == {"2030": 0.119, "2035": 0.21}
flytt = cast("dict[str, float]", sett.tabell("s_flytt"))
trening = cast("dict[str, float]", sett.tabell("s_trening"))
bortfall = [
flytt[aar] * (1 - trening[ende]) for ende in ("hoy", "lav") for aar in ("2030", "2035")
]
assert bortfall == pytest.approx([0.188, 0.376, 0.32, 0.64])
utslipp = cast("dict[str, Any]", sett.tabell("u_alt"))
assert utslipp["hoved"] == {"2024": 430, "2030": 340, "2035": 270, "2040": 201.2, "2050": 131.2}
assert utslipp["hoved"]["2040"] == pytest.approx(270 * 187 / 251, abs=0.05)
assert utslipp["hoved"]["2050"] == pytest.approx(270 * 122 / 251, abs=0.05)
assert utslipp["lav"] == {"2025": 170, "2030": 90}
assert utslipp["hoy"] == {"lav": 410, "hoy": 626}
assert utslipp["null"] == 0
assert sett.storrelse("u_alt").faktor == pytest.approx(1e-3) # g per kWh -> tonnes per MWh
assert sett.tabell("w_N_taarn") == {"forbruk": [2.2, 2.5, 3.2], "uttak": [3.0, 4.2, 9.8]}
assert {
sett.parameter(i).status for i in ("tau_1", "n_1", "eps_d", "s_flytt", "w_N_forbruk")
} == {"åpen forutsetning"}
def test_alle_storrelser_og_rekkefolgen(sett: pm.Parametersett) -> None:
"""136 scalar quantities with the composites split; 87 of them are drawn, in file order."""
assert len(sett.storrelser()) == 136
"""149 scalar quantities with the composites split; 91 of them are drawn, in file order."""
assert len(sett.storrelser()) == 149
stokastiske = [s.navn for s in sett.stokastiske()]
assert len(stokastiske) == 87
assert len(stokastiske) == 91
assert stokastiske[:4] == ["c_N_ref", "w_xi", "u_xi", "o_xi"]
assert stokastiske[-1] == "eps_e"
assert stokastiske[86] == "eps_e"
assert stokastiske[87:] == ["tau_1", "n_1", "w_D_uttak", "w_N_uttak"]
plass = stokastiske.index("vann.investering")
assert stokastiske[plass : plass + 2] == ["vann.investering", "vann.drift"]
assert sett.monte_carlo.froe == 20261111
assert sett.monte_carlo.antall_trekninger == 10_000
assert len(sett.foelsomheter) == 29
assert len(sett.foelsomheter) == 37