From 3e7ee69293afaafae79722398ee482a89cb6b6fc Mon Sep 17 00:00:00 2001
From: "Dmitry Yu. Naumov" <github@naumov.de>
Date: Thu, 20 Aug 2015 11:47:33 +0000
Subject: [PATCH] SimpleTests. Try to correct include paths.

---
 .../DenseGaussEliminationChecker.cpp          | 17 ++++------
 SimpleTests/MatrixTests/MatMult.cpp           | 28 ++++++++---------
 .../MatrixTests/MatTestRemoveRowsCols.cpp     |  8 ++---
 SimpleTests/MatrixTests/MatVecMultNDPerm.cpp  | 31 ++++++++-----------
 .../MatrixTests/MatVecMultNDPermOpenMP.cpp    | 30 ++++++++----------
 .../MatrixTests/MatVecMultPthreads.cpp        | 28 ++++++++---------
 SimpleTests/MeshTests/MeshRead.cpp            | 24 ++++++--------
 SimpleTests/MeshTests/MeshSearchTest.cpp      | 23 ++++++--------
 .../SolverTests/BiCGStabDiagPrecond.cpp       | 14 +++++----
 ...onjugateGradientDiagonalPreconditioned.cpp | 14 +++++----
 .../ConjugateGradientUnpreconditioned.cpp     | 10 +++---
 SimpleTests/SolverTests/GMResDiagPrecond.cpp  | 13 ++++----
 12 files changed, 109 insertions(+), 131 deletions(-)

diff --git a/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp b/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp
index b878c4678fd..418b1781c5d 100644
--- a/SimpleTests/MatrixTests/DenseGaussEliminationChecker.cpp
+++ b/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[])
 {
diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp
index 4302e9ac3dc..ad0e4a98b54 100644
--- a/SimpleTests/MatrixTests/MatMult.cpp
+++ b/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
  */
diff --git a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp b/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
index c16a3054278..70be3b72d6e 100644
--- a/SimpleTests/MatrixTests/MatTestRemoveRowsCols.cpp
+++ b/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[])
 {
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
index 1ef4b559b9c..06778898c2f 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp
+++ b/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
diff --git a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
index c055003b8e8..01c15993df4 100644
--- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp
+++ b/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
  */
diff --git a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
index 60a183aa349..5a566e7f4c8 100644
--- a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp
+++ b/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
  */
diff --git a/SimpleTests/MeshTests/MeshRead.cpp b/SimpleTests/MeshTests/MeshRead.cpp
index 48a80eeb1ee..3cf1017946a 100644
--- a/SimpleTests/MeshTests/MeshRead.cpp
+++ b/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[])
diff --git a/SimpleTests/MeshTests/MeshSearchTest.cpp b/SimpleTests/MeshTests/MeshSearchTest.cpp
index ab8878cbbc5..30d9904627d 100644
--- a/SimpleTests/MeshTests/MeshSearchTest.cpp
+++ b/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,
diff --git a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp b/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
index e50d1678680..85fb6091c8c 100644
--- a/SimpleTests/SolverTests/BiCGStabDiagPrecond.cpp
+++ b/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) {
diff --git a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp b/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
index e5cb18090d7..70b5c7424c1 100644
--- a/SimpleTests/SolverTests/ConjugateGradientDiagonalPreconditioned.cpp
+++ b/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) {
diff --git a/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp b/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
index 7970ddc1af1..cdf5f32d919 100644
--- a/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
+++ b/SimpleTests/SolverTests/ConjugateGradientUnpreconditioned.cpp
@@ -1,15 +1,15 @@
 #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;
diff --git a/SimpleTests/SolverTests/GMResDiagPrecond.cpp b/SimpleTests/SolverTests/GMResDiagPrecond.cpp
index 6eee4785cc9..cbbf87956bf 100644
--- a/SimpleTests/SolverTests/GMResDiagPrecond.cpp
+++ b/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[])
 {
-- 
GitLab