From b9105a394ecdf6e620d28180deef0000a9a06af0 Mon Sep 17 00:00:00 2001 From: jyviko <2501648+jyviko@users.noreply.github.com> Date: Sat, 31 Oct 2026 08:55:02 -0400 Subject: [PATCH] Wave 469/509: Kernel pocket floor fillet test: the corner rounds and the floor loop round add their exact volumes, by Pappus at the corners (and 3 more) 4 commits, squashed; the originals stay reachable from tag archive/merge-main-develop. - 94e67d4ca jyviko: Kernel loft test: the square-to-circle loft has the oracle's exact ruled volume, without printing - 4c7d4f5c0 jyviko: Tessellation lens test: the lens's triangles fill exactly the rhombus through its arcs' midpoints - 0d94d5f77 jyviko: Pattern test: six chamfered holes take exactly five more holes' bore and chamfer rings - c44cbe9ac jyviko: Kernel pocket floor fillet test: the corner rounds and the floor loop round add their exact volumes, by Pappus at the corners Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ --- crates/engine/src/cmd/patterns_tests.rs | 9 ++++++-- crates/kernel/src/tess/tests.rs | 13 +++++++++++- crates/kernel/src/tests.rs | 28 ++++++++++++++----------- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/crates/engine/src/cmd/patterns_tests.rs b/crates/engine/src/cmd/patterns_tests.rs index ce8b06f40..8f4678f54 100644 --- a/crates/engine/src/cmd/patterns_tests.rs +++ b/crates/engine/src/cmd/patterns_tests.rs @@ -926,8 +926,13 @@ fn circular_pattern_of_a_hole_and_its_chamfers_copies_all_of_them() { assert!(rel(v0, v1) < 1e-9); run(&mut s, "solid.pattern.circular", json!({"features": ["Bore", "TopChamfer", "BottomChamfer"], "axis": "Z", "count": 6, "angle": 360})); let v = volume(&mut s); - println!("{v1} -> {v}"); - assert!(v < v1 - 5.0 * 0.9 * (std::f64::consts::PI * 9.0 * 10.0), "pattern had no effect: {v1} -> {v}"); + // One chamfered hole takes its bore, π·3²·10, and two rings of the chamfer's triangle, + // 0.5 × 0.5 / 2, about the bore's axis at its centroid's radius 3 + 0.5/3 (Pappus). The + // copies, 20 apart on the radius 20, do not meet: the pattern takes five more. + let pi = std::f64::consts::PI; + let hole = pi * 9.0 * 10.0 + 2.0 * 2.0 * pi * (3.0 + 0.5 / 3.0) * 0.125; + assert!((v1 - (pi * 900.0 * 10.0 - hole)).abs() < 4e-7 * v1, "{v1}"); + assert!((v - (v1 - 5.0 * hole)).abs() < 4e-7 * v1, "{v1} -> {v}, expected {}", v1 - 5.0 * hole); } /// The features are copied in timeline order, not in the order they were picked in: a chamfer diff --git a/crates/kernel/src/tess/tests.rs b/crates/kernel/src/tess/tests.rs index 81730249d..befd7f9b3 100644 --- a/crates/kernel/src/tess/tests.rs +++ b/crates/kernel/src/tess/tests.rs @@ -862,7 +862,18 @@ fn a_face_bounded_by_two_short_arcs_keeps_an_area_to_mesh() { let made = ok(assemble(parts, false)); let (plan, _) = ok(plan(&made.brep, 0.5, None)); let lens = made.faces.first().and_then(|&f| plan.faces.get(f)).expect("the lens's plan"); - assert!(!lens.triangles.is_empty(), "the lens has triangles"); + // One round of halving puts a node at each arc's middle, (0, ±(r − c)) (the plane's (u, v) + // is its (x, y)): the triangles fill the rhombus with diagonals 2·half and 2(r − c). + let area: f64 = lens + .triangles + .iter() + .map(|t| { + let [a, b, c] = t.map(|i| lens.uv[i as usize]); + 0.5 * ((b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1])) + }) + .sum(); + let rhombus = 2.0 * half * (r - c); + assert!((area - rhombus).abs() < 1e-9 * rhombus, "{area} vs {rhombus}"); } /// Half of a square pyramid's sides as one spline face: degree 1, closed round the square diff --git a/crates/kernel/src/tests.rs b/crates/kernel/src/tests.rs index 641f5aad6..f73098b08 100644 --- a/crates/kernel/src/tests.rs +++ b/crates/kernel/src/tests.rs @@ -726,9 +726,11 @@ fn loft_and_sweep() { let sq = Loop2::polygon(&[Vec2::new(-20.0, -20.0), Vec2::new(20.0, -20.0), Vec2::new(20.0, 20.0), Vec2::new(-20.0, 20.0)]); let top = Plane::XY.offset(40.0); let l = loft(&[(Plane::XY, sq), (top, Loop2::circle(Vec2::ZERO, 10.0))]).unwrap(); - let m = measure(&l).unwrap(); - println!("loft volume {} faces {:?}", m.volume, m.merged); - assert!(m.volume > 314.0 * 40.0 && m.volume < 1600.0 * 40.0); + // Ruled, each side on the rational quarter of the circle between its corners' directions: the + // section at t has area (1 − t)² A_S + t² A_C + t(1 − t) M, M = ½∮(S × C' + C × S'), so + // V = h (A_S/3 + A_C/3 + M/6) = 35080.725 (M = 1433.790 by quadrature; tests/oracle/17-loft). + let v = measure(&l).unwrap().volume; + assert!(rel(v, 35080.725116) < 1e-6, "{v}"); // A tube: up 30, quarter bend of radius 20, across 30. let disc = Region2 { outer: Loop2::circle(Vec2::ZERO, 3.0), holes: vec![] }; let path = [ @@ -742,9 +744,6 @@ fn loft_and_sweep() { PathSeg::Line { a: Vec3::new(20.0, 0.0, 50.0), b: Vec3::new(50.0, 0.0, 50.0) }, ]; let t = sweep(&Plane::XY, &disc, &path).unwrap(); - for tol in [0.1, 0.01, 0.003, 0.001] { - println!("tube tess {tol}: {}", t.mesh(&crate::MeshTolerance::chord(tol)).unwrap().measure().volume); - } let area = PI * 9.0; let expect = area * (30.0 + 30.0 + 20.0 * std::f64::consts::FRAC_PI_2); assert!(rel(measure(&t).unwrap().volume, expect) < 1e-3, "{} vs {expect}", measure(&t).unwrap().volume); @@ -1381,18 +1380,23 @@ fn pocket_floor_loop_fillet() { cur = fillet(&cur, &[Vec3::new(65.0, 15.0, 16.0), Vec3::new(15.0, 15.0, 16.0), Vec3::new(65.0, 45.0, 16.0), Vec3::new(15.0, 45.0, 16.0)], 5.0) .unwrap(); let v1 = measure(&cur).unwrap().volume; + // The 50 x 30 x 8 pocket, less the four concave R5 rounds of its corners filling r²(1 − π/4) + // of section along their 8. + let want1 = 80.0 * 60.0 * 20.0 - 50.0 * 30.0 * 8.0 + 4.0 * 25.0 * (1.0 - PI / 4.0) * 8.0; + assert!(rel(v1, want1) < 1e-6, "{v1} vs {want1}"); let floor: Vec = [(40.0, 15.0), (65.0, 30.0), (40.0, 45.0), (15.0, 30.0)].iter().map(|(x, y)| Vec3::new(*x, *y, 12.0)).collect(); let mut pts = floor.clone(); let d = 5.0 - 5.0 / 2f64.sqrt(); pts.extend([(15.0 + d, 15.0 + d), (65.0 - d, 15.0 + d), (65.0 - d, 45.0 - d), (15.0 + d, 45.0 - d)].iter().map(|(x, y)| Vec3::new(*x, *y, 12.0))); let f = fillet(&cur, &pts, 2.0).unwrap(); let m = measure(&f).unwrap(); - // Added: the fillet profile (r²(1 − π/4)) swept along the floor outline (Pappus for the - // corners: the profile's centroid sits 2 − 4·2/(3(4 − π))·… inward; check loosely). - let straight = 2.0 * (40.0 + 20.0); - let added_lines = (4.0 - PI) * straight; - assert!(m.volume > v1 + added_lines && m.volume < v1 + added_lines + 4.0 * 2.0 * PI * 5.0, "{} {}", m.volume, v1); - println!("pocket: {:?} vol {}", m.merged, m.volume); + // Added: the R2 round's section, a = r²(1 − π/4), along the floor outline's straight 2(40 + 20), + // and round its four R5 corners by Pappus: a quarter turn each at the radius of the section's + // centroid, which sits r(10 − 3π)/(3(4 − π)) in from the wall, at 5 from the corner's axis. + let a = 4.0 * (1.0 - PI / 4.0); + let centroid = 5.0 - 2.0 * (10.0 - 3.0 * PI) / (3.0 * (4.0 - PI)); + let want = v1 + a * 2.0 * (40.0 + 20.0) + 4.0 * a * (PI / 2.0) * centroid; + assert!(rel(m.volume, want) < 1e-6, "{} vs {want}", m.volume); } #[test]