[mlpack-git] master: Properly use Enum type. (dd136db)
gitdub at mlpack.org
gitdub at mlpack.org
Fri May 20 18:40:30 EDT 2016
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/39eefded8c6e4edd95c5b0c8110adf8d5aba24be...9b42c22105c23bb9d653f8eca21effbda12e68cf
>---------------------------------------------------------------
commit dd136db3241a5d6f9d8c812e9876b89fb5d8786d
Author: MarcosPividori <marcos.pividori at gmail.com>
Date: Fri May 20 12:17:37 2016 -0300
Properly use Enum type.
>---------------------------------------------------------------
dd136db3241a5d6f9d8c812e9876b89fb5d8786d
src/mlpack/methods/neighbor_search/kfn_main.cpp | 2 +-
src/mlpack/methods/neighbor_search/knn_main.cpp | 2 +-
src/mlpack/methods/neighbor_search/ns_model.hpp | 8 ++++----
src/mlpack/methods/neighbor_search/ns_model_impl.hpp | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/kfn_main.cpp b/src/mlpack/methods/neighbor_search/kfn_main.cpp
index 3c185de..d680740 100644
--- a/src/mlpack/methods/neighbor_search/kfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
const string treeType = CLI::GetParam<string>("tree_type");
const bool randomBasis = CLI::HasParam("random_basis");
- int tree = 0;
+ KFNModel::TreeTypes tree = KFNModel::KD_TREE;
if (treeType == "kd")
tree = KFNModel::KD_TREE;
else if (treeType == "cover")
diff --git a/src/mlpack/methods/neighbor_search/knn_main.cpp b/src/mlpack/methods/neighbor_search/knn_main.cpp
index f02b96c..9dd7760 100644
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@ -153,7 +153,7 @@ int main(int argc, char *argv[])
const string treeType = CLI::GetParam<string>("tree_type");
const bool randomBasis = CLI::HasParam("random_basis");
- int tree = 0;
+ KNNModel::TreeTypes tree = KNNModel::KD_TREE;
if (treeType == "kd")
tree = KNNModel::KD_TREE;
else if (treeType == "cover")
diff --git a/src/mlpack/methods/neighbor_search/ns_model.hpp b/src/mlpack/methods/neighbor_search/ns_model.hpp
index df90f97..9c16199 100644
--- a/src/mlpack/methods/neighbor_search/ns_model.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model.hpp
@@ -52,7 +52,7 @@ class NSModel
};
private:
- int treeType;
+ TreeTypes treeType;
size_t leafSize;
// For random projections.
@@ -83,7 +83,7 @@ class NSModel
* Initialize the NSModel with the given type and whether or not a random
* basis should be used.
*/
- NSModel(int treeType = TreeTypes::KD_TREE, bool randomBasis = false);
+ NSModel(TreeTypes treeType = TreeTypes::KD_TREE, bool randomBasis = false);
//! Clean memory, if necessary.
~NSModel();
@@ -105,8 +105,8 @@ class NSModel
size_t LeafSize() const { return leafSize; }
size_t& LeafSize() { return leafSize; }
- int TreeType() const { return treeType; }
- int& TreeType() { return treeType; }
+ TreeTypes TreeType() const { return treeType; }
+ TreeTypes& TreeType() { return treeType; }
bool RandomBasis() const { return randomBasis; }
bool& RandomBasis() { return randomBasis; }
diff --git a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
index b25cf0e..28c5a0b 100644
--- a/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
+++ b/src/mlpack/methods/neighbor_search/ns_model_impl.hpp
@@ -21,7 +21,7 @@ namespace neighbor {
* basis should be used.
*/
template<typename SortPolicy>
-NSModel<SortPolicy>::NSModel(int treeType, bool randomBasis) :
+NSModel<SortPolicy>::NSModel(TreeTypes treeType, bool randomBasis) :
treeType(treeType),
randomBasis(randomBasis),
kdTreeNS(NULL),
More information about the mlpack-git
mailing list