[mlpack-git] master: The minimum Armadillo requirement is now 3.6.0. So the ifdefs aren't necessary. (4956dca)

[gitdub at big.cc.gt.atl.ga.us]

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

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/09cd0d67f2fdae252a8ab85324e71dbb4dfe0010...fecf1194c123ced12d56e7daad761c7b9aaac262

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

commit 4956dca501eae6915e06fdb2ee5c9c0c10eccef1
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Oct 18 10:20:19 2015 -0400

    The minimum Armadillo requirement is now 3.6.0.
    So the ifdefs aren't necessary.


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

4956dca501eae6915e06fdb2ee5c9c0c10eccef1
 src/mlpack/tests/tree_test.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/mlpack/tests/tree_test.cpp b/src/mlpack/tests/tree_test.cpp
index 6163bb0..b6ebe57 100644
--- a/src/mlpack/tests/tree_test.cpp
+++ b/src/mlpack/tests/tree_test.cpp
@@ -1470,12 +1470,6 @@ void GenerateVectorOfTree(TreeType* node,
   return;
 }
 
-#ifdef ARMA_HAS_SPMAT
-// Only run sparse tree tests if we are using Armadillo 3.6.  Armadillo 3.4 has
-// some bugs that cause the kd-tree splitting procedure to fail terribly.  Soon,
-// that version will be obsolete, though.
-#if !((ARMA_VERSION_MAJOR == 3) && (ARMA_VERSION_MINOR == 4))
-
 /**
  * Exhaustive sparse kd-tree test based on #125.
  *
@@ -1561,9 +1555,6 @@ BOOST_AUTO_TEST_CASE(ExhaustiveSparseKDTreeTest)
   TreeType root(dataset);
 }
 
-#endif // Using Armadillo 3.4.
-#endif // ARMA_HAS_SPMAT
-
 BOOST_AUTO_TEST_CASE(BinarySpaceTreeMoveConstructorTest)
 {
   arma::mat dataset(5, 1000);