From 79c7b949248a9c2ebd84809ab60ff4b4d40e9caa Mon Sep 17 00:00:00 2001 From: Dongryeol Lee Date: Mon, 1 Nov 2010 21:20:04 +0000 Subject: [PATCH] Slowly adding in --- .../dongryel/thesis_research/core/table/table.h | 4 ++-- .../dongryel/thesis_research/core/tree/CMakeLists.txt | 3 ++- .../core/tree/{bounds.h => ball_bound.h} | 11 ++++++----- 3 files changed, 10 insertions(+), 8 deletions(-) rename fastlib/trunk/contrib/dongryel/thesis_research/core/tree/{bounds.h => ball_bound.h} (96%) diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/table.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/table.h index 04bad243ce..29d569d282 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/table.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/table.h @@ -17,11 +17,11 @@ namespace core { namespace table { +template class Table: public boost::noncopyable { public: - typedef core::tree::GeneralBinarySpaceTree < core::tree::GenMetricTree < - core::table::DensePoint > > TreeType; + typedef core::tree::GeneralBinarySpaceTree < TreeSpecType > TreeType; public: diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/CMakeLists.txt b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/CMakeLists.txt index 4e245c6dd4..f010cd4567 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/CMakeLists.txt +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/CMakeLists.txt @@ -1,9 +1,10 @@ cmake_minimum_required(VERSION 2.8) set(SOURCES - bounds.h + ball_bound.h general_spacetree.h gen_metric_tree.h + hrect_bound.h statistic.h ) diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/bounds.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/ball_bound.h similarity index 96% rename from fastlib/trunk/contrib/dongryel/thesis_research/core/tree/bounds.h rename to fastlib/trunk/contrib/dongryel/thesis_research/core/tree/ball_bound.h index f16f05236f..7e6baaf375 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/bounds.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/tree/ball_bound.h @@ -1,11 +1,12 @@ -/** - * @file tree/bounds.h +/** @file tree/ball_bound.h * - * Bounds that are useful for binary space partitioning trees. + * @author Dongryeol Lee (dongryel@cc.gatech.edu) + * + * Bounds that are useful for binary space partitioning trees. */ -#ifndef CORE_TREE_BOUNDS_H -#define CORE_TREE_BOUNDS_H +#ifndef CORE_TREE_BALL_BOUND_H +#define CORE_TREE_BALL_BOUND_H #include "boost/serialization/string.hpp" #include "core/math/math_lib.h"