[mlpack-git] master: Force settings of --single and --naive. (9bd2063)
gitdub at big.cc.gt.atl.ga.us
gitdub at big.cc.gt.atl.ga.us
Thu Nov 5 12:08:34 EST 2015
Repository : https://github.com/mlpack/mlpack
On branch : master
Link : https://github.com/mlpack/mlpack/compare/c3b6a9b6cf3907e737f19b544f339690f2098ace...9bd2063f96de9430b387974e7ce7204a1e57a803
>---------------------------------------------------------------
commit 9bd2063f96de9430b387974e7ce7204a1e57a803
Author: ryan <ryan at ratml.org>
Date: Thu Nov 5 12:08:09 2015 -0500
Force settings of --single and --naive.
Minor output consistency changes.
>---------------------------------------------------------------
9bd2063f96de9430b387974e7ce7204a1e57a803
src/mlpack/methods/neighbor_search/allkfn_main.cpp | 17 +++++++----------
src/mlpack/methods/neighbor_search/allknn_main.cpp | 15 +++++----------
2 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/mlpack/methods/neighbor_search/allkfn_main.cpp b/src/mlpack/methods/neighbor_search/allkfn_main.cpp
index 3abbf01..c8ebbfe 100644
--- a/src/mlpack/methods/neighbor_search/allkfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/allkfn_main.cpp
@@ -1,4 +1,5 @@
/**
+w
* @file allkfn_main.cpp
* @author Ryan Curtin
*
@@ -170,10 +171,9 @@ int main(int argc, char *argv[])
data::Load(referenceFile, referenceSet, true);
Log::Info << "Loaded reference data from '" << referenceFile << "' ("
- << referenceSet.n_rows << " x " << referenceSet.n_cols << ")." << endl;
+ << referenceSet.n_rows << "x" << referenceSet.n_cols << ")." << endl;
- const size_t leafSize = (size_t) lsInt;
- kfn.BuildModel(std::move(referenceSet), leafSize, naive, singleMode);
+ kfn.BuildModel(std::move(referenceSet), size_t(lsInt), naive, singleMode);
}
else
{
@@ -186,12 +186,9 @@ int main(int argc, char *argv[])
<< endl;
// Adjust singleMode and naive if necessary.
- if (CLI::HasParam("single_mode"))
- kfn.SingleMode() = true;
- if (CLI::HasParam("naive"))
- kfn.Naive() = true;
- if (CLI::HasParam("leaf_size"))
- kfn.LeafSize() = (size_t) lsInt;
+ kfn.SingleMode() = CLI::HasParam("single_mode");
+ kfn.Naive() = CLI::HasParam("naive");
+ kfn.LeafSize() = size_t(lsInt);
}
// Perform search, if desired.
@@ -205,7 +202,7 @@ int main(int argc, char *argv[])
{
data::Load(queryFile, queryData, true);
Log::Info << "Loaded query data from '" << queryFile << "' ("
- << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
+ << queryData.n_rows << "x" << queryData.n_cols << ")." << endl;
}
// Sanity check on k value: must be greater than 0, must be less than the
diff --git a/src/mlpack/methods/neighbor_search/allknn_main.cpp b/src/mlpack/methods/neighbor_search/allknn_main.cpp
index f016b75..172f897 100644
--- a/src/mlpack/methods/neighbor_search/allknn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/allknn_main.cpp
@@ -178,9 +178,7 @@ int main(int argc, char *argv[])
<< referenceSet.n_rows << " x " << referenceSet.n_cols << ")."
<< endl;
- const size_t leafSize = (size_t) CLI::GetParam<int>("leaf_size");
-
- knn.BuildModel(std::move(referenceSet), leafSize, naive, singleMode);
+ knn.BuildModel(std::move(referenceSet), size_t(lsInt), naive, singleMode);
}
else
{
@@ -193,12 +191,9 @@ int main(int argc, char *argv[])
<< endl;
// Adjust singleMode and naive if necessary.
- if (CLI::HasParam("single_mode"))
- knn.SingleMode() = CLI::HasParam("single_mode");
- if (CLI::HasParam("naive"))
- knn.Naive() = CLI::HasParam("naive");
- if (CLI::HasParam("leaf_size"))
- knn.LeafSize() = (size_t) CLI::GetParam<int>("leaf_size");
+ knn.SingleMode() = CLI::HasParam("single_mode");
+ knn.Naive() = CLI::HasParam("naive");
+ knn.LeafSize() = size_t(lsInt);
}
// Perform search, if desired.
@@ -212,7 +207,7 @@ int main(int argc, char *argv[])
{
data::Load(queryFile, queryData, true);
Log::Info << "Loaded query data from '" << queryFile << "' ("
- << queryData.n_rows << " x " << queryData.n_cols << ")." << endl;
+ << queryData.n_rows << "x" << queryData.n_cols << ")." << endl;
}
// Sanity check on k value: must be greater than 0, must be less than the
More information about the mlpack-git
mailing list