diff --git a/fastlib/u/dongryel/kde/fft_kde.h b/fastlib/u/dongryel/kde/fft_kde.h index 99445ad34c..4d13630001 100644 --- a/fastlib/u/dongryel/kde/fft_kde.h +++ b/fastlib/u/dongryel/kde/fft_kde.h @@ -704,12 +704,6 @@ class FFTKde { ~FFTKde() {} ////////// Getters/Setters ////////// - - /** get the reference dataset */ - Matrix &get_reference_dataset() { return rset_; } - - /** get the query dataset */ - Matrix &get_query_dataset() { return qset_; } /** get the density estimate */ void get_density_estimates(Vector *results) { diff --git a/fastlib/u/dongryel/kde/fgt_kde.h b/fastlib/u/dongryel/kde/fgt_kde.h index 2143013a20..7ba4df52aa 100644 --- a/fastlib/u/dongryel/kde/fgt_kde.h +++ b/fastlib/u/dongryel/kde/fgt_kde.h @@ -849,6 +849,19 @@ class FGTKde { references_assigned, mcoeffs); } + /** + * Normalize the density estimates after the unnormalized sums have + * been computed + */ + void NormalizeDensities() { + double norm_const = kernel_.CalcNormConstant(qset_.n_rows()) * + rset_.n_cols(); + + for(index_t q = 0; q < qset_.n_cols(); q++) { + densities_[q] /= norm_const; + } + } + public: ////////// Constructor/Destructor ////////// @@ -1046,19 +1059,6 @@ class FGTKde { printf("FGT KDE completed...\n"); } - /** - * Normalize the density estimates after the unnormalized sums have - * been computed - */ - void NormalizeDensities() { - double norm_const = kernel_.CalcNormConstant(qset_.n_rows()) * - rset_.n_cols(); - - for(index_t q = 0; q < qset_.n_cols(); q++) { - densities_[q] /= norm_const; - } - } - void PrintDebug() { FILE *stream = stdout; diff --git a/fastlib/u/dongryel/kde/kde.h b/fastlib/u/dongryel/kde/kde.h index 747852cac5..2b40661398 100644 --- a/fastlib/u/dongryel/kde/kde.h +++ b/fastlib/u/dongryel/kde/kde.h @@ -906,12 +906,6 @@ class FastKde { ////////// Getters/Setters ////////// - /** get the reference dataset */ - Matrix &get_reference_dataset() { return rset_; } - - /** get the query dataset */ - Matrix &get_query_dataset() { return qset_; } - /** get the density estimate */ void get_density_estimates(Vector *results) { results->Init(q_results_.size());