apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Templatized the indexing type in tree building.

Browse Source
This commit is contained in:
Dongryeol Lee
2010-11-30 02:55:38 +00:00
parent 4411a929e1
commit 3efca7ab8d
3 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib/trunk/contrib/dongryel/thesis_research/core/tree/gen_kdtree.h
+2 -2
View File
@@ -93,12 +93,12 @@ class GenKdTree {
}
}
template<typename TreeType>
template<typename TreeType, typename IndexType>
static bool AttemptSplitting(
const core::metric_kernels::AbstractMetric &metric_in,
core::table::DenseMatrix& matrix, TreeType *node, TreeType **left,
TreeType **right, int leaf_size,
int *old_from_new,
IndexType *old_from_new,
core::table::MemoryMappedFile *m_file_in) {
*left = NULL;
fastlib/trunk/contrib/dongryel/thesis_research/core/tree/gen_metric_tree.h
+2 -3
View File
@@ -132,12 +132,11 @@ class GenMetricTree {
}
}
template<typename TreeType>
template<typename TreeType, typename IndexType>
static bool AttemptSplitting(
const core::metric_kernels::AbstractMetric &metric_in,
core::table::DenseMatrix& matrix, TreeType *node, TreeType **left,
TreeType **right, int leaf_size,
int *old_from_new,
TreeType **right, int leaf_size, IndexType *old_from_new,
core::table::MemoryMappedFile *m_file_in) {
// Pick a random row.
fastlib/trunk/contrib/dongryel/thesis_research/core/tree/general_spacetree.h
+67 -13
View File
@@ -36,6 +36,62 @@ extern core::table::MemoryMappedFile *global_m_file_;
namespace core {
namespace tree {
template<typename IndexType>
class IndexInitializer {
public:
static void OldFromNew(
const core::table::DenseMatrix &matrix_in,
IndexType *old_from_new_out);
static void NewFromOld(
const core::table::DenseMatrix &matrix_in,
IndexType *old_from_new_in,
IndexType *new_from_old_out);
};
template<>
class IndexInitializer< std::pair<int, int> > {
public:
static void OldFromNew(
const core::table::DenseMatrix &matrix_in,
std::pair<int, int> *old_from_new_out) {
for(int i = 0; i < matrix_in.n_cols(); i++) {
old_from_new_out[i] = std::pair<int, int>(0, i);
}
}
static void NewFromOld(
const core::table::DenseMatrix &matrix_in,
std::pair<int, int> *old_from_new_in,
std::pair<int, int> *new_from_old_out) {
for(int i = 0; i < matrix_in.n_cols(); i++) {
new_from_old_out[old_from_new_in[i].second] = std::pair<int, int>(0, i);
}
}
};
template<>
class IndexInitializer< int > {
public:
static void OldFromNew(
const core::table::DenseMatrix &matrix_in,
int *old_from_new_out) {
for(int i = 0; i < matrix_in.n_cols(); i++) {
old_from_new_out[i] = i;
}
}
static void NewFromOld(
const core::table::DenseMatrix &matrix_in,
int *old_from_new_in,
int *new_from_old_out) {
for(int i = 0; i < matrix_in.n_cols(); i++) {
new_from_old_out[old_from_new_in[i]] = i;
}
}
};
template < class TreeSpecType >
class GeneralBinarySpaceTree {
private:
@@ -287,6 +343,7 @@ class GeneralBinarySpaceTree {
}
}
template<typename IndexType>
static void SplitTree(
const core::metric_kernels::AbstractMetric &metric_in,
core::table::DenseMatrix& matrix,
@@ -294,7 +351,7 @@ class GeneralBinarySpaceTree {
int leaf_size,
int max_num_leaf_nodes,
int *current_num_leaf_nodes,
int *old_from_new,
IndexType *old_from_new,
int *num_nodes) {
TreeType *left = NULL;
@@ -353,23 +410,21 @@ class GeneralBinarySpaceTree {
* original indexes to new indices
* @param num_nodes the number of nodes constructed in total.
*/
template<typename IndexType>
static TreeType *MakeTree(
const core::metric_kernels::AbstractMetric &metric_in,
core::table::DenseMatrix& matrix, int leaf_size,
int max_num_leaf_nodes = std::numeric_limits<int>::max(),
int *old_from_new = NULL,
int *new_from_old = NULL,
IndexType *old_from_new = NULL,
IndexType *new_from_old = NULL,
int *num_nodes = NULL) {
TreeType *node = (core::table::global_m_file_) ?
core::table::global_m_file_->Construct<TreeType>() :
new TreeType();
if(old_from_new) {
for(int i = 0; i < matrix.n_cols(); i++) {
old_from_new[i] = i;
}
}
// Initialize the old_from_new mapping.
IndexInitializer<IndexType>::OldFromNew(matrix, old_from_new);
int num_nodes_in = 1;
node->Init(0, matrix.n_cols());
@@ -385,11 +440,10 @@ class GeneralBinarySpaceTree {
if(num_nodes) {
*num_nodes = num_nodes_in;
}
if(new_from_old) {
for(int i = 0; i < matrix.n_cols(); i++) {
new_from_old[old_from_new[i]] = i;
}
}
// Finalize the new_from_old mapping from old_from_new mapping.
IndexInitializer<IndexType>::NewFromOld(
matrix, old_from_new, new_from_old);
return node;
}