[mlpack-git] master: Merge remote-tracking branch 'upstream/master' into ubtree (3cd0d34)
gitdub at mlpack.org
gitdub at mlpack.org
Fri Aug 26 16:02:21 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/1797a49c8f76d65814fec4a122d0d2fea01fc2d9...9e5cd0ac9c5cde9ac141bc84e7327bd11e19d42e
>---------------------------------------------------------------
commit 3cd0d34620156f8bad17341db804060de25ce6b3
Merge: 9bcd066 5617fbc
Author: Mikhail Lozhnikov <lozhnikovma at gmail.com>
Date: Fri Aug 26 23:02:21 2016 +0300
Merge remote-tracking branch 'upstream/master' into ubtree
>---------------------------------------------------------------
3cd0d34620156f8bad17341db804060de25ce6b3
README.md | 14 +-
doc/guide/build.hpp | 12 +
src/mlpack/core/optimizers/lbfgs/lbfgs_impl.hpp | 19 +-
src/mlpack/core/tree/CMakeLists.txt | 2 +
.../tree/binary_space_tree/binary_space_tree.hpp | 30 ++
.../binary_space_tree/binary_space_tree_impl.hpp | 98 ++++
src/mlpack/core/tree/cover_tree/cover_tree.hpp | 30 ++
.../core/tree/cover_tree/cover_tree_impl.hpp | 116 +++++
.../core/tree/greedy_single_tree_traverser.hpp | 52 ++
.../tree/greedy_single_tree_traverser_impl.hpp | 47 ++
.../tree/rectangle_tree/discrete_hilbert_value.hpp | 25 +-
.../rectangle_tree/discrete_hilbert_value_impl.hpp | 84 +++-
.../hilbert_r_tree_auxiliary_information.hpp | 29 +-
.../hilbert_r_tree_auxiliary_information_impl.hpp | 23 +-
.../rectangle_tree/hilbert_r_tree_split_impl.hpp | 7 +-
.../rectangle_tree/no_auxiliary_information.hpp | 12 +-
.../r_plus_plus_tree_auxiliary_information.hpp | 21 +-
...r_plus_plus_tree_auxiliary_information_impl.hpp | 12 +-
.../core/tree/rectangle_tree/rectangle_tree.hpp | 41 +-
.../tree/rectangle_tree/rectangle_tree_impl.hpp | 196 +++++++-
.../x_tree_auxiliary_information.hpp | 61 ++-
.../spill_tree/spill_dual_tree_traverser_impl.hpp | 56 +--
.../spill_single_tree_traverser_impl.hpp | 7 +-
src/mlpack/core/tree/spill_tree/spill_tree.hpp | 47 +-
.../core/tree/spill_tree/spill_tree_impl.hpp | 145 ++++--
src/mlpack/methods/cf/cf.cpp | 2 +-
src/mlpack/methods/neighbor_search/kfn_main.cpp | 84 +++-
src/mlpack/methods/neighbor_search/knn_main.cpp | 88 +++-
.../methods/neighbor_search/neighbor_search.hpp | 133 +++++-
.../neighbor_search/neighbor_search_impl.hpp | 528 ++++++++++++++++-----
.../neighbor_search/neighbor_search_rules.hpp | 19 +-
.../neighbor_search/neighbor_search_rules_impl.hpp | 16 +
src/mlpack/methods/neighbor_search/ns_model.hpp | 36 +-
.../methods/neighbor_search/ns_model_impl.hpp | 174 ++++---
.../sort_policies/furthest_neighbor_sort.hpp | 22 +-
.../sort_policies/nearest_neighbor_sort.hpp | 21 +
src/mlpack/tests/akfn_test.cpp | 14 +-
src/mlpack/tests/aknn_test.cpp | 32 +-
src/mlpack/tests/kfn_test.cpp | 22 +-
src/mlpack/tests/knn_test.cpp | 40 +-
src/mlpack/tests/rectangle_tree_test.cpp | 107 ++++-
src/mlpack/tests/serialization_test.cpp | 2 +-
src/mlpack/tests/tree_test.cpp | 18 +-
src/mlpack/tests/vantage_point_tree_test.cpp | 8 +-
44 files changed, 2097 insertions(+), 455 deletions(-)
diff --cc src/mlpack/methods/neighbor_search/knn_main.cpp
index aa6f152,6e8fe19..0e29ff8
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@@ -219,13 -274,10 +274,13 @@@ int main(int argc, char *argv[]
tree = KNNModel::RP_TREE;
else if (treeType == "max-rp")
tree = KNNModel::MAX_RP_TREE;
+ else if (treeType == "ub")
+ tree = KNNModel::UB_TREE;
else
Log::Fatal << "Unknown tree type '" << treeType << "'; valid choices are "
- << "'kd', 'vp', 'rp', 'max-rp', 'cover', 'r', 'r-star', 'x', 'ball', "
- << "'hilbert-r', 'r-plus', 'r-plus-plus' and 'spill'." << endl;
+ << "'kd', 'vp', 'rp', 'max-rp', 'ub', 'cover', 'r', 'r-star', 'x', "
- << "'ball', 'hilbert-r', 'r-plus' and 'r-plus-plus', and 'spill'."
++ << "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus' and 'spill'."
+ << endl;
knn.TreeType() = tree;
knn.RandomBasis() = randomBasis;
diff --cc src/mlpack/methods/neighbor_search/ns_model_impl.hpp
index b232cfd,1591730..cc7015c
--- a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
@@@ -460,23 -477,17 +477,20 @@@ void NSModel<SortPolicy>::BuildModel(ar
epsilon);
break;
case VP_TREE:
- nSearch = new NSType<SortPolicy, tree::VPTree>(naive, singleMode,
- epsilon);
+ nSearch = new NSType<SortPolicy, tree::VPTree>(searchMode, epsilon);
break;
case RP_TREE:
- nSearch = new NSType<SortPolicy, tree::RPTree>(naive, singleMode,
- epsilon);
+ nSearch = new NSType<SortPolicy, tree::RPTree>(searchMode, epsilon);
break;
case MAX_RP_TREE:
- nSearch = new NSType<SortPolicy, tree::MaxRPTree>(naive, singleMode,
- epsilon);
+ nSearch = new NSType<SortPolicy, tree::MaxRPTree>(searchMode, epsilon);
+ break;
case SPILL_TREE:
- nSearch = new SpillKNN(naive, singleMode, epsilon);
+ nSearch = new SpillKNN(searchMode, epsilon);
break;
+ case UB_TREE:
- nSearch = new NSType<SortPolicy, tree::UBTree>(naive, singleMode,
- epsilon);
++ nSearch = new NSType<SortPolicy, tree::UBTree>(searchMode, epsilon);
+ break;
}
TrainVisitor<SortPolicy> tn(std::move(referenceSet), leafSize, tau, rho);
More information about the mlpack-git
mailing list