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

quick fix to account for dataset permutation

Browse Source
This commit is contained in:
Dongryeol Lee
2008-01-01 20:49:24 +00:00
parent c947e3749c
commit 3aebcbddf9
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib/u/dongryel/range_search/main.cc
+1 -1
View File
@@ -19,7 +19,7 @@ int main(int argc, char *argv[]) {
// if naive option is specified, do naive algorithm
if(do_naive) {
NaiveOrthoRangeSearch search;
search.Init(fast_search.get_data(), fast_search.get_range());
search.Init();
search.Compute();
ArrayList<bool> naive_search_results = search.get_results();
bool flag = true;
fastlib/u/dongryel/range_search/ortho_range_search.h
+11 -11
View File
@@ -57,17 +57,6 @@ class NaiveOrthoRangeSearch {
}
}
void Init(const Matrix &data, const ArrayList<DRange> &range) {
data_.Alias(data);
range_.Copy(range);
// re-initialize boolean flag
in_range_.Init(data_.n_cols());
for(index_t i = 0; i < data_.n_cols(); i++) {
in_range_[i] = false;
}
}
/** the main computation of naive orthogonal range search */
void Compute() {
@@ -140,6 +129,17 @@ class OrthoRangeSearch {
fx_timer_start(NULL, "tree_range_search");
ortho_range_search(root_, 0);
fx_timer_stop(NULL, "tree_range_search");
// reshuffle the results to account for shuffling during tree construction
ArrayList<bool> tmp_results;
tmp_results.Init(candidate_points_.size());
for(index_t i = 0; i < candidate_points_.size(); i++) {
tmp_results[old_from_new_[i]] = candidate_points_[i];
}
for(index_t i = 0; i < candidate_points_.size(); i++) {
candidate_points_[i] = tmp_results[i];
}
}
void SaveTree() {