[mlpack-svn] r13412 - in mlpack/tags/mlpack-1.0.2/src/mlpack: methods tests

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

Author: rcurtin
Date: 2012-08-15 13:50:57 -0400 (Wed, 15 Aug 2012)
New Revision: 13412

Removed:
   mlpack/tags/mlpack-1.0.2/src/mlpack/methods/maxip/
   mlpack/tags/mlpack-1.0.2/src/mlpack/tests/max_ip_test.cpp
Modified:
   mlpack/tags/mlpack-1.0.2/src/mlpack/methods/CMakeLists.txt
   mlpack/tags/mlpack-1.0.2/src/mlpack/tests/CMakeLists.txt
Log:
Remove maxip; it's not entirely ready for release yet.


Modified: mlpack/tags/mlpack-1.0.2/src/mlpack/methods/CMakeLists.txt
===================================================================
--- mlpack/tags/mlpack-1.0.2/src/mlpack/methods/CMakeLists.txt	2012-08-15 17:47:17 UTC (rev 13411)
+++ mlpack/tags/mlpack-1.0.2/src/mlpack/methods/CMakeLists.txt	2012-08-15 17:50:57 UTC (rev 13412)
@@ -10,9 +10,7 @@
   kmeans
   lars
   linear_regression
-#  lmnn
   local_coordinate_coding
-  maxip
   mvu
   naive_bayes
   nca

Modified: mlpack/tags/mlpack-1.0.2/src/mlpack/tests/CMakeLists.txt
===================================================================
--- mlpack/tags/mlpack-1.0.2/src/mlpack/tests/CMakeLists.txt	2012-08-15 17:47:17 UTC (rev 13411)
+++ mlpack/tags/mlpack-1.0.2/src/mlpack/tests/CMakeLists.txt	2012-08-15 17:50:57 UTC (rev 13412)
@@ -21,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

Deleted: mlpack/tags/mlpack-1.0.2/src/mlpack/tests/max_ip_test.cpp
===================================================================
--- mlpack/tags/mlpack-1.0.2/src/mlpack/tests/max_ip_test.cpp	2012-08-15 17:47:17 UTC (rev 13411)
+++ mlpack/tags/mlpack-1.0.2/src/mlpack/tests/max_ip_test.cpp	2012-08-15 17:50:57 UTC (rev 13412)
@@ -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/maxip/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();