Rework SparseMatrix class (#299)

* Remove useless things

* Init SparseMatrix rework

* End SparseMatrix implementation

* Add copy and move constructors. Add normalize function

* Enchance tests

* typo

* Using reduce

* fixes

* Add sparsematrix import from csv

Author: Grufoony

.gitignore

@@ -38,5 +38,7 @@ images
 examples/debug
 examples/release
 
+test/data/*dsm
+
 
 webapp/data/*

benchmark/Adj/BenchAdj.cpp

@@ -17,9 +17,9 @@ int main() {
   graph.buildAdj();
   auto const& adj{graph.adjacencyMatrix()};
   auto const N{adj.n()};
-  SparseMatrix<bool> sm(N, N);
+  SparseMatrix<bool> sm;
   for (const auto& [srcId, dstId] : adj.elements()) {
-    sm.insert(srcId, dstId);
+    sm.insert(srcId, dstId, true);
   }
 
 
@@ -28,14 +28,14 @@ int main() {
   Logger::info("Benchmarking SparseMatrix::getCol");
   b1.benchmark([&sm, &N]() -> void { 
     for (size_t i{0}; i < N; ++i) {
-      sm.getCol(i);
+      sm.col(i);
     }
   });
   b1.print<sb::microseconds>();
   Logger::info("Benchmarking SparseMatrix::getRow");
   b2.benchmark([&sm, &N]() -> void { 
     for (size_t i{0}; i < N; ++i) {
-      sm.getRow(i);
+      sm.row(i);
     }
   });
   b2.print<sb::microseconds>();

src/dsm/dsm.hpp

@@ -6,7 +6,7 @@
 
 static constexpr uint8_t DSM_VERSION_MAJOR = 2;
 static constexpr uint8_t DSM_VERSION_MINOR = 6;
-static constexpr uint8_t DSM_VERSION_PATCH = 23;
+static constexpr uint8_t DSM_VERSION_PATCH = 24;
 
 static auto const DSM_VERSION =
     std::format("{}.{}.{}", DSM_VERSION_MAJOR, DSM_VERSION_MINOR, DSM_VERSION_PATCH);

src/dsm/headers/AdjacencyMatrix.hpp

@@ -28,7 +28,8 @@ namespace dsm {
   ///          It is defined as \f$A = (a_{ij})\f$, where \f$a_{ij} \in \{0, 1\}\f$.
   ///          Moreover, \f$a_{ij} = 1\f$ if there is an edge from node \f$i\f$ to node \f$j\f$ and \f$a_{ij} = 0\f$ otherwise.
   ///          It is used to store the adjacency matrix of the network and to perform operations on it.
-  ///          The adjacency matrix is stored in compressed sparse row format.
+  ///          The adjacency matrix is stored in both CSR and CSC formats, to optimize access to rows and columns.
+  ///          Thus, this matrix has very fast access, using double the memory of a standard CSR/CSC one.
   class AdjacencyMatrix {
   private:
     // CSR format
@@ -44,15 +45,6 @@ namespace dsm {
     friend std::vector<Id> test::indices(const AdjacencyMatrix& adj);
 
   public:
-    using value_type = Id;
-    using difference_type = std::ptrdiff_t;
-    using reference = Id&;
-    using const_reference = const Id&;
-    using iterator = std::vector<Id>::iterator;
-    using const_iterator = std::vector<Id>::const_iterator;
-    using reverse_iterator = std::vector<Id>::reverse_iterator;
-    using const_reverse_iterator = std::vector<Id>::const_reverse_iterator;
-
     /// @brief Construct a new AdjacencyMatrix object
     AdjacencyMatrix();
     /// @brief Construct a new AdjacencyMatrix object using the @ref read method

src/dsm/headers/RoadNetwork.hpp

@@ -272,7 +272,7 @@ namespace dsm {
   std::optional<DijkstraResult> RoadNetwork::shortestPath(const Node& source,
                                                           const Node& destination,
                                                           Func f) const {
-    return this->shortestPath(source.id(), destination.id());
+    return this->shortestPath(source.id(), destination.id(), f);
   }
 
   template <typename Func>