Change Gt and Lt to match partial bin overlap

This is a breaking change, but it is needed to correctly support granule list datasets.
latis-data · Nov 13, 2024 · 1be53ac · 1be53ac
1 parent 4e8f448
commit 1be53ac
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/core/src/main/scala/latis/ops/Selection.scala b/core/src/main/scala/latis/ops/Selection.scala
@@ -161,13 +161,11 @@ object Selection {
 
     // Make lean predicate based on selection operator
     operator match {
-      case ast.Eq   => (d: Datum) => bounder(d).contains(dvalue)
-      case ast.EqEq => (d: Datum) => bounder(d).contains(dvalue)
-      case ast.NeEq => (d: Datum) => ! bounder(d).contains(dvalue)
-      case ast.Gt   => (d: Datum) => bounder(d).lower >  dvalue
-      case ast.GtEq => (d: Datum) => bounder(d).upper >  dvalue
-      case ast.Lt   => (d: Datum) => bounder(d).upper <= dvalue
-      case ast.LtEq => (d: Datum) => bounder(d).lower <= dvalue
+      case ast.Eq            => (d: Datum) => bounder(d).contains(dvalue)
+      case ast.EqEq          => (d: Datum) => bounder(d).contains(dvalue)
+      case ast.NeEq          => (d: Datum) => ! bounder(d).contains(dvalue)
+      case ast.Gt | ast.GtEq => (d: Datum) => bounder(d).upper >  dvalue
+      case ast.Lt | ast.LtEq => (d: Datum) => bounder(d).lower <= dvalue
       case _ => throw LatisException(s"Unsupported selection operator: $ast.prettyOp(operator)") //TODO: prevent by construction
     }
   }

diff --git a/core/src/test/scala/latis/ops/SelectionSuite.scala b/core/src/test/scala/latis/ops/SelectionSuite.scala
@@ -48,13 +48,13 @@ class SelectionSuite extends FunSuite {
     val value = Data.DoubleValue(0.5)
     assert(Selection.datumPredicateWithBinning(binnedScalar, ast.Gt, value)(datum))
   }
-  test("bin not gt start") {
+  test("bin gt start") {
     val value = Data.DoubleValue(1.0)
-    assert(! Selection.datumPredicateWithBinning(binnedScalar, ast.Gt, value)(datum))
+    assert(Selection.datumPredicateWithBinning(binnedScalar, ast.Gt, value)(datum))
   }
-  test("bin not gt in bin") {
+  test("bin gt in bin") {
     val value = Data.DoubleValue(1.5)
-    assert(! Selection.datumPredicateWithBinning(binnedScalar, ast.Gt, value)(datum))
+    assert(Selection.datumPredicateWithBinning(binnedScalar, ast.Gt, value)(datum))
   }
   test("bin not gt end") {
     val value = Data.DoubleValue(2.0)
@@ -90,13 +90,13 @@ class SelectionSuite extends FunSuite {
     val value = Data.DoubleValue(0.5)
     assert(! Selection.datumPredicateWithBinning(binnedScalar, ast.Lt, value)(datum))
   }
-  test("bin not lt start") {
+  test("bin lt start") {
     val value = Data.DoubleValue(1.0)
-    assert(! Selection.datumPredicateWithBinning(binnedScalar, ast.Lt, value)(datum))
+    assert(Selection.datumPredicateWithBinning(binnedScalar, ast.Lt, value)(datum))
   }
-  test("bin not lt in bin") {
+  test("bin lt in bin") {
     val value = Data.DoubleValue(1.5)
-    assert(! Selection.datumPredicateWithBinning(binnedScalar, ast.Lt, value)(datum))
+    assert(Selection.datumPredicateWithBinning(binnedScalar, ast.Lt, value)(datum))
   }
   test("bin lt end") {
     val value = Data.DoubleValue(2.0)