From cd310e626cdcd10e0616bd0dfb3bc8d969762679 Mon Sep 17 00:00:00 2001 From: Dongryeol Lee Date: Wed, 29 Dec 2010 02:38:52 +0000 Subject: [PATCH] Another checkpoint. --- .../dongryel/thesis_research/core/table/sub_dense_matrix.h | 6 ++++-- .../mlpack/distributed_kde/distributed_kde_dev.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_dense_matrix.h b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_dense_matrix.h index 65d12577aa..8d0b9226ad 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_dense_matrix.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/core/table/sub_dense_matrix.h @@ -59,7 +59,8 @@ class SubDenseMatrix { ar & n_cols; for(unsigned int j = 0; j < nodes_->size(); j++) { - if((*nodes_)[j] != NULL && (*nodes_)[j]->is_leaf()) { + if((*nodes_)[j] != NULL && (*nodes_)[j]->is_leaf() && + (*serialize_points_per_terminal_node_)[j]) { for(int i = (*nodes_)[j]->begin(); i < (*nodes_)[j]->end(); i++) { const double *column_ptr = matrix_->GetColumnPtr(i); for(int k = 0; k < matrix_->n_rows(); k++) { @@ -84,7 +85,8 @@ class SubDenseMatrix { } for(unsigned int j = 0; j < nodes_->size(); j++) { - if((*nodes_)[j] != NULL && (*nodes_)[j]->is_leaf()) { + if((*nodes_)[j] != NULL && (*nodes_)[j]->is_leaf() && + (*serialize_points_per_terminal_node_)[j]) { for(int i = (*nodes_)[j]->begin(); i < (*nodes_)[j]->end(); i++) { double *column_ptr = const_cast(matrix_->GetColumnPtr(i)); diff --git a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/distributed_kde/distributed_kde_dev.h b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/distributed_kde/distributed_kde_dev.h index 3d2d3c6fa3..11b3f11a87 100644 --- a/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/distributed_kde/distributed_kde_dev.h +++ b/fastlib/trunk/contrib/dongryel/thesis_research/mlpack/distributed_kde/distributed_kde_dev.h @@ -125,7 +125,7 @@ bool DistributedKde::ConstructBoostVariableMap_( "Generate the datasets on the fly of the specified dimension." )( "random_generate_n_entries", - boost::program_options::value()->default_value(100), + boost::program_options::value()->default_value(10000), "Generate the datasets on the fly of the specified number of points." )( "densities_out",