Fix errors caught by CI.

ORNL · Jul 2, 2024 · 31046e4 · 31046e4
1 parent f430b29
commit 31046e4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 50 deletions.
diff --git a/resolve/matrix/CMakeLists.txt b/resolve/matrix/CMakeLists.txt
@@ -15,7 +15,7 @@ set(Matrix_SRC
     Coo.cpp
     MatrixHandler.cpp
     MatrixHandlerCpu.cpp
-    utilities.cpp
+    Utilities.cpp
 )
 
 # C++ code that depends on CUDA SDK libraries
@@ -36,7 +36,7 @@ set(Matrix_HEADER_INSTALL
     Csr.hpp
     Csc.hpp
     MatrixHandler.hpp
-    utilities.hpp
+    Utilities.hpp
 )
 
 # Build shared library ReSolve::matrix

diff --git a/resolve/matrix/Csr.cpp b/resolve/matrix/Csr.cpp
@@ -5,9 +5,8 @@
 
 #include "Csr.hpp"
 #include "Coo.hpp"
-#include <resolve/utilities/misc/IndexValuePair.hpp>
 #include <resolve/utilities/logger/Logger.hpp>
-#include <resolve/matrix/utilities.hpp>
+#include <resolve/matrix/Utilities.hpp>
 
 namespace ReSolve 
 {

diff --git a/resolve/matrix/MatrixHandler.cpp b/resolve/matrix/MatrixHandler.cpp
@@ -6,7 +6,7 @@
 #include <resolve/matrix/Csc.hpp>
 #include <resolve/matrix/Csr.hpp>
 #include <resolve/workspace/LinAlgWorkspace.hpp>
-#include <resolve/matrix/utilities.hpp>
+#include <resolve/matrix/Utilities.hpp>
 #include "MatrixHandler.hpp"
 #include "MatrixHandlerCpu.hpp"
 

diff --git a/resolve/matrix/Utilities.cpp b/resolve/matrix/Utilities.cpp
@@ -2,12 +2,47 @@
 #include <resolve/Common.hpp>
 #include <resolve/matrix/Coo.hpp>
 #include <resolve/matrix/Csr.hpp>
-#include <resolve/utilities/misc/IndexValuePair.hpp>
 #include <resolve/utilities/logger/Logger.hpp>
-#include "utilities.hpp"
+#include "Utilities.hpp"
 
 namespace ReSolve
 {
+  /// @brief Helper class for COO matrix sorting
+  class IndexValuePair
+  {
+    public:
+      IndexValuePair() : idx_(0), value_(0.0)
+      {}
+      ~IndexValuePair()
+      {}
+      void setIdx (index_type new_idx)
+      {
+        idx_ = new_idx;
+      }
+      void setValue (real_type new_value)
+      {
+        value_ = new_value;
+      }
+
+      index_type getIdx()
+      {
+        return idx_;
+      }
+      real_type getValue()
+      {
+        return value_;
+      }
+
+      bool operator < (const IndexValuePair& str) const
+      {
+        return (idx_ < str.idx_);
+      }  
+
+    private:
+      index_type idx_;
+      real_type value_;
+  };
+
   using out = io::Logger;
   namespace matrix
   {

diff --git a/resolve/utilities/misc/IndexValuePair.hpp b/resolve/utilities/misc/IndexValuePair.hpp