[mlpack-git] master: Handle situations where the user passes in a distances matrix not a distance column. (c3d3825)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/31995784e651e1c17c988c79d9f53c9dbad620f8...81fce4edfc8bfb4c26b48ed388f559ec1cee26dd

>---------------------------------------------------------------

commit c3d38252d944d0902f91c98cd589addc352abac7
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Oct 30 20:50:24 2016 +0900

    Handle situations where the user passes in a distances matrix not a distance column.


>---------------------------------------------------------------

c3d38252d944d0902f91c98cd589addc352abac7
 src/mlpack/methods/approx_kfn/approx_kfn_main.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
index 97de7c5..7943850 100644
--- a/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
+++ b/src/mlpack/methods/approx_kfn/approx_kfn_main.cpp
@@ -241,10 +241,12 @@ int main(int argc, char** argv)
         Log::Info << "Calculation complete." << endl;
       }
 
-      const double averageError = arma::sum(exactDistances / distances.row(0)) /
-          distances.n_cols;
-      const double minError = arma::min(exactDistances / distances.row(0));
-      const double maxError = arma::max(exactDistances / distances.row(0));
+      const double averageError = arma::sum(exactDistances.row(0) /
+          distances.row(0)) / distances.n_cols;
+      const double minError = arma::min(exactDistances.row(0) /
+          distances.row(0));
+      const double maxError = arma::max(exactDistances.row(0) /
+          distances.row(0));
 
       Log::Info << "Average error: " << averageError << "." << endl;
       Log::Info << "Maximum error: " << maxError << "." << endl;