diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java index edcd5f4..dc1e4cc 100644 --- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java +++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java @@ -51,7 +51,7 @@ * *

Typical usage — per-vehicle-pair "did they come within * 100m of each other in the last 5 minutes?" via - * {@code MeosOpsTGeo.edwithin_tgeo_tgeo} (tier = {@code cross-stream}): + * {@code MeosOpsFreeGeo.edwithin_tgeo_tgeo} (tier = {@code cross-stream}): * *

{@code
  * KeyedStream a = streamA.keyBy(VehiclePosition::regionId);
@@ -64,7 +64,7 @@
  *             (left, right, ctx) -> {
  *                 Pointer leftT  = left.toTGeoPointer();
  *                 Pointer rightT = right.toTGeoPointer();
- *                 if (MeosOpsTGeo.edwithin_tgeo_tgeo(leftT, rightT, 100.0) != 0) {
+ *                 if (MeosOpsFreeGeo.edwithin_tgeo_tgeo(leftT, rightT, 100.0) != 0) {
  *                     return new MeetingEvent(left.id(), right.id(), ctx.getLeftTimestamp());
  *                 }
  *                 return null;  // no output for non-matches
diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
index 8e3329c..0685443 100644
--- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
+++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
@@ -44,14 +44,14 @@
  * independently.
  *
  * 

Typical usage: scalar-predicate filter against the - * generated {@code MeosOpsTBox.overlaps_tbox_tbox} (tier = + * generated {@code MeosOpsFreeCore.overlaps_tbox_tbox} (tier = * {@code stateless}): * *

{@code
  * DataStream in = ...;
  * DataStream overlapping = in.filter(
  *     new MeosStatelessFilter<>(
- *         pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)));
+ *         pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)));
  * }
* *

For int-coded predicates (JMEOS returns {@code int} for some MEOS diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java index 8ef1709..dafd21c 100644 --- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java +++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java @@ -52,14 +52,14 @@ * *

Typical usage: register a stateless MEOS predicate / arithmetic * call as a per-event map step in a DataStream pipeline. Example with - * the generated {@code MeosOpsTBox.overlaps_tbox_tbox} (tier = + * the generated {@code MeosOpsFreeCore.overlaps_tbox_tbox} (tier = * {@code stateless}, per the codegen manifest): * *

{@code
  * DataStream in = ...;            // (tboxA, tboxB)
  * DataStream overlap = in.map(
  *     new MeosStatelessMap<>(
- *         pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)));
+ *         pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)));
  * }
* *

Tier coverage: as of the codegen state on the parent PR, diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java index b4d26f5..6921c9c 100644 --- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java +++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java @@ -38,8 +38,8 @@ * *

