fix(simulation): address believability-stack review — all findings processed
Stack review (Hoshe + Tyre) of T-1083+T-1082+T-1080. Every finding fixed or disposed: - believability.rs sample_indices: replace the rejection-sampling loop (could stall when n ≈ take) with deterministic partial Fisher-Yates — O(n), guaranteed termination, distinct, sorted (Hoshe+Tyre). - believability.rs drainage proxy: exclude water-body districts (all elev 0, no banks) and require both wet + dry voxels — they were passing vacuously and inflating the metric (Hoshe). - believability.rs read_cities: log skipped malformed rows instead of dropping silently (Hoshe). - voxel.rs: add the 3 WaterBody zones to all_families_no_panic_at_extreme_positions + fix the "7 families" comment (Hoshe). - climate_constants.toml: bold warning that [moisture_gradient] is not loaded until T-1032 — tune ClimateConstants::default() (Tyre). - Q-123: record the per-zone "water renders wet" threshold + the land-relative vegetation-present denominator as calibration items (Tyre + the open 7th criterion). - T-1083 ticket: note the sampling-fix attribution (landed in the T-1082 commit). Believability golden regenerated (sampler + drainage fixes moved the metrics). clippy --all-targets -D warnings clean; 1580 lib tests + harness pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -230,14 +230,15 @@ pub fn analyze(
|
||||
coh.vegetated_districts += 1;
|
||||
}
|
||||
|
||||
// Drainage monotonicity (active-channel districts): a channel must render wet
|
||||
// AND its water must sit at/below the dry-land mean elevation. A district whose
|
||||
// channel renders no water (the T-1082 failure) fails this too — vacuously
|
||||
// non-monotonic, which is the believability-correct verdict.
|
||||
if ctx.has_active_channel {
|
||||
// Drainage monotonicity — LAND channels only (a river must sit at/below its
|
||||
// banks). Water-body districts (ocean/lake/tidal) are all-wet at sea level with
|
||||
// no dry banks, so they are excluded: counting them would pass the check
|
||||
// vacuously (dry_n == 0) and inflate the metric. The check therefore requires
|
||||
// both wet channel voxels AND dry bank voxels in the sample.
|
||||
if ctx.has_active_channel && prof.ocean_fraction_q < WATER_PRESENCE_Q {
|
||||
coh.drainage_samples += 1;
|
||||
let wet_below_land =
|
||||
wet_n > 0 && (dry_n == 0 || wet_elev_sum / wet_n <= dry_elev_sum / dry_n.max(1));
|
||||
wet_n > 0 && dry_n > 0 && wet_elev_sum / wet_n <= dry_elev_sum / dry_n;
|
||||
if wet_below_land {
|
||||
coh.drainage_monotonic += 1;
|
||||
}
|
||||
@@ -348,27 +349,33 @@ fn district_centre_chunk(dp: DistrictPos) -> ChunkPos {
|
||||
)
|
||||
}
|
||||
|
||||
/// Deterministic seeded spread of up to `take` distinct indices in `0..n` — a
|
||||
/// reproducible "random" sample across the whole district list (D-245's
|
||||
/// randomly-sampled-anywhere requirement), unbiased unlike a contiguous prefix.
|
||||
/// Returns all of `0..n` when `n <= take`. splitmix64 mixing keyed on the world seed.
|
||||
/// Deterministic seeded spread of `take` distinct indices in `0..n` — a reproducible
|
||||
/// "random" sample across the whole district list (D-245's randomly-sampled-anywhere
|
||||
/// requirement), unbiased unlike a contiguous prefix. Returns all of `0..n` when
|
||||
/// `n <= take`.
|
||||
///
|
||||
/// Partial Fisher-Yates over a splitmix64 stream keyed on the world seed: O(n),
|
||||
/// **guaranteed to terminate**, distinct by construction, sorted for stable
|
||||
/// (BTreeMap-order) consumption. (A rejection-sampling loop would stall as `n → take`,
|
||||
/// since splitmix64 output is not a permutation — the hazard this replaces.)
|
||||
fn sample_indices(world_seed: u64, n: usize, take: usize) -> Vec<usize> {
|
||||
if n <= take {
|
||||
return (0..n).collect();
|
||||
}
|
||||
let mut picked: BTreeSet<usize> = BTreeSet::new();
|
||||
let mut i: u64 = 0;
|
||||
while picked.len() < take {
|
||||
let mut z = world_seed
|
||||
.wrapping_add(i)
|
||||
.wrapping_add(0x9E37_79B9_7F4A_7C15);
|
||||
let mut idx: Vec<usize> = (0..n).collect();
|
||||
let mut state = world_seed;
|
||||
for i in 0..take {
|
||||
state = state.wrapping_add(0x9E37_79B9_7F4A_7C15);
|
||||
let mut z = state;
|
||||
z = (z ^ (z >> 30)).wrapping_mul(0xBF58_476D_1CE4_E5B9);
|
||||
z = (z ^ (z >> 27)).wrapping_mul(0x94D0_49BB_1331_11EB);
|
||||
z ^= z >> 31;
|
||||
picked.insert((z % n as u64) as usize);
|
||||
i += 1;
|
||||
let j = i + (z % (n - i) as u64) as usize;
|
||||
idx.swap(i, j);
|
||||
}
|
||||
picked.into_iter().collect()
|
||||
let mut chosen = idx[..take].to_vec();
|
||||
chosen.sort_unstable();
|
||||
chosen
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
@@ -448,7 +455,14 @@ fn read_cities(db: &PathBuf, body_id: &str) -> Result<Vec<CityRecord>, String> {
|
||||
})
|
||||
})
|
||||
.map_err(|e| format!("city query: {e}"))?
|
||||
.filter_map(Result::ok)
|
||||
.filter_map(|r| match r {
|
||||
Ok(c) => Some(c),
|
||||
Err(e) => {
|
||||
// A dropped city changes downstream placements, so never drop silently.
|
||||
eprintln!("[believability] skipped a malformed city row for {body_id}: {e}");
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
Ok(rows)
|
||||
}
|
||||
|
||||
@@ -3439,7 +3439,8 @@ mod tests {
|
||||
// T-1029 — Cross-family: no panics, correct materials, all deterministic
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
/// All 7 T-1029 families must not panic on any sample position.
|
||||
/// All families (7 T-1029 landform + the T-1082 WaterBody zones) must not panic on
|
||||
/// any sample position, including extreme coordinates.
|
||||
#[test]
|
||||
fn all_families_no_panic_at_extreme_positions() {
|
||||
let zones = [
|
||||
@@ -3450,6 +3451,10 @@ mod tests {
|
||||
MorphologyZone::DuneStrand,
|
||||
MorphologyZone::MountainPass,
|
||||
MorphologyZone::MeanderReach,
|
||||
// T-1082 WaterBody zones.
|
||||
MorphologyZone::OpenOcean,
|
||||
MorphologyZone::Lake,
|
||||
MorphologyZone::TidalFlat,
|
||||
];
|
||||
let positions = [
|
||||
(0, 0),
|
||||
|
||||
Reference in New Issue
Block a user