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

Timestamp:

Mar 24, 2007, 3:54:42 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #206.

File:

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

trunk/yat/utility/matrix.cc

@@ -54 +54 @@
     if (!m_)
       throw utility::GSL_error("matrix::matrix failed to allocate memory");
-    set_all(init_value);
+    all(init_value);
   }
 
@@ -276 +276 @@
     if (!m_)
       throw utility::GSL_error("matrix::matrix failed to allocate memory");
-    set_all(init_value);
+    all(init_value);
 
     // no need to delete blas_result_ if the number of rows fit, it
@@ -295 +295 @@
 
 
-  void matrix::set(const matrix& other)
-  {
-    assert(m_);
-    if (gsl_matrix_memcpy(m_, other.gsl_matrix_p()))
-      throw utility::GSL_error("matrix::create_gsl_matrix_copy dimension mis-match");
-  }
-
-
-  void matrix::set_all(const double value)
+  void matrix::all(const double value)
   {
     assert(m_);
@@ -310 +302 @@
 
 
-  void matrix::set_column(const size_t column, const vector& vec)
+  void matrix::column(const size_t column, const vector& vec)
   {
     assert(m_);
@@ -319 +311 @@
 
 
-  void matrix::set_row(const size_t row, const vector& vec)
+  void matrix::row(const size_t row, const vector& vec)
   {
     assert(m_);
@@ -413 +405 @@
   const matrix& matrix::operator=( const matrix& other )
   {
-    set(other);
+    assert(m_);
+    if (gsl_matrix_memcpy(m_, other.gsl_matrix_p()))
+      throw utility::GSL_error("matrix::create_gsl_matrix_copy dimension mis-match");
     return *this;
   }
@@ -517 +511 @@
       flag.clone(matrix(rows,columns,1.0));
     else
-      flag.set_all(1.0);
+      flag.all(1.0);
     bool nan=false;
     for (size_t i=0; i<rows; i++)