fix(landscape): func_zoning ranks the original P suitability rasters, not C
The reference notebook ("Three scenarios" cells) and zoning_core.py feed E plus
the five P_* WEIGHTED_CLASS rasters into functional zoning; the diagram folder
300-…-Equals_102_202 pointing at the C layers was a drawing error. C_k =
min(P_k, E) stay diagnostic conflict layers. Node 30 keeps its code/stage;
its changed inputs change every fingerprint, so V1–V3 recompute on the next run.
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
@@ -152,7 +152,7 @@ concurrently.
|
||||
| 10 | e_ecological_constraint | `lp-z-integrated`, `lp-u-integrated` | `lp-e` |
|
||||
| 20 | c_conflicts | `lp-p-irrigation`, `lp-p-snow`, `lp-p-crop`, `lp-p-pasture`, `lp-p-tourism`, `lp-e` | `lp-c-irrigation`, `lp-c-snow`, `lp-c-crop`, `lp-c-pasture`, `lp-c-tourism` |
|
||||
| 21 | p_max | five P groups | `lp-p-max` |
|
||||
| 30 | func_zoning | `lp-e`, five C groups | `lp-v1-conservative`, `lp-v2-balanced`, `lp-v3-development` |
|
||||
| 30 | func_zoning | `lp-e`, five P groups (original suitability) | `lp-v1-conservative`, `lp-v2-balanced`, `lp-v3-development` |
|
||||
| 31 | c_max | five C groups | `lp-c-max` |
|
||||
|
||||
Sector order everywhere: 1 irrigation, 2 snow, 3 crop, 4 pasture, 5 tourism.
|
||||
@@ -172,9 +172,10 @@ float32 score to a class: `<= 1.8 → 1`, `<= 2.6 → 2`, `<= 3.4 → 3`, `<= 4.
|
||||
| e_ecological_constraint | Z ∧ U valid | `max(Z, U)` |
|
||||
| c_conflicts | `P_j` ∧ E valid | `min(P_j, E)` per sector |
|
||||
| p_max / c_max | at least one input valid | `max` over the valid ones |
|
||||
| func_zoning | E valid ∧ at least one `C_k` valid | winning sector + 1, else 1 |
|
||||
| func_zoning | E valid ∧ at least one `P_k` valid | winning sector + 1, else 1 |
|
||||
|
||||
Functional zoning takes `S_k = C_k`. A sector is a candidate when `S_k` and `E`
|
||||
Functional zoning takes `S_k = P_k`, the original suitability rasters (the conflict
|
||||
layers `C_k` are diagnostics and are not zoning inputs). A sector is a candidate when `S_k` and `E`
|
||||
are valid and the scenario rule holds — V1: `E <= 2 && S >= v1_min_s_e12` or
|
||||
`E == 3 && S >= v1_min_s_e3`; V2: `E <= 2`, or `E == 3 && S >= v2_min_s_e3`, or
|
||||
`E == 4 && S >= v2_min_s_e4`; V3: `E <= 4`. With no candidate the pixel is class
|
||||
|
||||
Reference in New Issue
Block a user