From a868a2958dd7ea138b02543ef81cc78abf8622c7 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Fri, 15 Jan 2010 14:24:13 -0500 Subject: Rename kD splay trees to Bounding Volume Splay Trees. --- tests/libdimension/Makefile.am | 6 ++-- tests/libdimension/bvst.c | 72 ++++++++++++++++++++++++++++++++++++++ tests/libdimension/kD_splay_tree.c | 72 -------------------------------------- 3 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 tests/libdimension/bvst.c delete mode 100644 tests/libdimension/kD_splay_tree.c (limited to 'tests') diff --git a/tests/libdimension/Makefile.am b/tests/libdimension/Makefile.am index 7b238da..886eb42 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 \ - kD_splay_tree-test \ + bvst-test \ png-test \ gl-test TESTS = $(check_PROGRAMS) @@ -45,8 +45,8 @@ error_test_LDADD = libdimension-tests.la warning_test_SOURCES = warning.c warning_test_LDADD = libdimension-tests.la -kD_splay_tree_test_SOURCES = kD_splay_tree.c -kD_splay_tree_test_LDADD = libdimension-tests.la +bvst_test_SOURCES = bvst.c +bvst_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 new file mode 100644 index 0000000..36dce04 --- /dev/null +++ b/tests/libdimension/bvst.c @@ -0,0 +1,72 @@ +/************************************************************************* + * Copyright (C) 2009 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->min = dmnsn_new_vector(0.0, 0.0, 0.0); + obj1->max = dmnsn_new_vector(1.0, 1.0, 1.0); + + obj2->min = dmnsn_new_vector(-2.0, -2.0, -2.0); + obj2->max = dmnsn_new_vector(1.0, 1.0, 1.0); + + obj3->min = dmnsn_new_vector(-1.0, -1.0, -1.0); + obj3->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/kD_splay_tree.c b/tests/libdimension/kD_splay_tree.c deleted file mode 100644 index ea53550..0000000 --- a/tests/libdimension/kD_splay_tree.c +++ /dev/null @@ -1,72 +0,0 @@ -/************************************************************************* - * Copyright (C) 2009 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 fancy k-D splay tree framework - */ - -#include "../../libdimension/dimension_impl.h" -#include - -int -main() -{ - dmnsn_kD_splay_tree *tree; - dmnsn_object *obj1, *obj2, *obj3; - - obj1 = dmnsn_new_object(); - obj2 = dmnsn_new_object(); - obj3 = dmnsn_new_object(); - - obj1->min = dmnsn_new_vector(0.0, 0.0, 0.0); - obj1->max = dmnsn_new_vector(1.0, 1.0, 1.0); - - obj2->min = dmnsn_new_vector(-2.0, -2.0, -2.0); - obj2->max = dmnsn_new_vector(1.0, 1.0, 1.0); - - obj3->min = dmnsn_new_vector(-1.0, -1.0, -1.0); - obj3->max = dmnsn_new_vector(0.0, 0.0, 0.0); - - tree = dmnsn_new_kD_splay_tree(); - - dmnsn_kD_splay_insert(tree, obj1); - if (tree->root->object != obj1) { - fprintf(stderr, "Wrong kD splay tree built.\n"); - return EXIT_FAILURE; - } - - dmnsn_kD_splay_insert(tree, obj2); - if (tree->root->object != obj2 || tree->root->contains->object != obj1) { - fprintf(stderr, "Wrong kD splay tree built.\n"); - return EXIT_FAILURE; - } - - dmnsn_kD_splay_insert(tree, obj3); - if (tree->root->object != obj3 || tree->root->contains->object != obj1 - || tree->root->container->object != obj2) { - fprintf(stderr, "Wrong kD splay tree built.\n"); - return EXIT_FAILURE; - } - - dmnsn_delete_kD_splay_tree(tree); - dmnsn_delete_object(obj3); - dmnsn_delete_object(obj2); - dmnsn_delete_object(obj1); - return EXIT_SUCCESS; -} -- cgit v1.2.3