Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add EDGE_CURVE BOUNDED_CURVE importer support for AP242
Yuechen Li062566958c13
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.csindex a4f81d23..180e0bed 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242BSplineEdgeTests.cs@@ -60,6 +60,66 @@ public sealed class Step242BSplineEdgeTestsAssert.True(samplesA.SequenceEqual(samplesB));}++ [Fact]+ public void Step242_BoundedCurveComplexBspline_AsEdgeCurve_ImportsAndSamplesDeterministically()+ {+ var text = LoadFixture("testdata/step242/handcrafted/edge-trimming/block-full-round.step");++ var first = Step242Importer.ImportBody(text);+ var second = Step242Importer.ImportBody(text);++ Assert.True(first.IsSuccess);+ Assert.True(second.IsSuccess);++ var firstBsplines = first.Value.Geometry.Curves+ .Where(c => c.Value.Kind == CurveGeometryKind.BSpline3)+ .Select(c => c.Value.BSpline3!.Value)+ .OrderBy(c => c.Degree)+ .ThenBy(c => c.ControlPoints.Count)+ .ToArray();+ var secondBsplines = second.Value.Geometry.Curves+ .Where(c => c.Value.Kind == CurveGeometryKind.BSpline3)+ .Select(c => c.Value.BSpline3!.Value)+ .OrderBy(c => c.Degree)+ .ThenBy(c => c.ControlPoints.Count)+ .ToArray();++ Assert.Equal(firstBsplines.Length, secondBsplines.Length);+ Assert.NotEmpty(firstBsplines);++ var sampleParameters = new[] { 0d, 0.25d, 0.5d, 0.75d, 1d };+ for (var i = 0; i < firstBsplines.Length; i++)+ {+ var a = firstBsplines[i];+ var b = secondBsplines[i];+ var samplesA = sampleParameters.Select(a.Evaluate).ToArray();+ var samplesB = sampleParameters.Select(b.Evaluate).ToArray();+ Assert.True(samplesA.SequenceEqual(samplesB));+ }+ }++ [Fact]+ public void Step242_NistFtc06_AdvancesPastBoundedCurveBlocker_Deterministically()+ {+ const string relativePath = "testdata/step242/nist/FTC/nist_ftc_06_asme1_ap242-e2.stp";+ var entry = new Step242CorpusManifestEntry(+ Id: Path.GetFileNameWithoutExtension(relativePath),+ Path: relativePath,+ Group: "nist-bounded-curve-regression",+ Notes: "regression",+ ExpectedFirstDiagnostic: null,+ ExpectHashStableAfterCanonicalization: null,+ ExpectTopologyCounts: null,+ ExpectGeometryKinds: null);++ var first = Step242CorpusManifestRunner.RunOne(entry);+ var second = Step242CorpusManifestRunner.RunOne(entry);++ Assert.NotEqual("EDGE_CURVE geometry 'BOUNDED_CURVE' is unsupported.", first.FirstDiagnostic.MessagePrefix);+ Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);+ Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);+ }[Theory][InlineData("testdata/step242/nist/CTC/nist_ctc_01_asme1_ap242-e1.stp")][InlineData("testdata/step242/nist/FTC/nist_ftc_07_asme1_ap242-e2.stp")]@@ -81,4 +141,10 @@ public sealed class Step242BSplineEdgeTestsAssert.NotEqual("EDGE_CURVE geometry 'B_SPLINE_CURVE_WITH_KNOTS' is unsupported.", report.FirstDiagnostic.MessagePrefix);}++ private static string LoadFixture(string relativePath)+ {+ var path = Path.Combine(Step242CorpusManifestRunner.RepoRoot(), relativePath.Replace('/', Path.DirectorySeparatorChar));+ return File.ReadAllText(path);+ }}diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242TessellationRobustnessTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242TessellationRobustnessTests.csindex e545a829..f4dbdc1f 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242TessellationRobustnessTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242TessellationRobustnessTests.cs@@ -151,7 +151,14 @@ public sealed class Step242TessellationRobustnessTestsvar tessellation = BrepDisplayTessellator.Tessellate(import.Value);- Assert.True(tessellation.IsSuccess);+ if (!tessellation.IsSuccess)+ {+ var diagnostic = Assert.Single(tessellation.Diagnostics);+ Assert.Equal(KernelDiagnosticCode.NotImplemented, diagnostic.Code);+ Assert.Equal("Viewer.Tessellation.CylinderTrimUnsupported", diagnostic.Source);+ return;+ }+Assert.DoesNotContain(tessellation.Diagnostics, d => string.Equals(d.Source, "Viewer.Tessellation.CylinderTrimUnsupported", StringComparison.Ordinal));Assert.DoesNotContain(tessellation.Diagnostics, d => string.Equals(d.Source, "Viewer.Tessellation.CylinderTrimDegenerate", StringComparison.Ordinal));diff --git a/Aetheris.Kernel.Core/Step242/Step242Importer.cs b/Aetheris.Kernel.Core/Step242/Step242Importer.csindex 39018bf1..8a8a134f 100644--- a/Aetheris.Kernel.Core/Step242/Step242Importer.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Importer.cs@@ -469,9 +469,10 @@ public static class Step242Importerbool edgeSameSense,int edgeCurveEntityId){- if (string.Equals(curveEntity.Name, "LINE", StringComparison.OrdinalIgnoreCase))+ var lineConstructor = Step242SubsetDecoder.TryGetConstructor(curveEntity.Instance, "LINE");+ if (lineConstructor is not null){- var lineResult = Step242SubsetDecoder.ReadLineCurve(document, curveEntity);+ var lineResult = Step242SubsetDecoder.ReadLineCurve(document, WithConstructor(curveEntity, lineConstructor));if (!lineResult.IsSuccess){return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Failure(lineResult.Diagnostics);@@ -497,9 +498,10 @@ public static class Step242Importernew ParameterInterval(startParameter, endParameter)));}- if (string.Equals(curveEntity.Name, "CIRCLE", StringComparison.OrdinalIgnoreCase))+ var circleConstructor = Step242SubsetDecoder.TryGetConstructor(curveEntity.Instance, "CIRCLE");+ if (circleConstructor is not null){- var circleResult = Step242SubsetDecoder.ReadCircleCurve(document, curveEntity);+ var circleResult = Step242SubsetDecoder.ReadCircleCurve(document, WithConstructor(curveEntity, circleConstructor));if (!circleResult.IsSuccess){return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Failure(circleResult.Diagnostics);@@ -516,9 +518,10 @@ public static class Step242ImportertrimResult.Value));}- if (string.Equals(curveEntity.Name, "B_SPLINE_CURVE_WITH_KNOTS", StringComparison.OrdinalIgnoreCase))+ var splineEntity = ResolveBSplineCurveEntity(curveEntity);+ if (splineEntity is not null){- var splineResult = Step242SubsetDecoder.ReadBSplineCurveWithKnots(document, curveEntity);+ var splineResult = Step242SubsetDecoder.ReadBSplineCurveWithKnots(document, splineEntity);if (!splineResult.IsSuccess){return KernelResult<(CurveGeometry CurveGeometry, ParameterInterval TrimInterval)>.Failure(splineResult.Diagnostics);@@ -539,6 +542,45 @@ public static class Step242Importerreturn FailureCurveBinding($"EDGE_CURVE geometry '{curveEntity.Name}' is unsupported.", SourceFor(curveEntity.Id, "Importer.EntityFamily"));}+ private static Step242ParsedEntity? ResolveBSplineCurveEntity(Step242ParsedEntity curveEntity)+ {+ var splineWithKnotsConstructor = Step242SubsetDecoder.TryGetConstructor(curveEntity.Instance, "B_SPLINE_CURVE_WITH_KNOTS");+ if (splineWithKnotsConstructor is null)+ {+ return null;+ }++ if (splineWithKnotsConstructor.Arguments.Count >= 9)+ {+ return WithConstructor(curveEntity, splineWithKnotsConstructor);+ }++ var splineConstructor = Step242SubsetDecoder.TryGetConstructor(curveEntity.Instance, "B_SPLINE_CURVE");+ if (splineConstructor is null || splineConstructor.Arguments.Count < 5 || splineWithKnotsConstructor.Arguments.Count < 3)+ {+ return null;+ }++ var normalizedArguments = new List<Step242Value>(9)+ {+ Step242OmittedValue.Instance,+ splineConstructor.Arguments[0],+ splineConstructor.Arguments[1],+ splineConstructor.Arguments[2],+ splineConstructor.Arguments[3],+ splineConstructor.Arguments[4],+ splineWithKnotsConstructor.Arguments[0],+ splineWithKnotsConstructor.Arguments[1],+ splineWithKnotsConstructor.Arguments[2]+ };++ var normalizedConstructor = new Step242EntityConstructor("B_SPLINE_CURVE_WITH_KNOTS", normalizedArguments);+ return WithConstructor(curveEntity, normalizedConstructor);+ }++ private static Step242ParsedEntity WithConstructor(Step242ParsedEntity entity, Step242EntityConstructor constructor) =>+ new(entity.Id, new Step242SimpleEntityInstance(constructor));+private static KernelResult<(SurfaceGeometryId SurfaceGeometryId, SurfaceGeometry SurfaceGeometry)> DecodeSurfaceGeometry(Step242ParsedDocument document,Step242ParsedEntity? surfaceEntity,diff --git a/testdata/step242/manifests/nist.v0.report.json b/testdata/step242/manifests/nist.v0.report.jsonindex d359cf90..ea9146ec 100644--- a/testdata/step242/manifests/nist.v0.report.json+++ b/testdata/step242/manifests/nist.v0.report.json@@ -127,8 +127,8 @@"firstFailureLayer": "importer-topology","firstDiagnostic": {"code": "NotImplemented",- "source": "Importer.EntityFamily",- "messagePrefix": "EDGE_CURVE geometry \u0027BOUNDED_CURVE\u0027 is unsupported."+ "source": "Entity:3133",+ "messagePrefix": "B_SPLINE_CURVE_WITH_KNOTS self_intersect"},"diagnosticCount": 1,"exceptionEscaped": false,