From 4e90a8c1a56df1d0ade0c6970ba11aabc9f6fe4e Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Wed, 21 Oct 2015 09:02:39 +0200
Subject: [PATCH] [MaL] Moved sparse.h to MathLib/LinAlg/Sparse/.

Corrected also the include paths for files in MathLib folder and SimpleTests/MatrixTests/ folder.
---
 MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp          | 2 +-
 MathLib/LinAlg/Sparse/NestedDissectionPermutation/AdjMat.h     | 2 +-
 .../Sparse/NestedDissectionPermutation/CRSMatrixReordered.h    | 2 +-
 MathLib/{ => LinAlg/Sparse}/sparse.h                           | 0
 SimpleTests/MatrixTests/MatMult.cpp                            | 1 -
 SimpleTests/MatrixTests/MatVecMultNDPerm.cpp                   | 3 +--
 SimpleTests/MatrixTests/MatVecMultNDPermOpenMP.cpp             | 1 -
 SimpleTests/MatrixTests/MatVecMultPthreads.cpp                 | 1 -
 8 files changed, 4 insertions(+), 8 deletions(-)
 rename MathLib/{ => LinAlg/Sparse}/sparse.h (100%)

diff --git a/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp b/MathLib/LinAlg/Preconditioner/generateDiagPrecond.cpp
index 33793512d67..b1dc9fdb936 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 87f781a193a..d44f45583f4 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 009d3215545..96be642af11 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 ad0e4a98b54..6017bf6cbad 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 06778898c2f..f3fdbf50bee 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 01c15993df4..0a6b644c1b4 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 5a566e7f4c8..217e3e4997e 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"
-- 
GitLab