From d8d040e1cba45cfd2d0ac0c2717df14e5608295b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Zim=C3=A1nyi?= Date: Thu, 12 Nov 2026 20:52:15 +0100 Subject: [PATCH] Name the hex text of a point cloud value by its portable format The object layer gives no method the role names HexIn and HexOut: tools/objectgen.py reads the roles hexIn and hexOut, which the object model gives pcpoint_hex_in, pcpoint_hex_out, pcpatch_hex_in and pcpatch_hex_out, as it reads in and out, the roles #take_portable_names of GoMEOS's tools/objectgen.py reads. The catalog's typeEncodings names those four functions the text reader and writer of PCPoint and PCPatch, so PCPoint.FromText and PCPatch.FromText read the hex text and their AsText writes it through pcpoint_hex_out and pcpatch_hex_out, and ToString writes through AsText. Why. Rule 1 of the bindings in the input and output plan (MobilityDB #3353) names no reader or writer by its role, whoever owns the type; the rule of the object layer read the roles in and out alone, so the point cloud types kept HexIn and HexOut beside the portable names they duplicate. The tree is regenerated from the catalog of MobilityDB master 0bc5f54084, so it also carries the eight functions master adds, the ever and always overlaps of a temporal point cloud and a point cloud box in both orders, with their methods on TPCBox, TPCPatch and TPCPoint. Witness. On the catalog of MobilityDB master 0bc5f54084 and MEOS-API master cf4d124e6f, the generator before this change and this one differ in PCPoint.g.cs and PCPatch.g.cs alone, by those four methods, 5166 methods becoming 5162 over 155 classes, and two runs of this one write the same tree. Against the libmeos of that master with every family, dotnet build reports 0 warnings and 0 errors and dotnet test passes 106 of 106, none skipped; no test or example called HexIn or HexOut, and none reads a point cloud value, whose schema MEOS.NET has no fixture to register. MEOS.NET has no active committer: this needs another committer of the ecosystem to review and merge it. --- GAP-LEDGER.md | 12 +++++++-- MEOS.NET/Functions/Meos.Native.g.cs | 26 +++++++++++++++++++- MEOS.NET/Functions/Meos.meos_pointcloud.g.cs | 24 ++++++++++++++++++ MEOS.NET/Functions/Meos.meos_rgeo.g.cs | 4 +-- MEOS.NET/Types/PCPatch.g.cs | 10 ++------ MEOS.NET/Types/PCPoint.g.cs | 10 ++------ MEOS.NET/Types/TPCBox.g.cs | 12 +++++++++ MEOS.NET/Types/TPCPatch.g.cs | 6 +++++ MEOS.NET/Types/TPCPoint.g.cs | 6 +++++ tools/objectgen.py | 8 +++--- 10 files changed, 94 insertions(+), 24 deletions(-) diff --git a/GAP-LEDGER.md b/GAP-LEDGER.md index 9ece7aa..fc4bc3f 100644 --- a/GAP-LEDGER.md +++ b/GAP-LEDGER.md @@ -10,14 +10,14 @@ A kind with no rows is a site the generators watch and that nothing reached in this run. It prints so that an empty class reads as a measurement rather than as a class nobody looked at. -Generated from `meos-idl.json` at MobilityDB `c5174b8af15d3ef3f38c77ba60cbf5a5d99dd54c` by `tools/codegen.py` +Generated from `meos-idl.json` at MobilityDB `0bc5f54084207e4c0e48d2b55c7f6b9cbb944045` by `tools/codegen.py` and `tools/objectgen.py`. Do not edit. ## The flat surface — `tools/codegen.py` -### parameter nullability — 4336 +### parameter nullability — 4344 `shape.nullable` names the parameters a function accepts NULL for, and the catalog carries no field saying a parameter is required. A pointer parameter named in neither reaches the surface with its contract unstated: the wrapper takes it, and nothing says whether zero is an argument or a fault. @@ -332,6 +332,10 @@ and `tools/objectgen.py`. Do not edit. | always_overlaps_tgeo_tgeo | temp1, temp2 | | always_overlaps_tnpoint_stbox | temp, box | | always_overlaps_tnumber_tbox | temp, box | +| always_overlaps_tpcbox_tpcpatch | box, temp | +| always_overlaps_tpcbox_tpcpoint | box, temp | +| always_overlaps_tpcpatch_tpcbox | temp, box | +| always_overlaps_tpcpoint_tpcbox | temp, box | | always_overlaps_tpose_stbox | temp, box | | always_overlaps_tpose_tpose | temp1, temp2 | | always_overlaps_trgeometry_stbox | temp, box | @@ -957,6 +961,10 @@ and `tools/objectgen.py`. Do not edit. | ever_overlaps_tgeo_tgeo | temp1, temp2 | | ever_overlaps_tnpoint_stbox | temp, box | | ever_overlaps_tnumber_tbox | temp, box | +| ever_overlaps_tpcbox_tpcpatch | box, temp | +| ever_overlaps_tpcbox_tpcpoint | box, temp | +| ever_overlaps_tpcpatch_tpcbox | temp, box | +| ever_overlaps_tpcpoint_tpcbox | temp, box | | ever_overlaps_tpose_stbox | temp, box | | ever_overlaps_tpose_tpose | temp1, temp2 | | ever_overlaps_trgeometry_stbox | temp, box | diff --git a/MEOS.NET/Functions/Meos.Native.g.cs b/MEOS.NET/Functions/Meos.Native.g.cs index ccfba3c..4ef7616 100644 --- a/MEOS.NET/Functions/Meos.Native.g.cs +++ b/MEOS.NET/Functions/Meos.Native.g.cs @@ -12245,6 +12245,18 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "always_ne_tpcpoint_tpcpoint", StringMarshalling = StringMarshalling.Utf8)] internal static partial int AlwaysNeTpcpointTpcpoint(IntPtr temp1, IntPtr temp2); + [LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcbox_tpcpoint", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int EverOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp); + + [LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcpoint_tpcbox", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int EverOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box); + + [LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcbox_tpcpoint", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int AlwaysOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp); + + [LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcpoint_tpcbox", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int AlwaysOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box); + [LibraryImport(DllPath, EntryPoint = "ever_eq_pcpatch_tpcpatch", StringMarshalling = StringMarshalling.Utf8)] internal static partial int EverEqPcpatchTpcpatch(IntPtr pa, IntPtr temp); @@ -12281,6 +12293,18 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "always_ne_tpcpatch_tpcpatch", StringMarshalling = StringMarshalling.Utf8)] internal static partial int AlwaysNeTpcpatchTpcpatch(IntPtr temp1, IntPtr temp2); + [LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcbox_tpcpatch", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int EverOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp); + + [LibraryImport(DllPath, EntryPoint = "ever_overlaps_tpcpatch_tpcbox", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int EverOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box); + + [LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcbox_tpcpatch", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int AlwaysOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp); + + [LibraryImport(DllPath, EntryPoint = "always_overlaps_tpcpatch_tpcbox", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int AlwaysOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box); + [LibraryImport(DllPath, EntryPoint = "teq_pcpoint_tpcpoint", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TeqPcpointTpcpoint(IntPtr pt, IntPtr temp); @@ -14172,7 +14196,7 @@ private static partial class Native internal static partial IntPtr TrgeometryFromMfjson(string mfjson); [LibraryImport(DllPath, EntryPoint = "trgeometry_out", StringMarshalling = StringMarshalling.Utf8)] - internal static partial IntPtr TrgeometryOut(IntPtr temp, out nuint size_out); + internal static partial IntPtr TrgeometryOut(IntPtr temp, int maxdd, out nuint size_out); [LibraryImport(DllPath, EntryPoint = "trgeometry_as_text", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TrgeometryAsText(IntPtr temp, int maxdd, out nuint size_out); diff --git a/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs b/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs index 6418ad2..b9c9a11 100644 --- a/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs +++ b/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs @@ -896,6 +896,18 @@ public static int AlwaysNeTpcpointPcpoint(IntPtr temp, IntPtr pt) public static int AlwaysNeTpcpointTpcpoint(IntPtr temp1, IntPtr temp2) => SafeExecution(() => Native.AlwaysNeTpcpointTpcpoint(temp1, temp2)); + public static int EverOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp) + => SafeExecution(() => Native.EverOverlapsTpcboxTpcpoint(box, temp)); + + public static int EverOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box) + => SafeExecution(() => Native.EverOverlapsTpcpointTpcbox(temp, box)); + + public static int AlwaysOverlapsTpcboxTpcpoint(IntPtr box, IntPtr temp) + => SafeExecution(() => Native.AlwaysOverlapsTpcboxTpcpoint(box, temp)); + + public static int AlwaysOverlapsTpcpointTpcbox(IntPtr temp, IntPtr box) + => SafeExecution(() => Native.AlwaysOverlapsTpcpointTpcbox(temp, box)); + public static int EverEqPcpatchTpcpatch(IntPtr pa, IntPtr temp) => SafeExecution(() => Native.EverEqPcpatchTpcpatch(pa, temp)); @@ -932,6 +944,18 @@ public static int AlwaysNeTpcpatchPcpatch(IntPtr temp, IntPtr pa) public static int AlwaysNeTpcpatchTpcpatch(IntPtr temp1, IntPtr temp2) => SafeExecution(() => Native.AlwaysNeTpcpatchTpcpatch(temp1, temp2)); + public static int EverOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp) + => SafeExecution(() => Native.EverOverlapsTpcboxTpcpatch(box, temp)); + + public static int EverOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box) + => SafeExecution(() => Native.EverOverlapsTpcpatchTpcbox(temp, box)); + + public static int AlwaysOverlapsTpcboxTpcpatch(IntPtr box, IntPtr temp) + => SafeExecution(() => Native.AlwaysOverlapsTpcboxTpcpatch(box, temp)); + + public static int AlwaysOverlapsTpcpatchTpcbox(IntPtr temp, IntPtr box) + => SafeExecution(() => Native.AlwaysOverlapsTpcpatchTpcbox(temp, box)); + public static IntPtr TeqPcpointTpcpoint(IntPtr pt, IntPtr temp) => SafeExecution(() => Native.TeqPcpointTpcpoint(pt, temp)); diff --git a/MEOS.NET/Functions/Meos.meos_rgeo.g.cs b/MEOS.NET/Functions/Meos.meos_rgeo.g.cs index f792f2e..d4657c6 100644 --- a/MEOS.NET/Functions/Meos.meos_rgeo.g.cs +++ b/MEOS.NET/Functions/Meos.meos_rgeo.g.cs @@ -15,10 +15,10 @@ public static IntPtr TrgeometryIn(string str) public static IntPtr TrgeometryFromMfjson(string mfjson) => SafeExecution(() => Native.TrgeometryFromMfjson(mfjson)); - public static string TrgeometryOut(IntPtr temp) + public static string TrgeometryOut(IntPtr temp, int maxdd) { nuint _size = 0; - IntPtr _p = SafeExecution(() => Native.TrgeometryOut(temp, out _size)); + IntPtr _p = SafeExecution(() => Native.TrgeometryOut(temp, maxdd, out _size)); if (_p == IntPtr.Zero) { return null!; diff --git a/MEOS.NET/Types/PCPatch.g.cs b/MEOS.NET/Types/PCPatch.g.cs index 7eb6392..43201eb 100644 --- a/MEOS.NET/Types/PCPatch.g.cs +++ b/MEOS.NET/Types/PCPatch.g.cs @@ -16,7 +16,7 @@ internal PCPatch(IntPtr ptr) : base(ptr) { } /// The text MEOS writes this value as. public override string ToString() - => this.HexOut(15); + => this.AsText(15); public int AlwaysEq(TPCPatch temp) => Meos.AlwaysEqPcpatchTpcpatch(this.Ptr, temp.Ptr); @@ -28,7 +28,7 @@ public string AsHexWKB() => Meos.PcpatchAsHexwkb(this.Ptr); public string AsText(int maxdd) - => this.HexOut(maxdd); + => Meos.PcpatchHexOut(this.Ptr, maxdd); public int Cmp(PCPatch pa2) => Meos.PcpatchCmp(this.Ptr, pa2.Ptr); @@ -63,9 +63,6 @@ public uint Hash() public ulong HashExtended(ulong seed) => Meos.PcpatchHashExtended(this.Ptr, seed); - public string HexOut(int maxdd) - => Meos.PcpatchHexOut(this.Ptr, maxdd); - public Set? Intersection(PCPatchSet s) => MEOSFactory.WrapSet(Meos.IntersectionPcpatchSet(this.Ptr, s.Ptr)); @@ -118,9 +115,6 @@ public uint Npoints() => MEOSFactory.WrapPCPatch(Meos.PcpatchFromHexwkb(hexwkb)); public static PCPatch? FromText(string str) - => PCPatch.HexIn(str); - - public static PCPatch? HexIn(string str) => MEOSFactory.WrapPCPatch(Meos.PcpatchHexIn(str)); public static PCPatch? Make(PCPoint[] points) diff --git a/MEOS.NET/Types/PCPoint.g.cs b/MEOS.NET/Types/PCPoint.g.cs index 9a93617..4943239 100644 --- a/MEOS.NET/Types/PCPoint.g.cs +++ b/MEOS.NET/Types/PCPoint.g.cs @@ -16,7 +16,7 @@ internal PCPoint(IntPtr ptr) : base(ptr) { } /// The text MEOS writes this value as. public override string ToString() - => this.HexOut(15); + => this.AsText(15); public int AlwaysEq(TPCPoint temp) => Meos.AlwaysEqPcpointTpcpoint(this.Ptr, temp.Ptr); @@ -28,7 +28,7 @@ public string AsHexWKB() => Meos.PcpointAsHexwkb(this.Ptr); public string AsText(int maxdd) - => this.HexOut(maxdd); + => Meos.PcpointHexOut(this.Ptr, maxdd); public int Cmp(PCPoint pt2) => Meos.PcpointCmp(this.Ptr, pt2.Ptr); @@ -135,9 +135,6 @@ public uint Hash() public ulong HashExtended(ulong seed) => Meos.PcpointHashExtended(this.Ptr, seed); - public string HexOut(int maxdd) - => Meos.PcpointHexOut(this.Ptr, maxdd); - public Set? Intersection(PCPointSet s) => MEOSFactory.WrapSet(Meos.IntersectionPcpointSet(this.Ptr, s.Ptr)); @@ -175,9 +172,6 @@ public bool Ne(PCPoint pt2) => MEOSFactory.WrapPCPoint(Meos.PcpointFromHexwkb(hexwkb)); public static PCPoint? FromText(string str) - => PCPoint.HexIn(str); - - public static PCPoint? HexIn(string str) => MEOSFactory.WrapPCPoint(Meos.PcpointHexIn(str)); public static PCPoint? Make(uint pcid, double[] values) diff --git a/MEOS.NET/Types/TPCBox.g.cs b/MEOS.NET/Types/TPCBox.g.cs index 3968880..3f5ca5f 100644 --- a/MEOS.NET/Types/TPCBox.g.cs +++ b/MEOS.NET/Types/TPCBox.g.cs @@ -54,6 +54,12 @@ public bool After(TPCPatch temp) public bool After(TPCPoint temp) => Meos.AfterTpcboxTpointcloud(this.Ptr, temp.Ptr); + public int AlwaysOverlaps(TPCPoint temp) + => Meos.AlwaysOverlapsTpcboxTpcpoint(this.Ptr, temp.Ptr); + + public int AlwaysOverlaps(TPCPatch temp) + => Meos.AlwaysOverlapsTpcboxTpcpatch(this.Ptr, temp.Ptr); + public byte[]? AsEWKB(byte variant) { IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); @@ -177,6 +183,12 @@ public bool Contains(TPCPoint temp) public bool Eq(TPCBox box2) => Meos.TpcboxEq(this.Ptr, box2.Ptr); + public int EverOverlaps(TPCPoint temp) + => Meos.EverOverlapsTpcboxTpcpoint(this.Ptr, temp.Ptr); + + public int EverOverlaps(TPCPatch temp) + => Meos.EverOverlapsTpcboxTpcpatch(this.Ptr, temp.Ptr); + public bool Front(TPCBox box2) => Meos.FrontTpcboxTpcbox(this.Ptr, box2.Ptr); diff --git a/MEOS.NET/Types/TPCPatch.g.cs b/MEOS.NET/Types/TPCPatch.g.cs index b4ecc4d..a2c2f84 100644 --- a/MEOS.NET/Types/TPCPatch.g.cs +++ b/MEOS.NET/Types/TPCPatch.g.cs @@ -30,6 +30,9 @@ public int AlwaysNe(PCPatch pa) public int AlwaysNe(TPCPatch temp2) => Meos.AlwaysNeTpcpatchTpcpatch(this.Ptr, temp2.Ptr); + public int AlwaysOverlaps(TPCBox box) + => Meos.AlwaysOverlapsTpcpatchTpcbox(this.Ptr, box.Ptr); + public Temporal? AtTpcbox(TPCBox box, bool border_inc) => MEOSFactory.WrapTemporal(Meos.TpcpatchAtTpcbox(this.Ptr, box.Ptr, border_inc)); @@ -54,6 +57,9 @@ public int EverNe(PCPatch pa) public int EverNe(TPCPatch temp2) => Meos.EverNeTpcpatchTpcpatch(this.Ptr, temp2.Ptr); + public int EverOverlaps(TPCBox box) + => Meos.EverOverlapsTpcpatchTpcbox(this.Ptr, box.Ptr); + public Temporal? MinusTpcbox(TPCBox box, bool border_inc) => MEOSFactory.WrapTemporal(Meos.TpcpatchMinusTpcbox(this.Ptr, box.Ptr, border_inc)); diff --git a/MEOS.NET/Types/TPCPoint.g.cs b/MEOS.NET/Types/TPCPoint.g.cs index 7e0b5da..433a0b3 100644 --- a/MEOS.NET/Types/TPCPoint.g.cs +++ b/MEOS.NET/Types/TPCPoint.g.cs @@ -30,6 +30,9 @@ public int AlwaysNe(PCPoint pt) public int AlwaysNe(TPCPoint temp2) => Meos.AlwaysNeTpcpointTpcpoint(this.Ptr, temp2.Ptr); + public int AlwaysOverlaps(TPCBox box) + => Meos.AlwaysOverlapsTpcpointTpcbox(this.Ptr, box.Ptr); + public Temporal? AtTpcbox(TPCBox box, bool border_inc) => MEOSFactory.WrapTemporal(Meos.TpcpointAtTpcbox(this.Ptr, box.Ptr, border_inc)); @@ -54,6 +57,9 @@ public int EverNe(PCPoint pt) public int EverNe(TPCPoint temp2) => Meos.EverNeTpcpointTpcpoint(this.Ptr, temp2.Ptr); + public int EverOverlaps(TPCBox box) + => Meos.EverOverlapsTpcpointTpcbox(this.Ptr, box.Ptr); + public Temporal? MinusTpcbox(TPCBox box, bool border_inc) => MEOSFactory.WrapTemporal(Meos.TpcpointMinusTpcbox(this.Ptr, box.Ptr, border_inc)); diff --git a/tools/objectgen.py b/tools/objectgen.py index 64b3784..48a01b7 100644 --- a/tools/objectgen.py +++ b/tools/objectgen.py @@ -1616,9 +1616,11 @@ def portable_format(self, function: str) -> tuple[str, str] | None: @staticmethod def role_named(entry: dict) -> bool: """Whether the object model calls a method by its role, the reader or - writer of a type (ooName `in` or `out`), a name the object layer never - gives (rule 1 of the bindings in the I/O plan, MobilityDB #3353).""" - return entry["ooName"] in ("in", "out") + writer of a type (ooName `in`, `out`, or `hexIn` and `hexOut`, the + hex text of the point cloud types), a name the object layer never + gives (rule 1 of the bindings in the I/O plan, MobilityDB #3353), the + roles #take_portable_names of GoMEOS's tools/objectgen.py reads.""" + return entry["ooName"] in ("in", "out", "hexIn", "hexOut") def take_portable_names(self, cls: str, paired: list, entries: list) -> list: """Emit each reader or writer the object model calls by its role