Changeset 755 for trunk/yat/utility/matrix.cc

Timestamp:

Feb 18, 2007, 1:01:39 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Addresses #2 and #65. Continued adding GSL_error exceptions, and added doxygen briefs.

File:

• trunk/yat/utility/matrix.cc (modified) (5 diffs)

trunk/yat/utility/matrix.cc

@@ -191 +191 @@
 
 
-  int matrix::div_elements(const matrix& b)
-  {
-    return gsl_matrix_div_elements(m_, b.m_);
+  void matrix::div_elements(const matrix& b)
+  {
+    int status=gsl_matrix_div_elements(m_, b.m_);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::div_elements",status));
   }
 
@@ -269 +271 @@
 
 
-  int matrix::mul_elements(const matrix& b)
-  {
-    return gsl_matrix_mul_elements(m_, b.m_);
+  void matrix::mul_elements(const matrix& b)
+  {
+    int status=gsl_matrix_mul_elements(m_, b.m_);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::mul_elements",status));
+    
   }
 
@@ -326 +331 @@
 
 
-  int matrix::swap(matrix& other)
-  {
-    return gsl_matrix_swap(m_, other.m_);
-  }
-
-
-  int matrix::swap_columns(const size_t i, const size_t j)
-  {
-    return gsl_matrix_swap_columns(m_, i, j);
-  }
-
-
-  int matrix::swap_rowcol(const size_t i, const size_t j)
-  {
-    return gsl_matrix_swap_rowcol(m_, i, j);
-  }
-
-
-  int matrix::swap_rows(const size_t i, const size_t j)
-  {
-    return gsl_matrix_swap_rows(m_, i, j);
+  void matrix::swap(matrix& other)
+  {
+    int status=gsl_matrix_swap(m_, other.m_);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::swap",status));
+  }
+
+
+  void matrix::swap_columns(const size_t i, const size_t j)
+  {
+    int status=gsl_matrix_swap_columns(m_, i, j);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::swap_columns",status));
+  }
+
+
+  void matrix::swap_rowcol(const size_t i, const size_t j)
+  {
+    int status=gsl_matrix_swap_rowcol(m_, i, j);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::swap_rowcol",status));
+  }
+
+
+  void matrix::swap_rows(const size_t i, const size_t j)
+  {
+    int status=gsl_matrix_swap_rows(m_, i, j);
+    if (status)
+      throw utility::GSL_error(std::string("matrix::swap_rows",status));
   }
 
@@ -368 +381 @@
   double& matrix::operator()(size_t row, size_t column)
   {
-    return (*gsl_matrix_ptr(m_, row, column));
+    double* d=gsl_matrix_ptr(m_, row, column);
+    if (!d)
+      throw utility::GSL_error("matrix::operator()",GSL_EINVAL);
+    return *d;
   }
 
@@ -374 +390 @@
   const double& matrix::operator()(size_t row, size_t column) const
   {
-    return (*gsl_matrix_const_ptr(m_, row, column));
+    const double* d=gsl_matrix_const_ptr(m_, row, column);
+    if (!d)
+      throw utility::GSL_error("matrix::operator()",GSL_EINVAL);
+    return *d;
   }