From 0019501f8de04b30ec97b9fd6dc2b15254e4e2bf Mon Sep 17 00:00:00 2001
From: Ryan Curtin <ryan@ratml.org>
Date: Fri, 16 Aug 2019 01:37:28 -0400
Subject: [PATCH] Some minor style changes (and a bugfix).

---
 src/mlpack/methods/neighbor_search/kfn_main.cpp | 12 ++++++------
 src/mlpack/methods/neighbor_search/knn_main.cpp |  9 +++++----
 src/mlpack/tests/knn_test.cpp                   |  3 ---
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/mlpack/methods/neighbor_search/kfn_main.cpp b/src/mlpack/methods/neighbor_search/kfn_main.cpp
index b4440a3834..d046655888 100644
--- a/src/mlpack/methods/neighbor_search/kfn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/kfn_main.cpp
@@ -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;
diff --git a/src/mlpack/methods/neighbor_search/knn_main.cpp b/src/mlpack/methods/neighbor_search/knn_main.cpp
index 48a9152db2..f3e277d395 100644
--- a/src/mlpack/methods/neighbor_search/knn_main.cpp
+++ b/src/mlpack/methods/neighbor_search/knn_main.cpp
@@ -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;
diff --git a/src/mlpack/tests/knn_test.cpp b/src/mlpack/tests/knn_test.cpp
index 89cfc762dc..f92fd9426f 100644
--- a/src/mlpack/tests/knn_test.cpp
+++ b/src/mlpack/tests/knn_test.cpp
@@ -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);