brute force rewrite of tsk_tree_seek. tests are failing

Author: molpopgen

c/tskit/trees.c

@@ -4622,7 +4622,7 @@ tsk_tree_seek_index(tsk_tree_t *self, tsk_size_t index, tsk_flags_t TSK_UNUSED(o
         }
     }
 
-    self->index = index;
+    self->index = (tsk_id_t) index;
     self->interval.left = left;
     if (index < self->tree_sequence->num_trees - 1) {
         self->interval.right = tree_index.tree_left[index + 1];
@@ -4631,54 +4631,63 @@ tsk_tree_seek_index(tsk_tree_t *self, tsk_size_t index, tsk_flags_t TSK_UNUSED(o
     }
 
     /* nervous about the following */
-    self->left_index = tree_index.edge_insertion_index[index];
-    self->right_index = tree_index.edge_removal_index[index];
+    self->left_index = (tsk_id_t) tree_index.edge_insertion_index[index];
+    self->right_index = (tsk_id_t) tree_index.edge_removal_index[index];
 
 out:
     return ret;
 }
 
+/*FIXME: this has been gutted to a fully naive implementation*/
 int TSK_WARN_UNUSED
-tsk_tree_seek(tsk_tree_t *self, double x, tsk_flags_t TSK_UNUSED(options))
+tsk_tree_seek(tsk_tree_t *self, double x, tsk_flags_t options)
 {
     int ret = 0;
     const double L = tsk_treeseq_get_sequence_length(self->tree_sequence);
-    const double t_l = self->interval.left;
-    const double t_r = self->interval.right;
-    double distance_left, distance_right;
-
+    // const double t_l = self->interval.left;
+    // const double t_r = self->interval.right;
+    const double *restrict left = self->tree_sequence->tree_index.tree_left;
+    // double distance_left, distance_right;
+    tsk_size_t i;
     if (x < 0 || x >= L) {
         ret = TSK_ERR_SEEK_OUT_OF_BOUNDS;
         goto out;
     }
 
-    if (x < t_l) {
-        /* |-----|-----|========|---------| */
-        /* 0     x    t_l      t_r        L */
-        distance_left = t_l - x;
-        distance_right = L - t_r + x;
-    } else {
-        /* |------|========|------|-------| */
-        /* 0     t_l      t_r     x       L */
-        distance_right = x - t_r;
-        distance_left = t_l + L - x;
-    }
-    if (distance_right <= distance_left) {
-        while (!tsk_tree_position_in_interval(self, x)) {
-            ret = tsk_tree_next(self);
-            if (ret < 0) {
-                goto out;
-            }
-        }
-    } else {
-        while (!tsk_tree_position_in_interval(self, x)) {
-            ret = tsk_tree_prev(self);
-            if (ret < 0) {
-                goto out;
-            }
+    for (i = 0; i < self->tree_sequence->num_trees; ++i) {
+        if (x >= left[i]) {
+            break;
         }
     }
-    ret = 0;
+    ret = tsk_tree_seek_index(self, i, options);
+
+    // if (x < t_l) {
+    //    /* |-----|-----|========|---------| */
+    //    /* 0     x    t_l      t_r        L */
+    //    distance_left = t_l - x;
+    //    distance_right = L - t_r + x;
+    //} else {
+    //    /* |------|========|------|-------| */
+    //    /* 0     t_l      t_r     x       L */
+    //    distance_right = x - t_r;
+    //    distance_left = t_l + L - x;
+    //}
+    // if (distance_right <= distance_left) {
+    //    while (!tsk_tree_position_in_interval(self, x)) {
+    //        ret = tsk_tree_next(self);
+    //        if (ret < 0) {
+    //            goto out;
+    //        }
+    //    }
+    //} else {
+    //    while (!tsk_tree_position_in_interval(self, x)) {
+    //        ret = tsk_tree_prev(self);
+    //        if (ret < 0) {
+    //            goto out;
+    //        }
+    //    }
+    //}
+    // ret = 0;
 out:
     return ret;
 }