Use right-sided searchsort instead

Author: szhan

python/tests/beagle.py

@@ -72,14 +72,14 @@ def convert_to_genetic_map_position(pos, genetic_map=None):
     assert np.all(pos >= base_pos[0]) and np.all(
         pos <= base_pos[-1]
     ), "Physical positions outside of genetic map."
-    left_idx = np.searchsorted(base_pos, pos)
+    left_idx = np.searchsorted(base_pos, pos, side="right")
     xMa = np.zeros(len(pos), dtype=np.float32)
     bMa = np.zeros(len(pos), dtype=np.float32)
     fbMfa = np.zeros(len(pos), dtype=np.float32)
     for i in range(len(pos)):
         xMa[i] = pos[i] - base_pos[left_idx[i]]
-        bMa[i] = base_pos[left_idx[i] + 1] - base_pos[left_idx[i]]
-        fbMfa[i] = gen_pos[left_idx[i] + 1] - gen_pos[left_idx[i]]
+        bMa[i] = base_pos[left_idx[i]] - base_pos[left_idx[i] - 1]
+        fbMfa[i] = gen_pos[left_idx[i]] - gen_pos[left_idx[i] - 1]
     return xMa / bMa * fbMfa
 
 

python/tests/beagle_numba.py

@@ -37,14 +37,14 @@ def convert_to_genetic_map_position(pos, genetic_map_pos=None, genetic_map_cm=No
     assert np.all(pos >= base_pos[0]) and np.all(
         pos <= base_pos[-1]
     ), "Physical positions outside of genetic map."
-    left_idx = np.searchsorted(base_pos, pos)
+    left_idx = np.searchsorted(base_pos, pos, side="right")
     xMa = np.zeros(len(pos), dtype=np.float32)
     bMa = np.zeros(len(pos), dtype=np.float32)
     fbMfa = np.zeros(len(pos), dtype=np.float32)
     for i in range(len(pos)):
         xMa[i] = pos[i] - base_pos[left_idx[i]]
-        bMa[i] = base_pos[left_idx[i] + 1] - base_pos[left_idx[i]]
-        fbMfa[i] = gen_pos[left_idx[i] + 1] - gen_pos[left_idx[i]]
+        bMa[i] = base_pos[left_idx[i]] - base_pos[left_idx[i] - 1]
+        fbMfa[i] = gen_pos[left_idx[i]] - gen_pos[left_idx[i] - 1]
     return xMa / bMa * fbMfa