Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Add semantic PMI for cylinder through-hole diameter
Yuechen Li542ceda7ed02
diff --git a/Aetheris.Kernel.Core.Tests/Step242/Step242ExporterTests.cs b/Aetheris.Kernel.Core.Tests/Step242/Step242ExporterTests.csindex b6e2cb82..a46caca3 100644--- a/Aetheris.Kernel.Core.Tests/Step242/Step242ExporterTests.cs+++ b/Aetheris.Kernel.Core.Tests/Step242/Step242ExporterTests.cs@@ -29,6 +29,37 @@ public sealed class Step242ExporterTests}++ [Fact]+ public void ExportBody_WithSemanticCylinderHolePmi_EmitsSemanticOnlyDeterministicChain()+ {+ var boxResult = BrepPrimitives.CreateBox(4d, 6d, 8d);+ Assert.True(boxResult.IsSuccess);++ var semanticPmi = new[]+ {+ new Step242SemanticPmiDiameter("hole_a", 8d),+ new Step242SemanticPmiDiameter("hole_b", 6d)+ };++ var first = Step242Exporter.ExportBody(boxResult.Value, semanticPmi);+ var second = Step242Exporter.ExportBody(boxResult.Value, semanticPmi);++ Assert.True(first.IsSuccess);+ Assert.True(second.IsSuccess);+ Assert.Equal(first.Value, second.Value);+ Assert.Equal(2, CountOccurrences(first.Value, "SHAPE_ASPECT"));+ Assert.Equal(2, CountOccurrences(first.Value, "PROPERTY_DEFINITION_REPRESENTATION"));+ Assert.Equal(2, CountOccurrences(first.Value, "SHAPE_DIMENSION_REPRESENTATION"));+ Assert.Equal(2, CountOccurrences(first.Value, "MEASURE_REPRESENTATION_ITEM"));+ Assert.Contains("firmament-feature:hole_a", first.Value, StringComparison.Ordinal);+ Assert.Contains("firmament-feature:hole_b", first.Value, StringComparison.Ordinal);+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',8,#", first.Value, StringComparison.Ordinal);+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',6,#", first.Value, StringComparison.Ordinal);+ Assert.DoesNotContain("DRAUGHTING_CALLOUT", first.Value, StringComparison.Ordinal);+ Assert.DoesNotContain("ANNOTATION_PLANE", first.Value, StringComparison.Ordinal);+ }+[Fact]public void ExportBody_ImportedCylindricalFace_EmitsCylindricalSurface(){@@ -762,4 +793,18 @@ END-ISO-10303-21;";private sealed record ParsedLine((double X, double Y, double Z) Origin, int VectorId, double Length);private sealed record ParsedEdgeCurve(int EdgeCurveId, int StartVertexId, int EndVertexId, int CurveId);+++ private static int CountOccurrences(string text, string token)+ {+ var count = 0;+ var index = 0;+ while ((index = text.IndexOf(token, index, StringComparison.Ordinal)) >= 0)+ {+ count++;+ index += token.Length;+ }++ return count;+ }}diff --git a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs b/Aetheris.Kernel.Core/Step242/Step242Exporter.csindex 94fdbcc0..87143863 100644--- a/Aetheris.Kernel.Core/Step242/Step242Exporter.cs+++ b/Aetheris.Kernel.Core/Step242/Step242Exporter.cs@@ -12,6 +12,12 @@ namespace Aetheris.Kernel.Core.Step242;public static class Step242Exporter{public static KernelResult<string> ExportBody(BrepBody body, Step242ExportOptions? options = null)+ => ExportBody(body, semanticPmi: null, options);++ public static KernelResult<string> ExportBody(+ BrepBody body,+ IReadOnlyList<Step242SemanticPmiDiameter>? semanticPmi,+ Step242ExportOptions? options = null){options ??= new Step242ExportOptions();@@ -131,12 +137,60 @@ public static class Step242Exportervar planeAngleUnitId = writer.AddRawEntity("(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.))");var solidAngleUnitId = writer.AddRawEntity("(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT())");var repContextId = writer.AddRawEntity($"(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT(({lengthUnitId},{planeAngleUnitId},{solidAngleUnitId}))REPRESENTATION_CONTEXT('3','3D'))");+ EmitSemanticPmi(writer, shapeId, repContextId, lengthUnitId, semanticPmi);+var shapeRepresentationId = writer.AddEntity("SHAPE_REPRESENTATION", Step242TextWriter.String(options.ProductName), Step242TextWriter.List(brepId), Step242TextWriter.Ref(repContextId));writer.AddEntity("SHAPE_DEFINITION_REPRESENTATION", Step242TextWriter.Ref(shapeId), Step242TextWriter.Ref(shapeRepresentationId));return KernelResult<string>.Success(writer.Build(options.ApplicationName));}+ private static void EmitSemanticPmi(+ Step242TextWriter writer,+ string shapeId,+ string repContextId,+ string lengthUnitId,+ IReadOnlyList<Step242SemanticPmiDiameter>? semanticPmi)+ {+ if (semanticPmi is null || semanticPmi.Count == 0)+ {+ return;+ }++ foreach (var diameter in semanticPmi)+ {+ var featureShapeAspectId = writer.AddEntity(+ "SHAPE_ASPECT",+ Step242TextWriter.String($"firmament-feature:{diameter.FeatureId}"),+ Step242TextWriter.String("supported cylinder through-hole feature"),+ Step242TextWriter.Ref(shapeId),+ Step242TextWriter.Enum("FALSE"));++ var propertyDefinitionId = writer.AddEntity(+ "PROPERTY_DEFINITION",+ Step242TextWriter.String($"diameter:{diameter.FeatureId}"),+ Step242TextWriter.String("auto-derived semantic PMI diameter"),+ Step242TextWriter.Ref(featureShapeAspectId));++ var measureItemId = writer.AddEntity(+ "MEASURE_REPRESENTATION_ITEM",+ Step242TextWriter.String("diameter"),+ Step242TextWriter.Number(diameter.Diameter),+ Step242TextWriter.Ref(lengthUnitId));++ var representationId = writer.AddEntity(+ "SHAPE_DIMENSION_REPRESENTATION",+ Step242TextWriter.String($"diameter:{diameter.FeatureId}"),+ Step242TextWriter.List(measureItemId),+ Step242TextWriter.Ref(repContextId));++ writer.AddEntity(+ "PROPERTY_DEFINITION_REPRESENTATION",+ Step242TextWriter.Ref(propertyDefinitionId),+ Step242TextWriter.Ref(representationId));+ }+ }+private static string BuildPlane(Step242TextWriter writer, PlaneSurface plane){var originId = writer.AddEntity("CARTESIAN_POINT", "$", Step242TextWriter.List(Step242TextWriter.Number(plane.Origin.X), Step242TextWriter.Number(plane.Origin.Y), Step242TextWriter.Number(plane.Origin.Z)));diff --git a/Aetheris.Kernel.Core/Step242/Step242SemanticPmi.cs b/Aetheris.Kernel.Core/Step242/Step242SemanticPmi.csnew file mode 100644index 00000000..8e3c3e71--- /dev/null+++ b/Aetheris.Kernel.Core/Step242/Step242SemanticPmi.cs@@ -0,0 +1,5 @@+namespace Aetheris.Kernel.Core.Step242;++public sealed record Step242SemanticPmiDiameter(+ string FeatureId,+ double Diameter);diff --git a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.csindex 11d4dbfc..e02948a2 100644--- a/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/FirmamentStepExporterTests.cs@@ -67,7 +67,7 @@ public sealed class FirmamentStepExporterTests}[Fact]- public void Export_SupportedBoxCylinderHole_Exports_Deterministically_With_CylindricalSurface()+ public void Export_SupportedBoxCylinderHole_Exports_Deterministically_With_Semantic_Diameter_Pmi(){var first = ExportFixture("testdata/firmament/examples/boolean_box_cylinder_hole.firmament");var second = ExportFixture("testdata/firmament/examples/boolean_box_cylinder_hole.firmament");@@ -81,6 +81,13 @@ public sealed class FirmamentStepExporterTestsAssert.Equal("subtract", first.Value.ExportedFeatureKind);Assert.Contains("CYLINDRICAL_SURFACE", first.Value.StepText, StringComparison.Ordinal);Assert.Contains("MANIFOLD_SOLID_BREP", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("SHAPE_ASPECT", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("PROPERTY_DEFINITION_REPRESENTATION", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("SHAPE_DIMENSION_REPRESENTATION", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',8,#", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("firmament-feature:hole", first.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("DRAUGHTING_CALLOUT", first.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("ANNOTATION_PLANE", first.Value.StepText, StringComparison.Ordinal);}[Fact]@@ -105,7 +112,7 @@ public sealed class FirmamentStepExporterTests}[Fact]- public void Export_SupportedTwoCylinderComposition_Exports_Deterministically_With_Persisted_Artifact()+ public void Export_SupportedTwoCylinderComposition_Exports_Two_Semantic_Diameter_Items_Deterministically(){var first = ExportFixture("testdata/firmament/examples/boolean_two_cylinder_holes_basic.firmament");var second = ExportFixture("testdata/firmament/examples/boolean_two_cylinder_holes_basic.firmament");@@ -118,6 +125,12 @@ public sealed class FirmamentStepExporterTestsAssert.Equal("boolean", first.Value.ExportedBodyCategory);Assert.Equal("subtract", first.Value.ExportedFeatureKind);Assert.Equal(2, CountOccurrences(first.Value.StepText, "CYLINDRICAL_SURFACE"));+ Assert.Equal(2, CountOccurrences(first.Value.StepText, "SHAPE_ASPECT"));+ Assert.Equal(2, CountOccurrences(first.Value.StepText, "MEASURE_REPRESENTATION_ITEM"));+ Assert.Contains("firmament-feature:hole_a", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("firmament-feature:hole_b", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',8,#", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',6,#", first.Value.StepText, StringComparison.Ordinal);Assert.Contains("MANIFOLD_SOLID_BREP", first.Value.StepText, StringComparison.Ordinal);var artifactPath = WriteExportArtifact("boolean_two_cylinder_holes_basic.step", first.Value.StepText);@@ -126,7 +139,7 @@ public sealed class FirmamentStepExporterTests}[Fact]- public void Export_SupportedCylinderConeComposition_Exports_Deterministically_With_Persisted_Artifact()+ public void Export_SupportedCylinderConeComposition_Exports_Only_Cylinder_Diameter_Pmi(){var first = ExportFixture("testdata/firmament/examples/boolean_cylinder_cone_holes_basic.firmament");var second = ExportFixture("testdata/firmament/examples/boolean_cylinder_cone_holes_basic.firmament");@@ -140,6 +153,10 @@ public sealed class FirmamentStepExporterTestsAssert.Equal("subtract", first.Value.ExportedFeatureKind);Assert.Contains("CYLINDRICAL_SURFACE", first.Value.StepText, StringComparison.Ordinal);Assert.Contains("CONICAL_SURFACE", first.Value.StepText, StringComparison.Ordinal);+ Assert.Contains("firmament-feature:hole_a", first.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("firmament-feature:cut_b", first.Value.StepText, StringComparison.Ordinal);+ Assert.Equal(1, CountOccurrences(first.Value.StepText, "MEASURE_REPRESENTATION_ITEM"));+ Assert.Contains("MEASURE_REPRESENTATION_ITEM('diameter',8,#", first.Value.StepText, StringComparison.Ordinal);Assert.Contains("MANIFOLD_SOLID_BREP", first.Value.StepText, StringComparison.Ordinal);var artifactPath = WriteExportArtifact("boolean_cylinder_cone_holes_basic.step", first.Value.StepText);@@ -147,6 +164,31 @@ public sealed class FirmamentStepExporterTestsAssert.Equal(first.Value.StepText, File.ReadAllText(artifactPath));}++ [Fact]+ public void Export_NonCylinderOrFailedBooleanCases_DoNotEmit_SemanticPmi()+ {+ var boxSubtract = ExportFixture("testdata/firmament/examples/boolean_subtract_basic.firmament");+ var coneHole = ExportFixture("testdata/firmament/examples/boolean_box_cone_throughhole_basic.firmament");+ var unsupportedCylinder = ExportFixture("testdata/firmament/fixtures/m10h1-unsupported-box-with-cylinder-hole.firmament");+ var unsupportedSphere = ExportFixture("testdata/firmament/fixtures/m10l-unsupported-box-subtract-sphere-contained.firmament");+ var unsupportedTorus = ExportFixture("testdata/firmament/fixtures/m10n-unsupported-box-subtract-torus.firmament");++ Assert.True(boxSubtract.IsSuccess);+ Assert.DoesNotContain("SHAPE_ASPECT", boxSubtract.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("MEASURE_REPRESENTATION_ITEM", boxSubtract.Value.StepText, StringComparison.Ordinal);++ Assert.True(coneHole.IsSuccess);+ Assert.DoesNotContain("SHAPE_ASPECT", coneHole.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("MEASURE_REPRESENTATION_ITEM", coneHole.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("DRAUGHTING_CALLOUT", coneHole.Value.StepText, StringComparison.Ordinal);+ Assert.DoesNotContain("ANNOTATION_PLANE", coneHole.Value.StepText, StringComparison.Ordinal);++ Assert.False(unsupportedCylinder.IsSuccess);+ Assert.False(unsupportedSphere.IsSuccess);+ Assert.False(unsupportedTorus.IsSuccess);+ }+[Fact]public void Export_UnsupportedBoxWithCylinderHole_Fails_Instead_Of_Falling_Back_To_Base_Primitive(){diff --git a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs b/Aetheris.Kernel.Firmament/FirmamentStepExporter.csindex ff38226b..3112c557 100644--- a/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs+++ b/Aetheris.Kernel.Firmament/FirmamentStepExporter.cs@@ -4,6 +4,7 @@ using Aetheris.Kernel.Core.Results;using Aetheris.Kernel.Core.Step242;using Aetheris.Kernel.Firmament.Diagnostics;using Aetheris.Kernel.Firmament.Execution;+using Aetheris.Kernel.Firmament.Lowering;namespace Aetheris.Kernel.Firmament;@@ -36,7 +37,8 @@ public static class FirmamentStepExporterreturn KernelResult<FirmamentStepExportResult>.Failure(selectionResult.Diagnostics);}- var stepResult = Step242Exporter.ExportBody(selectionResult.Value.Body);+ var semanticPmi = DeriveSemanticPmi(artifact.PrimitiveLoweringPlan, selectionResult.Value);+ var stepResult = Step242Exporter.ExportBody(selectionResult.Value.Body, semanticPmi);if (!stepResult.IsSuccess){return KernelResult<FirmamentStepExportResult>.Failure(stepResult.Diagnostics);@@ -112,6 +114,41 @@ public static class FirmamentStepExporterprivate const string ExportBodyCategoryPrimitive = "primitive";private const string ExportBodyCategoryBoolean = "boolean";+ private static IReadOnlyList<Step242SemanticPmiDiameter> DeriveSemanticPmi(+ FirmamentPrimitiveLoweringPlan? loweringPlan,+ ExportBodySelection selection)+ {+ if (loweringPlan is null+ || !string.Equals(selection.BodyCategory, ExportBodyCategoryBoolean, StringComparison.Ordinal)+ || !string.Equals(selection.FeatureKind, "subtract", StringComparison.Ordinal))+ {+ return [];+ }++ var booleansByFeatureId = loweringPlan.Booleans.ToDictionary(boolean => boolean.FeatureId, StringComparer.Ordinal);+ var currentFeatureId = selection.FeatureId;+ var derived = new List<(int OpIndex, Step242SemanticPmiDiameter Item)>();++ while (booleansByFeatureId.TryGetValue(currentFeatureId, out var boolean)+ && boolean.Kind == FirmamentLoweredBooleanKind.Subtract)+ {+ if (string.Equals(boolean.Tool.OpName, "cylinder", StringComparison.Ordinal)+ && boolean.Tool.RawFields.TryGetValue("radius", out var radiusRaw)+ && !string.IsNullOrWhiteSpace(radiusRaw))+ {+ var radius = FirmamentPrimitiveToolParsing.ParseScalar(radiusRaw);+ derived.Add((boolean.OpIndex, new Step242SemanticPmiDiameter(boolean.FeatureId, radius * 2d)));+ }++ currentFeatureId = boolean.PrimaryReferenceFeatureId;+ }++ return derived+ .OrderBy(item => item.OpIndex)+ .Select(item => item.Item)+ .ToArray();+ }+private sealed record ExportBodySelection(int OpIndex,string FeatureId,diff --git a/testdata/firmament/exports/boolean_box_cylinder_hole.step b/testdata/firmament/exports/boolean_box_cylinder_hole.stepindex e5680897..d35e397c 100644--- a/testdata/firmament/exports/boolean_box_cylinder_hole.step+++ b/testdata/firmament/exports/boolean_box_cylinder_hole.step@@ -209,7 +209,12 @@ DATA;#202=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));#203=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());#204=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#201,#202,#203))REPRESENTATION_CONTEXT('3','3D'));-#205=SHAPE_REPRESENTATION('AetherisBody',(#193),#204);-#206=SHAPE_DEFINITION_REPRESENTATION(#200,#205);+#205=SHAPE_ASPECT('firmament-feature:hole','supported cylinder through-hole feature',#200,.FALSE.);+#206=PROPERTY_DEFINITION('diameter:hole','auto-derived semantic PMI diameter',#205);+#207=MEASURE_REPRESENTATION_ITEM('diameter',8,#201);+#208=SHAPE_DIMENSION_REPRESENTATION('diameter:hole',(#207),#204);+#209=PROPERTY_DEFINITION_REPRESENTATION(#206,#208);+#210=SHAPE_REPRESENTATION('AetherisBody',(#193),#204);+#211=SHAPE_DEFINITION_REPRESENTATION(#200,#210);ENDSEC;END-ISO-10303-21;diff --git a/testdata/firmament/exports/boolean_cylinder_cone_holes_basic.step b/testdata/firmament/exports/boolean_cylinder_cone_holes_basic.stepindex 08ab1959..0b8af812 100644--- a/testdata/firmament/exports/boolean_cylinder_cone_holes_basic.step+++ b/testdata/firmament/exports/boolean_cylinder_cone_holes_basic.step@@ -252,7 +252,12 @@ DATA;#245=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));#246=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());#247=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#244,#245,#246))REPRESENTATION_CONTEXT('3','3D'));-#248=SHAPE_REPRESENTATION('AetherisBody',(#236),#247);-#249=SHAPE_DEFINITION_REPRESENTATION(#243,#248);+#248=SHAPE_ASPECT('firmament-feature:hole_a','supported cylinder through-hole feature',#243,.FALSE.);+#249=PROPERTY_DEFINITION('diameter:hole_a','auto-derived semantic PMI diameter',#248);+#250=MEASURE_REPRESENTATION_ITEM('diameter',8,#244);+#251=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_a',(#250),#247);+#252=PROPERTY_DEFINITION_REPRESENTATION(#249,#251);+#253=SHAPE_REPRESENTATION('AetherisBody',(#236),#247);+#254=SHAPE_DEFINITION_REPRESENTATION(#243,#253);ENDSEC;END-ISO-10303-21;diff --git a/testdata/firmament/exports/boolean_two_cylinder_holes_basic.step b/testdata/firmament/exports/boolean_two_cylinder_holes_basic.stepindex 1c5e6769..09b8aedf 100644--- a/testdata/firmament/exports/boolean_two_cylinder_holes_basic.step+++ b/testdata/firmament/exports/boolean_two_cylinder_holes_basic.step@@ -252,7 +252,17 @@ DATA;#245=(NAMED_UNIT(*)PLANE_ANGLE_UNIT()SI_UNIT($,.RADIAN.));#246=(NAMED_UNIT(*)SI_UNIT($,.STERADIAN.)SOLID_ANGLE_UNIT());#247=(GEOMETRIC_REPRESENTATION_CONTEXT(3)GLOBAL_UNIT_ASSIGNED_CONTEXT((#244,#245,#246))REPRESENTATION_CONTEXT('3','3D'));-#248=SHAPE_REPRESENTATION('AetherisBody',(#236),#247);-#249=SHAPE_DEFINITION_REPRESENTATION(#243,#248);+#248=SHAPE_ASPECT('firmament-feature:hole_a','supported cylinder through-hole feature',#243,.FALSE.);+#249=PROPERTY_DEFINITION('diameter:hole_a','auto-derived semantic PMI diameter',#248);+#250=MEASURE_REPRESENTATION_ITEM('diameter',8,#244);+#251=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_a',(#250),#247);+#252=PROPERTY_DEFINITION_REPRESENTATION(#249,#251);+#253=SHAPE_ASPECT('firmament-feature:hole_b','supported cylinder through-hole feature',#243,.FALSE.);+#254=PROPERTY_DEFINITION('diameter:hole_b','auto-derived semantic PMI diameter',#253);+#255=MEASURE_REPRESENTATION_ITEM('diameter',6,#244);+#256=SHAPE_DIMENSION_REPRESENTATION('diameter:hole_b',(#255),#247);+#257=PROPERTY_DEFINITION_REPRESENTATION(#254,#256);+#258=SHAPE_REPRESENTATION('AetherisBody',(#236),#247);+#259=SHAPE_DEFINITION_REPRESENTATION(#243,#258);ENDSEC;END-ISO-10303-21;