Merge branch 'master' of git.assembla.com:MBI_ICA

Stanwise · Stanwise · commit 0dc5efc50c47 · 2012-01-24T06:14:22.000+01:00
diff --git a/tests/pca_test.cpp b/tests/pca_test.cpp
@@ -42,3 +42,5 @@ BOOST_AUTO_TEST_CASE(dimension_reduction)
 
     BOOST_CHECK(D.n_elem == 1);
 }
+
+#include "whitening_test.h"
diff --git a/tests/tests.pro b/tests/tests.pro
@@ -10,8 +10,9 @@ TEMPLATE = app
 CONFIG += console
 
 SOURCES += \
-    pca_test.cpp \
-    whitening_test.cpp
+    pca_test.cpp
+HEADERS += \
+    whitening_test.h
 
 LIBS += -lmbica -larmadillo -lboost_unit_test_framework
 
diff --git a/tests/whitening_test.h b/tests/whitening_test.h
@@ -1,10 +1,3 @@
-#include "utils.h"
-#include <armadillo>
-using namespace arma;
-
-#define BOOST_TEST_MODULE Whitening_tests
-#define BOOST_T
-#include <boost/test/unit_test.hpp>
 
 BOOST_AUTO_TEST_CASE( identity_covariance )
 {

Original file line number	Diff line number	Diff line change
`@@ -42,3 +42,5 @@ BOOST_AUTO_TEST_CASE(dimension_reduction)`
`42`	`42`
`43`	`43`	`BOOST_CHECK(D.n_elem == 1);`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+#include "whitening_test.h"`