cmake: Fix include path and get tests working again.

Signed-off-by: Matthew Emmett <[email protected]>

Author: memmett

CMakeLists.txt

@@ -70,7 +70,7 @@ add_subdirectory(3rdparty)
 
 message(STATUS "********************************************************************************")
 message(STATUS "Configuring sources")
-add_subdirectory(src)
+add_subdirectory(include)
 
 if(pfasst_BUILD_EXAMPLES)
     message(STATUS "********************************************************************************")

examples/ad/main.cpp

@@ -76,7 +76,7 @@ class FFT {
   complex<double>* forward(const dvector& x)
   {
     workspace *wk = get_workspace(x.size());
-    for (int i=0; i<x.size(); i++)
+    for (unsigned int i=0; i<x.size(); i++)
       wk->z[i] = x[i];
     fftw_execute_dft(wk->ffft, wk->wk, wk->wk);
     return wk->z;
@@ -86,7 +86,7 @@ class FFT {
   {
     workspace *wk = get_workspace(x.size());
     fftw_execute_dft(wk->ifft, wk->wk, wk->wk);
-    for (int i=0; i<x.size(); i++)
+    for (unsigned int i=0; i<x.size(); i++)
       x[i] = real(wk->z[i]);
   }
 

include/pfasst.hpp

@@ -1,4 +1,9 @@
+#ifndef _PFASST_HPP_
+#define _PFASST_HPP_
+
 #include "pfasst/interfaces.hpp"
 #include "pfasst/sdc.hpp"
 #include "pfasst/mlsdc.hpp"
 #include "pfasst/pfasst.hpp"
+
+#endif

include/pfasst/quadrature.hpp

@@ -10,9 +10,12 @@
 
 #include <boost/numeric/ublas/matrix.hpp>
 
-using boost::numeric::ublas::matrix;
+using std::complex;
+using std::string;
 using std::vector;
 
+using boost::numeric::ublas::matrix;
+
 namespace pfasst {
 
   typedef unsigned int uint;
@@ -91,15 +94,15 @@ namespace pfasst {
     	coeffT acc = 0.0;
     	for (int j=0; j<n; j++)
     	  acc += abs(z0[j] - z1[j]);
-    	if (acc < 2*numeric_limits<coeffT>::epsilon())
+    	if (acc < 2*std::numeric_limits<coeffT>::epsilon())
 	  break;
 
 	z1 = z0;
       }
 
       vector<coeffT> roots(n);
       for (int j=0; j<n; j++)
-    	roots[j] = abs(z0[j]) < 4*numeric_limits<coeffT>::epsilon() ? 0.0 : real(z0[j]);
+    	roots[j] = abs(z0[j]) < 4*std::numeric_limits<coeffT>::epsilon() ? 0.0 : real(z0[j]);
 
       sort(roots.begin(), roots.end());
       return roots;

tests/test-quadrature.cpp

@@ -8,7 +8,7 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
 
-#include <pfasst-quadrature.hpp>
+#include <pfasst/quadrature.hpp>
 
 using namespace std;
 
@@ -136,7 +136,7 @@ TEST(QuadratureTest, GaussLobattoNodes) {
 			       0.33333333333333333,
 			       0.20833333333333333 };
 
-  EXPECT_THAT(s3, testing::Pointwise(DoubleNear(), s3e));
+  EXPECT_THAT(s3.data(), testing::Pointwise(DoubleNear(), s3e));
 
   // XXX: need more tests here
 }