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

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

Author: rcurtin
Date: 2011-11-23 01:57:13 -0500 (Wed, 23 Nov 2011)
New Revision: 10354

Modified:
   mlpack/trunk/src/mlpack/tests/kernel_test.cpp
   mlpack/trunk/src/mlpack/tests/nca_test.cpp
   mlpack/trunk/src/mlpack/tests/tree_test.cpp
Log:
Update kernels to metrics (where applicable).


Modified: mlpack/trunk/src/mlpack/tests/kernel_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/kernel_test.cpp	2011-11-23 06:56:59 UTC (rev 10353)
+++ mlpack/trunk/src/mlpack/tests/kernel_test.cpp	2011-11-23 06:57:13 UTC (rev 10354)
@@ -4,8 +4,8 @@
  *
  * Tests for the various kernel classes.
  */
-#include <mlpack/core/kernels/lmetric.hpp>
-#include <mlpack/core/kernels/mahalanobis_distance.hpp>
+#include <mlpack/core/metrics/lmetric.hpp>
+#include <mlpack/core/metrics/mahalanobis_distance.hpp>
 #include <mlpack/core/kernels/cosine_distance.hpp>
 #include <mlpack/core/kernels/gaussian_kernel.hpp>
 #include <mlpack/core/kernels/linear_kernel.hpp>
@@ -14,6 +14,7 @@
 
 using namespace mlpack;
 using namespace mlpack::kernel;
+using namespace mlpack::metric;
 
 BOOST_AUTO_TEST_SUITE(KernelTest);
 

Modified: mlpack/trunk/src/mlpack/tests/nca_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/nca_test.cpp	2011-11-23 06:56:59 UTC (rev 10353)
+++ mlpack/trunk/src/mlpack/tests/nca_test.cpp	2011-11-23 06:57:13 UTC (rev 10354)
@@ -6,13 +6,13 @@
  * the softmax error function).
  */
 #include <mlpack/core.h>
-#include <mlpack/core/kernels/lmetric.hpp>
+#include <mlpack/core/metrics/lmetric.hpp>
 #include <mlpack/methods/nca/nca.h>
 
 #include <boost/test/unit_test.hpp>
 
 using namespace mlpack;
-using namespace mlpack::kernel;
+using namespace mlpack::metric;
 using namespace mlpack::nca;
 
 //

Modified: mlpack/trunk/src/mlpack/tests/tree_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/tree_test.cpp	2011-11-23 06:56:59 UTC (rev 10353)
+++ mlpack/trunk/src/mlpack/tests/tree_test.cpp	2011-11-23 06:57:13 UTC (rev 10354)
@@ -5,7 +5,7 @@
  */
 #include <mlpack/core/tree/bounds.hpp>
 #include <mlpack/core/tree/binary_space_tree.hpp>
-#include <mlpack/core/kernels/lmetric.hpp>
+#include <mlpack/core/metrics/lmetric.hpp>
 #include <vector>
 
 #include <boost/test/unit_test.hpp>
@@ -13,7 +13,7 @@
 using namespace mlpack;
 using namespace mlpack::math;
 using namespace mlpack::tree;
-using namespace mlpack::kernel;
+using namespace mlpack::metric;
 using namespace mlpack::bound;
 
 BOOST_AUTO_TEST_SUITE(TreeTest);