[mlpack-svn] r13845 - mlpack/trunk/src/mlpack/tests

[fastlab-svn at coffeetalk-1.cc.gatech.edu]

Author: rcurtin
Date: 2012-11-05 16:54:09 -0500 (Mon, 05 Nov 2012)
New Revision: 13845

Added:
   mlpack/trunk/src/mlpack/tests/fastmks_test.cpp
Removed:
   mlpack/trunk/src/mlpack/tests/max_ip_test.cpp
Modified:
   mlpack/trunk/src/mlpack/tests/CMakeLists.txt
Log:
Rename MaxIP test to FastMKS test and update everything accordingly.


Modified: mlpack/trunk/src/mlpack/tests/CMakeLists.txt
===================================================================
--- mlpack/trunk/src/mlpack/tests/CMakeLists.txt	2012-11-05 21:53:56 UTC (rev 13844)
+++ mlpack/trunk/src/mlpack/tests/CMakeLists.txt	2012-11-05 21:54:09 UTC (rev 13845)
@@ -8,6 +8,7 @@
   cli_test.cpp
   distribution_test.cpp
   emst_test.cpp
+  fastmks_test.cpp
   gmm_test.cpp
   hmm_test.cpp
   kernel_test.cpp
@@ -20,7 +21,6 @@
   local_coordinate_coding_test.cpp
   lrsdp_test.cpp
   math_test.cpp
-  max_ip_test.cpp
   nbc_test.cpp
   nca_test.cpp
   nmf_test.cpp

Copied: mlpack/trunk/src/mlpack/tests/fastmks_test.cpp (from rev 13838, mlpack/trunk/src/mlpack/tests/max_ip_test.cpp)
===================================================================
--- mlpack/trunk/src/mlpack/tests/fastmks_test.cpp	                        (rev 0)
+++ mlpack/trunk/src/mlpack/tests/fastmks_test.cpp	2012-11-05 21:54:09 UTC (rev 13845)
@@ -0,0 +1,62 @@
+/**
+ * @file fastmks_test.cpp
+ * @author Ryan Curtin
+ *
+ * Ensure that fast max-kernel search is correct.
+ */
+#include <stddef.h>
+size_t distanceEvaluations;
+
+#include <mlpack/core.hpp>
+#include <mlpack/methods/fastmks/fastmks.hpp>
+#include <mlpack/core/kernels/linear_kernel.hpp>
+
+#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
+
+using namespace mlpack;
+using namespace mlpack::tree;
+using namespace mlpack::fastmks;
+using namespace mlpack::kernel;
+
+BOOST_AUTO_TEST_SUITE(FastMKSTest);
+
+/**
+ * Compare single-tree and naive.
+ */
+BOOST_AUTO_TEST_CASE(SingleTreeVsNaive)
+{
+  distanceEvaluations = 0;
+
+  // First create a random dataset.
+  arma::mat data;
+  srand(time(NULL));
+  data.randn(5, 1000);
+  LinearKernel lk;
+
+  // Now run FastMKS naively.
+  FastMKS<LinearKernel> naive(data, lk, false, true);
+
+  arma::Mat<size_t> naiveIndices;
+  arma::mat naiveProducts;
+  naive.Search(10, naiveIndices, naiveProducts);
+
+  // Now run it in single-tree mode.
+  FastMKS<LinearKernel> single(data, lk, true);
+
+  arma::Mat<size_t> singleIndices;
+  arma::mat singleProducts;
+  single.Search(10, singleIndices, singleProducts);
+
+  // Compare the results.
+  for (size_t q = 0; q < singleIndices.n_cols; ++q)
+  {
+    for (size_t r = 0; r < singleIndices.n_rows; ++r)
+    {
+      BOOST_REQUIRE_EQUAL(singleIndices(r, q), naiveIndices(r, q));
+      BOOST_REQUIRE_CLOSE(singleProducts(r, q), naiveProducts(r, q), 1e-5);
+    }
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END();

Deleted: mlpack/trunk/src/mlpack/tests/max_ip_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/max_ip_test.cpp	2012-11-05 21:53:56 UTC (rev 13844)
+++ mlpack/trunk/src/mlpack/tests/max_ip_test.cpp	2012-11-05 21:54:09 UTC (rev 13845)
@@ -1,62 +0,0 @@
-/**
- * @file max_ip_test.cpp
- * @author Ryan Curtin
- *
- * Ensure that the maximum inner product search is successful.
- */
-#include <stddef.h>
-size_t distanceEvaluations;
-
-#include <mlpack/core.hpp>
-#include <mlpack/methods/fastmks/max_ip.hpp>
-#include <mlpack/core/kernels/linear_kernel.hpp>
-
-#include <boost/test/unit_test.hpp>
-#include "old_boost_test_definitions.hpp"
-
-using namespace mlpack;
-using namespace mlpack::tree;
-using namespace mlpack::maxip;
-using namespace mlpack::kernel;
-
-BOOST_AUTO_TEST_SUITE(MaxIPTest);
-
-/**
- * Compare single-tree and naive.
- */
-BOOST_AUTO_TEST_CASE(SingleTreeVsNaive)
-{
-  distanceEvaluations = 0;
-
-  // First create a random dataset.
-  arma::mat data;
-  srand(time(NULL));
-  data.randn(5, 1000);
-  LinearKernel lk;
-
-  // Now run MaxIP naively.
-  MaxIP<LinearKernel> naive(data, lk, false, true);
-
-  arma::Mat<size_t> naiveIndices;
-  arma::mat naiveProducts;
-  naive.Search(10, naiveIndices, naiveProducts);
-
-  // Now run it in single-tree mode.
-  MaxIP<LinearKernel> single(data, lk, true);
-
-  arma::Mat<size_t> singleIndices;
-  arma::mat singleProducts;
-  single.Search(10, singleIndices, singleProducts);
-
-  // Compare the results.
-  for (size_t q = 0; q < singleIndices.n_cols; ++q)
-  {
-    for (size_t r = 0; r < singleIndices.n_rows; ++r)
-    {
-      BOOST_REQUIRE_EQUAL(singleIndices(r, q), naiveIndices(r, q));
-      BOOST_REQUIRE_CLOSE(singleProducts(r, q), naiveProducts(r, q), 1e-5);
-    }
-  }
-}
-
-BOOST_AUTO_TEST_SUITE_END();