From 9b04b4e2a1147ed2a30e4f86dd403851036b3b51 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 27 Apr 2010 21:25:50 -0600 Subject: Replace BVSTs with priority R-trees. --- tests/libdimension/Makefile.am | 6 ++-- tests/libdimension/bvst.c | 72 ------------------------------------------ tests/libdimension/prtree.c | 31 ++++++++++++++++++ 3 files changed, 34 insertions(+), 75 deletions(-) delete mode 100644 tests/libdimension/bvst.c create mode 100644 tests/libdimension/prtree.c (limited to 'tests') diff --git a/tests/libdimension/Makefile.am b/tests/libdimension/Makefile.am index 6fc3dc7..f59848e 100644 --- a/tests/libdimension/Makefile.am +++ b/tests/libdimension/Makefile.am @@ -22,7 +22,7 @@ INCLUDES = -I$(top_srcdir)/libdimension check_LTLIBRARIES = libdimension-tests.la check_PROGRAMS = error-test \ warning-test \ - bvst-test \ + prtree-test \ png-test \ gl-test \ cxx-test @@ -56,8 +56,8 @@ error_test_LDADD = libdimension-tests.la warning_test_SOURCES = warning.c warning_test_LDADD = libdimension-tests.la -bvst_test_SOURCES = bvst.c -bvst_test_LDADD = libdimension-tests.la +prtree_test_SOURCES = prtree.c +prtree_test_LDADD = libdimension-tests.la png_test_SOURCES = png.c png_test_LDADD = libdimension-tests.la diff --git a/tests/libdimension/bvst.c b/tests/libdimension/bvst.c deleted file mode 100644 index 33c737b..0000000 --- a/tests/libdimension/bvst.c +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * Copyright (C) 2010 Tavian Barnes * - * * - * This file is part of The Dimension Test Suite. * - * * - * The Dimension Test Suite is free software; you can redistribute it * - * and/or modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension Test Suite is distributed in the hope that it will be * - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - *************************************************************************/ - -/* - * Basic tests of our Bounding Volume Splay Tree framework - */ - -#include "../../libdimension/dimension_impl.h" -#include - -int -main() -{ - dmnsn_bvst *tree; - dmnsn_object *obj1, *obj2, *obj3; - - obj1 = dmnsn_new_object(); - obj2 = dmnsn_new_object(); - obj3 = dmnsn_new_object(); - - obj1->bounding_box.min = dmnsn_new_vector(0.0, 0.0, 0.0); - obj1->bounding_box.max = dmnsn_new_vector(1.0, 1.0, 1.0); - - obj2->bounding_box.min = dmnsn_new_vector(-2.0, -2.0, -2.0); - obj2->bounding_box.max = dmnsn_new_vector(1.0, 1.0, 1.0); - - obj3->bounding_box.min = dmnsn_new_vector(-1.0, -1.0, -1.0); - obj3->bounding_box.max = dmnsn_new_vector(0.0, 0.0, 0.0); - - tree = dmnsn_new_bvst(); - - dmnsn_bvst_insert(tree, obj1); - if (tree->root->object != obj1) { - fprintf(stderr, "Wrong BVST built.\n"); - return EXIT_FAILURE; - } - - dmnsn_bvst_insert(tree, obj2); - if (tree->root->object != obj2 || tree->root->contains->object != obj1) { - fprintf(stderr, "Wrong BVST built.\n"); - return EXIT_FAILURE; - } - - dmnsn_bvst_insert(tree, obj3); - if (tree->root->object != obj3 || tree->root->contains->object != obj1 - || tree->root->container->object != obj2) { - fprintf(stderr, "Wrong BVST built.\n"); - return EXIT_FAILURE; - } - - dmnsn_delete_bvst(tree); - dmnsn_delete_object(obj3); - dmnsn_delete_object(obj2); - dmnsn_delete_object(obj1); - return EXIT_SUCCESS; -} diff --git a/tests/libdimension/prtree.c b/tests/libdimension/prtree.c new file mode 100644 index 0000000..c75d8da --- /dev/null +++ b/tests/libdimension/prtree.c @@ -0,0 +1,31 @@ +/************************************************************************* + * Copyright (C) 2010 Tavian Barnes * + * * + * This file is part of The Dimension Test Suite. * + * * + * The Dimension Test Suite is free software; you can redistribute it * + * and/or modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 3 of the * + * License, or (at your option) any later version. * + * * + * The Dimension Test Suite is distributed in the hope that it will be * + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty * + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + *************************************************************************/ + +/* + * Basic tests of PR-trees + */ + +#include "../../libdimension/dimension_impl.h" +#include + +int +main() +{ + return EXIT_SUCCESS; +} -- cgit v1.2.3