CSRMatrix now uses templates

Signed-off-by: Eugenio Angriman <eugenio.angriman@informatik.hu-berlin.de>
networkit · Jun 27, 2019 · cd5ad55 · cd5ad55
1 parent 20f23f8
commit cd5ad55
Show file tree

Hide file tree

Showing 23 changed files with 1,238 additions and 1,314 deletions.
diff --git a/include/networkit/algebraic/CSRGeneralMatrix.hpp b/include/networkit/algebraic/CSRGeneralMatrix.hpp
diff --git a/include/networkit/algebraic/CSRMatrix.hpp b/include/networkit/algebraic/CSRMatrix.hpp
diff --git a/include/networkit/centrality/SpanningEdgeCentrality.hpp b/include/networkit/centrality/SpanningEdgeCentrality.hpp
@@ -10,7 +10,7 @@
 
 #include <networkit/numerics/LAMG/Lamg.hpp>
 #include <networkit/centrality/Centrality.hpp>
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 
 namespace NetworKit {

diff --git a/include/networkit/distance/CommuteTimeDistance.hpp b/include/networkit/distance/CommuteTimeDistance.hpp
@@ -8,7 +8,7 @@
 #ifndef COMMUTETIMEDIST_H_
 #define COMMUTETIMEDIST_H_
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 #include <networkit/numerics/LAMG/Lamg.hpp>
 #include <networkit/graph/Graph.hpp>
 #include <networkit/base/Algorithm.hpp>

diff --git a/include/networkit/io/MatrixReader.hpp b/include/networkit/io/MatrixReader.hpp
@@ -8,7 +8,7 @@
 #ifndef MATRIXREADER_H_
 #define MATRIXREADER_H_
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 namespace NetworKit {
 

diff --git a/include/networkit/numerics/ConjugateGradient.hpp b/include/networkit/numerics/ConjugateGradient.hpp
@@ -13,7 +13,7 @@
 
 #include <networkit/numerics/LinearSolver.hpp>
 #include <networkit/algebraic/Vector.hpp>
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 namespace NetworKit {
 

diff --git a/include/networkit/numerics/LAMG/Level/Level.hpp b/include/networkit/numerics/LAMG/Level/Level.hpp
@@ -8,7 +8,7 @@
 #ifndef LEVEL_H_
 #define LEVEL_H_
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 namespace NetworKit {
 

diff --git a/include/networkit/numerics/LAMG/MultiLevelSetup.hpp b/include/networkit/numerics/LAMG/MultiLevelSetup.hpp
@@ -10,7 +10,7 @@
 
 #include <networkit/numerics/LAMG/LevelHierarchy.hpp>
 #include <networkit/numerics/Smoother.hpp>
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 #include <limits>
 

diff --git a/include/networkit/numerics/Preconditioner/DiagonalPreconditioner.hpp b/include/networkit/numerics/Preconditioner/DiagonalPreconditioner.hpp
@@ -8,7 +8,7 @@
 #ifndef NETWORKIT_CPP_NUMERICS_PRECONDITIONER_DIAGONALPRECONDITIONER_H_
 #define NETWORKIT_CPP_NUMERICS_PRECONDITIONER_DIAGONALPRECONDITIONER_H_
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 
 namespace NetworKit {
 

diff --git a/include/networkit/numerics/Smoother.hpp b/include/networkit/numerics/Smoother.hpp
@@ -8,7 +8,7 @@
 #ifndef SMOOTHER_H_
 #define SMOOTHER_H_
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 #include <networkit/algebraic/Vector.hpp>
 
 #include <limits>

diff --git a/include/networkit/viz/MaxentStress.hpp b/include/networkit/viz/MaxentStress.hpp
@@ -10,7 +10,7 @@
 
 #include <networkit/viz/GraphLayoutAlgorithm.hpp>
 #include <networkit/numerics/LinearSolver.hpp>
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 #include <networkit/viz/Octree.hpp>
 
 #include <networkit/distance/BFS.hpp>

diff --git a/include/networkit/viz/PivotMDS.hpp b/include/networkit/viz/PivotMDS.hpp
@@ -10,7 +10,7 @@
 
 #include <networkit/viz/GraphLayoutAlgorithm.hpp>
 
-#include <networkit/algebraic/CSRMatrix.hpp>
+#include <networkit/algebraic/CSRGeneralMatrix.hpp>
 #include <networkit/algebraic/Vector.hpp>
 
 #include <networkit/graph/Graph.hpp>

diff --git a/networkit/cpp/algebraic/CMakeLists.txt b/networkit/cpp/algebraic/CMakeLists.txt
@@ -1,5 +1,4 @@
 networkit_add_module(algebraic
-    CSRMatrix.cpp
     DenseMatrix.cpp
     DynamicMatrix.cpp
     Vector.cpp