Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

Honor oriented edge sense when resolving exporter edge endpoints

Yuechen Li276687ad9b53
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
index 82b263b0..f93e6ae1 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
@@ -50,10 +50,11 @@ public sealed class Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTes
var first = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ftc11", relativePath, "nist-regression", null, null, null, null, null));
var second = Step242CorpusManifestRunner.RunOne(new Step242CorpusManifestEntry("ftc11", relativePath, "nist-regression", null, null, null, null, null));
- Assert.Equal("exporter", first.FirstFailureLayer);
Assert.NotEqual("Viewer.Tessellation.CylinderTrimDegenerate", first.FirstDiagnostic.Source);
- Assert.Equal("Edge:29", first.FirstDiagnostic.Source);
- Assert.StartsWith("Edge endpoints resolve to a degenerate line direction.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
+ Assert.NotEqual("Edge:29", first.FirstDiagnostic.Source);
+ Assert.DoesNotContain("Edge endpoints resolve to a degenerate line direction.", first.FirstDiagnostic.MessagePrefix, StringComparison.Ordinal);
+ Assert.False(string.IsNullOrWhiteSpace(first.FirstFailureLayer));
+ Assert.False(string.IsNullOrWhiteSpace(first.FirstDiagnostic.MessagePrefix));
Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
index f2dadae7..d82b6207 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242UnsupportedSurfaceForHolesRegressionTests.cs
@@ -13,14 +13,14 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests
"Face 4 planar loop triangulation failed because the polygon is not simple.")]
[InlineData(
"testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp",
- "exporter",
+ null,
"Topology.GraphValidator",
- "Edge:29",
- "Edge endpoints resolve to a degenerate line direction.")]
+ null,
+ null)]
public void Step242_NistTargets_AdvancePastGenericUnsupportedSurfaceForHoles_Deterministically(
string relativePath,
- string expectedLayer,
+ string? expectedLayer,
string disallowedSource,
string? expectedSource,
string? expectedMessagePrefix)
@@ -38,7 +38,10 @@ public sealed class Step242UnsupportedSurfaceForHolesRegressionTests
var first = Step242CorpusManifestRunner.RunOne(entry);
var second = Step242CorpusManifestRunner.RunOne(entry);
- Assert.Equal(expectedLayer, first.FirstFailureLayer);
+ if (expectedLayer is not null)
+ {
+ Assert.Equal(expectedLayer, first.FirstFailureLayer);
+ }
Assert.NotEqual(disallowedSource, first.FirstDiagnostic.Source);
if (expectedSource is not null)
{
diff --git a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs b/Aetheris.Kernel.Core/Step242/Step242Exporter.cs
index 07e632cd..862fb408 100644
--- a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs
+++ b/Aetheris.Kernel.Core/Step242/Step242Exporter.cs
@@ -607,7 +607,8 @@ public static class Step242Exporter
return FailurePoint("Edge curve geometry was not found.", $"Curve:{edgeBinding.CurveGeometryId.Value}");
}
- var parameter = useStart ? edgeBinding.TrimInterval.Value.Start : edgeBinding.TrimInterval.Value.End;
+ var useTrimStart = useStart == edgeBinding.OrientedEdgeSense;
+ var parameter = useTrimStart ? edgeBinding.TrimInterval.Value.Start : edgeBinding.TrimInterval.Value.End;
return curve.Kind switch
{
CurveGeometryKind.Line3 when curve.Line3 is Line3Curve line => KernelResult<Point3D>.Success(line.Evaluate(parameter)),