[mlpack-git] master: Change parameter name to 'oct'. (0278a34)
gitdub at mlpack.org
gitdub at mlpack.org
Mon Oct 3 14:40:56 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/9ef7339d40550a974b3939e9fcb966fac2c09065...ebdb5abeaa3fd621a06ae663862bb72df76d2b40
>---------------------------------------------------------------
commit 0278a3445ba3b21d78265ef7b4f42a7d5faf69f4
Author: Ryan Curtin <ryan at ratml.org>
Date: Mon Oct 3 14:40:56 2016 -0400
Change parameter name to 'oct'.
>---------------------------------------------------------------
0278a3445ba3b21d78265ef7b4f42a7d5faf69f4
src/mlpack/methods/neighbor_search/kfn_main.cpp | 6 +++---
src/mlpack/methods/neighbor_search/knn_main.cpp | 6 +++---
src/mlpack/methods/range_search/range_search_main.cpp | 6 +++---
src/mlpack/methods/rann/krann_main.cpp | 6 +++---
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/kfn_main.cpp b/src/mlpack/methods/neighbor_search/kfn_main.cpp
index 9645472..f773549 100644
--- a/src/mlpack/methods/neighbor_search/kfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp
@@ -68,7 +68,7 @@ PARAM_INT_IN("k", "Number of furthest neighbors to find.", "k", 0);
// building.
PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'rp', 'max-rp', "
"'ub', 'cover', 'r', 'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', "
- "'r-plus-plus', 'octree'.", "t", "kd");
+ "'r-plus-plus', 'oct'.", "t", "kd");
PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, "
"vp trees, random projection trees, UB trees, R trees, R* trees, X trees, "
"Hilbert R trees, R+ trees, R++ trees, and octrees).", "l", 20);
@@ -262,12 +262,12 @@ int main(int argc, char *argv[])
tree = KFNModel::MAX_RP_TREE;
else if (treeType == "ub")
tree = KFNModel::UB_TREE;
- else if (treeType == "octree")
+ else if (treeType == "oct")
tree = KFNModel::OCTREE;
else
Log::Fatal << "Unknown tree type '" << treeType << "'; valid choices are "
<< "'kd', 'vp', 'rp', 'max-rp', 'ub', 'cover', 'r', 'r-star', 'x', "
- << "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', and 'octree'."
+ << "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', and 'oct'."
<< endl;
kfn.TreeType() = tree;
diff --git a/src/mlpack/methods/neighbor_search/knn_main.cpp b/src/mlpack/methods/neighbor_search/knn_main.cpp
index 2127b79..8cc8915 100644
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@ -70,7 +70,7 @@ PARAM_INT_IN("k", "Number of nearest neighbors to find.", "k", 0);
// building.
PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'rp', 'max-rp', "
"'ub', 'cover', 'r', 'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', "
- "'r-plus-plus', 'spill'.", "t", "kd");
+ "'r-plus-plus', 'spill', 'oct'.", "t", "kd");
PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, vp "
"trees, random projection trees, UB trees, R trees, R* trees, X trees, "
"Hilbert R trees, R+ trees, R++ trees, spill trees, and octrees).", "l",
@@ -277,13 +277,13 @@ int main(int argc, char *argv[])
tree = KNNModel::MAX_RP_TREE;
else if (treeType == "ub")
tree = KNNModel::UB_TREE;
- else if (treeType == "octree")
+ else if (treeType == "oct")
tree = KNNModel::OCTREE;
else
Log::Fatal << "Unknown tree type '" << treeType << "'; valid choices are "
<< "'kd', 'vp', 'rp', 'max-rp', 'ub', 'cover', 'r', 'r-star', 'x', "
<< "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', 'spill', and "
- << "'octree'." << endl;
+ << "'oct'." << endl;
knn.TreeType() = tree;
knn.RandomBasis() = randomBasis;
diff --git a/src/mlpack/methods/range_search/range_search_main.cpp b/src/mlpack/methods/range_search/range_search_main.cpp
index 990e3c1..92e0be8 100644
--- a/src/mlpack/methods/range_search/range_search_main.cpp
+++ b/src/mlpack/methods/range_search/range_search_main.cpp
@@ -72,7 +72,7 @@ PARAM_DOUBLE_IN("min", "Lower bound in range.", "L", 0.0);
// building.
PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'vp', 'rp', 'max-rp', "
"'ub', 'cover', 'r', 'r-star', 'x', 'ball', 'hilbert-r', 'r-plus', "
- "'r-plus-plus', 'octree'.", "t", "kd");
+ "'r-plus-plus', 'oct'.", "t", "kd");
PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, "
"vp trees, random projection trees, UB trees, R trees, R* trees, X trees, "
"Hilbert R trees, R+ trees, R++ trees, and octrees).", "l", 20);
@@ -191,12 +191,12 @@ int main(int argc, char *argv[])
tree = RSModel::MAX_RP_TREE;
else if (treeType == "ub")
tree = RSModel::UB_TREE;
- else if (treeType == "octree")
+ else if (treeType == "oct")
tree = RSModel::OCTREE;
else
Log::Fatal << "Unknown tree type '" << treeType << "; valid choices are "
<< "'kd', 'vp', 'rp', 'max-rp', 'ub', 'cover', 'r', 'r-star', 'x', "
- << "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', and 'octree'." << endl;
+ << "'ball', 'hilbert-r', 'r-plus', 'r-plus-plus', and 'oct'." << endl;
rs.TreeType() = tree;
rs.RandomBasis() = randomBasis;
diff --git a/src/mlpack/methods/rann/krann_main.cpp b/src/mlpack/methods/rann/krann_main.cpp
index 7830f89..26f3eb5 100644
--- a/src/mlpack/methods/rann/krann_main.cpp
+++ b/src/mlpack/methods/rann/krann_main.cpp
@@ -65,7 +65,7 @@ PARAM_INT_IN("k", "Number of nearest neighbors to find.", "k", 0);
// The user may specify the type of tree to use, and a few parameters for tree
// building.
PARAM_STRING_IN("tree_type", "Type of tree to use: 'kd', 'ub', 'cover', 'r', "
- "'x', 'r-star', 'hilbert-r', 'r-plus', 'r-plus-plus', 'octree'.", "t",
+ "'x', 'r-star', 'hilbert-r', 'r-plus', 'r-plus-plus', 'oct'.", "t",
"kd");
PARAM_INT_IN("leaf_size", "Leaf size for tree building (used for kd-trees, "
"UB trees, R trees, R* trees, X trees, Hilbert R trees, R+ trees, "
@@ -183,12 +183,12 @@ int main(int argc, char *argv[])
tree = RANNModel::R_PLUS_PLUS_TREE;
else if (treeType == "ub")
tree = RANNModel::UB_TREE;
- else if (treeType == "octree")
+ else if (treeType == "oct")
tree = RANNModel::OCTREE;
else
Log::Fatal << "Unknown tree type '" << treeType << "'; valid choices are "
<< "'kd', 'ub', 'cover', 'r', 'r-star', 'x', 'hilbert-r', "
- << "'r-plus', 'r-plus-plus', 'octree'." << endl;
+ << "'r-plus', 'r-plus-plus', 'oct'." << endl;
rann.TreeType() = tree;
rann.RandomBasis() = randomBasis;
More information about the mlpack-git
mailing list