fixed the distance condition for range queries

jlvdb · Jan 29, 2024 · 29f5769 · 29f5769
1 parent dc34ba8
commit 29f5769
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/ballnode_query.c b/src/ballnode_query.c
@@ -37,7 +37,7 @@ static double ptslc_sumw_in_range_sq(
     for (const Point *point = slice->start; point < slice->end; ++point) {
         double dist_sq = EUCLIDEAN_DIST_SQ(ref_point, point);
         // add point weight if condition is met otherwise zero
-        int dist_mask = rmin_sq < dist_sq || dist_sq <= rmax_sq;
+        int dist_mask = rmin_sq < dist_sq && dist_sq <= rmax_sq;
         sumw += point->weight * (double)dist_mask;
     }
     return sumw;
@@ -57,7 +57,7 @@ static double ptslc_dualsumw_in_radius_sq(
 
 static double ptslc_dualsumw_in_range_sq(
     const PointSlice *slice1,
-    const PointSlice *slice2, 
+    const PointSlice *slice2,
     double rmin_sq,
     double rmax_sq
 ) {
@@ -80,7 +80,7 @@ double bnode_count_radius(
     if (distance <= radius - node_radius) {
         return point->weight * node->sum_weight;
     }
-    
+
     // case: some points may be pairs
     else if (distance <= radius + node_radius) {
         if (BALLNODE_IS_LEAF(node) == false) {

diff --git a/tests/test_balltree.py b/tests/test_balltree.py
@@ -252,7 +252,6 @@ def test_count_radius_multi(self, radius, rand_data_weight):
             count += brute_force((data, weight), (p, w), radius)
         npt.assert_almost_equal(tree.count_radius(data, radius, weight), count)
 
-    @pytest.mark.xfail
     @pytest.mark.parametrize("rmin,rmax", rminmax_testvalues)
     def test_count_range_single(self, rmin, rmax, rand_data_weight):
         data, weight = rand_data_weight
@@ -275,7 +274,6 @@ def test_dualcount_radius(self, radius, rand_data_weight):
             count += brute_force((data, weight), (p, w), radius)
         npt.assert_almost_equal(tree.dualcount_radius(tree, radius), count)
 
-    @pytest.mark.xfail
     @pytest.mark.parametrize("rmin,rmax", rminmax_testvalues)
     def test_dualcount_range(self, rmin, rmax, rand_data_weight):
         data, weight = rand_data_weight