[mlpack-git] master: At Conrad's suggestion, undo 310e72d and instead force a newer version of Armadillo. (045c16a)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/e9da451589e35766730bbd2aa9f81d07c9fe854a...045c16afa6fff8520722bbf19d98312e0eb24532

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

commit 045c16afa6fff8520722bbf19d98312e0eb24532
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Sep 20 20:55:10 2016 -0400

    At Conrad's suggestion, undo 310e72d and instead force a newer version of Armadillo.


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

045c16afa6fff8520722bbf19d98312e0eb24532
 CMakeLists.txt                |  2 +-
 HISTORY.md                    |  2 ++
 README.md                     |  2 +-
 doc/guide/build.hpp           |  2 +-
 src/mlpack/tests/lsh_test.cpp | 13 +++++--------
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b7c2bf..e0f18c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,7 +180,7 @@ endif()
 #   BOOST_LIBRARYDIR - library directory for Boost
 #   MATHJAX_ROOT - root of MathJax installation
 
-find_package(Armadillo 4.100.0 REQUIRED)
+find_package(Armadillo 4.200.0 REQUIRED)
 
 # If Armadillo was compiled without ARMA_64BIT_WORD and we are on a 64-bit
 # system (where size_t will be 64 bits), suggest to the user that they should
diff --git a/HISTORY.md b/HISTORY.md
index 99ab955..759fa20 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -11,6 +11,8 @@
   * Fix prioritized recursion for k-furthest-neighbor search (mlpack_kfn and the
     KFN class), leading to orders-of-magnitude speedups in some cases.
 
+  * Bump minimum required version of Armadillo to 4.200.0.
+
 ### mlpack 2.0.3
 ###### 2016-07-21
   * Added multiprobe LSH (#691).  The parameter 'T' to LSHSearch::Search() can
diff --git a/README.md b/README.md
index 0653ef8..80b572f 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Citations are beneficial for the growth and improvement of mlpack.
 
 mlpack has the following dependencies:
 
-      Armadillo     >= 4.100.0
+      Armadillo     >= 4.200.0
       Boost (program_options, math_c99, unit_test_framework, serialization)
       CMake         >= 2.8.5
 
diff --git a/doc/guide/build.hpp b/doc/guide/build.hpp
index 423092e..d178d8b 100644
--- a/doc/guide/build.hpp
+++ b/doc/guide/build.hpp
@@ -42,7 +42,7 @@ enough.
 mlpack depends on the following libraries, which need to be installed on the
 system and have headers present:
 
- - Armadillo >= 4.100.0 (with LAPACK support)
+ - Armadillo >= 4.200.0 (with LAPACK support)
  - Boost (math_c99, program_options, serialization, unit_test_framework, heap)
       >= 1.49
 
diff --git a/src/mlpack/tests/lsh_test.cpp b/src/mlpack/tests/lsh_test.cpp
index 60ea3a0..0d15428 100644
--- a/src/mlpack/tests/lsh_test.cpp
+++ b/src/mlpack/tests/lsh_test.cpp
@@ -594,24 +594,21 @@ BOOST_AUTO_TEST_CASE(MultiprobeDeterministicTest)
   BOOST_REQUIRE(arma::all(neighbors.col(0) == N));
 
   // Test that q1 search with 1 additional probe returns some C2 points.
-  // We use the schur product (%) instead of logical and (&&) to handle an early
-  // Armadillo bug, and we also use boolean addition (+) instead of logical or
-  // (||).
   lshTest.Search(q1, k, neighbors, distances, 0, 1);
   BOOST_REQUIRE(arma::all(
-        (neighbors.col(0) == N) +
-        ((neighbors.col(0) >= N / 4) % (neighbors.col(0) < N / 2))));
+        (neighbors.col(0) == N) ||
+        ((neighbors.col(0) >= N / 4) && (neighbors.col(0) < N / 2))));
 
   // Test that q2 simple search returns some C2 points.
   lshTest.Search(q2, k, neighbors, distances);
   BOOST_REQUIRE(arma::all(
-      (neighbors.col(0) == N) +
-      ((neighbors.col(0) >= N / 4) % (neighbors.col(0) < N / 2))));
+      (neighbors.col(0) == N) ||
+      ((neighbors.col(0) >= N / 4) && (neighbors.col(0) < N / 2))));
 
   // Test that q2 with 3 additional probes returns all C2 points.
   lshTest.Search(q2, k, neighbors, distances, 0, 3);
   BOOST_REQUIRE(arma::all(
-      (neighbors.col(0) >= N / 4) % (neighbors.col(0) < N / 2)));
+      (neighbors.col(0) >= N / 4) && (neighbors.col(0) < N / 2)));
 }
 
 BOOST_AUTO_TEST_CASE(LSHTrainTest)