[mlpack-svn] r10850 - mlpack/trunk/src/mlpack/tests
fastlab-svn at coffeetalk-1.cc.gatech.edu
fastlab-svn at coffeetalk-1.cc.gatech.edu
Fri Dec 16 09:31:09 EST 2011
Author: rcurtin
Date: 2011-12-16 09:31:09 -0500 (Fri, 16 Dec 2011)
New Revision: 10850
Modified:
mlpack/trunk/src/mlpack/tests/radical_test.cpp
mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
Log:
Explicitly specify namespaces.
Modified: mlpack/trunk/src/mlpack/tests/radical_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/radical_test.cpp 2011-12-16 07:51:19 UTC (rev 10849)
+++ mlpack/trunk/src/mlpack/tests/radical_test.cpp 2011-12-16 14:31:09 UTC (rev 10850)
@@ -12,31 +12,28 @@
BOOST_AUTO_TEST_SUITE(Radical_Test);
-
+using namespace mlpack;
+using namespace mlpack::radical;
using namespace std;
using namespace arma;
-
-
BOOST_AUTO_TEST_CASE(Radical_Test_Radical3D) {
-
mat matX;
data::Load("data_3d_mixed.txt", matX);
-
- mlpack::radical::Radical rad(0.175, 5, 100, matX.n_rows - 1);
+
+ radical::Radical rad(0.175, 5, 100, matX.n_rows - 1);
mat matY;
mat matW;
-
+
rad.DoRadical(matX, matY, matW);
-
-
+
mat matYT = trans(matY);
double valEst = 0;
for(u32 i = 0; i < matYT.n_cols; i++) {
vec y = vec(matYT.col(i));
valEst += rad.Vasicek(y);
- }
-
+ }
+
mat matS;
data::Load("data_3d_ind.txt", matS);
rad.DoRadical(matS, matY, matW);
@@ -46,7 +43,7 @@
vec y = vec(matYT.col(i));
valBest += rad.Vasicek(y);
}
-
+
/*
printf("valBest = %f\n", valBest);
printf("valEst = %f\n", valEst);
@@ -54,14 +51,8 @@
printf("\n\n\t\t%f\n", fabs(valBest - valEst) / fabs(valBest));
printf("\n\n\t\t%f\n", fabs(valBest - valEst) / fabs(valEst));
*/
-
+
BOOST_REQUIRE_CLOSE(valBest, valEst, 0.2);
-
}
-
-
-
-
-
BOOST_AUTO_TEST_SUITE_END();
Modified: mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp 2011-12-16 07:51:19 UTC (rev 10849)
+++ mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp 2011-12-16 14:31:09 UTC (rev 10850)
@@ -10,6 +10,9 @@
#define ARGSTR(a) a,#a
+using namespace mlpack;
+using namespace mlpack::utilities;
+
BOOST_AUTO_TEST_SUITE(SaveRestoreUtilityTests);
/*
More information about the mlpack-svn
mailing list