From 4956dca501eae6915e06fdb2ee5c9c0c10eccef1 Mon Sep 17 00:00:00 2001 From: Ryan Curtin Date: Sun, 18 Oct 2015 10:20:19 -0400 Subject: [PATCH] The minimum Armadillo requirement is now 3.6.0. So the ifdefs aren't necessary. --- 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 6163bb0eff..b6ebe57c1e 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);