[mlpack-git] master: Fix collision of variable names. (aa19d06)

gitdub at big.cc.gt.atl.ga.us gitdub at big.cc.gt.atl.ga.us
Wed Nov 4 13:54:12 EST 2015


Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/1eb721c663e640d571d8374c67c40ad8a5ea6fb3...e09d6a4869ed02fbf3d9d9b22ab1bf46a116cfdd

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

commit aa19d06fcfcabd2fd2bd930ad8eb923fba66a4ef
Author: ryan <ryan at ratml.org>
Date:   Wed Nov 4 13:18:58 2015 -0500

    Fix collision of variable names.


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

aa19d06fcfcabd2fd2bd930ad8eb923fba66a4ef
 src/mlpack/tests/allknn_test.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/mlpack/tests/allknn_test.cpp b/src/mlpack/tests/allknn_test.cpp
index 70fa802..c5aa0ef 100644
--- a/src/mlpack/tests/allknn_test.cpp
+++ b/src/mlpack/tests/allknn_test.cpp
@@ -1018,13 +1018,13 @@ BOOST_AUTO_TEST_CASE(KNNModelTest)
       BOOST_REQUIRE_EQUAL(distances.n_rows, baselineDistances.n_rows);
       BOOST_REQUIRE_EQUAL(distances.n_cols, baselineDistances.n_cols);
       BOOST_REQUIRE_EQUAL(distances.n_elem, baselineDistances.n_elem);
-      for (size_t i = 0; i < distances.n_elem; ++i)
+      for (size_t k = 0; k < distances.n_elem; ++k)
       {
-        BOOST_REQUIRE_EQUAL(neighbors[i], baselineNeighbors[i]);
-        if (std::abs(baselineDistances[i]) < 1e-5)
-          BOOST_REQUIRE_SMALL(distances[i], 1e-5);
+        BOOST_REQUIRE_EQUAL(neighbors[k], baselineNeighbors[k]);
+        if (std::abs(baselineDistances[k]) < 1e-5)
+          BOOST_REQUIRE_SMALL(distances[k], 1e-5);
         else
-          BOOST_REQUIRE_CLOSE(distances[i], baselineDistances[i], 1e-5);
+          BOOST_REQUIRE_CLOSE(distances[k], baselineDistances[k], 1e-5);
       }
     }
   }
@@ -1081,13 +1081,13 @@ BOOST_AUTO_TEST_CASE(KNNModelMonochromaticTest)
       BOOST_REQUIRE_EQUAL(distances.n_rows, baselineDistances.n_rows);
       BOOST_REQUIRE_EQUAL(distances.n_cols, baselineDistances.n_cols);
       BOOST_REQUIRE_EQUAL(distances.n_elem, baselineDistances.n_elem);
-      for (size_t i = 0; i < distances.n_elem; ++i)
+      for (size_t k = 0; k < distances.n_elem; ++k)
       {
-        BOOST_REQUIRE_EQUAL(neighbors[i], baselineNeighbors[i]);
-        if (std::abs(baselineDistances[i]) < 1e-5)
-          BOOST_REQUIRE_SMALL(distances[i], 1e-5);
+        BOOST_REQUIRE_EQUAL(neighbors[k], baselineNeighbors[k]);
+        if (std::abs(baselineDistances[k]) < 1e-5)
+          BOOST_REQUIRE_SMALL(distances[k], 1e-5);
         else
-          BOOST_REQUIRE_CLOSE(distances[i], baselineDistances[i], 1e-5);
+          BOOST_REQUIRE_CLOSE(distances[k], baselineDistances[k], 1e-5);
       }
     }
   }



More information about the mlpack-git mailing list