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

Some minor style changes (and a bugfix).

Browse Source
This commit is contained in:
Ryan Curtin
2019-08-16 01:37:28 -04:00
parent 4eb0279e1f
commit 0019501f8d
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/methods/neighbor_search/kfn_main.cpp
+6 -6
View File
@@ -274,8 +274,8 @@ static void mlpackMain()
<< queryData.n_rows << "x" << queryData.n_cols << ")." << endl;
if (queryData.n_rows != kfn->Dataset().n_rows)
{
Log::Fatal << "Query has invalid dimensions(" << queryData.n_rows <<
") whereas it should be " << kfn->Dataset().n_rows << endl;
Log::Fatal << "Query has invalid dimensions (" << queryData.n_rows <<
"); should be " << kfn->Dataset().n_rows << "!" << endl;
}
}
@@ -308,10 +308,6 @@ static void mlpackMain()
kfn->Search(k, neighbors, distances);
Log::Info << "Search complete." << endl;
// Save output.
CLI::GetParam<arma::Mat<size_t>>("neighbors") = neighbors;
CLI::GetParam<arma::mat>("distances") = distances;
// Calculate the effective error, if desired.
if (CLI::HasParam("true_distances"))
{
@@ -350,6 +346,10 @@ static void mlpackMain()
Log::Info << "Recall: " << KFN::Recall(neighbors, trueNeighbors) << endl;
}
// Save output.
CLI::GetParam<arma::Mat<size_t>>("neighbors") = std::move(neighbors);
CLI::GetParam<arma::mat>("distances") = std::move(distances);
}
CLI::GetParam<KFNModel*>("output_model") = kfn;
src/mlpack/methods/neighbor_search/knn_main.cpp
+5 -4
View File
@@ -292,7 +292,7 @@ static void mlpackMain()
if (queryData.n_rows != knn->Dataset().n_rows)
{
Log::Fatal << "Query has invalid dimensions(" << queryData.n_rows <<
") whereas it should be " << knn->Dataset().n_rows << endl;
"); should be " << knn->Dataset().n_rows << "!" << endl;
}
}
@@ -325,9 +325,6 @@ static void mlpackMain()
knn->Search(k, neighbors, distances);
Log::Info << "Search complete." << endl;
// Save output.
CLI::GetParam<arma::Mat<size_t>>("neighbors") = std::move(neighbors);
CLI::GetParam<arma::mat>("distances") = std::move(distances);
// Calculate the effective error, if desired.
if (CLI::HasParam("true_distances"))
{
@@ -366,6 +363,10 @@ static void mlpackMain()
Log::Info << "Recall: " << KNN::Recall(neighbors, trueNeighbors) << endl;
}
// Save output.
CLI::GetParam<arma::Mat<size_t>>("neighbors") = std::move(neighbors);
CLI::GetParam<arma::mat>("distances") = std::move(distances);
}
CLI::GetParam<KNNModel*>("output_model") = knn;
src/mlpack/tests/knn_test.cpp
-3
View File
@@ -1100,7 +1100,6 @@ BOOST_AUTO_TEST_CASE(KNNModelTest)
models[26] = KNNModel(KNNModel::TreeTypes::OCTREE, true);
models[27] = KNNModel(KNNModel::TreeTypes::OCTREE, false);
for (size_t j = 0; j < 3; ++j)
{
// Get a baseline.
@@ -1184,9 +1183,7 @@ BOOST_AUTO_TEST_CASE(KNNModelMonochromaticTest)
models[26] = KNNModel(KNNModel::TreeTypes::OCTREE, true);
models[27] = KNNModel(KNNModel::TreeTypes::OCTREE, false);
for (size_t j = 0; j < 3; ++j)
{
// Get a baseline.
KNN knn(referenceData);