[mlpack-svn] r13383 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Aug 10 15:52:46 EDT 2012
Author: rcurtin
Date: 2012-08-10 15:52:46 -0400 (Fri, 10 Aug 2012)
New Revision: 13383
Modified:
mlpack/trunk/src/mlpack/tests/allknn_test.cpp
Log:
Use correct L2 distance, not squared L2 distance in cover tree test.
Modified: mlpack/trunk/src/mlpack/tests/allknn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-08-10 19:35:10 UTC (rev 13382)
+++ mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-08-10 19:52:46 UTC (rev 13383)
@@ -477,11 +477,11 @@
*/
BOOST_AUTO_TEST_CASE(DualCoverTreeTest)
{
- arma::mat data;
+ arma::mat dataset;
srand(time(NULL));
- data.randn(3, 1000);
+ dataset.randn(5, 5000);
- arma::mat kdtreeData(data);
+ arma::mat kdtreeData(dataset);
AllkNN tree(kdtreeData);
@@ -489,15 +489,15 @@
arma::mat kdDistances;
tree.Search(5, kdNeighbors, kdDistances);
- tree::CoverTree<metric::LMetric<2>, tree::FirstPointIsRoot,
+ tree::CoverTree<metric::LMetric<2, true>, tree::FirstPointIsRoot,
QueryStat<NearestNeighborSort> > referenceTree = tree::CoverTree<
- metric::LMetric<2>, tree::FirstPointIsRoot,
- QueryStat<NearestNeighborSort> >(data);
+ metric::LMetric<2, true>, tree::FirstPointIsRoot,
+ QueryStat<NearestNeighborSort> >(dataset);
- NeighborSearch<NearestNeighborSort, metric::LMetric<2>,
- tree::CoverTree<metric::LMetric<2>, tree::FirstPointIsRoot,
+ NeighborSearch<NearestNeighborSort, metric::LMetric<2, true>,
+ tree::CoverTree<metric::LMetric<2, true>, tree::FirstPointIsRoot,
QueryStat<NearestNeighborSort> > >
- coverTreeSearch(&referenceTree, data);
+ coverTreeSearch(&referenceTree, dataset);
arma::Mat<size_t> coverNeighbors;
arma::mat coverDistances;
@@ -508,7 +508,7 @@
for (size_t j = 0; j < coverNeighbors.n_rows; ++j)
{
BOOST_REQUIRE_EQUAL(coverNeighbors(j, i), kdNeighbors(j, i));
- BOOST_REQUIRE_CLOSE(coverDistances(j, i), kdDistances(j, i), 1e-5);
+ BOOST_REQUIRE_CLOSE(coverDistances(j, i), sqrt(kdDistances(j, i)), 1e-5);
}
}
}
More information about the mlpack-svn
mailing list