From 006a7f63327cae9d3260406558a4de121e8ef1d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Del=20Pino?= <stephane.delpino44@gmail.com>
Date: Mon, 2 Nov 2020 12:11:48 +0100
Subject: [PATCH] Rename CSRGraph to CRSGraph (fixing typo)

---
 src/mesh/Connectivity.hpp                |  6 +++---
 src/mesh/ConnectivityDispatcher.cpp      |  5 +++--
 src/mesh/Mesh.hpp                        |  1 -
 src/utils/{CSRGraph.hpp => CRSGraph.hpp} | 22 +++++++++++-----------
 src/utils/Partitioner.cpp                |  4 ++--
 src/utils/Partitioner.hpp                |  4 ++--
 6 files changed, 21 insertions(+), 21 deletions(-)
 rename src/utils/{CSRGraph.hpp => CRSGraph.hpp} (52%)

diff --git a/src/mesh/Connectivity.hpp b/src/mesh/Connectivity.hpp
index 7a3c77b71..f8e4dafdb 100644
--- a/src/mesh/Connectivity.hpp
+++ b/src/mesh/Connectivity.hpp
@@ -12,7 +12,7 @@
 #include <mesh/RefId.hpp>
 #include <mesh/RefItemList.hpp>
 #include <mesh/SubItemValuePerItem.hpp>
-#include <utils/CSRGraph.hpp>
+#include <utils/CRSGraph.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsAssert.hpp>
 #include <utils/PugsMacros.hpp>
@@ -542,7 +542,7 @@ class Connectivity final : public IConnectivity
   }
 
   PUGS_INLINE
-  CSRGraph
+  CRSGraph
   cellToCellGraph() const
   {
     std::vector<std::set<int>> cell_cells(this->numberOfCells());
@@ -574,7 +574,7 @@ class Connectivity final : public IConnectivity
         }
       }
     }
-    return CSRGraph(entries, neighbors);
+    return CRSGraph(entries, neighbors);
   }
 
   PUGS_INLINE
diff --git a/src/mesh/ConnectivityDispatcher.cpp b/src/mesh/ConnectivityDispatcher.cpp
index 82bf2a2e0..6b73d967d 100644
--- a/src/mesh/ConnectivityDispatcher.cpp
+++ b/src/mesh/ConnectivityDispatcher.cpp
@@ -1,6 +1,7 @@
 #include <mesh/ConnectivityDispatcher.hpp>
-#include <mesh/ItemOfItemType.hpp>
 
+#include <mesh/ItemOfItemType.hpp>
+#include <utils/CRSGraph.hpp>
 #include <utils/Partitioner.hpp>
 
 #include <iostream>
@@ -12,7 +13,7 @@ void
 ConnectivityDispatcher<Dimension>::_buildNewOwner()
 {
   if constexpr (item_type == ItemType::cell) {
-    CSRGraph connectivity_graph = m_connectivity.cellToCellGraph();
+    CRSGraph connectivity_graph = m_connectivity.cellToCellGraph();
     Partitioner P;
 
     CellValue<int> cell_new_owner(m_connectivity);
diff --git a/src/mesh/Mesh.hpp b/src/mesh/Mesh.hpp
index d04807650..e78383978 100644
--- a/src/mesh/Mesh.hpp
+++ b/src/mesh/Mesh.hpp
@@ -4,7 +4,6 @@
 #include <algebra/TinyVector.hpp>
 #include <mesh/IMesh.hpp>
 #include <mesh/ItemValue.hpp>
-#include <utils/CSRGraph.hpp>
 
 #include <memory>
 
diff --git a/src/utils/CSRGraph.hpp b/src/utils/CRSGraph.hpp
similarity index 52%
rename from src/utils/CSRGraph.hpp
rename to src/utils/CRSGraph.hpp
index a3ae85dcc..18300f47a 100644
--- a/src/utils/CSRGraph.hpp
+++ b/src/utils/CRSGraph.hpp
@@ -1,9 +1,9 @@
-#ifndef CSR_GRAPH_HPP
-#define CSR_GRAPH_HPP
+#ifndef CRS_GRAPH_HPP
+#define CRS_GRAPH_HPP
 
 #include <utils/Array.hpp>
 
-class CSRGraph
+class CRSGraph
 {
  private:
   Array<int> m_entries;
@@ -29,18 +29,18 @@ class CSRGraph
     return m_neighbors;
   }
 
-  CSRGraph& operator=(CSRGraph&&) = default;
-  CSRGraph& operator=(const CSRGraph&) = default;
+  CRSGraph& operator=(CRSGraph&&) = default;
+  CRSGraph& operator=(const CRSGraph&) = default;
 
-  CSRGraph(const Array<int>& entries, const Array<int>& neighbors) : m_entries(entries), m_neighbors(neighbors)
+  CRSGraph(const Array<int>& entries, const Array<int>& neighbors) : m_entries(entries), m_neighbors(neighbors)
   {
     Assert(m_entries.size() > 0);
   }
 
-  CSRGraph()                = default;
-  CSRGraph(CSRGraph&&)      = default;
-  CSRGraph(const CSRGraph&) = default;
-  ~CSRGraph()               = default;
+  CRSGraph()                = default;
+  CRSGraph(CRSGraph&&)      = default;
+  CRSGraph(const CRSGraph&) = default;
+  ~CRSGraph()               = default;
 };
 
-#endif   // CSR_GRAPH_HPP
+#endif   // CRS_GRAPH_HPP
diff --git a/src/utils/Partitioner.cpp b/src/utils/Partitioner.cpp
index 43ee64851..4e6a45e1c 100644
--- a/src/utils/Partitioner.cpp
+++ b/src/utils/Partitioner.cpp
@@ -15,7 +15,7 @@
 #include <utils/Exceptions.hpp>
 
 Array<int>
-Partitioner::partition(const CSRGraph& graph)
+Partitioner::partition(const CRSGraph& graph)
 {
   std::cout << "Partitioning graph into " << rang::style::bold << parallel::size() << rang::style::reset << " parts\n";
 
@@ -78,7 +78,7 @@ Partitioner::partition(const CSRGraph& graph)
 #else   // PUGS_HAS_MPI
 
 Array<int>
-Partitioner::partition(const CSRGraph&)
+Partitioner::partition(const CRSGraph&)
 {
   return Array<int>(0);
 }
diff --git a/src/utils/Partitioner.hpp b/src/utils/Partitioner.hpp
index 30f50723a..2c720bfd8 100644
--- a/src/utils/Partitioner.hpp
+++ b/src/utils/Partitioner.hpp
@@ -1,7 +1,7 @@
 #ifndef PARTITIONER_HPP
 #define PARTITIONER_HPP
 
-#include <utils/CSRGraph.hpp>
+#include <utils/CRSGraph.hpp>
 
 class Partitioner
 {
@@ -10,7 +10,7 @@ class Partitioner
   Partitioner(const Partitioner&) = default;
   ~Partitioner()                  = default;
 
-  Array<int> partition(const CSRGraph& graph);
+  Array<int> partition(const CRSGraph& graph);
 };
 
 #endif   // PARTITIONER_HPP
-- 
GitLab