Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Stabilize CIR/BRep boolean matrix runtime sampling

Yuechen Lidff8623bc0cb
diff --git a/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs b/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
index d4ff0738..857b7b88 100644
--- a/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
+++ b/Aetheris.Kernel.Core/Brep/Queries/BrepSpatialQueries.cs
@@ -15,6 +15,21 @@ namespace Aetheris.Kernel.Core.Brep.Queries;
/// </summary>
public static class BrepSpatialQueries
{
+ public sealed class PointContainmentQueryContext
+ {
+ private readonly object? analyticRayProvider;
+
+ internal PointContainmentQueryContext(object? analyticRayProvider, string providerUnavailableReason)
+ {
+ this.analyticRayProvider = analyticRayProvider;
+ ProviderUnavailableReason = providerUnavailableReason;
+ }
+
+ internal string ProviderUnavailableReason { get; }
+
+ internal object? TryGetProviderObject() => analyticRayProvider;
+ }
+
private static readonly JudgmentEngine<PointContainmentContext> PointContainmentJudgmentEngine = new();
private static readonly IReadOnlyList<JudgmentCandidate<PointContainmentContext>> PointContainmentCandidates =
[
@@ -60,10 +75,17 @@ public static class BrepSpatialQueries
BrepBody body,
Point3D point,
ToleranceContext? tolerance = null)
+ => ClassifyPoint(body, point, tolerance, queryContext: null);
+
+ public static KernelResult<PointContainment> ClassifyPoint(
+ BrepBody body,
+ Point3D point,
+ ToleranceContext? tolerance,
+ PointContainmentQueryContext? queryContext)
{
var context = tolerance ?? ToleranceContext.Default;
var resolvedPrimitive = TryResolvePrimitive(body, out var primitive, out var primitiveDiagnostic);
- var containmentContext = BuildPointContainmentContext(body, point, context, resolvedPrimitive, primitive, primitiveDiagnostic);
+ var containmentContext = BuildPointContainmentContext(body, point, context, resolvedPrimitive, primitive, primitiveDiagnostic, queryContext);
var selection = PointContainmentJudgmentEngine.Evaluate(containmentContext, PointContainmentCandidates);
if (!selection.IsSuccess)
{
@@ -81,6 +103,13 @@ public static class BrepSpatialQueries
};
}
+ public static PointContainmentQueryContext CreatePointContainmentQueryContext(BrepBody body, ToleranceContext? tolerance = null)
+ {
+ var context = tolerance ?? ToleranceContext.Default;
+ _ = TryCreateAnalyticRayProvider(body, context, out var provider, out var unavailableReason);
+ return new PointContainmentQueryContext(provider, unavailableReason);
+ }
+
private static PointContainment ClassifyPrimitive(PrimitiveDescriptor primitive, Point3D point, ToleranceContext context) =>
primitive.Kind switch
{
@@ -96,10 +125,23 @@ public static class BrepSpatialQueries
ToleranceContext tolerance,
bool resolvedPrimitive,
PrimitiveDescriptor primitive,
- KernelDiagnostic primitiveDiagnostic)
+ KernelDiagnostic primitiveDiagnostic,
+ PointContainmentQueryContext? queryContext)
{
var hasPrimitive = resolvedPrimitive && primitive.Kind is PrimitiveKind.Box or PrimitiveKind.Cylinder or PrimitiveKind.Sphere;
- var analyticProvider = TryCreateAnalyticRayProvider(body, tolerance, out var provider, out var unavailableReason);
+ AnalyticRayProvider? provider;
+ string unavailableReason;
+ bool analyticProvider;
+ if (queryContext is not null)
+ {
+ provider = queryContext.TryGetProviderObject() as AnalyticRayProvider;
+ unavailableReason = queryContext.ProviderUnavailableReason;
+ analyticProvider = provider is not null;
+ }
+ else
+ {
+ analyticProvider = TryCreateAnalyticRayProvider(body, tolerance, out provider, out unavailableReason);
+ }
return new PointContainmentContext(
point,
new BoundingBox3D(point, point),
@@ -536,7 +578,7 @@ public static class BrepSpatialQueries
{
var context = tolerance ?? ToleranceContext.Default;
var resolvedPrimitive = TryResolvePrimitive(body, out var primitive, out var primitiveDiagnostic);
- var containmentContext = BuildPointContainmentContext(body, point, context, resolvedPrimitive, primitive, primitiveDiagnostic);
+ var containmentContext = BuildPointContainmentContext(body, point, context, resolvedPrimitive, primitive, primitiveDiagnostic, queryContext: null);
var classification = ClassifyByMultiAxisRayConsensus(body, containmentContext, out var rays);
return new ContainmentConsensusTrace(classification, containmentContext.AnalyticRayProvider is not null, "multi_axis_ray_consensus", rays);
}
diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
index 91077648..f6272a0c 100644
--- a/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentCirDifferentialAnalysisTests.cs
@@ -11,7 +11,8 @@ namespace Aetheris.Kernel.Firmament.Tests;
public sealed class FirmamentCirDifferentialAnalysisTests
{
- private const int SharedVolumeResolution = 72;
+ private const int CirVolumeResolution = 72;
+ private const int BrepVolumeResolution = 20;
private const int ReportArtifactResolution = 32;
private static readonly JsonSerializerOptions ReportJsonOptions = new(JsonSerializerDefaults.Web) { WriteIndented = true };
private static readonly Lazy<(CirBrepDifferentialReport Report, string OutputPath, IReadOnlyList<CirBrepDifferentialCase> Cases)> CachedReportArtifact =
@@ -59,7 +60,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
new DifferentialProbePoint("inside_material", new Point3D(-2.5d, 0d, 0d), ProbeExpectation.Certain),
new DifferentialProbePoint("inside_void", new Point3D(0d, 0d, 0d), ProbeExpectation.Certain),
new DifferentialProbePoint("outside_far", new Point3D(20d, 0d, 0d), ProbeExpectation.Certain)
- ]),
+ ], AllowVolumeUnavailable: true),
new CirBrepDifferentialCase("boolean_add_basic", "testdata/firmament/examples/boolean_add_basic.firmament", true, 0.10d, 0.02d,
[
new DifferentialProbePoint("inside_original", new Point3D(-2d, 0d, 0d), ProbeExpectation.Certain),
@@ -111,7 +112,8 @@ public sealed class FirmamentCirDifferentialAnalysisTests
var parsed = JsonSerializer.Deserialize<CirBrepDifferentialReport>(json, ReportJsonOptions);
Assert.NotNull(parsed);
Assert.Equal("cir-vs-brep", parsed.MatrixName);
- Assert.Equal(ReportArtifactResolution, parsed.Resolution);
+ Assert.Equal(ReportArtifactResolution, parsed.CirVolumeResolution);
+ Assert.Equal(ReportArtifactResolution, parsed.BrepVolumeResolution);
Assert.Equal(artifact.Cases.Count, parsed.FixtureCount);
Assert.NotNull(parsed.GeneratedAtUtc);
Assert.NotEmpty(parsed.Fixtures);
@@ -156,7 +158,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
private static (CirBrepDifferentialReport Report, string OutputPath, IReadOnlyList<CirBrepDifferentialCase> Cases) GenerateReportArtifact()
{
var cases = BuildAllCases();
- var report = RunMatrix(cases, enforceAssertions: false, resolution: ReportArtifactResolution);
+ var report = RunMatrix(cases, enforceAssertions: false, cirVolumeResolution: ReportArtifactResolution, brepVolumeResolution: ReportArtifactResolution);
var outputPath = WriteDifferentialReport(report);
return (report, outputPath, cases);
}
@@ -190,7 +192,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
new DifferentialProbePoint("inside_material", new Point3D(-2.5d, 0d, 0d), ProbeExpectation.Certain),
new DifferentialProbePoint("inside_void", new Point3D(0d, 0d, 0d), ProbeExpectation.Certain),
new DifferentialProbePoint("outside_far", new Point3D(20d, 0d, 0d), ProbeExpectation.Certain)
- ]),
+ ], AllowVolumeUnavailable: true),
new CirBrepDifferentialCase("boolean_add_basic", "testdata/firmament/examples/boolean_add_basic.firmament", true, 0.10d, 0.02d,
[
new DifferentialProbePoint("inside_original", new Point3D(-2d, 0d, 0d), ProbeExpectation.Certain),
@@ -218,7 +220,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
new CirBrepDifferentialCase("rounded_corner_box_basic", "testdata/firmament/examples/rounded_corner_box_basic.firmament", false, 0d, 0d, [])
];
- private static CirBrepDifferentialReport RunMatrix(IReadOnlyList<CirBrepDifferentialCase> cases, bool enforceAssertions = true, int resolution = SharedVolumeResolution)
+ private static CirBrepDifferentialReport RunMatrix(IReadOnlyList<CirBrepDifferentialCase> cases, bool enforceAssertions = true, int cirVolumeResolution = CirVolumeResolution, int brepVolumeResolution = BrepVolumeResolution)
{
var entries = new List<CirBrepFixtureReport>(cases.Count);
foreach (var @case in cases)
@@ -229,8 +231,8 @@ public sealed class FirmamentCirDifferentialAnalysisTests
var notes = lower.Diagnostics.Select(d => d.Message).ToList();
var status = lower.IsSuccess ? "passed" : (@case.ExpectedSupport ? "failed" : "unsupported");
var entry = new CirBrepFixtureReport(@case.Name, @case.FixturePath, @case.ExpectedSupport ? "supported" : "unsupported", status, null,
- new CirFixtureSection(lower.IsSuccess, notes, null, new VolumeMetric(null, resolution), []),
- new BrepFixtureSection(false, null, new VolumeMetric(null, resolution, null, null), []),
+ new CirFixtureSection(lower.IsSuccess, notes, null, new VolumeMetric(null, cirVolumeResolution), []),
+ new BrepFixtureSection(false, null, new VolumeMetric(null, brepVolumeResolution, null, null), []),
new ComparisonSection(new ComparisonMetric(0d, true, @case.BoundsTolerance), new VolumeComparisonMetric(null, null, true, @case.VolumeTolerance), new ProbeComparisonMetric(true, 0, 0, [])),
notes);
entries.Add(entry);
@@ -289,13 +291,13 @@ public sealed class FirmamentCirDifferentialAnalysisTests
};
entries[^1] = entry;
- var cirVolume = CirAnalyzer.EstimateVolume(lower.Value.Root, resolution);
- var brepVolume = EstimateBrepVolume(rootBody, resolution, out var unknownCount, out var sampleCount);
+ var cirVolume = CirAnalyzer.EstimateVolume(lower.Value.Root, cirVolumeResolution);
+ var brepVolume = EstimateBrepVolume(rootBody, brepVolumeResolution, out var unknownCount, out var sampleCount);
var unknownRatio = sampleCount == 0 ? 1d : unknownCount / (double)sampleCount;
entry = entry with
{
- Cir = entry.Cir with { Volume = new VolumeMetric(cirVolume, resolution) },
- Brep = entry.Brep with { Volume = new VolumeMetric(brepVolume, resolution, unknownCount, unknownRatio) }
+ Cir = entry.Cir with { Volume = new VolumeMetric(cirVolume, cirVolumeResolution) },
+ Brep = entry.Brep with { Volume = new VolumeMetric(brepVolume, brepVolumeResolution, unknownCount, unknownRatio) }
};
entries[^1] = entry;
@@ -321,7 +323,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
if (enforceAssertions)
{
Assert.True(volumePassed,
- $"{@case.Name}: volume mismatch. class=analyzer uncertainty or semantic drift. cir={cirVolume:F6}, brep={brepVolume.Value:F6}, relDelta={relDelta:F6}, tolerance={@case.VolumeTolerance:F6}, resolution={resolution}, brepUnknownCount={unknownCount}, sampleCount={sampleCount}");
+ $"{@case.Name}: volume mismatch. class=analyzer uncertainty or semantic drift. cir={cirVolume:F6}, brep={brepVolume.Value:F6}, relDelta={relDelta:F6}, tolerance={@case.VolumeTolerance:F6}, cirResolution={cirVolumeResolution}, brepResolution={brepVolumeResolution}, brepUnknownCount={unknownCount}, sampleCount={sampleCount}");
}
}
entry = entry with
@@ -378,7 +380,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
entries[^1] = entry;
}
- return BuildSummary(entries, resolution);
+ return BuildSummary(entries, cirVolumeResolution, brepVolumeResolution);
}
private static string WriteDifferentialReport(CirBrepDifferentialReport report)
@@ -390,7 +392,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
return outputPath;
}
- private static CirBrepDifferentialReport BuildSummary(IReadOnlyList<CirBrepFixtureReport> fixtures, int resolution)
+ private static CirBrepDifferentialReport BuildSummary(IReadOnlyList<CirBrepFixtureReport> fixtures, int cirVolumeResolution, int brepVolumeResolution)
{
var failedCount = fixtures.Count(f => f.Status == "failed");
var unsupportedCount = fixtures.Count(f => f.Status == "unsupported");
@@ -399,7 +401,8 @@ public sealed class FirmamentCirDifferentialAnalysisTests
Success: failedCount == 0,
GeneratedAtUtc: DateTime.UtcNow.ToString("O", CultureInfo.InvariantCulture),
MatrixName: "cir-vs-brep",
- Resolution: resolution,
+ CirVolumeResolution: cirVolumeResolution,
+ BrepVolumeResolution: brepVolumeResolution,
FixtureCount: fixtures.Count,
PassedCount: passedCount,
FailedCount: failedCount,
@@ -475,12 +478,13 @@ public sealed class FirmamentCirDifferentialAnalysisTests
var cell = dx * dy * dz;
var inside = 0;
+ var queryContext = BrepSpatialQueries.CreatePointContainmentQueryContext(body);
for (var ix = 0; ix < resolution; ix++)
for (var iy = 0; iy < resolution; iy++)
for (var iz = 0; iz < resolution; iz++)
{
var p = new Point3D(value.Min.X + (ix + 0.5d) * dx, value.Min.Y + (iy + 0.5d) * dy, value.Min.Z + (iz + 0.5d) * dz);
- var result = BrepSpatialQueries.ClassifyPoint(body, p);
+ var result = BrepSpatialQueries.ClassifyPoint(body, p, tolerance: null, queryContext: queryContext);
sampleCount++;
if (!result.IsSuccess || result.Value == PointContainment.Unknown)
{
@@ -537,7 +541,7 @@ public sealed class FirmamentCirDifferentialAnalysisTests
AllowUnknown
}
- private sealed record CirBrepDifferentialReport(bool Success, string GeneratedAtUtc, string MatrixName, int Resolution, int FixtureCount, int PassedCount, int FailedCount, int UnsupportedCount, IReadOnlyList<CirBrepFixtureReport> Fixtures);
+ private sealed record CirBrepDifferentialReport(bool Success, string GeneratedAtUtc, string MatrixName, int CirVolumeResolution, int BrepVolumeResolution, int FixtureCount, int PassedCount, int FailedCount, int UnsupportedCount, IReadOnlyList<CirBrepFixtureReport> Fixtures);
private sealed record CirBrepFixtureReport(string Name, string Path, string ExpectedSupport, string Status, string? MismatchClass, CirFixtureSection Cir, BrepFixtureSection Brep, ComparisonSection Comparisons, IReadOnlyList<string> Notes);
private sealed record CirFixtureSection(bool LoweringSucceeded, IReadOnlyList<string> Diagnostics, BoundsMetric? Bounds, VolumeMetric Volume, IReadOnlyList<ProbeClassificationMetric> ProbeClassifications);
private sealed record BrepFixtureSection(bool BuildSucceeded, BoundsMetric? Bounds, VolumeMetric Volume, IReadOnlyList<ProbeClassificationMetric> ProbeClassifications);