Skip to content

Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel

H5 decouple AP242 audit lane from display/picker lane

Yuechen Li2b501605a84d
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
index e996bcf8..393db5e1 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestGateTests.cs
@@ -87,13 +87,29 @@ public sealed class Step242CorpusManifestGateTests
var manifest = Step242CorpusManifestRunner.LoadManifest("testdata/step242/manifests/v0.corpus.json");
var blockerEntry = manifest.Entries.Single(e => e.Id == "exp_cylinder_hole_unsupported");
var blockerReport = Step242CorpusManifestRunner.RunOne(blockerEntry);
- Assert.Equal("pickerBlockedByTessellationSkip", blockerReport.Status);
- Assert.Equal("picker", blockerReport.FirstFailureLayer);
- Assert.Equal("Audit.Picker", blockerReport.FirstDiagnostic.Source);
+ Assert.Equal("success", blockerReport.Status);
+ Assert.Equal(string.Empty, blockerReport.FirstFailureLayer);
+ Assert.Equal("pickerBlockedByTessellationSkip", blockerReport.DisplayStatus);
+ Assert.Equal("picker", blockerReport.DisplayFirstFailureLayer);
+ Assert.Equal("Audit.Picker", blockerReport.DisplayFirstDiagnostic.Source);
var successEntry = manifest.Entries.Single(e => e.Id == "gen_box_v0");
var successReport = Step242CorpusManifestRunner.RunOne(successEntry);
Assert.Equal("success", successReport.Status);
Assert.Equal(string.Empty, successReport.FirstFailureLayer);
+ Assert.Equal("success", successReport.DisplayStatus);
+ Assert.Equal(string.Empty, successReport.DisplayFirstFailureLayer);
+ }
+
+ [Fact]
+ public void V0CorpusManifest_StatusContract_ParserFailureStillFailsAp242Lane()
+ {
+ var manifest = Step242CorpusManifestRunner.LoadManifest("testdata/step242/manifests/v0.corpus.json");
+ var parserFailureEntry = manifest.Entries.Single(e => e.Id == "exp_parser_missing_paren");
+ var parserFailureReport = Step242CorpusManifestRunner.RunOne(parserFailureEntry);
+
+ Assert.Equal("parseFail", parserFailureReport.Status);
+ Assert.Equal("parser", parserFailureReport.FirstFailureLayer);
+ Assert.Equal("notRun", parserFailureReport.DisplayStatus);
}
}
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
index c4287193..0cbe7bfc 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CorpusManifestRunner.cs
@@ -57,34 +57,23 @@ internal static class Step242CorpusManifestRunner
var import = Step242Importer.ImportBody(text);
if (!import.IsSuccess)
{
- return BuildFailure(entry, sizeBytes, DetermineImportFailureLayer(import.Diagnostics), import.Diagnostics);
+ return BuildAp242Failure(entry, sizeBytes, DetermineImportFailureLayer(import.Diagnostics), import.Diagnostics);
}
var body = import.Value;
var validation = BrepBindingValidator.Validate(body, requireAllEdgeAndFaceBindings: true);
if (!validation.IsSuccess)
{
- return BuildFailure(entry, sizeBytes, "validator", validation.Diagnostics, body);
- }
-
- var tessellation = BrepDisplayTessellator.Tessellate(body);
- if (!tessellation.IsSuccess)
- {
- return BuildFailure(entry, sizeBytes, "tessellator", tessellation.Diagnostics, body);
- }
-
- var pick = TryPickSmoke(body, tessellation.Value);
- if (!pick.IsSuccess)
- {
- return BuildFailure(entry, sizeBytes, "picker", pick.Diagnostics, body, tessellation.Value, tessellation.Diagnostics);
+ return BuildAp242Failure(entry, sizeBytes, "validator", validation.Diagnostics, body);
}
var export = Step242Exporter.ExportBody(body);
if (!export.IsSuccess)
{
- return BuildFailure(entry, sizeBytes, "exporter", export.Diagnostics, body, tessellation.Value);
+ return BuildAp242Failure(entry, sizeBytes, "exporter", export.Diagnostics, body);
}
+ var displayAudit = RunDisplayAudit(body);
return new Step242CorpusReportEntry(
entry.Id,
entry.Path,
@@ -95,8 +84,12 @@ internal static class Step242CorpusManifestRunner
FirstDiagnostic: FirstDiagnostic(import.Diagnostics),
DiagnosticCount: import.Diagnostics.Count,
ExceptionEscaped: false,
+ DisplayStatus: displayAudit.Status,
+ DisplayFirstFailureLayer: displayAudit.FirstFailureLayer,
+ DisplayFirstDiagnostic: displayAudit.FirstDiagnostic,
+ DisplayDiagnosticCount: displayAudit.DiagnosticCount,
TopologyCounts: new Step242TopologyCounts(body.Topology.Vertices.Count(), body.Topology.Edges.Count(), body.Topology.Faces.Count()),
- TessellationCounts: new Step242TessellationCounts(tessellation.Value.FacePatches.Count, tessellation.Value.EdgePolylines.Count),
+ TessellationCounts: displayAudit.TessellationCounts,
CanonicalSha256: ComputeSha256LowerHex(export.Value),
ExportedCanonicalText: export.Value);
}
@@ -112,6 +105,10 @@ internal static class Step242CorpusManifestRunner
FirstDiagnostic: new Step242AuditDiagnostic("InvalidOperation", "Audit.Exception", StableMessagePrefix(ex.Message)),
DiagnosticCount: 1,
ExceptionEscaped: true,
+ DisplayStatus: "notRun",
+ DisplayFirstFailureLayer: string.Empty,
+ DisplayFirstDiagnostic: new Step242AuditDiagnostic("Unknown", "Audit.None", "Not run."),
+ DisplayDiagnosticCount: 0,
TopologyCounts: Step242TopologyCounts.Zero,
TessellationCounts: Step242TessellationCounts.Zero,
CanonicalSha256: null,
@@ -205,46 +202,67 @@ internal static class Step242CorpusManifestRunner
];
}
- private static Step242CorpusReportEntry BuildFailure(
+ private static Step242CorpusReportEntry BuildAp242Failure(
Step242CorpusManifestEntry entry,
int sizeBytes,
string layer,
IReadOnlyList<KernelDiagnostic> diagnostics,
- BrepBody? body = null,
- DisplayTessellationResult? tessellation = null,
- IReadOnlyList<KernelDiagnostic>? tessellationDiagnostics = null)
+ BrepBody? body = null)
{
return new Step242CorpusReportEntry(
entry.Id,
entry.Path,
entry.Group,
sizeBytes,
- Status: ClassifyStatus(layer, tessellationDiagnostics),
+ Status: ClassifyAp242Status(layer),
FirstFailureLayer: layer,
FirstDiagnostic: FirstDiagnostic(diagnostics),
DiagnosticCount: diagnostics.Count,
ExceptionEscaped: false,
+ DisplayStatus: "notRun",
+ DisplayFirstFailureLayer: string.Empty,
+ DisplayFirstDiagnostic: new Step242AuditDiagnostic("Unknown", "Audit.None", "Not run."),
+ DisplayDiagnosticCount: 0,
TopologyCounts: body is null ? Step242TopologyCounts.Zero : new Step242TopologyCounts(body.Topology.Vertices.Count(), body.Topology.Edges.Count(), body.Topology.Faces.Count()),
- TessellationCounts: tessellation is null ? Step242TessellationCounts.Zero : new Step242TessellationCounts(tessellation.FacePatches.Count, tessellation.EdgePolylines.Count),
+ TessellationCounts: Step242TessellationCounts.Zero,
CanonicalSha256: null,
ExportedCanonicalText: null);
}
- private static string ClassifyStatus(string layer, IReadOnlyList<KernelDiagnostic>? tessellationDiagnostics)
+ private static string ClassifyAp242Status(string layer)
{
if (string.Equals(layer, "parser", StringComparison.Ordinal))
{
return "parseFail";
}
- if (string.Equals(layer, "picker", StringComparison.Ordinal))
+ return "importFail";
+ }
+
+ private static DisplayAuditResult RunDisplayAudit(BrepBody body)
+ {
+ var tessellation = BrepDisplayTessellator.Tessellate(body);
+ if (!tessellation.IsSuccess)
{
- return HasTruthfulTessellationSkip(tessellationDiagnostics)
- ? "pickerBlockedByTessellationSkip"
- : "pickerFail";
+ return new DisplayAuditResult(
+ "tessellationFail",
+ "tessellator",
+ FirstDiagnostic(tessellation.Diagnostics),
+ tessellation.Diagnostics.Count,
+ Step242TessellationCounts.Zero);
}
- return "importFail";
+ var counts = new Step242TessellationCounts(tessellation.Value.FacePatches.Count, tessellation.Value.EdgePolylines.Count);
+ var pick = TryPickSmoke(body, tessellation.Value);
+ if (pick.IsSuccess)
+ {
+ return new DisplayAuditResult("success", string.Empty, FirstDiagnostic(pick.Diagnostics), pick.Diagnostics.Count, counts);
+ }
+
+ var status = HasTruthfulTessellationSkip(tessellation.Diagnostics)
+ ? "pickerBlockedByTessellationSkip"
+ : "pickerFail";
+ return new DisplayAuditResult(status, "picker", FirstDiagnostic(pick.Diagnostics), pick.Diagnostics.Count, counts);
}
private static bool HasTruthfulTessellationSkip(IReadOnlyList<KernelDiagnostic>? tessellationDiagnostics)
@@ -340,6 +358,10 @@ internal sealed record Step242CorpusReportEntry(
Step242AuditDiagnostic FirstDiagnostic,
int DiagnosticCount,
bool ExceptionEscaped,
+ string DisplayStatus,
+ string DisplayFirstFailureLayer,
+ Step242AuditDiagnostic DisplayFirstDiagnostic,
+ int DisplayDiagnosticCount,
Step242TopologyCounts TopologyCounts,
Step242TessellationCounts TessellationCounts,
string? CanonicalSha256,
@@ -356,3 +378,10 @@ internal sealed record Step242TessellationCounts(int FacePatches, int EdgePolyli
{
public static Step242TessellationCounts Zero { get; } = new(0, 0);
}
+
+internal sealed record DisplayAuditResult(
+ string Status,
+ string FirstFailureLayer,
+ Step242AuditDiagnostic FirstDiagnostic,
+ int DiagnosticCount,
+ Step242TessellationCounts TessellationCounts);
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
index 20664920..4fb3263d 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242CylinderTrimDualSingleCoedgeClosedCircleRegressionTests.cs
@@ -50,14 +50,17 @@ 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("pickerBlockedByTessellationSkip", first.Status);
- Assert.Equal("picker", first.FirstFailureLayer);
- Assert.Equal("Audit.Picker", first.FirstDiagnostic.Source);
- Assert.Equal("Picker smoke ray produced no hit.", first.FirstDiagnostic.MessagePrefix);
-
- Assert.Equal(first.FirstFailureLayer, second.FirstFailureLayer);
- Assert.Equal(first.FirstDiagnostic.Source, second.FirstDiagnostic.Source);
- Assert.Equal(first.FirstDiagnostic.MessagePrefix, second.FirstDiagnostic.MessagePrefix);
+ Assert.Equal("success", first.Status);
+ Assert.Equal(string.Empty, first.FirstFailureLayer);
+ Assert.Equal("pickerBlockedByTessellationSkip", first.DisplayStatus);
+ Assert.Equal("picker", first.DisplayFirstFailureLayer);
+ Assert.Equal("Audit.Picker", first.DisplayFirstDiagnostic.Source);
+ Assert.Equal("Picker smoke ray produced no hit.", first.DisplayFirstDiagnostic.MessagePrefix);
+
+ Assert.Equal(first.DisplayStatus, second.DisplayStatus);
+ Assert.Equal(first.DisplayFirstFailureLayer, second.DisplayFirstFailureLayer);
+ Assert.Equal(first.DisplayFirstDiagnostic.Source, second.DisplayFirstDiagnostic.Source);
+ Assert.Equal(first.DisplayFirstDiagnostic.MessagePrefix, second.DisplayFirstDiagnostic.MessagePrefix);
}
[Fact]
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
index e520896a..85a68e4a 100644
--- a/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242NistAuditHarnessTests.cs
@@ -16,6 +16,10 @@ public sealed class Step242NistAuditHarnessTests
var second = ExecutePerFileLegacyAudit(entry);
Assert.Equal(first, second);
+ if (string.Equals(Environment.GetEnvironmentVariable("AETHERIS_UPDATE_STEP242_SNAPSHOT"), "1", StringComparison.Ordinal))
+ {
+ return;
+ }
var expectedByPath = LoadLegacySnapshotEntriesByPath();
Assert.True(expectedByPath.TryGetValue(entry.Path, out var expected), $"Missing snapshot entry for '{entry.Path}'.");
@@ -46,6 +50,25 @@ public sealed class Step242NistAuditHarnessTests
}
}
+ [Fact]
+ public void NistCorpus_RepresentativeDisplayBlocker_DoesNotFailAp242Lane()
+ {
+ const string relativePath = "testdata/step242/nist/FTC/nist_ftc_11_asme1_ap242-e2.stp";
+ var entry = BuildNistEntry(relativePath);
+
+ var first = Step242CorpusManifestRunner.RunOne(entry);
+ var second = Step242CorpusManifestRunner.RunOne(entry);
+
+ Assert.Equal("success", first.Status);
+ Assert.Equal(string.Empty, first.FirstFailureLayer);
+ Assert.Equal("pickerBlockedByTessellationSkip", first.DisplayStatus);
+ Assert.Equal("picker", first.DisplayFirstFailureLayer);
+ Assert.Equal(first.DisplayStatus, second.DisplayStatus);
+ Assert.Equal(first.DisplayFirstFailureLayer, second.DisplayFirstFailureLayer);
+ Assert.Equal(first.DisplayFirstDiagnostic.Source, second.DisplayFirstDiagnostic.Source);
+ Assert.Equal(first.DisplayFirstDiagnostic.MessagePrefix, second.DisplayFirstDiagnostic.MessagePrefix);
+ }
+
public static IEnumerable<object[]> NistCorpusEntries() => GetNistCorpusRelativePaths().Select(path => new object[] { path });
private static IReadOnlyList<Step242CorpusManifestEntry> GetNistCorpusEntries() => GetNistCorpusRelativePaths().Select(BuildNistEntry).ToArray();
diff --git a/testdata/step242/manifests/v0.corpus.json b/testdata/step242/manifests/v0.corpus.json
index ca7d6cb6..5683ee90 100644
--- a/testdata/step242/manifests/v0.corpus.json
+++ b/testdata/step242/manifests/v0.corpus.json
@@ -51,13 +51,8 @@
{
"id": "exp_cylinder_hole_unsupported",
"path": "testdata/step242/generated/v0-expectedfail/cylinder_hole_unsupported.step",
- "group": "expectedFail",
- "notes": "Truthful warn-and-skip tessellation leaves no face patch for picker smoke to hit.",
- "expectedFirstDiagnostic": {
- "code": "ValidationFailed",
- "source": "Audit.Picker",
- "messagePrefix": "Picker smoke ray produced no hit."
- }
+ "group": "deferred",
+ "notes": "AP242 lane passes while display/query lane truthfully reports picker blocker from tessellation warn-and-skip behavior."
},
{
"id": "exp_parser_missing_paren",
@@ -76,4 +71,4 @@
"notes": "Representative NIST deferred item retained in report output"
}
]
-}
\ No newline at end of file
+}