The {@code windowed} tier is "output cardinality changes; needs a * window". The canonical examples are - * {@code temporal_length(tgeo)} (one length per trajectory window), - * {@code temporal_twavg(tnumber)} (one time-weighted average per + * {@code tpoint_length(tpoint)} (one length per trajectory window), + * {@code tnumber_twavg(tnumber)} (one time-weighted average per * window), and the per-class {@code _trajectory} / {@code _time} / * {@code _timespan} accessors that reduce a full sequence to a single * derived value. @@ -61,7 +61,7 @@ * per-window. * *

Typical usage — per-vehicle per-tumbling-window - * trajectory length via {@code MeosOpsTemporal.temporal_length} (tier + * trajectory length via {@code MeosOpsTPoint.tpoint_length} (tier * = {@code windowed}): * *

{@code
@@ -73,7 +73,7 @@
  *     .process(new MeosWindowedAggregate(
  *         (window, events, ctx) -> {
  *             Pointer trajectory = buildTrajectoryFromPoints(events);  // adopter helper
- *             double length = MeosOpsTemporal.temporal_length(trajectory);
+ *             double length = MeosOpsTPoint.tpoint_length(trajectory);
  *             return new VehicleLength(ctx.getCurrentKey(), window.getStart(), length);
  *         }));
  * }
diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/README.md b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/README.md index b79ec19..d3c0794 100644 --- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/README.md +++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/README.md @@ -38,11 +38,11 @@ The pattern is the same across all four tiers: ```java // 1. Pick the generated MeosOps method // (Javadoc tier marker tells you which wiring to use) -boolean overlap = MeosOpsTBox.overlaps_tbox_tbox(boxA, boxB); // tier = stateless +boolean overlap = MeosOpsFreeCore.overlaps_tbox_tbox(boxA, boxB); // tier = stateless // 2. Wrap with the matching wiring MeosStatelessFilter filter = MeosStatelessFilter.fromIntPredicate( - pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)); + pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)); // 3. Apply to the DataStream DataStream overlapping = stream.filter(filter); @@ -61,9 +61,9 @@ through a 3-stage DataStream pipeline using two of the generated facades wired through `MeosStatelessMap` + `MeosStatelessFilter`: 1. Parse a stream of TBox WKT strings via - `MeosOpsFreeCore.tbox_in` (io-meta, no state). + `MeosOpsTBox.tbox_in` (io-meta, no state). 2. Filter to those overlapping a fixed query box via - `MeosOpsTBox.overlaps_tbox_tbox` (stateless predicate). + `MeosOpsFreeCore.overlaps_tbox_tbox` (stateless predicate). 3. Serialize each survivor to hex-WKB via `MeosOpsTBox.tbox_as_hexwkb` (io-meta, no state). diff --git a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java index bb70f79..9ee612f 100644 --- a/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java +++ b/benchmark/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java @@ -49,7 +49,7 @@ *
  • Parses each into a JMEOS {@code Pointer} via * {@code MeosOpsTBox.tbox_in} (tier = {@code io-meta}).
  • *
  • Filters to those that overlap with a fixed query TBox via - * {@code MeosOpsTBox.overlaps_tbox_tbox} wrapped as a + * {@code MeosOpsFreeCore.overlaps_tbox_tbox} wrapped as a * {@link MeosStatelessFilter} (tier = {@code stateless}).
  • *
  • Maps each surviving TBox to its serialized WKB hex via * {@code MeosOpsTBox.tbox_as_hexwkb} wrapped as a diff --git a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java index 4bad5d4..83f71c1 100644 --- a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java +++ b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java @@ -59,9 +59,9 @@ static void finalizeMeos() { @Test void cbuffer() { - Pointer cb = MeosOpsFreeCbuffer.cbuffer_make(MeosOpsFreeGeo.geom_in("POINT(1 1)", 0), 0.5); + Pointer cb = MeosOpsCbuffer.cbuffer_make(MeosOpsGeometry.geom_in("POINT(1 1)", 0), 0.5); assertNotNull(cb); - assertEquals(0.5, MeosOpsFreeCbuffer.cbuffer_radius(cb), 1e-9); - assertNotNull(MeosOpsFreeCbuffer.cbuffer_out(cb, 6)); + assertEquals(0.5, MeosOpsCbuffer.cbuffer_radius(cb), 1e-9); + assertNotNull(MeosOpsCbuffer.cbuffer_out(cb, 6)); } } diff --git a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java index 539dc1c..6720695 100644 --- a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java +++ b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java @@ -86,8 +86,8 @@ void geoStbox() { @Test void geoGeometry() { - Pointer geom = MeosOpsFreeGeo.geom_in("POINT(1 1)", 0); + Pointer geom = MeosOpsGeometry.geom_in("POINT(1 1)", 0); assertNotNull(geom); - assertTrue(MeosOpsFreeGeo.geo_as_text(geom, 6).toUpperCase().contains("POINT")); + assertTrue(MeosOpsGeo.geo_as_text(geom, 6).toUpperCase().contains("POINT")); } } diff --git a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java index 0cfaf41..1be2934 100644 --- a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java +++ b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java @@ -58,9 +58,9 @@ static void finalizeMeos() { @Test void npoint() { - Pointer np = MeosOpsFreeNpoint.npoint_make(1, 0.5); + Pointer np = MeosOpsNpoint.npoint_make(1, 0.5); assertNotNull(np); - assertEquals(1, MeosOpsFreeNpoint.npoint_route(np)); - assertEquals(0.5, MeosOpsFreeNpoint.npoint_position(np), 1e-9); + assertEquals(1, MeosOpsNpoint.npoint_route(np)); + assertEquals(0.5, MeosOpsNpoint.npoint_position(np), 1e-9); } } diff --git a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java index d395a55..219a36f 100644 --- a/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java +++ b/benchmark/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java @@ -59,9 +59,9 @@ static void finalizeMeos() { @Test void pose() { - Pointer pose = MeosOpsFreePose.pose_in("Pose(Point(1 1), 0.5)"); + Pointer pose = MeosOpsPose.pose_in("Pose(Point(1 1), 0.5)"); assertNotNull(pose); - assertNotNull(MeosOpsFreePose.pose_out(pose, 6)); - assertEquals(0.5, MeosOpsFreePose.pose_yaw(pose), 1e-9); + assertNotNull(MeosOpsPose.pose_out(pose, 6)); + assertEquals(0.5, MeosOpsPose.pose_yaw(pose), 1e-9); } } diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java index edcd5f4..dc1e4cc 100644 --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosCrossStreamJoin.java @@ -51,7 +51,7 @@ * *

    Typical usage — per-vehicle-pair "did they come within * 100m of each other in the last 5 minutes?" via - * {@code MeosOpsTGeo.edwithin_tgeo_tgeo} (tier = {@code cross-stream}): + * {@code MeosOpsFreeGeo.edwithin_tgeo_tgeo} (tier = {@code cross-stream}): * *

    {@code
      * KeyedStream a = streamA.keyBy(VehiclePosition::regionId);
    @@ -64,7 +64,7 @@
      *             (left, right, ctx) -> {
      *                 Pointer leftT  = left.toTGeoPointer();
      *                 Pointer rightT = right.toTGeoPointer();
    - *                 if (MeosOpsTGeo.edwithin_tgeo_tgeo(leftT, rightT, 100.0) != 0) {
    + *                 if (MeosOpsFreeGeo.edwithin_tgeo_tgeo(leftT, rightT, 100.0) != 0) {
      *                     return new MeetingEvent(left.id(), right.id(), ctx.getLeftTimestamp());
      *                 }
      *                 return null;  // no output for non-matches
    diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
    index 8e3329c..0685443 100644
    --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
    +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessFilter.java
    @@ -44,14 +44,14 @@
      * independently.
      *
      * 

    Typical usage: scalar-predicate filter against the - * generated {@code MeosOpsTBox.overlaps_tbox_tbox} (tier = + * generated {@code MeosOpsFreeCore.overlaps_tbox_tbox} (tier = * {@code stateless}): * *

    {@code
      * DataStream in = ...;
      * DataStream overlapping = in.filter(
      *     new MeosStatelessFilter<>(
    - *         pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)));
    + *         pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)));
      * }
    * *

    For int-coded predicates (JMEOS returns {@code int} for some MEOS diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java index 8ef1709..dafd21c 100644 --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosStatelessMap.java @@ -52,14 +52,14 @@ * *

    Typical usage: register a stateless MEOS predicate / arithmetic * call as a per-event map step in a DataStream pipeline. Example with - * the generated {@code MeosOpsTBox.overlaps_tbox_tbox} (tier = + * the generated {@code MeosOpsFreeCore.overlaps_tbox_tbox} (tier = * {@code stateless}, per the codegen manifest): * *

    {@code
      * DataStream in = ...;            // (tboxA, tboxB)
      * DataStream overlap = in.map(
      *     new MeosStatelessMap<>(
    - *         pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)));
    + *         pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)));
      * }
    * *

    Tier coverage: as of the codegen state on the parent PR, diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java index b4d26f5..6921c9c 100644 --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/MeosWindowedAggregate.java @@ -38,8 +38,8 @@ * *

    The {@code windowed} tier is "output cardinality changes; needs a * window". The canonical examples are - * {@code temporal_length(tgeo)} (one length per trajectory window), - * {@code temporal_twavg(tnumber)} (one time-weighted average per + * {@code tpoint_length(tpoint)} (one length per trajectory window), + * {@code tnumber_twavg(tnumber)} (one time-weighted average per * window), and the per-class {@code _trajectory} / {@code _time} / * {@code _timespan} accessors that reduce a full sequence to a single * derived value. @@ -61,7 +61,7 @@ * per-window. * *

    Typical usage — per-vehicle per-tumbling-window - * trajectory length via {@code MeosOpsTemporal.temporal_length} (tier + * trajectory length via {@code MeosOpsTPoint.tpoint_length} (tier * = {@code windowed}): * *

    {@code
    @@ -73,7 +73,7 @@
      *     .process(new MeosWindowedAggregate(
      *         (window, events, ctx) -> {
      *             Pointer trajectory = buildTrajectoryFromPoints(events);  // adopter helper
    - *             double length = MeosOpsTemporal.temporal_length(trajectory);
    + *             double length = MeosOpsTPoint.tpoint_length(trajectory);
      *             return new VehicleLength(ctx.getCurrentKey(), window.getStart(), length);
      *         }));
      * }
    diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md index b79ec19..d3c0794 100644 --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/README.md @@ -38,11 +38,11 @@ The pattern is the same across all four tiers: ```java // 1. Pick the generated MeosOps method // (Javadoc tier marker tells you which wiring to use) -boolean overlap = MeosOpsTBox.overlaps_tbox_tbox(boxA, boxB); // tier = stateless +boolean overlap = MeosOpsFreeCore.overlaps_tbox_tbox(boxA, boxB); // tier = stateless // 2. Wrap with the matching wiring MeosStatelessFilter filter = MeosStatelessFilter.fromIntPredicate( - pair -> MeosOpsTBox.overlaps_tbox_tbox(pair.a, pair.b)); + pair -> MeosOpsFreeCore.overlaps_tbox_tbox(pair.a, pair.b)); // 3. Apply to the DataStream DataStream overlapping = stream.filter(filter); @@ -61,9 +61,9 @@ through a 3-stage DataStream pipeline using two of the generated facades wired through `MeosStatelessMap` + `MeosStatelessFilter`: 1. Parse a stream of TBox WKT strings via - `MeosOpsFreeCore.tbox_in` (io-meta, no state). + `MeosOpsTBox.tbox_in` (io-meta, no state). 2. Filter to those overlapping a fixed query box via - `MeosOpsTBox.overlaps_tbox_tbox` (stateless predicate). + `MeosOpsFreeCore.overlaps_tbox_tbox` (stateless predicate). 3. Serialize each survivor to hex-WKB via `MeosOpsTBox.tbox_as_hexwkb` (io-meta, no state). diff --git a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java index bb70f79..9ee612f 100644 --- a/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java +++ b/binding/src/main/java/org/mobilitydb/flink/meos/wirings/demo/MeosWiringsDemoJob.java @@ -49,7 +49,7 @@ *
  • Parses each into a JMEOS {@code Pointer} via * {@code MeosOpsTBox.tbox_in} (tier = {@code io-meta}).
  • *
  • Filters to those that overlap with a fixed query TBox via - * {@code MeosOpsTBox.overlaps_tbox_tbox} wrapped as a + * {@code MeosOpsFreeCore.overlaps_tbox_tbox} wrapped as a * {@link MeosStatelessFilter} (tier = {@code stateless}).
  • *
  • Maps each surviving TBox to its serialized WKB hex via * {@code MeosOpsTBox.tbox_as_hexwkb} wrapped as a diff --git a/binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java index 4bad5d4..83f71c1 100644 --- a/binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java +++ b/binding/src/test/java/org/mobilitydb/flink/meos/MeosCbufferSmokeTest.java @@ -59,9 +59,9 @@ static void finalizeMeos() { @Test void cbuffer() { - Pointer cb = MeosOpsFreeCbuffer.cbuffer_make(MeosOpsFreeGeo.geom_in("POINT(1 1)", 0), 0.5); + Pointer cb = MeosOpsCbuffer.cbuffer_make(MeosOpsGeometry.geom_in("POINT(1 1)", 0), 0.5); assertNotNull(cb); - assertEquals(0.5, MeosOpsFreeCbuffer.cbuffer_radius(cb), 1e-9); - assertNotNull(MeosOpsFreeCbuffer.cbuffer_out(cb, 6)); + assertEquals(0.5, MeosOpsCbuffer.cbuffer_radius(cb), 1e-9); + assertNotNull(MeosOpsCbuffer.cbuffer_out(cb, 6)); } } diff --git a/binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java index 539dc1c..6720695 100644 --- a/binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java +++ b/binding/src/test/java/org/mobilitydb/flink/meos/MeosFacadeSmokeTest.java @@ -86,8 +86,8 @@ void geoStbox() { @Test void geoGeometry() { - Pointer geom = MeosOpsFreeGeo.geom_in("POINT(1 1)", 0); + Pointer geom = MeosOpsGeometry.geom_in("POINT(1 1)", 0); assertNotNull(geom); - assertTrue(MeosOpsFreeGeo.geo_as_text(geom, 6).toUpperCase().contains("POINT")); + assertTrue(MeosOpsGeo.geo_as_text(geom, 6).toUpperCase().contains("POINT")); } } diff --git a/binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java index 0cfaf41..1be2934 100644 --- a/binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java +++ b/binding/src/test/java/org/mobilitydb/flink/meos/MeosNpointSmokeTest.java @@ -58,9 +58,9 @@ static void finalizeMeos() { @Test void npoint() { - Pointer np = MeosOpsFreeNpoint.npoint_make(1, 0.5); + Pointer np = MeosOpsNpoint.npoint_make(1, 0.5); assertNotNull(np); - assertEquals(1, MeosOpsFreeNpoint.npoint_route(np)); - assertEquals(0.5, MeosOpsFreeNpoint.npoint_position(np), 1e-9); + assertEquals(1, MeosOpsNpoint.npoint_route(np)); + assertEquals(0.5, MeosOpsNpoint.npoint_position(np), 1e-9); } } diff --git a/binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java b/binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java index d395a55..219a36f 100644 --- a/binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java +++ b/binding/src/test/java/org/mobilitydb/flink/meos/MeosPoseSmokeTest.java @@ -59,9 +59,9 @@ static void finalizeMeos() { @Test void pose() { - Pointer pose = MeosOpsFreePose.pose_in("Pose(Point(1 1), 0.5)"); + Pointer pose = MeosOpsPose.pose_in("Pose(Point(1 1), 0.5)"); assertNotNull(pose); - assertNotNull(MeosOpsFreePose.pose_out(pose, 6)); - assertEquals(0.5, MeosOpsFreePose.pose_yaw(pose), 1e-9); + assertNotNull(MeosOpsPose.pose_out(pose, 6)); + assertEquals(0.5, MeosOpsPose.pose_yaw(pose), 1e-9); } }