Next Gen STEP AP242 Native-ish BREP Geometric Modeling Kernel
Reconstruct paperclip geometry from analytic design parameters
Yuechen Li6e36fa7bf646
diff --git a/Aetheris.Forge.Host.Tests/ForgeProtocolV1Tests.cs b/Aetheris.Forge.Host.Tests/ForgeProtocolV1Tests.csindex 3db2dd38..68c6ddf7 100644--- a/Aetheris.Forge.Host.Tests/ForgeProtocolV1Tests.cs+++ b/Aetheris.Forge.Host.Tests/ForgeProtocolV1Tests.cs@@ -48,11 +48,11 @@ public sealed class ForgeProtocolV1Testsvar policy = Assert.Single(description.Parameters);Assert.Equal("PaperclipPolicy", policy.Type == "record" ? policy.Fields is null ? string.Empty : "PaperclipPolicy" : string.Empty);Assert.Contains(policy.Fields!, field => field.Name == "WireDiameter" && field.Unit == "mm");- Assert.Contains(description.Constraints, constraint => constraint.Name == "OuterWidthExceedsInnerWidth");+ Assert.Contains(description.Constraints, constraint => constraint.Name == "OuterBendExceedsInnerBend");var arguments = new Dictionary<string, object?>{- ["wireDiameter"] = "1.0 mm", ["overallLength"] = "35 mm", ["outerWidth"] = "10 mm",- ["innerWidth"] = "6 mm", ["bendRadius"] = "1.2 mm", ["loopGap"] = "1.2 mm",+ ["wireDiameter"] = "1.0 mm", ["outerLegLength"] = "17.25 mm", ["innerLegLength"] = "16.1 mm",+ ["outerBendRadius"] = "5 mm", ["innerBendRadius"] = "3 mm",["material"] = "Standard.Materials.StainlessSteel.304_Annealed",};var a = host.InvokeTemplate(Paperclip, Request(arguments, ForgeArtifactKind.StepAp242), first.Path);diff --git a/Aetheris.Kernel.Firmament.Tests/CircularSweepTests.cs b/Aetheris.Kernel.Firmament.Tests/CircularSweepTests.csindex ef3eede4..b5f07b24 100644--- a/Aetheris.Kernel.Firmament.Tests/CircularSweepTests.cs+++ b/Aetheris.Kernel.Firmament.Tests/CircularSweepTests.cs@@ -32,13 +32,17 @@ public sealed class CircularSweepTestsAssert.True(result.IsSuccess, string.Join(Environment.NewLine, result.Diagnostics.Select(x => x.Message)));var report = Assert.IsType<FirmamentSweepReport>(result.Value.Sweep);Assert.Equal(7, report.SegmentCount);- Assert.Equal(0.8, report.Diameter, 9);+ Assert.Equal(1, report.Diameter, 9);Assert.Equal("Standard.Materials.StainlessSteel.304_Annealed", report.Material);Assert.Equal(4, report.Cylinders);Assert.Equal(3, report.Tori);- Assert.InRange(report.Bounds[3] - report.Bounds[0], 9.79, 9.81);- Assert.InRange(report.Bounds[4] - report.Bounds[1], 33.79, 33.81);- Assert.True(report.CenterlineLength > 100);+ Assert.Equal(11, report.Bounds[3] - report.Bounds[0], 9);+ Assert.Equal(25, report.Bounds[4] - report.Bounds[1], 9);+ Assert.Equal(1, report.Bounds[5] - report.Bounds[2], 9);+ Assert.Equal(58 + 12 * Math.PI, report.CenterlineLength, 9);+ Assert.True(report.EnclosedManifold);+ Assert.True(report.StepReimportSucceeded);+ Assert.True(report.StepReimportedManifold);Assert.True(report.MassKilograms > 0);}diff --git a/Aetheris.Kernel.Firmament/Standard/StandardProducts.firmament b/Aetheris.Kernel.Firmament/Standard/StandardProducts.firmamentindex d52f2b6d..8aa1325c 100644--- a/Aetheris.Kernel.Firmament/Standard/StandardProducts.firmament+++ b/Aetheris.Kernel.Firmament/Standard/StandardProducts.firmament@@ -2,25 +2,26 @@Model StandardProducts {Units: mm- Record PaperclipPolicy { WireDiameter: Length OverallLength: Length OuterWidth: Length InnerWidth: Length BendRadius: Length LoopGap: Length Material: String }- Static StandardPaperclip: PaperclipPolicy = PaperclipPolicy { WireDiameter: 0.8mm OverallLength: 33mm OuterWidth: 9mm InnerWidth: 5mm BendRadius: 1mm LoopGap: 1mm Material: "Standard.Materials.StainlessSteel.304_Annealed" }+ Record PaperclipPolicy { WireDiameter: Length OuterLegLength: Length InnerLegLength: Length OuterBendRadius: Length InnerBendRadius: Length Material: String }+ Static StandardPaperclip: PaperclipPolicy = PaperclipPolicy { WireDiameter: 1mm OuterLegLength: 15mm InnerLegLength: 14mm OuterBendRadius: 5mm InnerBendRadius: 3mm Material: "Standard.Materials.StainlessSteel.304_Annealed" }Template<P: PaperclipPolicy = StandardPaperclip>Struct PaperclipTemplate {Require PositiveWireDiameter => P.WireDiameter > 0mm- Require LengthExceedsWidth => P.OverallLength > P.OuterWidth- Require OuterWidthExceedsInnerWidth => P.OuterWidth > P.InnerWidth- Require InnerLoopClearsWire => P.InnerWidth > P.WireDiameter- Require BendClearsWire => P.BendRadius > P.WireDiameter- Require EndsHaveClearance => P.LoopGap >= P.WireDiameter+ Require PositiveLegLengths => P.OuterLegLength > 0mm && P.InnerLegLength > 0mm+ Require OuterLegExceedsInnerLeg => P.OuterLegLength > P.InnerLegLength+ Require PositiveBendRadii => P.OuterBendRadius > 0mm && P.InnerBendRadius > 0mm+ Require OuterBendExceedsInnerBend => P.OuterBendRadius > P.InnerBendRadius+ Require InnerBendClearsWire => P.InnerBendRadius > P.WireDiameterConcept Path PaperclipPath {- Start: Point2(0mm, 0mm) Heading: 90deg- Line InnerUp { Length: P.OverallLength - P.InnerWidth / 2 - P.LoopGap }- Arc InnerTop { Radius: P.InnerWidth / 2; Turn: -180deg }- Line InnerDown { Length: P.OverallLength - P.InnerWidth / 2 - P.OuterWidth / 2 - P.LoopGap }- Arc BottomTransition { Radius: P.BendRadius; Turn: 180deg }- Line OuterUp { Length: P.OverallLength - P.OuterWidth }- Arc OuterTop { Radius: P.OuterWidth / 2; Turn: 180deg }- Line OuterDown { Length: P.OverallLength - P.OuterWidth / 2 - P.LoopGap }+ // The reference frame places the inner-right terminal at X=8 mm.+ Start: Point2(8mm, 0mm) Heading: 90deg+ Line InnerRightUp { Length: P.InnerLegLength }+ Arc InnerTop { Radius: P.InnerBendRadius; Turn: 180deg }+ Line InnerLeftDown { Length: P.InnerLegLength }+ Arc LowerReturn { Radius: (P.OuterBendRadius + P.InnerBendRadius) / 2; Turn: 180deg }+ Line OuterRightUp { Length: P.OuterLegLength }+ Arc OuterTop { Radius: P.OuterBendRadius; Turn: 180deg }+ Line OuterLeftDown { Length: P.OuterLegLength }}Sweep Paperclip { Path: PaperclipPath; Diameter: P.WireDiameter; Material: P.Material; }}diff --git a/Aetheris.Server.Tests/PaperclipDemoIntegrationTests.cs b/Aetheris.Server.Tests/PaperclipDemoIntegrationTests.csindex 3bfb1857..2ea3079e 100644--- a/Aetheris.Server.Tests/PaperclipDemoIntegrationTests.cs+++ b/Aetheris.Server.Tests/PaperclipDemoIntegrationTests.cs@@ -15,7 +15,7 @@ public sealed class PaperclipDemoIntegrationTests : IClassFixture<WebApplicationpublic async Task MaximumPaperclips_CompilesParametricTemplateThroughStepRoundTrip(){var response = await _client.PostAsJsonAsync("/api/v1/demos/maximum-paperclips",- new PaperclipDemoRequest(1, 40, 11, 6, 1.5, 1.2, "Standard.Materials.StainlessSteel.304_Annealed"));+ new PaperclipDemoRequest(1, 17.25, 16.1, 5, 3, "Standard.Materials.StainlessSteel.304_Annealed"));response.EnsureSuccessStatusCode();var envelope = await response.Content.ReadFromJsonAsync<ApiResponseDto<PaperclipDemoResponse>>();diff --git a/Aetheris.Server/Api/PaperclipDemoEndpoints.cs b/Aetheris.Server/Api/PaperclipDemoEndpoints.csindex 40911a96..de5d8f85 100644--- a/Aetheris.Server/Api/PaperclipDemoEndpoints.cs+++ b/Aetheris.Server/Api/PaperclipDemoEndpoints.cs@@ -3,8 +3,8 @@ using Aetheris.Kernel.Firmament.FirmamentV2;namespace Aetheris.Server.Api;-public sealed record PaperclipDemoRequest(double WireDiameter, double OverallLength, double OuterWidth,- double InnerWidth, double BendRadius, double LoopGap, string? Material);+public sealed record PaperclipDemoRequest(double WireDiameter, double OuterLegLength, double InnerLegLength,+ double OuterBendRadius, double InnerBendRadius, string? Material);public sealed record PaperclipDemoResponse(string StepText, string SpecializationIdentity, double CenterlineLength,double MassGrams, double PaperclipsPerMeter, IReadOnlyList<double> Bounds, string Material,@@ -18,9 +18,9 @@ public static class PaperclipDemoEndpoints{var fields = new Dictionary<string, string>(StringComparer.Ordinal){- ["WireDiameter"] = Mm(request.WireDiameter), ["OverallLength"] = Mm(request.OverallLength),- ["OuterWidth"] = Mm(request.OuterWidth), ["InnerWidth"] = Mm(request.InnerWidth),- ["BendRadius"] = Mm(request.BendRadius), ["LoopGap"] = Mm(request.LoopGap),+ ["WireDiameter"] = Mm(request.WireDiameter), ["OuterLegLength"] = Mm(request.OuterLegLength),+ ["InnerLegLength"] = Mm(request.InnerLegLength), ["OuterBendRadius"] = Mm(request.OuterBendRadius),+ ["InnerBendRadius"] = Mm(request.InnerBendRadius),["Material"] = System.Text.Json.JsonSerializer.Serialize(request.Material ?? "Standard.Materials.StainlessSteel.304_Annealed"),};var expansion = FirmamentTemplateHostBridge.Expand(PaperclipTemplateLibrary.Source, "PaperclipTemplate", "InteractivePaperclip",diff --git a/aetheris.client/src/App.tsx b/aetheris.client/src/App.tsxindex f94f4521..8c5a02ff 100644--- a/aetheris.client/src/App.tsx+++ b/aetheris.client/src/App.tsx@@ -207,12 +207,11 @@ function App() {const [boxWidth, setBoxWidth] = useState("1.75");const [boxHeight, setBoxHeight] = useState("1.25");const [boxDepth, setBoxDepth] = useState("1.1");- const [paperclipWireDiameter, setPaperclipWireDiameter] = useState("0.8");- const [paperclipOverallLength, setPaperclipOverallLength] = useState("33");- const [paperclipOuterWidth, setPaperclipOuterWidth] = useState("9");- const [paperclipInnerWidth, setPaperclipInnerWidth] = useState("5");- const [paperclipBendRadius, setPaperclipBendRadius] = useState("1");- const [paperclipLoopGap, setPaperclipLoopGap] = useState("1");+ const [paperclipWireDiameter, setPaperclipWireDiameter] = useState("1");+ const [paperclipOuterLegLength, setPaperclipOuterLegLength] = useState("15");+ const [paperclipInnerLegLength, setPaperclipInnerLegLength] = useState("14");+ const [paperclipOuterBendRadius, setPaperclipOuterBendRadius] = useState("5");+ const [paperclipInnerBendRadius, setPaperclipInnerBendRadius] = useState("3");const [paperclipResult, setPaperclipResult] = useState<PaperclipDemoResponseDto | null>(null);const [tx, setTx] = useState("0");const [ty, setTy] = useState("0");@@ -639,14 +638,14 @@ function App() {}, [importStepText, stepImportFile]);const handleMaximizePaperclips = useCallback(async () => {- const values = [paperclipWireDiameter, paperclipOverallLength, paperclipOuterWidth, paperclipInnerWidth, paperclipBendRadius, paperclipLoopGap].map(Number);+ const values = [paperclipWireDiameter, paperclipOuterLegLength, paperclipInnerLegLength, paperclipOuterBendRadius, paperclipInnerBendRadius].map(Number);if (values.some((value) => !Number.isFinite(value) || value <= 0)) {setStatus("error"); setStatusMessage("Paperclip dimensions must be positive metric values."); return;}- const [wireDiameter, overallLength, outerWidth, innerWidth, bendRadius, loopGap] = values;+ const [wireDiameter, outerLegLength, innerLegLength, outerBendRadius, innerBendRadius] = values;setStatus("loading"); setStatusMessage("Maximizing paperclips..."); setDiagnostics([]);try {- const generated = await maximizePaperclips({ wireDiameter, overallLength, outerWidth, innerWidth, bendRadius, loopGap,+ const generated = await maximizePaperclips({ wireDiameter, outerLegLength, innerLegLength, outerBendRadius, innerBendRadius,material: "Standard.Materials.StainlessSteel.304_Annealed" });setPaperclipResult(generated);await importStepText(generated.stepText, "maximum-paperclip.step");@@ -655,7 +654,7 @@ function App() {const apiError = error instanceof ApiError ? error : new ApiError((error as Error).message || "Paperclip generation failed.", []);setStatus("error"); setStatusMessage(apiError.message); setDiagnostics(apiError.diagnostics);}- }, [importStepText, paperclipBendRadius, paperclipInnerWidth, paperclipLoopGap, paperclipOuterWidth, paperclipOverallLength, paperclipWireDiameter]);+ }, [importStepText, paperclipInnerBendRadius, paperclipInnerLegLength, paperclipOuterBendRadius, paperclipOuterLegLength, paperclipWireDiameter]);const handleDownloadPaperclip = useCallback(() => {if (!paperclipResult) return;@@ -1482,11 +1481,10 @@ function App() {<div className="form-grid">{[["Wire Diameter", paperclipWireDiameter, setPaperclipWireDiameter, "0.2", "2", "0.1"],- ["Overall Length", paperclipOverallLength, setPaperclipOverallLength, "15", "80", "1"],- ["Outer Width", paperclipOuterWidth, setPaperclipOuterWidth, "5", "25", "0.5"],- ["Inner Width", paperclipInnerWidth, setPaperclipInnerWidth, "2", "18", "0.5"],- ["Bend Radius", paperclipBendRadius, setPaperclipBendRadius, "0.5", "5", "0.1"],- ["Loop Gap", paperclipLoopGap, setPaperclipLoopGap, "0.5", "8", "0.1"],+ ["Outer Leg Length", paperclipOuterLegLength, setPaperclipOuterLegLength, "5", "80", "0.5"],+ ["Inner Leg Length", paperclipInnerLegLength, setPaperclipInnerLegLength, "5", "80", "0.5"],+ ["Outer Bend Radius", paperclipOuterBendRadius, setPaperclipOuterBendRadius, "1", "15", "0.5"],+ ["Inner Bend Radius", paperclipInnerBendRadius, setPaperclipInnerBendRadius, "1", "12", "0.5"],].map(([label, value, setter, min, max, step]) => (<label key={label as string}>{label as string} (mm)<input type="number" value={value as string} min={min as string} max={max as string} step={step as string}diff --git a/aetheris.client/src/__tests__/aetherisApi.test.ts b/aetheris.client/src/__tests__/aetherisApi.test.tsindex 43c5f9c5..c5df8c4c 100644--- a/aetheris.client/src/__tests__/aetherisApi.test.ts+++ b/aetheris.client/src/__tests__/aetherisApi.test.ts@@ -29,7 +29,7 @@ describe("maximum paperclips", () => {const fetchMock = vi.fn().mockResolvedValue(new Response(JSON.stringify({ success: true, data, diagnostics: [] }), { status: 200 }));vi.stubGlobal("fetch", fetchMock);- const request = { wireDiameter: 1, overallLength: 40, outerWidth: 11, innerWidth: 6, bendRadius: 1.5, loopGap: 1.2, material: data.material };+ const request = { wireDiameter: 1, outerLegLength: 17.25, innerLegLength: 16.1, outerBendRadius: 5, innerBendRadius: 3, material: data.material };await expect(maximizePaperclips(request)).resolves.toEqual(data);expect(fetchMock).toHaveBeenCalledWith("/api/v1/demos/maximum-paperclips", expect.objectContaining({method: "POST",diff --git a/aetheris.client/src/api/aetherisApi.ts b/aetheris.client/src/api/aetherisApi.tsindex abd234d7..2d7603c9 100644--- a/aetheris.client/src/api/aetherisApi.ts+++ b/aetheris.client/src/api/aetherisApi.ts@@ -68,11 +68,10 @@ export interface StepImportResponseDto {export interface PaperclipDemoRequestDto {wireDiameter: number;- overallLength: number;- outerWidth: number;- innerWidth: number;- bendRadius: number;- loopGap: number;+ outerLegLength: number;+ innerLegLength: number;+ outerBendRadius: number;+ innerBendRadius: number;material: string;}diff --git a/docs/public/firmament/paperclip.md b/docs/public/firmament/paperclip.mdindex 502f9516..0fe3b050 100644--- a/docs/public/firmament/paperclip.md+++ b/docs/public/firmament/paperclip.md@@ -1,21 +1,22 @@# Standard Paperclip Template-`Standard.Products.Office.Paperclip` is the first Standard Products Template. It specializes a typed `PaperclipPolicy`, derives a readable seven-segment Concept Path, and lowers it through circular Sweep.+`Standard.Products.Office.Paperclip` specializes a typed `PaperclipPolicy`, derives a readable seven-segment Concept Path, and lowers it through the exact circular Sweep lane.-The default `StandardPaperclip` is metric and intentionally described as a recognizable office paperclip, not as compliance with a commercial or ISO dimensional standard.+The default `StandardPaperclip` reconstructs the analytic design intent of the PAPERCLIP-X1 SolidWorks reference. Its ordered centerline is: 14 mm inner-right leg, R3 180° inner-top bend, 14 mm inner-left leg, R4 180° lower return, 15 mm outer-right leg, R5 180° outer-top bend, and 15 mm outer-left leg. Every join is tangent, the wire diameter is constant at 1 mm, and the resulting product envelope is 11 × 25 × 1 mm.| Parameter | Default ||---|---:|-| `WireDiameter` | 0.8 mm |-| `OverallLength` | 33 mm |-| `OuterWidth` | 9 mm |-| `InnerWidth` | 5 mm |-| `BendRadius` | 1 mm |-| `LoopGap` | 1 mm |+| `WireDiameter` | 1 mm |+| `OuterLegLength` | 15 mm |+| `InnerLegLength` | 14 mm |+| `OuterBendRadius` | 5 mm |+| `InnerBendRadius` | 3 mm || `Material` | `Standard.Materials.StainlessSteel.304_Annealed` |The canonical authoring form is `Record → Static defaults → with overrides → Template<PaperclipPolicy>`. Start with [`paperclip.firmament`](../../../fixtures/Canonical/Templates/paperclip.firmament); variants should override policy data instead of rewriting the path.+The X0 fields `OverallLength`, `OuterWidth`, `InnerWidth`, `BendRadius`, and `LoopGap` encoded the former incorrect silhouette and are no longer accepted. For example, “make the paperclip 15% longer” maps to `StandardPaperclip with { OuterLegLength: 17.25mm InnerLegLength: 16.1mm }`; a wider form can increase both bend radii while preserving `OuterBendRadius > InnerBendRadius` and adequate wire clearance.+Forge Host Protocol v1 publishes the template through ordinary `list`, `describe`, and `invoke` operations. It has no paperclip-specific RPC. Cadmata's **MAXIMUM PAPERCLIPS** tab calls the same specialization/compiler path, imports the returned AP242, and displays the generated engineering geometry.The bounded maximizer reports centerline length, mass from catalog density, and paperclips per metre of wire. It does not perform unbounded optimization.diff --git a/fixtures/Canonical/Integration/paperclip-maximizer.firmament b/fixtures/Canonical/Integration/paperclip-maximizer.firmamentindex 1a6fe908..07a000ad 100644--- a/fixtures/Canonical/Integration/paperclip-maximizer.firmament+++ b/fixtures/Canonical/Integration/paperclip-maximizer.firmament@@ -1,28 +1,28 @@Model MaximumPaperclips {Units: mm- Record PaperclipPolicy { WireDiameter: Length OverallLength: Length OuterWidth: Length InnerWidth: Length BendRadius: Length LoopGap: Length Material: String }+ Record PaperclipPolicy { WireDiameter: Length OuterLegLength: Length InnerLegLength: Length OuterBendRadius: Length InnerBendRadius: Length Material: String }Static StandardPaperclip: PaperclipPolicy = PaperclipPolicy {- WireDiameter: 0.8mm OverallLength: 33mm OuterWidth: 9mm InnerWidth: 5mm BendRadius: 1mm LoopGap: 1mm+ WireDiameter: 1mm OuterLegLength: 15mm InnerLegLength: 14mm OuterBendRadius: 5mm InnerBendRadius: 3mmMaterial: "Standard.Materials.StainlessSteel.304_Annealed"}- Static WiderPaperclip: PaperclipPolicy = StandardPaperclip with { WireDiameter: 1mm OuterWidth: 11mm InnerWidth: 6mm BendRadius: 1.2mm LoopGap: 1.2mm }+ Static LongerPaperclip: PaperclipPolicy = StandardPaperclip with { OuterLegLength: 17.25mm InnerLegLength: 16.1mm }Template < P: PaperclipPolicy >Struct PaperclipTemplate {Require PositiveWire => P.WireDiameter > 0mm- Require OuterOverInner => P.OuterWidth > P.InnerWidth- Require BendClearsWire => P.BendRadius > P.WireDiameter+ Require OuterOverInner => P.OuterBendRadius > P.InnerBendRadius+ Require BendClearsWire => P.InnerBendRadius > P.WireDiameterConcept Path PaperclipPath {- Start: Point2(0mm, 0mm)+ Start: Point2(8mm, 0mm)Heading: 90deg- Line InnerUp { Length: P.OverallLength - P.InnerWidth / 2 - P.LoopGap }- Arc InnerTop { Radius: P.InnerWidth / 2; Turn: -180deg }- Line InnerDown { Length: P.OverallLength - P.InnerWidth / 2 - P.OuterWidth / 2 - P.LoopGap }- Arc BottomTransition { Radius: P.BendRadius; Turn: 180deg }- Line OuterUp { Length: P.OverallLength - P.OuterWidth }- Arc OuterTop { Radius: P.OuterWidth / 2; Turn: 180deg }- Line OuterDown { Length: P.OverallLength - P.OuterWidth / 2 - P.LoopGap }+ Line InnerRightUp { Length: P.InnerLegLength }+ Arc InnerTop { Radius: P.InnerBendRadius; Turn: 180deg }+ Line InnerLeftDown { Length: P.InnerLegLength }+ Arc LowerReturn { Radius: (P.OuterBendRadius + P.InnerBendRadius) / 2; Turn: 180deg }+ Line OuterRightUp { Length: P.OuterLegLength }+ Arc OuterTop { Radius: P.OuterBendRadius; Turn: 180deg }+ Line OuterLeftDown { Length: P.OuterLegLength }}Sweep Paperclip { Path: PaperclipPath; Diameter: P.WireDiameter; Material: P.Material }}- Struct Maximized = PaperclipTemplate < P: WiderPaperclip >+ Struct Maximized = PaperclipTemplate < P: LongerPaperclip >}diff --git a/fixtures/Canonical/Templates/paperclip.firmament b/fixtures/Canonical/Templates/paperclip.firmamentindex eb9755da..20b12145 100644--- a/fixtures/Canonical/Templates/paperclip.firmament+++ b/fixtures/Canonical/Templates/paperclip.firmament@@ -2,40 +2,39 @@ Model StandardProductsOfficePaperclip {Units: mmRecord PaperclipPolicy {WireDiameter: Length- OverallLength: Length- OuterWidth: Length- InnerWidth: Length- BendRadius: Length- LoopGap: Length+ OuterLegLength: Length+ InnerLegLength: Length+ OuterBendRadius: Length+ InnerBendRadius: LengthMaterial: String}Static StandardPaperclip: PaperclipPolicy = PaperclipPolicy {- WireDiameter: 0.8mm- OverallLength: 33mm- OuterWidth: 9mm- InnerWidth: 5mm- BendRadius: 1mm- LoopGap: 1mm+ WireDiameter: 1mm+ OuterLegLength: 15mm+ InnerLegLength: 14mm+ OuterBendRadius: 5mm+ InnerBendRadius: 3mmMaterial: "Standard.Materials.StainlessSteel.304_Annealed"}Template < P: PaperclipPolicy >Struct PaperclipTemplate {Require PositiveWireDiameter => P.WireDiameter > 0mm- Require LengthExceedsWidth => P.OverallLength > P.OuterWidth- Require OuterWidthExceedsInnerWidth => P.OuterWidth > P.InnerWidth- Require InnerLoopClearsWire => P.InnerWidth > P.WireDiameter- Require BendClearsWire => P.BendRadius > P.WireDiameter- Require EndsHaveClearance => P.LoopGap >= P.WireDiameter+ Require PositiveLegLengths => P.OuterLegLength > 0mm && P.InnerLegLength > 0mm+ Require OuterLegExceedsInnerLeg => P.OuterLegLength > P.InnerLegLength+ Require PositiveBendRadii => P.OuterBendRadius > 0mm && P.InnerBendRadius > 0mm+ Require OuterBendExceedsInnerBend => P.OuterBendRadius > P.InnerBendRadius+ Require InnerBendClearsWire => P.InnerBendRadius > P.WireDiameterConcept Path PaperclipPath {- Start: Point2(0mm, 0mm)+ // The reference frame places the inner-right terminal at X=8 mm.+ Start: Point2(8mm, 0mm)Heading: 90deg- Line InnerUp { Length: P.OverallLength - P.InnerWidth / 2 - P.LoopGap }- Arc InnerTop { Radius: P.InnerWidth / 2; Turn: -180deg }- Line InnerDown { Length: P.OverallLength - P.InnerWidth / 2 - P.OuterWidth / 2 - P.LoopGap }- Arc BottomTransition { Radius: P.BendRadius; Turn: 180deg }- Line OuterUp { Length: P.OverallLength - P.OuterWidth }- Arc OuterTop { Radius: P.OuterWidth / 2; Turn: 180deg }- Line OuterDown { Length: P.OverallLength - P.OuterWidth / 2 - P.LoopGap }+ Line InnerRightUp { Length: P.InnerLegLength }+ Arc InnerTop { Radius: P.InnerBendRadius; Turn: 180deg }+ Line InnerLeftDown { Length: P.InnerLegLength }+ Arc LowerReturn { Radius: (P.OuterBendRadius + P.InnerBendRadius) / 2; Turn: 180deg }+ Line OuterRightUp { Length: P.OuterLegLength }+ Arc OuterTop { Radius: P.OuterBendRadius; Turn: 180deg }+ Line OuterLeftDown { Length: P.OuterLegLength }}Sweep Paperclip {Path: PaperclipPathdiff --git a/fixtures/Invalid/Templates/paperclip-policy.firmament b/fixtures/Invalid/Templates/paperclip-policy.firmamentindex e0382669..436321c3 100644--- a/fixtures/Invalid/Templates/paperclip-policy.firmament+++ b/fixtures/Invalid/Templates/paperclip-policy.firmament@@ -2,29 +2,27 @@ Model InvalidPaperclipPolicy {Units: mmRecord PaperclipPolicy {WireDiameter: Length- OverallLength: Length- OuterWidth: Length- InnerWidth: Length- BendRadius: Length- LoopGap: Length+ OuterLegLength: Length+ InnerLegLength: Length+ OuterBendRadius: Length+ InnerBendRadius: LengthMaterial: String}Static Invalid: PaperclipPolicy = PaperclipPolicy {WireDiameter: 1mm- OverallLength: 20mm- OuterWidth: 5mm- InnerWidth: 8mm- BendRadius: 2mm- LoopGap: 1mm+ OuterLegLength: 15mm+ InnerLegLength: 14mm+ OuterBendRadius: 3mm+ InnerBendRadius: 5mmMaterial: "Standard.Materials.StainlessSteel.304_Annealed"}Template < P: PaperclipPolicy >Struct PaperclipTemplate {- Require OuterWidthExceedsInnerWidth => P.OuterWidth > P.InnerWidth+ Require OuterBendExceedsInnerBend => P.OuterBendRadius > P.InnerBendRadiusConcept Path Centerline {Start: Point2(0mm, 0mm)Heading: 0deg- Line Stem { Length: P.OverallLength }+ Line Stem { Length: P.OuterLegLength }}Sweep Wire {Path: Centerline