eckit::linalg::SparseMatrix improved

ecmwf · Aug 20, 2024 · e4172ff · e4172ff
1 parent ba71237
commit e4172ff
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/eckit/linalg/SparseMatrix.cc b/src/eckit/linalg/SparseMatrix.cc
@@ -188,6 +188,12 @@ SparseMatrix& SparseMatrix::operator=(const SparseMatrix& other) {
 }
 
 
+SparseMatrix& SparseMatrix::operator=(SparseMatrix&& other) {
+    swap(other);
+    return *this;
+}
+
+
 SparseMatrix::~SparseMatrix() {
     reset();
 }

diff --git a/src/eckit/linalg/SparseMatrix.h b/src/eckit/linalg/SparseMatrix.h
@@ -76,7 +76,7 @@ class SparseMatrix {
         Size innerSize() const { return nonZeros(); }
 
         /// @returns outer size is number of rows + 1
-        Size outerSize() const { return static_cast<Size>(rows_ + 1); }
+        Size outerSize() const { return rows_ + 1; }
 
         size_t allocSize() const { return sizeofData() + sizeofOuter() + sizeofInner(); }
 
@@ -88,7 +88,7 @@ class SparseMatrix {
         Size rows_ = 0;  ///< Number of rows
         Size cols_ = 0;  ///< Number of columns
 
-        void print(std::ostream& os) const;
+        void print(std::ostream&) const;
 
         friend std::ostream& operator<<(std::ostream& os, const Shape& p) {
             p.print(os);
@@ -141,11 +141,15 @@ class SparseMatrix {
     /// Copy constructor
     SparseMatrix(const SparseMatrix&);
 
+    /// Destructor
     ~SparseMatrix();
 
     /// Assignment operator (allocates and copies data)
     SparseMatrix& operator=(const SparseMatrix&);
 
+    /// Assignment operator (moves data)
+    SparseMatrix& operator=(SparseMatrix&&);
+
 public:
     /// Prune entries with exactly the given value
     SparseMatrix& prune(Scalar = 0);
@@ -239,7 +243,7 @@ class SparseMatrix {
         const_iterator& operator=(const_iterator&&)      = default;
 
         bool operator!=(const const_iterator& other) const { return !operator==(other); }
-        bool operator==(const const_iterator& other) const;
+        bool operator==(const const_iterator&) const;
 
         const Scalar& operator*() const;