Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Refine cylinder axial-span degenerate family diagnostics
Yuechen Li665d5f94b7e5
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.csindex 5b90edf7..7c685f83 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242EdgeCurveSenseRegressionTests.cs@@ -32,7 +32,7 @@ public sealed class Step242EdgeCurveSenseRegressionTestsif (string.Equals(relativePath, "testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp", StringComparison.Ordinal)){Assert.Equal("tessellator", first.FirstFailureLayer);- Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate", first.FirstDiagnostic.Source);+ Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap", first.FirstDiagnostic.Source);}Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242HoleSemanticsTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242HoleSemanticsTests.csindex 271c649a..7f0bce7a 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242HoleSemanticsTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242HoleSemanticsTests.cs@@ -95,7 +95,7 @@ public sealed class Step242HoleSemanticsTestsAssert.False(tessellation.IsSuccess);var diagnostic = Assert.Single(tessellation.Diagnostics);Assert.Equal(KernelDiagnosticCode.InvalidArgument, diagnostic.Code);- Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate", diagnostic.Source);+ Assert.Equal("Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap", diagnostic.Source);Assert.Contains("collapsed axial span", diagnostic.Message, StringComparison.Ordinal);}}diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.csindex 95105226..20266dff 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs@@ -9,7 +9,7 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests"testdata/step242/nist/CTC/nist_ctc_05_asme1_ap242-e1.stp","tessellator","Importer.LoopRole.UnsupportedSurfaceForHoles",- "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","Face 31 cylindrical trim loop 62 has 1 coedges, angular span")][InlineData("testdata/step242/nist/FTC/nist_ftc_08_asme1_ap242-e2.stp",@@ -21,13 +21,13 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests"testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp","tessellator","Topology.GraphValidator",- "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","Face 3 cylindrical trim loop 7 has 1 coedges, angular span")][InlineData("testdata/step242/nist/STC/nist_stc_06_asme1_ap242-e3.stp","tessellator","Importer.LoopRole.UnsupportedSurfaceForHoles",- "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","Face 29 cylindrical trim loop 54 has 1 coedges, angular span")]public void Step242_NistTargets_AdvancePastGenericUnsupportedSurfaceForHoles_Deterministically(string relativePath,diff --git a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.csindex 55547e79..80e80595 100644--- a/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs+++ b/Aetheris.Kernel.Core/Brep/Tessellation/BrepDisplayTessellator.cs@@ -18,6 +18,9 @@ public static class BrepDisplayTessellatorprivate const string CylinderTrimUnsupportedSource = "Viewer.Tessellation.CylinderTrimUnsupported";private const string CylinderTrimDegenerateSource = "Viewer.Tessellation.CylinderTrimDegenerate";private const string CylinderTrimAxialSpanDegenerateSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate";+ private const string CylinderTrimAxialSpanDegenerateSingleCoedgeNearFullWrapSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap";+ private const string CylinderTrimAxialSpanDegenerateSingleCoedgeSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedge";+ private const string CylinderTrimAxialSpanDegenerateMultiCoedgeSource = "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.MultiCoedge";private const string CylinderTrimAmbiguousUsedShorterSpanSource = "Viewer.Tessellation.CylinderTrimAmbiguousUsedShorterSpan";private const string CurvedTopologyUnsupportedSource = "Viewer.Tessellation.CurvedTopologyUnsupported";private const string BSplineSurfaceTrimUnsupportedSource = "Viewer.Tessellation.BSplineSurfaceTrimUnsupported";@@ -1691,7 +1694,7 @@ public static class BrepDisplayTessellatorvar yAxis = cylinder.YAxis.ToVector();(double UStart, double USpan, double VStart, double VEnd, bool UsedAmbiguousShorterSpanResolution)? best = null;- (LoopId LoopId, int CoedgeCount, double AngularSpan, double AxialSpan, bool IsNearFullWrap, bool AngularResolved)? bestAxialSpanDegenerate = null;+ (LoopId LoopId, int CoedgeCount, double AngularSpan, double AxialSpan, bool IsNearFullWrap, bool AngularResolved, bool IsSingleCoedgeClosed)? bestAxialSpanDegenerate = null;foreach (var loopId in loopIds){@@ -1751,13 +1754,20 @@ public static class BrepDisplayTessellatorif (axialSpan <= minSpan){+ var isSingleCoedgeClosed = false;+ if (coedges.Length == 1 && body.TryGetEdgeVertices(coedges[0].EdgeId, out var edgeStart, out var edgeEnd))+ {+ isSingleCoedgeClosed = edgeStart == edgeEnd;+ }+var degenerateCandidate = (LoopId: loopId,CoedgeCount: coedges.Length,AngularSpan: angularSpan,AxialSpan: axialSpan,IsNearFullWrap: angularBounds.IsSuccess && angularBounds.Value.Span >= nearFullWrapThreshold,- AngularResolved: angularBounds.IsSuccess && angularBounds.Value.Span > minSpan);+ AngularResolved: angularBounds.IsSuccess && angularBounds.Value.Span > minSpan,+ IsSingleCoedgeClosed: isSingleCoedgeClosed);if (!bestAxialSpanDegenerate.HasValue ||degenerateCandidate.AngularSpan > bestAxialSpanDegenerate.Value.AngularSpan ||(System.Math.Abs(degenerateCandidate.AngularSpan - bestAxialSpanDegenerate.Value.AngularSpan) <= minSpan &&@@ -1787,15 +1797,30 @@ public static class BrepDisplayTessellator{if (bestAxialSpanDegenerate.HasValue && loopIds.Count == 1){+ var isSingleCoedge = bestAxialSpanDegenerate.Value.CoedgeCount == 1;var classification = bestAxialSpanDegenerate.Value.IsNearFullWrap- ? "full-wrap ring-like boundary with collapsed axial span"+ ? isSingleCoedge+ ? bestAxialSpanDegenerate.Value.IsSingleCoedgeClosed+ ? "single-coedge closed ring-like near-full-wrap boundary with collapsed axial span"+ : "single-coedge near-full-wrap boundary with collapsed axial span"+ : "multi-coedge ring-like near-full-wrap boundary with collapsed axial span": bestAxialSpanDegenerate.Value.AngularResolved- ? "trimmed cylindrical loop with collapsed axial span"+ ? isSingleCoedge+ ? "single-coedge trimmed cylindrical loop with collapsed axial span"+ : "multi-coedge trimmed cylindrical loop with collapsed axial span": "axial-span-collapsed loop without resolvable angular extent";++ var diagnosticSource = bestAxialSpanDegenerate.Value.IsNearFullWrap+ ? isSingleCoedge+ ? CylinderTrimAxialSpanDegenerateSingleCoedgeNearFullWrapSource+ : CylinderTrimAxialSpanDegenerateMultiCoedgeSource+ : isSingleCoedge+ ? CylinderTrimAxialSpanDegenerateSingleCoedgeSource+ : CylinderTrimAxialSpanDegenerateMultiCoedgeSource;return KernelResult<(double, double, double, double)>.Failure([CreateInvalidArgument($"Face {faceId.Value} cylindrical trim loop {bestAxialSpanDegenerate.Value.LoopId.Value} has {bestAxialSpanDegenerate.Value.CoedgeCount} coedges, angular span {bestAxialSpanDegenerate.Value.AngularSpan:R}, axial span {bestAxialSpanDegenerate.Value.AxialSpan:R}, loop count {loopIds.Count}; classified as {classification} and treated as degenerate.",- CylinderTrimAxialSpanDegenerateSource)]);+ diagnosticSource)]);}return KernelResult<(double, double, double, double)>.Failure([diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex 127452c2..13612202 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -103,7 +103,7 @@"firstFailureLayer": "tessellator","firstDiagnostic": {"code": "InvalidArgument",- "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","messagePrefix": "Face 31 cylindrical trim loop 62 has 1 coedges, angular span 6.108652381980155, axial span 0, loop count 1; classified a"},"diagnosticCount": 1,@@ -271,7 +271,7 @@"firstFailureLayer": "tessellator","firstDiagnostic": {"code": "InvalidArgument",- "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","messagePrefix": "Face 3 cylindrical trim loop 7 has 1 coedges, angular span 6.1086523819801535, axial span 0, loop count 1; classified as"},"diagnosticCount": 1,@@ -295,7 +295,7 @@"firstFailureLayer": "tessellator","firstDiagnostic": {"code": "InvalidArgument",- "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","messagePrefix": "Face 29 cylindrical trim loop 54 has 1 coedges, angular span 6.1086523819801535, axial span 0, loop count 1; classified "},"diagnosticCount": 1,diff --git a/testdata/step242/manifests/v0.corpus.json b/testdata/step242/manifests/v0.corpus.jsonindex 2a388c6f..0f22ab01 100644--- a/testdata/step242/manifests/v0.corpus.json+++ b/testdata/step242/manifests/v0.corpus.json@@ -54,7 +54,7 @@"group": "expectedFail","expectedFirstDiagnostic": {"code": "InvalidArgument",- "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate",+ "source": "Viewer.Tessellation.CylinderTrimAxialSpanDegenerate.SingleCoedgeNearFullWrap","messagePrefix": "Face 1 cylindrical trim loop 1 has 1 coedges, angular span"}},