[mlpack-svn] r10500 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Dec 1 21:59:51 EST 2011
Author: rcurtin
Date: 2011-12-01 21:59:50 -0500 (Thu, 01 Dec 2011)
New Revision: 10500
Modified:
mlpack/trunk/src/mlpack/tests/allkfn_test.cpp
mlpack/trunk/src/mlpack/tests/allknn_test.cpp
Log:
Update tests to conform to new NeighborSearch API.
Modified: mlpack/trunk/src/mlpack/tests/allkfn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allkfn_test.cpp 2011-12-02 02:59:07 UTC (rev 10499)
+++ mlpack/trunk/src/mlpack/tests/allkfn_test.cpp 2011-12-02 02:59:50 UTC (rev 10500)
@@ -38,31 +38,27 @@
// We will loop through three times, one for each method of performing the
// calculation. We'll always use 10 neighbors, so set that parameter.
- CLI::GetParam<int>("neighbor_search/k") = 10;
for (int i = 0; i < 3; i++)
{
AllkFN* allkfn;
arma::mat data_mutable = data;
- switch(i)
+ switch (i)
{
- case 0: // Use the dual-tree method.
- allkfn = new AllkFN(data_mutable);
+ case 2: // Use the dual-tree method.
+ allkfn = new AllkFN(data_mutable, false, false, 1);
break;
case 1: // Use the single-tree method.
- CLI::GetParam<bool>("neighbor_search/single_mode") = true;
- allkfn = new AllkFN(data_mutable);
+ allkfn = new AllkFN(data_mutable, false, true, 1);
break;
- case 2: // Use the naive method.
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- allkfn = new AllkFN(data_mutable);
+ case 0: // Use the naive method.
+ allkfn = new AllkFN(data_mutable, true);
break;
}
// Now perform the actual calculation.
arma::Mat<size_t> neighbors;
arma::mat distances;
- allkfn->ComputeNeighbors(neighbors, distances);
+ allkfn->ComputeNeighbors(10, neighbors, distances);
// Now the exhaustive check for correctness. This will be long. We must
// also remember that the distances returned are squared distances. As a
@@ -336,20 +332,17 @@
arma::mat naive_query(data_for_tree_);
arma::mat naive_references(data_for_tree_);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
AllkFN allkfn_(dual_query, dual_references);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- AllkFN naive_(naive_query, naive_references);
+ AllkFN naive_(naive_query, naive_references, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allkfn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allkfn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
@@ -373,24 +366,21 @@
if (!data::Load("test_data_3_1000.csv", data_for_tree_))
BOOST_FAIL("Cannot load test dataset test_data_3_1000.csv!");
- // Set up matrices to work with (may not be necessary with no ALIAS_MATRIX?).
+ // Set up matrices to work with.
arma::mat dual_references(data_for_tree_);
arma::mat naive_references(data_for_tree_);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
AllkFN allkfn_(dual_references);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- AllkFN naive_(naive_references);
+ AllkFN naive_(naive_references, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allkfn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allkfn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
@@ -417,21 +407,17 @@
arma::mat single_query(data_for_tree_);
arma::mat naive_query(data_for_tree_);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = true;
- AllkFN allkfn_(single_query);
+ AllkFN allkfn_(single_query, false, true);
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
- AllkFN naive_(naive_query);
+ AllkFN naive_(naive_query, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allkfn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allkfn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
Modified: mlpack/trunk/src/mlpack/tests/allknn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2011-12-02 02:59:07 UTC (rev 10499)
+++ mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2011-12-02 02:59:50 UTC (rev 10500)
@@ -37,32 +37,28 @@
data[10] = 1.00;
// We will loop through three times, one for each method of performing the
- // calculation. We'll always use 10 neighbors, so set that parameter.
- CLI::GetParam<int>("neighbor_search/k") = 10;
+ // calculation.
for (int i = 0; i < 3; i++)
{
AllkNN* allknn;
arma::mat data_mutable = data;
- switch(i)
+ switch (i)
{
case 0: // Use the dual-tree method.
- allknn = new AllkNN(data_mutable);
+ allknn = new AllkNN(data_mutable, false, false, 1);
break;
case 1: // Use the single-tree method.
- CLI::GetParam<bool>("neighbor_search/single_mode") = true;
- allknn = new AllkNN(data_mutable);
+ allknn = new AllkNN(data_mutable, false, true, 1);
break;
case 2: // Use the naive method.
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- allknn = new AllkNN(data_mutable);
+ allknn = new AllkNN(data_mutable, true);
break;
}
// Now perform the actual calculation.
arma::Mat<size_t> neighbors;
arma::mat distances;
- allknn->ComputeNeighbors(neighbors, distances);
+ allknn->ComputeNeighbors(10, neighbors, distances);
// Now the exhaustive check for correctness. This will be long. We must
// also remember that the distances returned are squared distances. As a
@@ -336,23 +332,17 @@
arma::mat naive_query(data_for_tree_);
arma::mat naive_references(data_for_tree_);
- // Reset parameters from last test.
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
-
AllkNN allknn_(dual_query, dual_references);
- // Set parameters right for naive run.
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- AllkNN naive_(naive_query, naive_references);
+ AllkNN naive_(naive_query, naive_references, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allknn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allknn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
@@ -380,22 +370,18 @@
arma::mat dual_query(data_for_tree_);
arma::mat naive_query(data_for_tree_);
- // Reset parameters from last test.
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
AllkNN allknn_(dual_query);
// Set naive mode.
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- AllkNN naive_(naive_query);
+ AllkNN naive_(naive_query, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allknn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allknn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
@@ -423,23 +409,18 @@
arma::mat single_query(data_for_tree_);
arma::mat naive_query(data_for_tree_);
- // Reset parameters from last test.
- CLI::GetParam<bool>("neighbor_search/naive_mode") = false;
- CLI::GetParam<bool>("neighbor_search/single_mode") = true;
- AllkNN allknn_(single_query);
+ AllkNN allknn_(single_query, false, true);
// Set up computation for naive mode.
- CLI::GetParam<bool>("neighbor_search/single_mode") = false;
- CLI::GetParam<bool>("neighbor_search/naive_mode") = true;
- AllkNN naive_(naive_query);
+ AllkNN naive_(naive_query, true);
arma::Mat<size_t> resulting_neighbors_tree;
arma::mat distances_tree;
- allknn_.ComputeNeighbors(resulting_neighbors_tree, distances_tree);
+ allknn_.ComputeNeighbors(15, resulting_neighbors_tree, distances_tree);
arma::Mat<size_t> resulting_neighbors_naive;
arma::mat distances_naive;
- naive_.ComputeNeighbors(resulting_neighbors_naive, distances_naive);
+ naive_.ComputeNeighbors(15, resulting_neighbors_naive, distances_naive);
for (size_t i = 0; i < resulting_neighbors_tree.n_elem; i++)
{
More information about the mlpack-svn
mailing list