diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp index 33793512d67996f6360373dbb5dd5bdf01ef1572..b1dc9fdb936517b8b904c67c9f0434f0802d9e7e 100644 --- a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp +++ b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp @@ -12,9 +12,9 @@ * */ -#include "sparse.h" #include <limits> #include <cmath> +#include <iostream> namespace MathLib { diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h index 87f781a193a540c708227dbd3edfa4f8f8ceae0f..d44f45583f47af9afe74892edebd7be77a147ff5 100644 --- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h +++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h @@ -15,7 +15,7 @@ #ifndef ADJMAT_H_ #define ADJMAT_H_ -#include "LinAlg/Sparse/CRSMatrix.h" +#include "MathLib/LinAlg/Sparse/CRSMatrix.h" namespace MathLib { diff --git a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h index 009d321554509ee49b152b80c009f862c13520e1..96be642af112f7a2506ac4131b2745ed999ac7ed 100644 --- a/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h +++ b/MathLib/LinAlg/Sparse/NestedDissectionPermutation/CRSMatrixReordered.h @@ -17,7 +17,7 @@ #include <string> -#include "LinAlg/Sparse/CRSMatrix.h" +#include "MathLib/LinAlg/Sparse/CRSMatrix.h" namespace MathLib { diff --git a/MathLib/sparse.h b/MathLib/LinAlg/Sparse/sparse.h similarity index 100% rename from MathLib/sparse.h rename to MathLib/LinAlg/Sparse/sparse.h diff --git a/SimpleTests/MatrixTests/MatMult.cpp b/SimpleTests/MatrixTests/MatMult.cpp index ad0e4a98b54486c70e72da8c43a560240fe606b4..6017bf6cbad5a2c89ea57b0636ae0cad9ac1a620 100644 --- a/SimpleTests/MatrixTests/MatMult.cpp +++ b/SimpleTests/MatrixTests/MatMult.cpp @@ -37,7 +37,6 @@ #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/MatVecMultNDPerm.cpp b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp index 06778898c2f7b80b0eff1a443ac3256ac7aba336..f3fdbf50bee833b765f6c41e41cf841fa329dc25 100644 --- a/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp +++ b/SimpleTests/MatrixTests/MatVecMultNDPerm.cpp @@ -26,11 +26,10 @@ #include "BaseLib/RunTime.h" #include "BaseLib/CPUTime.h" -#include "MathLib/sparse.h" +#include "MathLib/LinAlg/Sparse/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 01c15993df4f92c212e38aa8f7d9011ffe417d35..0a6b644c1b49de51daf79651ef3847cb0e68cdff 100644 --- a/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp +++ b/SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp @@ -34,7 +34,6 @@ #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 5a566e7f4c8739dab6d689c28850f7ef15b71e2d..217e3e4997e07da58deba3e918ae17113b14276d 100644 --- a/SimpleTests/MatrixTests/MatVecMultPthreads.cpp +++ b/SimpleTests/MatrixTests/MatVecMultPthreads.cpp @@ -30,7 +30,6 @@ #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"