views-frames 1.6.0__tar.gz → 1.7.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {views_frames-1.6.0 → views_frames-1.7.0}/PKG-INFO +47 -4
- {views_frames-1.6.0 → views_frames-1.7.0}/README.md +46 -3
- {views_frames-1.6.0 → views_frames-1.7.0}/pyproject.toml +7 -2
- views_frames-1.7.0/src/views_frames_reconcile/__init__.py +11 -0
- views_frames-1.7.0/src/views_frames_reconcile/conformance.py +74 -0
- views_frames-1.7.0/src/views_frames_reconcile/frames.py +69 -0
- views_frames-1.7.0/src/views_frames_reconcile/grouping.py +92 -0
- views_frames-1.7.0/src/views_frames_reconcile/module.py +68 -0
- views_frames-1.7.0/src/views_frames_reconcile/proportional.py +74 -0
- views_frames-1.7.0/src/views_frames_reconcile/validation.py +79 -0
- views_frames-1.7.0/src/views_frames_summarize/py.typed +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/.gitignore +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/LICENSE +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/__init__.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/_typing.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/_validation.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/conformance/__init__.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/feature_frame.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/index.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/io/__init__.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/io/arrow.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/io/npz.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/metadata.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/prediction_frame.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/protocols.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/py.typed +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/spatial_level.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames/target_frame.py +0 -0
- {views_frames-1.6.0/src/views_frames_summarize → views_frames-1.7.0/src/views_frames_reconcile}/py.typed +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/__init__.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/_common.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/aggregate.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/bimodality.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/collapse.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/config.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/conformance.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/exceedance.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/expected_shortfall.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/interval.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/point.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/summarize_tower.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/tower.py +0 -0
- {views_frames-1.6.0 → views_frames-1.7.0}/src/views_frames_summarize/tower_point.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: views-frames
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.7.0
|
|
4
4
|
Summary: The VIEWS platform data-contract layer: immutable array+identifier frames (numpy only, root of the dependency DAG).
|
|
5
5
|
Project-URL: Homepage, https://github.com/views-platform/views-frames
|
|
6
6
|
Project-URL: Repository, https://github.com/views-platform/views-frames
|
|
@@ -30,19 +30,22 @@ Description-Content-Type: text/markdown
|
|
|
30
30
|
> containers (`FeatureFrame`, `PredictionFrame`, and their anticipated siblings)
|
|
31
31
|
> that every other repo depends on and that depends on nothing internal.
|
|
32
32
|
>
|
|
33
|
-
> **Status:** **v1.
|
|
33
|
+
> **Status:** **v1.7.0 — frozen API** (frozen since v1.0.0, ADR-018; the v1.1 surface is
|
|
34
34
|
> purely additive — the coherent posterior summary, ADR-019; v1.2.0 rebuilt the tower
|
|
35
35
|
> `outside-in`, C-44; v1.3.0 makes the tower summary distribution-agnostic — no magnitude
|
|
36
36
|
> zeroing by default, register C-45; v1.4.0 adds generic provenance to `FrameMetadata`
|
|
37
37
|
> (`run_id`/`data_version`) and publishes the shared `assert_frame_envelope` checker,
|
|
38
38
|
> ADR-020; v1.5.0 adds the threshold **exceedance** estimator `P(Y > c)`, ADR-021; v1.6.0
|
|
39
|
-
> adds the worst-case **expected_shortfall** estimator, ADR-022
|
|
39
|
+
> adds the worst-case **expected_shortfall** estimator, ADR-022; v1.7.0 adds a third
|
|
40
|
+
> sibling package **`views_frames_reconcile`** — forecast reconciliation, ADR-023). This
|
|
40
41
|
> README is the design
|
|
41
42
|
> bible; the contract it specifies is realised in `src/views_frames/` (index, frames,
|
|
42
43
|
> io, conformance suite) plus the `src/views_frames_summarize/` sibling package
|
|
43
44
|
> (sample-axis summarization — `collapse`/MAP/HDI/quantiles, the coherent-tower estimators
|
|
44
45
|
> `hdi_tower`/`tower_point`/`bimodality`/`summarize_tower`, + cross-level
|
|
45
|
-
> aggregation; ADR-017, ADR-019)
|
|
46
|
+
> aggregation; ADR-017, ADR-019) and the `src/views_frames_reconcile/` sibling package
|
|
47
|
+
> (forecast reconciliation — make grid forecasts sum to country totals per draw; ADR-023).
|
|
48
|
+
> The blocking design decisions are resolved (§13a) and
|
|
46
49
|
> ratified as ADRs 011–018; two rounds of consumer review validated
|
|
47
50
|
> the design. Consumer adoption (re-export shims, pandas migration) is the owner's
|
|
48
51
|
> migration, not this repo's.
|
|
@@ -421,6 +424,14 @@ views-frames/
|
|
|
421
424
|
│ ├── point.py # map_estimate (histogram MAP)
|
|
422
425
|
│ ├── interval.py # hdi, quantiles → arrays aligned to the frame index
|
|
423
426
|
│ └── aggregate.py # conservation-correct cross-level aggregation
|
|
427
|
+
├── src/views_frames_reconcile/ # forecast reconciliation OVER frames (ADR-023)
|
|
428
|
+
│ ├── __init__.py # depends on views_frames + numpy only; never the reverse
|
|
429
|
+
│ ├── proportional.py # reconcile_proportional — per-draw top-down scaling
|
|
430
|
+
│ ├── grouping.py # reconcile_pgm_to_cm — group by (time, country)
|
|
431
|
+
│ ├── frames.py # prediction_frame_from_arrays adapter
|
|
432
|
+
│ ├── validation.py # fail-loud input guards
|
|
433
|
+
│ ├── module.py # ReconciliationModule (holds the injected mapping)
|
|
434
|
+
│ └── conformance.py # assert_reconcile_contract
|
|
424
435
|
└── tests/
|
|
425
436
|
├── conformance/ # the published contract suite consumers re-run (see §9)
|
|
426
437
|
└── unit/
|
|
@@ -443,6 +454,38 @@ Layout rules (these *are* the screaming-architecture requirements):
|
|
|
443
454
|
- A new developer should infer every responsibility from the file tree without
|
|
444
455
|
reading bodies.
|
|
445
456
|
|
|
457
|
+
### 6a. The `views_frames_reconcile` sibling (ADR-023)
|
|
458
|
+
|
|
459
|
+
Forecast **reconciliation** — making grid (`pgm`) predictions sum to their country
|
|
460
|
+
(`cm`) totals — is a numpy-only frame→frame operation, structurally the same kind of
|
|
461
|
+
thing as `views_frames_summarize` (ADR-017). It is its own sibling package, **not** in
|
|
462
|
+
the leaf and **not** in views-postprocessing (its old, mis-homed host).
|
|
463
|
+
|
|
464
|
+
**Charter.** **May:** forecast-reconciliation algorithms on frames (the per-draw
|
|
465
|
+
top-down proportional method; future methods as sibling modules — the principled
|
|
466
|
+
probabilistic upgrade, C-37); per-sample reconciliation; fail-loud validation; a
|
|
467
|
+
conformance suite. **Must not:** IO; **fetch the `(time, unit) → country` mapping** (it
|
|
468
|
+
is *injected* by the caller as numpy arrays, exactly like `cross_level_align` — ADR-014);
|
|
469
|
+
actuals/scoring (views-evaluation); plotting; or any `views_*` import except
|
|
470
|
+
`views_frames`. Import-DAG: `views_frames_reconcile → {views_frames}`.
|
|
471
|
+
|
|
472
|
+
```python
|
|
473
|
+
import numpy as np
|
|
474
|
+
from views_frames_reconcile import ReconciliationModule
|
|
475
|
+
|
|
476
|
+
# mapping is INJECTED by the caller (sourced from the producer; never fetched here):
|
|
477
|
+
# map_keys: (M, 2) int (time, priogrid_gid) map_vals: (M,) int country_id
|
|
478
|
+
reconciler = ReconciliationModule(map_keys, map_vals)
|
|
479
|
+
pgm_reconciled = reconciler.reconcile(cm_frame, pgm_frame) # new pgm PredictionFrame
|
|
480
|
+
# each (time, country) group's cells now sum, per draw, to the country total
|
|
481
|
+
# (all-zero grid draws stay zero); zeros preserved; non-negative.
|
|
482
|
+
```
|
|
483
|
+
|
|
484
|
+
> **Future DRY pass (deferred).** `grouping.py` labels grid rows by country with the
|
|
485
|
+
> leaf's `cross_level_align_arrays` and overlaps `cross_level_align` (index.py). Folding
|
|
486
|
+
> the two is a separate later story — the v1.7.0 relocation is a faithful **WET** move,
|
|
487
|
+
> proven bit-identical to the original before any refactor.
|
|
488
|
+
|
|
446
489
|
---
|
|
447
490
|
|
|
448
491
|
## 7. On-disk / serialization contract (where "doesn't scale" is actually decided)
|
|
@@ -4,19 +4,22 @@
|
|
|
4
4
|
> containers (`FeatureFrame`, `PredictionFrame`, and their anticipated siblings)
|
|
5
5
|
> that every other repo depends on and that depends on nothing internal.
|
|
6
6
|
>
|
|
7
|
-
> **Status:** **v1.
|
|
7
|
+
> **Status:** **v1.7.0 — frozen API** (frozen since v1.0.0, ADR-018; the v1.1 surface is
|
|
8
8
|
> purely additive — the coherent posterior summary, ADR-019; v1.2.0 rebuilt the tower
|
|
9
9
|
> `outside-in`, C-44; v1.3.0 makes the tower summary distribution-agnostic — no magnitude
|
|
10
10
|
> zeroing by default, register C-45; v1.4.0 adds generic provenance to `FrameMetadata`
|
|
11
11
|
> (`run_id`/`data_version`) and publishes the shared `assert_frame_envelope` checker,
|
|
12
12
|
> ADR-020; v1.5.0 adds the threshold **exceedance** estimator `P(Y > c)`, ADR-021; v1.6.0
|
|
13
|
-
> adds the worst-case **expected_shortfall** estimator, ADR-022
|
|
13
|
+
> adds the worst-case **expected_shortfall** estimator, ADR-022; v1.7.0 adds a third
|
|
14
|
+
> sibling package **`views_frames_reconcile`** — forecast reconciliation, ADR-023). This
|
|
14
15
|
> README is the design
|
|
15
16
|
> bible; the contract it specifies is realised in `src/views_frames/` (index, frames,
|
|
16
17
|
> io, conformance suite) plus the `src/views_frames_summarize/` sibling package
|
|
17
18
|
> (sample-axis summarization — `collapse`/MAP/HDI/quantiles, the coherent-tower estimators
|
|
18
19
|
> `hdi_tower`/`tower_point`/`bimodality`/`summarize_tower`, + cross-level
|
|
19
|
-
> aggregation; ADR-017, ADR-019)
|
|
20
|
+
> aggregation; ADR-017, ADR-019) and the `src/views_frames_reconcile/` sibling package
|
|
21
|
+
> (forecast reconciliation — make grid forecasts sum to country totals per draw; ADR-023).
|
|
22
|
+
> The blocking design decisions are resolved (§13a) and
|
|
20
23
|
> ratified as ADRs 011–018; two rounds of consumer review validated
|
|
21
24
|
> the design. Consumer adoption (re-export shims, pandas migration) is the owner's
|
|
22
25
|
> migration, not this repo's.
|
|
@@ -395,6 +398,14 @@ views-frames/
|
|
|
395
398
|
│ ├── point.py # map_estimate (histogram MAP)
|
|
396
399
|
│ ├── interval.py # hdi, quantiles → arrays aligned to the frame index
|
|
397
400
|
│ └── aggregate.py # conservation-correct cross-level aggregation
|
|
401
|
+
├── src/views_frames_reconcile/ # forecast reconciliation OVER frames (ADR-023)
|
|
402
|
+
│ ├── __init__.py # depends on views_frames + numpy only; never the reverse
|
|
403
|
+
│ ├── proportional.py # reconcile_proportional — per-draw top-down scaling
|
|
404
|
+
│ ├── grouping.py # reconcile_pgm_to_cm — group by (time, country)
|
|
405
|
+
│ ├── frames.py # prediction_frame_from_arrays adapter
|
|
406
|
+
│ ├── validation.py # fail-loud input guards
|
|
407
|
+
│ ├── module.py # ReconciliationModule (holds the injected mapping)
|
|
408
|
+
│ └── conformance.py # assert_reconcile_contract
|
|
398
409
|
└── tests/
|
|
399
410
|
├── conformance/ # the published contract suite consumers re-run (see §9)
|
|
400
411
|
└── unit/
|
|
@@ -417,6 +428,38 @@ Layout rules (these *are* the screaming-architecture requirements):
|
|
|
417
428
|
- A new developer should infer every responsibility from the file tree without
|
|
418
429
|
reading bodies.
|
|
419
430
|
|
|
431
|
+
### 6a. The `views_frames_reconcile` sibling (ADR-023)
|
|
432
|
+
|
|
433
|
+
Forecast **reconciliation** — making grid (`pgm`) predictions sum to their country
|
|
434
|
+
(`cm`) totals — is a numpy-only frame→frame operation, structurally the same kind of
|
|
435
|
+
thing as `views_frames_summarize` (ADR-017). It is its own sibling package, **not** in
|
|
436
|
+
the leaf and **not** in views-postprocessing (its old, mis-homed host).
|
|
437
|
+
|
|
438
|
+
**Charter.** **May:** forecast-reconciliation algorithms on frames (the per-draw
|
|
439
|
+
top-down proportional method; future methods as sibling modules — the principled
|
|
440
|
+
probabilistic upgrade, C-37); per-sample reconciliation; fail-loud validation; a
|
|
441
|
+
conformance suite. **Must not:** IO; **fetch the `(time, unit) → country` mapping** (it
|
|
442
|
+
is *injected* by the caller as numpy arrays, exactly like `cross_level_align` — ADR-014);
|
|
443
|
+
actuals/scoring (views-evaluation); plotting; or any `views_*` import except
|
|
444
|
+
`views_frames`. Import-DAG: `views_frames_reconcile → {views_frames}`.
|
|
445
|
+
|
|
446
|
+
```python
|
|
447
|
+
import numpy as np
|
|
448
|
+
from views_frames_reconcile import ReconciliationModule
|
|
449
|
+
|
|
450
|
+
# mapping is INJECTED by the caller (sourced from the producer; never fetched here):
|
|
451
|
+
# map_keys: (M, 2) int (time, priogrid_gid) map_vals: (M,) int country_id
|
|
452
|
+
reconciler = ReconciliationModule(map_keys, map_vals)
|
|
453
|
+
pgm_reconciled = reconciler.reconcile(cm_frame, pgm_frame) # new pgm PredictionFrame
|
|
454
|
+
# each (time, country) group's cells now sum, per draw, to the country total
|
|
455
|
+
# (all-zero grid draws stay zero); zeros preserved; non-negative.
|
|
456
|
+
```
|
|
457
|
+
|
|
458
|
+
> **Future DRY pass (deferred).** `grouping.py` labels grid rows by country with the
|
|
459
|
+
> leaf's `cross_level_align_arrays` and overlaps `cross_level_align` (index.py). Folding
|
|
460
|
+
> the two is a separate later story — the v1.7.0 relocation is a faithful **WET** move,
|
|
461
|
+
> proven bit-identical to the original before any refactor.
|
|
462
|
+
|
|
420
463
|
---
|
|
421
464
|
|
|
422
465
|
## 7. On-disk / serialization contract (where "doesn't scale" is actually decided)
|
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "views-frames"
|
|
7
|
-
version = "1.
|
|
7
|
+
version = "1.7.0"
|
|
8
8
|
description = "The VIEWS platform data-contract layer: immutable array+identifier frames (numpy only, root of the dependency DAG)."
|
|
9
9
|
authors = [
|
|
10
10
|
{ name = "Simon Polichinel von der Maase", email = "simmaa@prio.org" },
|
|
@@ -52,7 +52,7 @@ dev = [
|
|
|
52
52
|
]
|
|
53
53
|
|
|
54
54
|
[tool.hatch.build.targets.wheel]
|
|
55
|
-
packages = ["src/views_frames", "src/views_frames_summarize"]
|
|
55
|
+
packages = ["src/views_frames", "src/views_frames_summarize", "src/views_frames_reconcile"]
|
|
56
56
|
|
|
57
57
|
[tool.hatch.build.targets.sdist]
|
|
58
58
|
include = ["/src"]
|
|
@@ -87,6 +87,11 @@ select = ["E", "F", "I", "N", "UP", "B", "A", "C4", "SIM"]
|
|
|
87
87
|
# The falsification stubs assert against the README via long, literal regexes
|
|
88
88
|
# whose lines cannot wrap without changing their semantics.
|
|
89
89
|
"tests/test_falsification_*.py" = ["E501"]
|
|
90
|
+
# The reconciliation parity tests + their oracle-regeneration scripts are
|
|
91
|
+
# faithfully relocated from views-postprocessing (Epic 11 / ADR-023); their dense
|
|
92
|
+
# numpy/dict-comprehension assertions are kept verbatim rather than re-wrapped.
|
|
93
|
+
"tests/test_reconciliation_*.py" = ["E501"]
|
|
94
|
+
"scripts/gen_reconciliation_*.py" = ["E501"]
|
|
90
95
|
|
|
91
96
|
[tool.mypy]
|
|
92
97
|
python_version = "3.10"
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"""Forecast reconciliation (pgm forecasts reconciled to cm totals).
|
|
2
|
+
|
|
3
|
+
Slice 1 ports the top-down proportional method from views-reporting as a pure
|
|
4
|
+
numpy function. New methods (e.g. principled probabilistic reconciliation, C-37)
|
|
5
|
+
should be added as sibling modules, not by modifying ``proportional``.
|
|
6
|
+
"""
|
|
7
|
+
|
|
8
|
+
from views_frames_reconcile.module import ReconciliationModule
|
|
9
|
+
from views_frames_reconcile.proportional import reconcile_proportional
|
|
10
|
+
|
|
11
|
+
__all__ = ["ReconciliationModule", "reconcile_proportional"]
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"""Conformance checks for the reconcile package (ADR-023).
|
|
2
|
+
|
|
3
|
+
A consumer can re-run these against its own frame factories to confirm the reconciler
|
|
4
|
+
behaves: grid (``pgm``) predictions sum, per draw, to their country (``cm``) totals
|
|
5
|
+
(except all-zero grid draws, which stay zero — the documented edge); zeros preserved;
|
|
6
|
+
values stay non-negative; the output is a same-shape ``pgm`` ``PredictionFrame`` at PGM
|
|
7
|
+
level; and the cm/pgm mapping is **injected, never fetched** (ADR-014/ADR-023).
|
|
8
|
+
|
|
9
|
+
Mirrors ``views_frames_summarize/conformance.py:assert_summarizer_contract``.
|
|
10
|
+
"""
|
|
11
|
+
|
|
12
|
+
from __future__ import annotations
|
|
13
|
+
|
|
14
|
+
from typing import Any
|
|
15
|
+
|
|
16
|
+
import numpy as np
|
|
17
|
+
from numpy.typing import NDArray
|
|
18
|
+
|
|
19
|
+
from views_frames import PredictionFrame, SpatialLevel
|
|
20
|
+
from views_frames_reconcile.module import ReconciliationModule
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
def assert_reconcile_contract(
|
|
24
|
+
cm_frame: PredictionFrame,
|
|
25
|
+
pgm_frame: PredictionFrame,
|
|
26
|
+
map_keys: NDArray[np.integer[Any]] | object,
|
|
27
|
+
map_vals: NDArray[np.integer[Any]] | object,
|
|
28
|
+
) -> None:
|
|
29
|
+
"""Assert the reconciler obeys its contract on ``(cm_frame, pgm_frame, mapping)``.
|
|
30
|
+
|
|
31
|
+
The mapping is **injected** (``map_keys``/``map_vals`` arrays) — never fetched
|
|
32
|
+
(enforced by the signature + the import-DAG; honoured here by the sum-to-country
|
|
33
|
+
law, which only holds if each cell is grouped under its injected country).
|
|
34
|
+
|
|
35
|
+
Raises:
|
|
36
|
+
AssertionError: a contract law is violated.
|
|
37
|
+
"""
|
|
38
|
+
mk = np.asarray(map_keys)
|
|
39
|
+
mv = np.asarray(map_vals)
|
|
40
|
+
out = ReconciliationModule(mk, mv).reconcile(cm_frame, pgm_frame)
|
|
41
|
+
|
|
42
|
+
# 1. Output type / shape / level / index: a same-shape pgm PredictionFrame at PGM.
|
|
43
|
+
assert type(out) is type(pgm_frame), "reconcile must return the pgm frame type"
|
|
44
|
+
assert out.values.shape == pgm_frame.values.shape, "reconcile must preserve (N, S)"
|
|
45
|
+
assert out.index.level is SpatialLevel.PGM, "reconciled frame stays at PGM level"
|
|
46
|
+
assert np.array_equal(out.index.time, pgm_frame.index.time), "time index preserved"
|
|
47
|
+
assert np.array_equal(out.index.unit, pgm_frame.index.unit), "unit index preserved"
|
|
48
|
+
|
|
49
|
+
# 2. Non-negativity.
|
|
50
|
+
assert bool((out.values >= 0).all()), "reconciled forecasts must be non-negative"
|
|
51
|
+
|
|
52
|
+
# 3. Zero-preservation: an input zero cell stays zero.
|
|
53
|
+
assert bool((out.values[pgm_frame.values == 0] == 0).all()), "zeros preserved"
|
|
54
|
+
|
|
55
|
+
# 4. Sum-to-country per draw: each (time, country) group's cells sum, per draw, to
|
|
56
|
+
# its country total — except all-zero input draws, which stay zero (the edge).
|
|
57
|
+
cm_units = pgm_frame.index.cross_level_align_arrays(mk, mv, SpatialLevel.CM).unit
|
|
58
|
+
pg_time = pgm_frame.index.time
|
|
59
|
+
cm_pos = {
|
|
60
|
+
(int(t), int(u)): j
|
|
61
|
+
for j, (t, u) in enumerate(
|
|
62
|
+
zip(cm_frame.index.time, cm_frame.index.unit, strict=True)
|
|
63
|
+
)
|
|
64
|
+
}
|
|
65
|
+
for t, c in np.unique(np.stack([pg_time, cm_units], axis=1), axis=0):
|
|
66
|
+
rows = (pg_time == t) & (cm_units == c)
|
|
67
|
+
in_sum = pgm_frame.values[rows].sum(axis=0) # (S,)
|
|
68
|
+
out_sum = out.values[rows].sum(axis=0) # (S,)
|
|
69
|
+
total = cm_frame.values[cm_pos[(int(t), int(c))]] # (S,)
|
|
70
|
+
active = in_sum != 0
|
|
71
|
+
np.testing.assert_allclose(
|
|
72
|
+
out_sum[active], total[active], rtol=1e-4, atol=1e-3
|
|
73
|
+
)
|
|
74
|
+
assert bool((out_sum[~active] == 0).all()), "all-zero draws stay zero"
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"""Array → `PredictionFrame` adapters for reconciliation (epic #31, story #33).
|
|
2
|
+
|
|
3
|
+
Reconciliation works on views-frames `PredictionFrame`s at two spatial levels:
|
|
4
|
+
country (`cm`) and PRIO-GRID (`pgm`). Both are built the same way from
|
|
5
|
+
`(time, unit, values)` arrays — only the `SpatialLevel` and the unit identifier
|
|
6
|
+
(`country_id` vs `priogrid_gid`) differ. Predictions here carry a real posterior
|
|
7
|
+
sample axis, so values are `(N, S)` with `S >= 1`.
|
|
8
|
+
|
|
9
|
+
This is the reconciliation package's **own** I/O: it differs from the unfao
|
|
10
|
+
delivery adapters (`unfao/frames.py`), which wrap pandas *scalar* columns as
|
|
11
|
+
`(N, 1)` point frames — so per CRP they are not forced together. numpy +
|
|
12
|
+
views-frames only; no torch, no pandas.
|
|
13
|
+
"""
|
|
14
|
+
|
|
15
|
+
from __future__ import annotations
|
|
16
|
+
|
|
17
|
+
from typing import Any
|
|
18
|
+
|
|
19
|
+
import numpy as np
|
|
20
|
+
from numpy.typing import NDArray
|
|
21
|
+
|
|
22
|
+
from views_frames import (
|
|
23
|
+
FrameMetadata,
|
|
24
|
+
PredictionFrame,
|
|
25
|
+
SpatialLevel,
|
|
26
|
+
SpatioTemporalIndex,
|
|
27
|
+
)
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def prediction_frame_from_arrays(
|
|
31
|
+
time: NDArray[np.integer[Any]] | object,
|
|
32
|
+
unit: NDArray[np.integer[Any]] | object,
|
|
33
|
+
values: NDArray[np.floating[Any]] | object,
|
|
34
|
+
*,
|
|
35
|
+
level: SpatialLevel,
|
|
36
|
+
metadata: FrameMetadata | None = None,
|
|
37
|
+
) -> PredictionFrame:
|
|
38
|
+
"""Build a `PredictionFrame` from `(time, unit, values)` at ``level``.
|
|
39
|
+
|
|
40
|
+
Args:
|
|
41
|
+
time: 1-D integer array, length ``N`` (``month_id``).
|
|
42
|
+
unit: 1-D integer array, length ``N`` — ``country_id`` for
|
|
43
|
+
``SpatialLevel.CM``, ``priogrid_gid`` for ``SpatialLevel.PGM``.
|
|
44
|
+
values: ``(N, S)`` float32-coercible array of posterior samples.
|
|
45
|
+
level: the frame's spatial level.
|
|
46
|
+
|
|
47
|
+
Returns:
|
|
48
|
+
A `PredictionFrame` of shape ``(N, S)`` at ``level``. The values buffer
|
|
49
|
+
is reused without copy when already float32 (views-frames C-07); the
|
|
50
|
+
input arrays are never mutated.
|
|
51
|
+
|
|
52
|
+
Raises:
|
|
53
|
+
ValueError: ``values`` is not 2-D, or ``time``/``unit`` are not 1-D of
|
|
54
|
+
length ``N``.
|
|
55
|
+
"""
|
|
56
|
+
time_arr = np.asarray(time, dtype=np.int64)
|
|
57
|
+
unit_arr = np.asarray(unit, dtype=np.int64)
|
|
58
|
+
vals = np.asarray(values, dtype=np.float32)
|
|
59
|
+
|
|
60
|
+
if vals.ndim != 2:
|
|
61
|
+
raise ValueError(f"values must be 2-D (N, S); got ndim={vals.ndim}")
|
|
62
|
+
if time_arr.shape != (vals.shape[0],) or unit_arr.shape != (vals.shape[0],):
|
|
63
|
+
raise ValueError(
|
|
64
|
+
f"time {time_arr.shape} and unit {unit_arr.shape} must both be 1-D "
|
|
65
|
+
f"of length N={vals.shape[0]}"
|
|
66
|
+
)
|
|
67
|
+
|
|
68
|
+
index = SpatioTemporalIndex(time=time_arr, unit=unit_arr, level=level)
|
|
69
|
+
return PredictionFrame(vals, index, metadata)
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"""Reconcile a pgm `PredictionFrame` to cm country totals (epic #31, story #34).
|
|
2
|
+
|
|
3
|
+
The heart of the migration: for each `(time, country)`, scale that country's grid
|
|
4
|
+
cells so their per-draw sum matches the country forecast, using the parity-proven
|
|
5
|
+
leaf `reconcile_proportional` (PR #30). Grid rows are labelled by country with
|
|
6
|
+
views-frames `cross_level_align` — the sanctioned cm↔pgm primitive, which fails
|
|
7
|
+
loud if any grid row lacks a country (mirrors the original's "valid countries"
|
|
8
|
+
guard). De-mutated: returns a **new** pgm frame (C-184); the input is untouched.
|
|
9
|
+
|
|
10
|
+
numpy + views-frames only. The loop is over `(time, country)` groups (a small
|
|
11
|
+
number), not over rows; each group call is fully vectorised over cells × samples.
|
|
12
|
+
"""
|
|
13
|
+
|
|
14
|
+
from __future__ import annotations
|
|
15
|
+
|
|
16
|
+
from typing import Any
|
|
17
|
+
|
|
18
|
+
import numpy as np
|
|
19
|
+
from numpy.typing import NDArray
|
|
20
|
+
|
|
21
|
+
from views_frames import PredictionFrame, SpatialLevel
|
|
22
|
+
from views_frames_reconcile.proportional import reconcile_proportional
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def reconcile_pgm_to_cm(
|
|
26
|
+
pgm_frame: PredictionFrame,
|
|
27
|
+
cm_frame: PredictionFrame,
|
|
28
|
+
map_keys: NDArray[np.integer[Any]] | object,
|
|
29
|
+
map_vals: NDArray[np.integer[Any]] | object,
|
|
30
|
+
) -> PredictionFrame:
|
|
31
|
+
"""Return a new pgm `PredictionFrame` reconciled to ``cm_frame``'s totals.
|
|
32
|
+
|
|
33
|
+
Args:
|
|
34
|
+
pgm_frame: grid forecasts at PGM level, values ``(N_pg, S)``.
|
|
35
|
+
cm_frame: country forecasts at CM level, values ``(N_cm, S)``.
|
|
36
|
+
map_keys: ``(M, 2)`` int ``(time, priogrid_gid)`` covering every pgm row.
|
|
37
|
+
map_vals: ``(M,)`` int ``country_id`` for each key (injected; geography is
|
|
38
|
+
never embedded here — views-frames ADR-014).
|
|
39
|
+
|
|
40
|
+
Returns:
|
|
41
|
+
A new pgm `PredictionFrame` (same index/metadata as ``pgm_frame``) whose
|
|
42
|
+
cells sum, per draw, to the country forecast — except all-zero country
|
|
43
|
+
draws, which stay zero (the leaf's documented edge case).
|
|
44
|
+
|
|
45
|
+
Raises:
|
|
46
|
+
ValueError: a grid row has no country mapping (raised by
|
|
47
|
+
``cross_level_align``), or a ``(time, country)`` group has no matching
|
|
48
|
+
country forecast in ``cm_frame``.
|
|
49
|
+
"""
|
|
50
|
+
# 1. Label every grid row with its country (cm-level units); fails loud if a
|
|
51
|
+
# row's (time, priogrid) is absent from the injected mapping.
|
|
52
|
+
cm_units = pgm_frame.index.cross_level_align_arrays(
|
|
53
|
+
np.asarray(map_keys), np.asarray(map_vals), SpatialLevel.CM
|
|
54
|
+
).unit # (N_pg,)
|
|
55
|
+
pg_time = pgm_frame.index.time
|
|
56
|
+
|
|
57
|
+
# 2. (time, country) -> row position in the country frame.
|
|
58
|
+
cm_time = cm_frame.index.time
|
|
59
|
+
cm_unit = cm_frame.index.unit
|
|
60
|
+
cm_vals = cm_frame.values
|
|
61
|
+
cm_pos = {(int(cm_time[j]), int(cm_unit[j])): j for j in range(cm_frame.n_rows)}
|
|
62
|
+
|
|
63
|
+
# 3. Group grid rows by (time, country) and reconcile each group with the leaf.
|
|
64
|
+
# Group-by-sort: a single argsort lays the rows out contiguously per group
|
|
65
|
+
# (O(N log N), one index array) — no per-group full-array scan — so it
|
|
66
|
+
# scales to the full grid (register C-38). Group iteration order is
|
|
67
|
+
# irrelevant: each group writes only its own rows.
|
|
68
|
+
pg_vals = pgm_frame.values
|
|
69
|
+
out = np.empty_like(pg_vals)
|
|
70
|
+
group_key = np.stack([pg_time, cm_units], axis=1) # (N_pg, 2)
|
|
71
|
+
unique_groups, inverse, counts = np.unique(
|
|
72
|
+
group_key, axis=0, return_inverse=True, return_counts=True
|
|
73
|
+
)
|
|
74
|
+
inverse = np.asarray(inverse).reshape(-1)
|
|
75
|
+
order = np.argsort(inverse, kind="stable") # rows grouped contiguously by group
|
|
76
|
+
# group gi -> order[bounds[gi]:bounds[gi + 1]]
|
|
77
|
+
bounds = np.concatenate(([0], np.cumsum(counts)))
|
|
78
|
+
|
|
79
|
+
for gi in range(unique_groups.shape[0]):
|
|
80
|
+
t, c = int(unique_groups[gi, 0]), int(unique_groups[gi, 1])
|
|
81
|
+
if (t, c) not in cm_pos:
|
|
82
|
+
raise ValueError(
|
|
83
|
+
f"grid group (time={t}, country={c}) has no country forecast "
|
|
84
|
+
"in cm_frame"
|
|
85
|
+
)
|
|
86
|
+
rows = order[bounds[gi]:bounds[gi + 1]]
|
|
87
|
+
country_total = cm_vals[cm_pos[(t, c)]] # (S,)
|
|
88
|
+
# leaf convention: grid is (samples, cells); our frame slice is (cells, samples)
|
|
89
|
+
scaled = reconcile_proportional(pg_vals[rows].T, country_total) # (S, n_cells)
|
|
90
|
+
out[rows] = scaled.T # back to (n_cells, S)
|
|
91
|
+
|
|
92
|
+
return PredictionFrame(out, pgm_frame.index, pgm_frame.metadata)
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"""Frames-native reconciliation orchestration (epic #31, story #36).
|
|
2
|
+
|
|
3
|
+
`ReconciliationModule` holds the injected `(time, priogrid_gid) -> country_id`
|
|
4
|
+
mapping (geography is injected, never embedded — views-frames ADR-014) and
|
|
5
|
+
applies it: `reconcile(cm_frame, pgm_frame)` validates the inputs and scales the
|
|
6
|
+
grid forecasts to the country totals, returning a **new** pgm frame (de-mutated,
|
|
7
|
+
C-184).
|
|
8
|
+
|
|
9
|
+
**SRP:** orchestration only — the scaling math is the leaf (`proportional`), the
|
|
10
|
+
grouping is `grouping`, the guards are `validation`, the I/O is `frames`. No
|
|
11
|
+
torch, no pandas, no viewser, no wandb: the original's `ProcessPoolExecutor` and
|
|
12
|
+
WandB alerting are dropped (numpy is fast; there is no GPU). If scale ever needs
|
|
13
|
+
parallelism, add it behind this same interface (OCP). Multi-target inputs are
|
|
14
|
+
reconciled by calling `reconcile` once per target.
|
|
15
|
+
"""
|
|
16
|
+
|
|
17
|
+
from __future__ import annotations
|
|
18
|
+
|
|
19
|
+
from typing import Any
|
|
20
|
+
|
|
21
|
+
import numpy as np
|
|
22
|
+
from numpy.typing import NDArray
|
|
23
|
+
|
|
24
|
+
from views_frames import PredictionFrame
|
|
25
|
+
from views_frames_reconcile.grouping import reconcile_pgm_to_cm
|
|
26
|
+
from views_frames_reconcile.validation import validate_reconciliation_inputs
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
class ReconciliationModule:
|
|
30
|
+
"""Reconcile pgm forecasts to cm country totals (one target per call)."""
|
|
31
|
+
|
|
32
|
+
def __init__(
|
|
33
|
+
self,
|
|
34
|
+
map_keys: NDArray[np.integer[Any]] | object,
|
|
35
|
+
map_vals: NDArray[np.integer[Any]] | object,
|
|
36
|
+
) -> None:
|
|
37
|
+
"""Inject the `(time, priogrid_gid) -> country_id` mapping.
|
|
38
|
+
|
|
39
|
+
Args:
|
|
40
|
+
map_keys: ``(M, 2)`` int array of ``(time, priogrid_gid)`` pairs.
|
|
41
|
+
map_vals: ``(M,)`` int ``country_id`` for each key.
|
|
42
|
+
|
|
43
|
+
Raises:
|
|
44
|
+
ValueError: ``map_keys`` is not ``(M, 2)`` or ``map_vals`` is not
|
|
45
|
+
length ``M``.
|
|
46
|
+
"""
|
|
47
|
+
keys = np.asarray(map_keys)
|
|
48
|
+
vals = np.asarray(map_vals)
|
|
49
|
+
if keys.ndim != 2 or keys.shape[1] != 2:
|
|
50
|
+
raise ValueError("map_keys must be an (M, 2) array of (time, priogrid_gid)")
|
|
51
|
+
if vals.shape != (keys.shape[0],):
|
|
52
|
+
raise ValueError("map_vals must be a length-M array aligned to map_keys")
|
|
53
|
+
self._map_keys = keys
|
|
54
|
+
self._map_vals = vals
|
|
55
|
+
|
|
56
|
+
def reconcile(
|
|
57
|
+
self, cm_frame: PredictionFrame, pgm_frame: PredictionFrame
|
|
58
|
+
) -> PredictionFrame:
|
|
59
|
+
"""Validate the inputs, then return a new pgm frame reconciled to cm totals.
|
|
60
|
+
|
|
61
|
+
Raises:
|
|
62
|
+
ValueError: the inputs fail validation (level / sample-count / time
|
|
63
|
+
coverage / missing country forecast).
|
|
64
|
+
"""
|
|
65
|
+
validate_reconciliation_inputs(
|
|
66
|
+
cm_frame, pgm_frame, self._map_keys, self._map_vals
|
|
67
|
+
)
|
|
68
|
+
return reconcile_pgm_to_cm(pgm_frame, cm_frame, self._map_keys, self._map_vals)
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
"""Top-down proportional reconciliation (numpy port — phase 2, slice 1).
|
|
2
|
+
|
|
3
|
+
Makes PRIO-GRID-month (pgm) forecasts sum to their country-month (cm) total by
|
|
4
|
+
**top-down disaggregation using forecast proportions** (FPP3 terminology),
|
|
5
|
+
applied **per posterior draw**: within a draw, each grid cell keeps its relative
|
|
6
|
+
share and the cells are rescaled so they sum to that draw's country total. Zeros
|
|
7
|
+
stay zero; country totals are authoritative; the result is non-negative.
|
|
8
|
+
|
|
9
|
+
This is a *faithful, numpy-only* port of views-reporting's
|
|
10
|
+
``ForecastReconciler.reconcile_forecast`` (torch), migrated here because the
|
|
11
|
+
algorithm belongs in post-processing, not reporting (views-reporting issue #72).
|
|
12
|
+
It is intentionally the **same** method — a pragmatic per-draw approximation, not
|
|
13
|
+
principled joint probabilistic reconciliation. The upgrade to the latter is
|
|
14
|
+
tracked as **C-37** and is deliberately deferred until this port's parity with
|
|
15
|
+
the original is proven and the move is wired.
|
|
16
|
+
|
|
17
|
+
No torch, no pandas — numpy only.
|
|
18
|
+
"""
|
|
19
|
+
|
|
20
|
+
from __future__ import annotations
|
|
21
|
+
|
|
22
|
+
from typing import Any
|
|
23
|
+
|
|
24
|
+
import numpy as np
|
|
25
|
+
from numpy.typing import NDArray
|
|
26
|
+
|
|
27
|
+
_EPS = np.float32(1e-8)
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
def reconcile_proportional(
|
|
31
|
+
grid: NDArray[np.floating[Any]] | object,
|
|
32
|
+
country: NDArray[np.floating[Any]] | float | object,
|
|
33
|
+
) -> NDArray[np.float32]:
|
|
34
|
+
"""Rescale grid forecasts so each draw sums to its country total.
|
|
35
|
+
|
|
36
|
+
Args:
|
|
37
|
+
grid: Grid-level forecasts, float32-coercible. Either
|
|
38
|
+
``(num_samples, num_grid_cells)`` (probabilistic) or
|
|
39
|
+
``(num_grid_cells,)`` (point).
|
|
40
|
+
country: Country-level total. Either ``(num_samples,)`` (probabilistic)
|
|
41
|
+
or a scalar (point). Must align with ``grid``'s sample axis.
|
|
42
|
+
|
|
43
|
+
Returns:
|
|
44
|
+
Adjusted grid forecasts, float32, same shape as ``grid``. ``sum`` over
|
|
45
|
+
grid cells equals ``country`` per sample; zero cells stay zero; values
|
|
46
|
+
are clamped to be non-negative.
|
|
47
|
+
|
|
48
|
+
Raises:
|
|
49
|
+
ValueError: the grid and country sample counts disagree.
|
|
50
|
+
"""
|
|
51
|
+
grid_arr = np.asarray(grid, dtype=np.float32)
|
|
52
|
+
is_point = grid_arr.ndim == 1
|
|
53
|
+
|
|
54
|
+
if is_point:
|
|
55
|
+
grid_arr = grid_arr[np.newaxis, :] # (1, N)
|
|
56
|
+
country_arr = np.asarray([country], dtype=np.float32)
|
|
57
|
+
else:
|
|
58
|
+
country_arr = np.asarray(country, dtype=np.float32).reshape(-1)
|
|
59
|
+
|
|
60
|
+
if grid_arr.shape[0] != country_arr.shape[0]:
|
|
61
|
+
raise ValueError(
|
|
62
|
+
f"Mismatch in sample count: grid has {grid_arr.shape[0]}, "
|
|
63
|
+
f"country has {country_arr.shape[0]}"
|
|
64
|
+
)
|
|
65
|
+
|
|
66
|
+
# Preserve zeros: only strictly-positive cells carry probability mass.
|
|
67
|
+
nonzero = np.where(grid_arr > 0, grid_arr, np.float32(0.0))
|
|
68
|
+
|
|
69
|
+
# Per-draw proportional scaling to the (authoritative) country total.
|
|
70
|
+
sum_nonzero = nonzero.sum(axis=1, keepdims=True) # (S, 1)
|
|
71
|
+
scaling = country_arr.reshape(-1, 1) / (sum_nonzero + _EPS) # (S, 1)
|
|
72
|
+
adjusted = np.clip(nonzero * scaling, 0.0, None).astype(np.float32)
|
|
73
|
+
|
|
74
|
+
return np.asarray(adjusted[0] if is_point else adjusted, dtype=np.float32)
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"""Fail-loud validation for reconciliation inputs (epic #31, story #35).
|
|
2
|
+
|
|
3
|
+
Ports views-reporting `ReconciliationModule.__init__`'s guards to frames-native
|
|
4
|
+
checks, run before any work. SRP: small, independently testable helpers — not
|
|
5
|
+
buried in the orchestrator. The original's intents map as:
|
|
6
|
+
|
|
7
|
+
- dataset type checks -> spatial-level guard (cm@CM, pgm@PGM)
|
|
8
|
+
- same time steps + exact overlap -> identical set of time values
|
|
9
|
+
- (per-draw scaling needs it) -> equal `sample_count`
|
|
10
|
+
- valid countries -> every (time, country) the grid maps to has
|
|
11
|
+
a country forecast in the cm frame
|
|
12
|
+
|
|
13
|
+
The original's "different time units" (e.g. month_id vs year_id) check is
|
|
14
|
+
subsumed by the level guard; per-target intersection is handled by the
|
|
15
|
+
orchestrator, since frames here are single-target.
|
|
16
|
+
"""
|
|
17
|
+
|
|
18
|
+
from __future__ import annotations
|
|
19
|
+
|
|
20
|
+
from typing import Any
|
|
21
|
+
|
|
22
|
+
import numpy as np
|
|
23
|
+
from numpy.typing import NDArray
|
|
24
|
+
|
|
25
|
+
from views_frames import PredictionFrame, SpatialLevel
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
def validate_reconciliation_inputs(
|
|
29
|
+
cm_frame: PredictionFrame,
|
|
30
|
+
pgm_frame: PredictionFrame,
|
|
31
|
+
map_keys: NDArray[np.integer[Any]] | object,
|
|
32
|
+
map_vals: NDArray[np.integer[Any]] | object,
|
|
33
|
+
) -> None:
|
|
34
|
+
"""Raise ``ValueError`` if the reconciliation inputs are inconsistent.
|
|
35
|
+
|
|
36
|
+
Checks spatial levels, sample-count alignment, identical time coverage, and
|
|
37
|
+
that every country the grid maps to has a forecast in ``cm_frame``.
|
|
38
|
+
"""
|
|
39
|
+
if cm_frame.index.level is not SpatialLevel.CM:
|
|
40
|
+
raise ValueError(
|
|
41
|
+
f"country frame must be at SpatialLevel.CM, got {cm_frame.index.level}"
|
|
42
|
+
)
|
|
43
|
+
if pgm_frame.index.level is not SpatialLevel.PGM:
|
|
44
|
+
raise ValueError(
|
|
45
|
+
f"grid frame must be at SpatialLevel.PGM, got {pgm_frame.index.level}"
|
|
46
|
+
)
|
|
47
|
+
if cm_frame.sample_count != pgm_frame.sample_count:
|
|
48
|
+
raise ValueError(
|
|
49
|
+
f"sample-count mismatch: cm has {cm_frame.sample_count}, "
|
|
50
|
+
f"pgm has {pgm_frame.sample_count}"
|
|
51
|
+
)
|
|
52
|
+
|
|
53
|
+
cm_times = {int(t) for t in np.unique(cm_frame.index.time)}
|
|
54
|
+
pg_times = {int(t) for t in np.unique(pgm_frame.index.time)}
|
|
55
|
+
if cm_times != pg_times:
|
|
56
|
+
raise ValueError(
|
|
57
|
+
"cm and pgm cover different time steps: "
|
|
58
|
+
f"cm-only={sorted(cm_times - pg_times)}, "
|
|
59
|
+
f"pgm-only={sorted(pg_times - cm_times)}"
|
|
60
|
+
)
|
|
61
|
+
|
|
62
|
+
# Valid countries: every (time, country) the grid maps to must have a forecast.
|
|
63
|
+
cm_units = pgm_frame.index.cross_level_align_arrays(
|
|
64
|
+
np.asarray(map_keys), np.asarray(map_vals), SpatialLevel.CM
|
|
65
|
+
).unit
|
|
66
|
+
needed = {
|
|
67
|
+
(int(t), int(c))
|
|
68
|
+
for t, c in zip(pgm_frame.index.time, cm_units, strict=True)
|
|
69
|
+
}
|
|
70
|
+
have = {
|
|
71
|
+
(int(t), int(c))
|
|
72
|
+
for t, c in zip(cm_frame.index.time, cm_frame.index.unit, strict=True)
|
|
73
|
+
}
|
|
74
|
+
missing = needed - have
|
|
75
|
+
if missing:
|
|
76
|
+
raise ValueError(
|
|
77
|
+
f"{len(missing)} grid group(s) have no country forecast in cm_frame, "
|
|
78
|
+
f"e.g. {sorted(missing)[:5]}"
|
|
79
|
+
)
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|