Add clear() member functions to matrix class

knodlseder
1 parent 0796cf5e
Showing 5 changed files with 44 additions and 9 deletions
src/GMatrix.cpp
src/GMatrix.hpp
src/GSparseMatrix.hpp
src/GSymMatrix.hpp
test/test_GSparseMatrix.cpp
@@ -495,6 +495,20 @@ GMatrix&amp; GMatrix::operator/= (const double&amp; d)
  ==========================================================================*/
  
 /***************************************************************************
+ *                       Set all matrix elements to zero                   *
+ ***************************************************************************/
+void GMatrix::clear()
+{
+  // Loop over all matrix elements
+  for (int i = 0; i < m_elements; ++i)
+    m_data[i] = 0.0;
+  
+  // Return
+  return;
+}
+
+
+/***************************************************************************
  *                    Get minimum physical matrix element                  *
  ***************************************************************************/
 double GMatrix::min() const
@@ -76,6 +76,7 @@ public:
   // Matrix functions
   virtual int     rows() const { return m_rows; }
   virtual int     cols() const { return m_cols; }
+  virtual void    clear();
   virtual double  min() const;
   virtual double  max() const;
   virtual double  sum() const;
@@ -84,7 +84,8 @@ public:
   // Matrix functions
   // USE_BASE: virtual int rows() const { return m_rows; }
   // USE_BASE: virtual int cols() const { return m_cols; }
-  virtual double  fill() const { return (double(m_elements)/double(m_rows*m_cols)); }
+  virtual void    clear();
+  virtual double  fill() const;
   virtual double  min() const;
   virtual double  max() const;
   virtual double  sum() const;
@@ -244,6 +245,21 @@ GSparseMatrix operator/ (const GSparseMatrix&amp; a, const double&amp; b)
   return result;
 }
  
+// Matrix clear function
+inline
+void GSparseMatrix::clear()
+{
+  free_elements(0, m_elements);
+  return;
+}
+
+// Matrix fill function
+inline
+double GSparseMatrix::fill() const
+{
+  return (double(m_elements)/double(m_rows*m_cols));
+}
+
 // Matrix transpose function
 inline
 GSparseMatrix transpose(const GSparseMatrix& m)
@@ -77,8 +77,9 @@ public:
   virtual GSymMatrix& operator/= (const double& d);
  
   // Matrix functions
-  // USE_BASE: virtual int rows() const { return m_rows; }
-  // USE_BASE: virtual int cols() const { return m_cols; }
+  // USE_BASE: virtual int      rows() const { return m_rows; }
+  // USE_BASE: virtual int      cols() const { return m_cols; }
+  // USE_BASE: virtual void     clear();
   // USE_BASE: virtual double   min() const;
   // USE_BASE: virtual double   max() const;
   virtual double  sum() const;
@@ -92,12 +93,6 @@ public:
   virtual GVector cholesky_solver(const GVector& v, int compress = 1);
   virtual void    cholesky_invert(int compress = 1);
  
-  // Exception: All matrix elements are zero
-  class all_zero : public GException {
-  public:
-    all_zero(string origin);
-  };
-
 private:
   void set_inx(void);  // Set indices of non-zero rows/columns
   int  m_num_inx;      // Number of non-zero rows/columns
@@ -349,6 +349,15 @@ void test_assign_values(const GSparseMatrix&amp; m_test)
 	  throw;
 	}
 	cout << ".";
+	//
+	result.clear();
+    if (!check_matrix(result, 0.0, 0.0) || !check_matrix(m_test, 1.0, 0.0)) {
+      cout << endl << "TEST ERROR: Corrupt GSparseMatrix.clear()." << endl;
+	  cout << "result:" << endl << result << endl;
+	  cout << "m_test:" << endl << m_test << endl;
+	  throw;
+	}
+	cout << ".";
   }
   catch (exception &e) {
     cout << e.what() << endl;