[mlpack-git] mlpack-1.0.x: Backport r17403. (a5813d8)

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

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

On branch  : mlpack-1.0.x
Link       : https://github.com/mlpack/mlpack/compare/0000000000000000000000000000000000000000...904762495c039e345beba14c1142fd719b3bd50e

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

commit a5813d8f78f99c877619ed3c886897e50cc32ef6
Author: Ryan Curtin <ryan at ratml.org>
Date:   Sun Dec 7 19:41:46 2014 +0000

    Backport r17403.


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

a5813d8f78f99c877619ed3c886897e50cc32ef6
 src/mlpack/tests/allknn_test.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mlpack/tests/allknn_test.cpp b/src/mlpack/tests/allknn_test.cpp
index fd2b726..741cc10 100644
--- a/src/mlpack/tests/allknn_test.cpp
+++ b/src/mlpack/tests/allknn_test.cpp
@@ -1,3 +1,4 @@
+<<<<<<< .working
 /**
  * @file allknn_test.cpp
  *
@@ -762,9 +763,9 @@ BOOST_AUTO_TEST_CASE(SparseAllkNNKDTreeTest)
   // 70, the probability of all 70 dimensions being zero is 0.8^70 = 1.65e-7 in
   // the reference set and 0.9^70 = 6.27e-4 in the query set.
   arma::sp_mat queryDataset;
-  queryDataset.sprandu(50, 5000, 0.2);
+  queryDataset.sprandu(70, 500, 0.2);
   arma::sp_mat referenceDataset;
-  referenceDataset.sprandu(50, 8000, 0.1);
+  referenceDataset.sprandu(70, 800, 0.1);
   arma::mat denseQuery(queryDataset);
   arma::mat denseReference(referenceDataset);