Removed some excess code. Specifically the float functions and the 3d helpers.

Author: sdeming

examples/test.c

@@ -37,18 +37,20 @@ int main(int argc, char **argv)
 
 	start = get_msec();
 	for(i=0; i<vcount; i++) {
-		float x, y, z;
-		x = ((float)rand() / RAND_MAX) * 200.0 - 100.0;
-		y = ((float)rand() / RAND_MAX) * 200.0 - 100.0;
-		z = ((float)rand() / RAND_MAX) * 200.0 - 100.0;
+        double pos[3] = {
+		  ((float)rand() / RAND_MAX) * 200.0 - 100.0,
+		  ((float)rand() / RAND_MAX) * 200.0 - 100.0,
+		  ((float)rand() / RAND_MAX) * 200.0 - 100.0 
+        };
 
-		assert(kd_insert3(kd, x, y, z, 0) == 0);
+		assert(kd_insert(kd, pos, 0) == 0);
 	}
 	msec = get_msec() - start;
 	printf("%.3f sec\n", (float)msec / 1000.0);
 
 	start = get_msec();
-	set = kd_nearest_range3(kd, 0, 0, 0, 40);
+    double near_pos[3] = {0, 0, 0};
+	set = kd_nearest_range(kd, near_pos, 40);
 	msec = get_msec() - start;
 	printf("range query returned %d items in %.5f sec\n", kd_res_size(set), (float)msec / 1000.0);
 	kd_res_free(set);

examples/test2.c

@@ -41,8 +41,9 @@ int main(int argc, char **argv) {
 
   /* add some random nodes to the tree (assert nodes are successfully inserted) */
   for( i=0; i<num_pts; i++ ) {
+    double pos[3] = { rd(), rd(), rd() };
     data[i] = 'a' + i;
-    assert( 0 == kd_insert3( ptree, rd(), rd(), rd(), &data[i] ) );
+    assert( 0 == kd_insert( ptree, pos, &data[i] ) );
   }
 
   /* find points closest to the origin and within distance radius */

src/kdtree.cpp

@@ -178,48 +178,6 @@ int kd_insert(struct kdtree *tree, const double *pos, void *data)
     return 0;
 }
 
-int kd_insertf(struct kdtree *tree, const float *pos, void *data)
-{
-    static double sbuf[16];
-    double *bptr, *buf = 0;
-    int res, dim = tree->dim;
-
-    if(dim > 16) {
-        if(!(bptr = buf = new double[dim])) {
-            return -1;
-        }
-    } else {
-        bptr = sbuf;
-    }
-
-    while(dim-- > 0) {
-        *bptr++ = *pos++;
-    }
-
-    res = kd_insert(tree, buf, data);
-
-    if (tree->dim > 16) delete[] buf;
-    return res;
-}
-
-int kd_insert3(struct kdtree *tree, double x, double y, double z, void *data)
-{
-    double buf[3];
-    buf[0] = x;
-    buf[1] = y;
-    buf[2] = z;
-    return kd_insert(tree, buf, data);
-}
-
-int kd_insert3f(struct kdtree *tree, float x, float y, float z, void *data)
-{
-    double buf[3];
-    buf[0] = x;
-    buf[1] = y;
-    buf[2] = z;
-    return kd_insert(tree, buf, data);
-}
-
 static int find_nearest(struct kdnode *node, const double *pos, double range, struct res_node *list, int ordered, int dim)
 {
     double dist_sq, dx;
@@ -417,48 +375,6 @@ struct kdres *kd_nearest(struct kdtree *kd, const double *pos)
     }
 }
 
-struct kdres *kd_nearestf(struct kdtree *tree, const float *pos)
-{
-    static double sbuf[16];
-    double *bptr, *buf = 0;
-    int dim = tree->dim;
-    struct kdres *res;
-
-    if(dim > 16) {
-        if(!(bptr = buf = new double[dim])) {
-            return 0;
-        }
-    } else {
-        bptr = sbuf;
-    }
-
-    while(dim-- > 0) {
-        *bptr++ = *pos++;
-    }
-
-    res = kd_nearest(tree, buf);
-    if(tree->dim > 16) delete[] buf;
-    return res;
-}
-
-struct kdres *kd_nearest3(struct kdtree *tree, double x, double y, double z)
-{
-    double pos[3];
-    pos[0] = x;
-    pos[1] = y;
-    pos[2] = z;
-    return kd_nearest(tree, pos);
-}
-
-struct kdres *kd_nearest3f(struct kdtree *tree, float x, float y, float z)
-{
-    double pos[3];
-    pos[0] = x;
-    pos[1] = y;
-    pos[2] = z;
-    return kd_nearest(tree, pos);
-}
-
 struct kdres *kd_nearest_range(struct kdtree *kd, const double *pos, double range)
 {
     int ret;
@@ -483,48 +399,6 @@ struct kdres *kd_nearest_range(struct kdtree *kd, const double *pos, double rang
     return rset;
 }
 
-struct kdres *kd_nearest_rangef(struct kdtree *kd, const float *pos, float range)
-{
-    static double sbuf[16];
-    double *bptr, *buf = 0;
-    int dim = kd->dim;
-    struct kdres *res;
-
-    if(dim > 16) {
-        if(!(bptr = buf = new double[dim])) {
-            return 0;
-        }
-    } else {
-        bptr = sbuf;
-    }
-
-    while(dim-- > 0) {
-        *bptr++ = *pos++;
-    }
-
-    res = kd_nearest_range(kd, buf, range);
-    if(kd->dim > 16) delete[] buf;
-    return res;
-}
-
-struct kdres *kd_nearest_range3(struct kdtree *tree, double x, double y, double z, double range)
-{
-    double buf[3];
-    buf[0] = x;
-    buf[1] = y;
-    buf[2] = z;
-    return kd_nearest_range(tree, buf, range);
-}
-
-struct kdres *kd_nearest_range3f(struct kdtree *tree, float x, float y, float z, float range)
-{
-    double buf[3];
-    buf[0] = x;
-    buf[1] = y;
-    buf[2] = z;
-    return kd_nearest_range(tree, buf, range);
-}
-
 void kd_res_free(struct kdres *rset)
 {
     clear_results(rset);
@@ -564,40 +438,6 @@ void *kd_res_item(struct kdres *rset, double *pos)
     return 0;
 }
 
-void *kd_res_itemf(struct kdres *rset, float *pos)
-{
-    if(rset->riter) {
-        if(pos) {
-            int i;
-            for(i=0; i<rset->tree->dim; i++) {
-                pos[i] = rset->riter->item->pos[i];
-            }
-        }
-        return rset->riter->item->data;
-    }
-    return 0;
-}
-
-void *kd_res_item3(struct kdres *rset, double *x, double *y, double *z)
-{
-    if(rset->riter) {
-        if(*x) *x = rset->riter->item->pos[0];
-        if(*y) *y = rset->riter->item->pos[1];
-        if(*z) *z = rset->riter->item->pos[2];
-    }
-    return 0;
-}
-
-void *kd_res_item3f(struct kdres *rset, float *x, float *y, float *z)
-{
-    if(rset->riter) {
-        if(*x) *x = rset->riter->item->pos[0];
-        if(*y) *y = rset->riter->item->pos[1];
-        if(*z) *z = rset->riter->item->pos[2];
-    }
-    return 0;
-}
-
 void *kd_res_item_data(struct kdres *set)
 {
     return kd_res_item(set, 0);