SimpleTests. Try to correct include paths.

SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp

@@ -13,18 +13,13 @@
 #include <fstream>
 #include <sstream>
 
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
 
-// BaseLib
-#include "LogogSimpleFormatter.h"
-
-// MathLib
-#include "LinAlg/Dense/DenseMatrix.h"
-#include "LinAlg/Solvers/GaussAlgorithm.h"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "MathLib/LinAlg/Dense/DenseMatrix.h"
+#include "MathLib/LinAlg/Solvers/GaussAlgorithm.h"
 
 int main(int argc, char *argv[])
 {

SimpleTests/MatrixTests/MatMult.cpp

@@ -17,30 +17,28 @@
 #include <cmath>
 #include <limits>
 #include <cstdlib>
-#include "sparse.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "LinAlg/Sparse/CRSMatrixOpenMP.h"
-#include "LinAlg/Sparse/CRSMatrixPThreads.h"
-
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
 
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+#include <tclap/CmdLine.h>
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixPThreads.h"
+#include "MathLib/sparse.h"
+
 /**
  * new formatter for logog
  */

SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp

@@ -14,12 +14,10 @@
 #include <fstream>
 #include <iostream>
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
 
-// MathLib
-#include "LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
 
 int main(int argc, char *argv[])
 {

SimpleTests/MatrixTests/MatVecMultNDPerm.cpp

@@ -14,28 +14,23 @@
 
 #include <cstdlib>
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-
-// MathLib
-#include "sparse.h"
-
-#include "LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/sparse.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h"
+#include "MathLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
 
 /**
  * new formatter for logog

SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp

@@ -14,32 +14,28 @@
 
 #include <cstdlib>
 
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-
-// MathLib
-#include "sparse.h"
-
-#include "LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h"
-#include "LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
-
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReorderedOpenMP.h"
+#include "BaseLib/LinAlg/Sparse/NestedDissectionPermutation/Cluster.h"
+#include "BaseLib/sparse.h"
+
 /**
  * new formatter for logog
  */

SimpleTests/MatrixTests/MatVecMultPthreads.cpp

@@ -14,30 +14,28 @@
 #include <cmath>
 #include <limits>
 #include <cstdlib>
-#include "sparse.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "LinAlg/Sparse/CRSMatrixOpenMP.h"
-#include "LinAlg/Sparse/CRSMatrixPThreads.h"
-
-// BaseLib
-#include "RunTime.h"
-#include "CPUTime.h"
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
-#include "logog/include/formatter.hpp"
-// BaseLib/tclap
-#include "tclap/CmdLine.h"
 
 #ifdef UNIX
 #include <sys/unistd.h>
 #endif
 
-#include "BaseLib/BuildInfo.h"
-
 #ifdef HAVE_PTHREADS
 #include <pthread.h>
 #endif
 
+#include <logog/include/logog.hpp>
+#include <logog/include/formatter.hpp>
+#include <tclap/CmdLine.h>
+
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixOpenMP.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixPThreads.h"
+#include "MathLib/sparse.h"
+
+#include "BaseLib/BuildInfo.h"
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+
 /**
  * new formatter for logog
  */

SimpleTests/MeshTests/MeshRead.cpp

@@ -12,24 +12,20 @@
  *
  */
 
-// BaseLib
-#include "MemWatch.h"
-#include "RunTime.h"
-#include "StringTools.h"
-#include "FileTools.h"
-#include "tclap/CmdLine.h"
-#include "LogogSimpleFormatter.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
 
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "BaseLib/MemWatch.h"
+#include "BaseLib/RunTime.h"
+#include "BaseLib/StringTools.h"
+#include "BaseLib/FileTools.h"
 
-// FileIO
-#include "readMeshFromFile.h"
+#include "FileIO/readMeshFromFile.h"
 
-// MeshLib
 #include "MeshLib/Node.h"
-#include "Elements/Element.h"
-#include "Mesh.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Mesh.h"
 
 
 int main(int argc, char *argv[])

SimpleTests/MeshTests/MeshSearchTest.cpp

@@ -9,23 +9,20 @@
  *  Created on  Aug 30, 2012 by Thomas Fischer
  */
 
-// BaseLib
-#include "MemWatch.h"
-#include "RunTime.h"
-#include "tclap/CmdLine.h"
-#include "LogogSimpleFormatter.h"
+#include <tclap/CmdLine.h>
+#include <logog/include/logog.hpp>
 
-// ThirdParty/logog
-#include "logog/include/logog.hpp"
+#include "BaseLib/LogogSimpleFormatter.h"
+#include "BaseLib/MemWatch.h"
+#include "BaseLib/RunTime.h"
 
-// GeoLib
-#include "Grid.h"
+#include "FileIO/Legacy/MeshIO.h"
+
+#include "GeoLib/Grid.h"
 
-// MeshLib
 #include "MeshLib/Node.h"
-#include "Elements/Element.h"
-#include "Mesh.h"
-#include "Legacy/MeshIO.h"
+#include "MeshLib/Elements/Element.h"
+#include "MeshLib/Mesh.h"
 
 void testMeshGridAlgorithm(MeshLib::Mesh const*const mesh,
 				std::vector<GeoLib::Point*>& pnts_for_search,

SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp

@@ -2,17 +2,19 @@
 #include <iostream>
 #include <cmath>
 #include <cstdlib>
-#include "LinAlg/Solvers/BiCGStab.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/LinAlg/Solvers/BiCGStab.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	if (argc != 4) {

SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp

@@ -2,17 +2,19 @@
 #include <iostream>
 #include <cmath>
 #include <cstdlib>
-#include "LinAlg/Solvers/CG.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "BaseLib/RunTime.h"
+#include "BaseLib/CPUTime.h"
+
+#include "MathLib/LinAlg/Solvers/BiCGStab.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	if (argc != 4) {

SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp

 #include <fstream>
 #include <iostream>
-#include "LinAlg/Solvers/CG.h"
-#include "LinAlg/Sparse/CRSMatrix.h"
-#include "sparse.h"
-#include "vector_io.h"
-//#include "timeMeasurement.h"
 
 #ifdef _OPENMP
 #include <omp.h>
 #endif
 
+#include "MathLib/LinAlg/Solvers/CG.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrix.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
+
 int main(int argc, char *argv[])
 {
 	(void) argc;

SimpleTests/SolverTests/GMResDiagPrecond.cpp

@@ -14,12 +14,13 @@
 
 #include <iostream>
 #include <cstdlib>
-#include "LinAlg/Solvers/GMRes.h"
-#include "LinAlg/Sparse/CRSMatrixDiagPrecond.h"
-#include "sparse.h"
-#include "vector_io.h"
-#include "RunTime.h"
-#include "CPUTime.h"
+
+#include "BaseLib/CPUTime.h"
+#include "BaseLib/RunTime.h"
+#include "MathLib/LinAlg/Solvers/GMRes.h"
+#include "MathLib/LinAlg/Sparse/CRSMatrixDiagPrecond.h"
+#include "MathLib/sparse.h"
+#include "MathLib/vector_io.h"
 
 int main(int argc, char *argv[])
 {