jpmschweitzer/settled-reach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(simulation): cargo fmt atlas modules

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
jpmschweitzer
2026-05-03 09:46:16 +02:00
co-authored by Claude Opus 4.6
parent 64a873fc1a
commit f1278f88fd
10 changed files with 247 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/atlas/drainage.rs
+5 -13
View File
@@ -397,9 +397,7 @@ fn merge_small_basins(
let n_basins = sizes.len();
// Stop if within target range and all basins are large enough.
if n_basins <= max_count
&& sizes.values().all(|&s| s as f64 / n as f64 >= min_frac)
{
if n_basins <= max_count && sizes.values().all(|&s| s as f64 / n as f64 >= min_frac) {
break;
}
if n_basins <= min_count {
@@ -407,10 +405,7 @@ fn merge_small_basins(
}
// Find the smallest basin.
let (&smallest_id, &smallest_size) = sizes
.iter()
.min_by_key(|(_, &s)| s)
.unwrap();
let (&smallest_id, &smallest_size) = sizes.iter().min_by_key(|(_, &s)| s).unwrap();
if n_basins <= max_count && smallest_size as f64 / n as f64 >= min_frac {
break;
@@ -533,10 +528,8 @@ fn build_basins(labels: &[i32], w: usize, h: usize) -> Vec<DrainageBasin> {
// Sort boundary by angle from centroid for a coherent polygon.
if !boundary.is_empty() {
let cr = boundary.iter().map(|&(r, _)| r as f32).sum::<f32>()
/ boundary.len() as f32;
let cc = boundary.iter().map(|&(_, c)| c as f32).sum::<f32>()
/ boundary.len() as f32;
let cr = boundary.iter().map(|&(r, _)| r as f32).sum::<f32>() / boundary.len() as f32;
let cc = boundary.iter().map(|&(_, c)| c as f32).sum::<f32>() / boundary.len() as f32;
boundary.sort_by(|&(r1, c1), &(r2, c2)| {
let a1 = (r1 as f32 - cr).atan2(c1 as f32 - cc);
let a2 = (r2 as f32 - cr).atan2(c2 as f32 - cc);
@@ -644,8 +637,7 @@ mod tests {
let r1 = analyze(&elev, 64, 32, 0.3);
let r2 = analyze(&elev, 64, 32, 0.3);
assert_eq!(
r1.river_network.river_cells,
r2.river_network.river_cells,
r1.river_network.river_cells, r2.river_network.river_cells,
"River cells must be deterministic"
);
assert_eq!(