[mlpack-svn] r12470 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Thu Apr 19 14:53:13 EDT 2012
Author: rcurtin
Date: 2012-04-19 14:53:13 -0400 (Thu, 19 Apr 2012)
New Revision: 12470
Added:
mlpack/trunk/src/mlpack/tests/old_boost_test_definitions.hpp
Modified:
mlpack/trunk/src/mlpack/tests/allkfn_test.cpp
mlpack/trunk/src/mlpack/tests/allknn_test.cpp
mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp
mlpack/trunk/src/mlpack/tests/cli_test.cpp
mlpack/trunk/src/mlpack/tests/det_test.cpp
mlpack/trunk/src/mlpack/tests/distribution_test.cpp
mlpack/trunk/src/mlpack/tests/emst_test.cpp
mlpack/trunk/src/mlpack/tests/gmm_test.cpp
mlpack/trunk/src/mlpack/tests/hmm_test.cpp
mlpack/trunk/src/mlpack/tests/kernel_pca_test.cpp
mlpack/trunk/src/mlpack/tests/kernel_test.cpp
mlpack/trunk/src/mlpack/tests/kmeans_test.cpp
mlpack/trunk/src/mlpack/tests/lars_test.cpp
mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
mlpack/trunk/src/mlpack/tests/lin_alg_test.cpp
mlpack/trunk/src/mlpack/tests/linear_regression_test.cpp
mlpack/trunk/src/mlpack/tests/load_save_test.cpp
mlpack/trunk/src/mlpack/tests/local_coordinate_coding_test.cpp
mlpack/trunk/src/mlpack/tests/lrsdp_test.cpp
mlpack/trunk/src/mlpack/tests/math_test.cpp
mlpack/trunk/src/mlpack/tests/mlpack_test.cpp
mlpack/trunk/src/mlpack/tests/nbc_test.cpp
mlpack/trunk/src/mlpack/tests/nca_test.cpp
mlpack/trunk/src/mlpack/tests/pca_test.cpp
mlpack/trunk/src/mlpack/tests/radical_test.cpp
mlpack/trunk/src/mlpack/tests/range_search_test.cpp
mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
mlpack/trunk/src/mlpack/tests/sort_policy_test.cpp
mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp
mlpack/trunk/src/mlpack/tests/tree_test.cpp
mlpack/trunk/src/mlpack/tests/union_find_test.cpp
Log:
Make ourselves compatible with older versions of Boost.Test.
Modified: mlpack/trunk/src/mlpack/tests/allkfn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allkfn_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/allkfn_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -6,6 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
Modified: mlpack/trunk/src/mlpack/tests/allknn_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/allknn_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -6,6 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/neighbor_search/neighbor_search.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
Modified: mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/aug_lagrangian_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian.hpp>
#include <mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_test_functions.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::optimization;
Modified: mlpack/trunk/src/mlpack/tests/cli_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/cli_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/cli_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -21,6 +21,7 @@
#define DEFAULT_INT 42
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
#define BASH_RED "\033[0;31m"
#define BASH_GREEN "\033[0;32m"
Modified: mlpack/trunk/src/mlpack/tests/det_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/det_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/det_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -15,6 +15,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::det;
Modified: mlpack/trunk/src/mlpack/tests/distribution_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/distribution_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/distribution_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -7,11 +7,12 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::distribution;
-BOOST_AUTO_TEST_SUITE(DistributionTest)
+BOOST_AUTO_TEST_SUITE(DistributionTest);
/**
* Make sure we initialize correctly.
Modified: mlpack/trunk/src/mlpack/tests/emst_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/emst_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/emst_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -6,6 +6,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/emst/dtb.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::emst;
Modified: mlpack/trunk/src/mlpack/tests/gmm_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/gmm_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/gmm_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/methods/gmm/phi.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::gmm;
Modified: mlpack/trunk/src/mlpack/tests/hmm_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/hmm_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/hmm_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/methods/gmm/gmm.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::hmm;
Modified: mlpack/trunk/src/mlpack/tests/kernel_pca_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/kernel_pca_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/kernel_pca_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -9,6 +9,7 @@
#include <mlpack/methods/kernel_pca/kernel_pca.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
BOOST_AUTO_TEST_SUITE(KernelPCATest);
Modified: mlpack/trunk/src/mlpack/tests/kernel_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/kernel_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/kernel_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -18,6 +18,7 @@
#include <mlpack/core/metrics/mahalanobis_distance.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::kernel;
@@ -312,6 +313,7 @@
BOOST_REQUIRE_CLOSE(ek.ConvolutionIntegral(a,c), 0.0, 1e-5);
BOOST_REQUIRE_CLOSE(ek.ConvolutionIntegral(b,c), 1.5263455690698258, 1e-5);
}
+
BOOST_AUTO_TEST_CASE(polynomial_kernel)
{
arma::vec a = "0 0 1";
Modified: mlpack/trunk/src/mlpack/tests/kmeans_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/kmeans_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/kmeans_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/methods/kmeans/allow_empty_clusters.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::kmeans;
Modified: mlpack/trunk/src/mlpack/tests/lars_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lars_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/lars_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -12,6 +12,7 @@
#include <mlpack/methods/lars/lars.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::regression;
@@ -26,7 +27,7 @@
}
-void VerifyCorrectness(arma::vec beta, arma::vec errCorr, double lambda)
+void LARSVerifyCorrectness(arma::vec beta, arma::vec errCorr, double lambda)
{
size_t nDims = beta.n_elem;
const double tol = 1e-12;
@@ -78,7 +79,7 @@
arma::vec errCorr = (arma::trans(X) * X + lambda2 *
arma::eye(nDims, nDims)) * betaOpt - arma::trans(X) * y;
- VerifyCorrectness(betaOpt, errCorr, lambda1);
+ LARSVerifyCorrectness(betaOpt, errCorr, lambda1);
}
}
Modified: mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/lbfgs_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/core/optimizers/lbfgs/test_functions.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack::optimization;
using namespace mlpack::optimization::test;
Modified: mlpack/trunk/src/mlpack/tests/lin_alg_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lin_alg_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/lin_alg_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/core/math/lin_alg.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace arma;
using namespace mlpack;
Modified: mlpack/trunk/src/mlpack/tests/linear_regression_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/linear_regression_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/linear_regression_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -7,6 +7,7 @@
#include <mlpack/methods/linear_regression/linear_regression.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::regression;
@@ -17,7 +18,7 @@
* Creates two 10x3 random matrices and one 10x1 "results" matrix.
* Finds B in y=BX with one matrix, then predicts against the other.
*/
-BOOST_AUTO_TEST_CASE(LinearRegressionTest)
+BOOST_AUTO_TEST_CASE(LinearRegressionTestCase)
{
// Predictors and points are 100x3 matrices.
arma::mat predictors(3, 10);
Modified: mlpack/trunk/src/mlpack/tests/load_save_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/load_save_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/load_save_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/core/data/save.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
Modified: mlpack/trunk/src/mlpack/tests/local_coordinate_coding_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/local_coordinate_coding_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/local_coordinate_coding_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -12,6 +12,7 @@
#include <mlpack/methods/local_coordinate_coding/lcc.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace arma;
using namespace mlpack;
Modified: mlpack/trunk/src/mlpack/tests/lrsdp_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/lrsdp_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/lrsdp_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/core/optimizers/lrsdp/lrsdp.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::optimization;
Modified: mlpack/trunk/src/mlpack/tests/math_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/math_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/math_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/core/math/random.hpp>
#include <mlpack/core/math/range.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace math;
Modified: mlpack/trunk/src/mlpack/tests/mlpack_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/mlpack_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/mlpack_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -6,4 +6,10 @@
*/
#define BOOST_TEST_MODULE MLPACKTest
+// We only need to do this for old Boost versions.
+#if BOOST_VERSION < 103600
+ #define BOOST_AUTO_TEST_MAIN
+#endif
+
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
Modified: mlpack/trunk/src/mlpack/tests/nbc_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/nbc_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/nbc_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -7,6 +7,7 @@
#include <mlpack/methods/naive_bayes/naive_bayes_classifier.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace naive_bayes;
Modified: mlpack/trunk/src/mlpack/tests/nca_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/nca_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/nca_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -10,6 +10,7 @@
#include <mlpack/methods/nca/nca.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::metric;
Added: mlpack/trunk/src/mlpack/tests/old_boost_test_definitions.hpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/old_boost_test_definitions.hpp (rev 0)
+++ mlpack/trunk/src/mlpack/tests/old_boost_test_definitions.hpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -0,0 +1,36 @@
+/**
+ * @file old_boost_test_definitions.hpp
+ * @author Ryan Curtin
+ *
+ * Ancient Boost.Test versions don't act how we expect. This file includes the
+ * things we need to fix that.
+ */
+#ifndef __MLPACK_TESTS_OLD_BOOST_TEST_DEFINITIONS_HPP
+#define __MLPACK_TESTS_OLD_BOOST_TEST_DEFINITIONS_HPP
+
+// This is only necessary for pre-1.36 Boost.Test.
+#if BOOST_VERSION < 103600
+
+#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/auto_unit_test.hpp>
+
+// This depends on other macros. Probably not a great idea... but it works, and
+// we only need it for ancient Boost versions.
+#define BOOST_REQUIRE_GE( L, R ) \
+ BOOST_REQUIRE_EQUAL( (L >= R), true )
+
+#define BOOST_REQUIRE_NE( L, R ) \
+ BOOST_REQUIRE_EQUAL( (L != R), true )
+
+#define BOOST_REQUIRE_LE( L, R ) \
+ BOOST_REQUIRE_EQUAL( (L <= R), true )
+
+#define BOOST_REQUIRE_LT( L, R ) \
+ BOOST_REQUIRE_EQUAL( (L < R), true )
+
+#define BOOST_REQUIRE_GT( L, R ) \
+ BOOST_REQUIRE_EQUAL( (L > R), true )
+
+#endif
+
+#endif
Modified: mlpack/trunk/src/mlpack/tests/pca_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/pca_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/pca_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/methods/pca/pca.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
BOOST_AUTO_TEST_SUITE(PCATest);
Modified: mlpack/trunk/src/mlpack/tests/radical_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/radical_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/radical_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/radical/radical.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
BOOST_AUTO_TEST_SUITE(RadicalTest);
Modified: mlpack/trunk/src/mlpack/tests/range_search_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/range_search_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/range_search_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -7,6 +7,7 @@
#include <mlpack/core.hpp>
#include <mlpack/methods/range_search/range_search.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::range;
Modified: mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -6,6 +6,7 @@
*/
#include <mlpack/core/util/save_restore_utility.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
#define ARGSTR(a) a,#a
Modified: mlpack/trunk/src/mlpack/tests/sort_policy_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/sort_policy_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/sort_policy_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -13,6 +13,7 @@
#include <mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::neighbor;
Modified: mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/sparse_coding_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -11,6 +11,7 @@
#include <mlpack/methods/sparse_coding/sparse_coding.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace arma;
using namespace mlpack;
@@ -19,7 +20,7 @@
BOOST_AUTO_TEST_SUITE(SparseCodingTest);
-void VerifyCorrectness(vec beta, vec errCorr, double lambda)
+void SCVerifyCorrectness(vec beta, vec errCorr, double lambda)
{
const double tol = 1e-12;
size_t nDims = beta.n_elem;
@@ -66,7 +67,7 @@
for (uword i = 0; i < nPoints; ++i)
{
vec errCorr = trans(D) * (D * Z.unsafe_col(i) - X.unsafe_col(i));
- VerifyCorrectness(Z.unsafe_col(i), errCorr, lambda1);
+ SCVerifyCorrectness(Z.unsafe_col(i), errCorr, lambda1);
}
}
@@ -96,7 +97,7 @@
vec errCorr = (trans(D) * D + lambda2 *
eye(nAtoms, nAtoms)) * Z.unsafe_col(i) - trans(D) * X.unsafe_col(i);
- VerifyCorrectness(Z.unsafe_col(i), errCorr, lambda1);
+ SCVerifyCorrectness(Z.unsafe_col(i), errCorr, lambda1);
}
}
Modified: mlpack/trunk/src/mlpack/tests/tree_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/tree_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/tree_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -9,6 +9,7 @@
#include <vector>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::math;
Modified: mlpack/trunk/src/mlpack/tests/union_find_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/union_find_test.cpp 2012-04-19 18:48:33 UTC (rev 12469)
+++ mlpack/trunk/src/mlpack/tests/union_find_test.cpp 2012-04-19 18:53:13 UTC (rev 12470)
@@ -8,6 +8,7 @@
#include <mlpack/core.hpp>
#include <boost/test/unit_test.hpp>
+#include "old_boost_test_definitions.hpp"
using namespace mlpack;
using namespace mlpack::emst;
More information about the mlpack-svn
mailing list