Changeset 830 for trunk/yat/utility

Timestamp:

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

Author:

Jari Häkkinen

Message:

Fixes #206.

Location:

trunk/yat/utility

Files:

• matrix.cc (modified) (7 diffs)
• matrix.h (modified) (3 diffs)
• vector.cc (modified) (5 diffs)
• vector.h (modified) (1 diff)

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++)

trunk/yat/utility/matrix.h

@@ -217 +217 @@
     size_t rows(void) const;
 
-    /**
-       \brief Set element values to values in \a mat.
-
-       This function is needed for assignment of viewed elements.
-
-       \see const matrix& operator=(const matrix&)
-
-       \throw GSL_error if dimensions mis-match.
-    */
-    void set(const matrix& mat);
-
     ///
     /// Set all elements to \a value.
     ///
-    void set_all(const double value);
+    void all(const double value);
 
     /**
@@ -241 +230 @@
        sizes.
     */
-    void set_column(const size_t column, const vector& vec);
+    void column(const size_t column, const vector& vec);
 
     /**
@@ -251 +240 @@
        sizes.
     */
-    void set_row(const size_t row, const vector& vec);
+    void row(const size_t row, const vector& vec);
 
     /**

trunk/yat/utility/vector.cc

@@ -55 +55 @@
       throw utility::GSL_error("vector::vector failed to allocate memory");
 
-    set_all(init_value);
+    all(init_value);
   }
 
@@ -300 +300 @@
     if (!v_)
       throw utility::GSL_error("vector::vector failed to allocate memory");
-    set_all(init_value);
+    all(init_value);
   } 
 
@@ -311 +311 @@
 
 
-  void vector::set(const vector& vec)
-  {
-    assert(v_);
-    if (gsl_vector_memcpy(v_,vec.gsl_vector_p()))
-      throw utility::GSL_error("vector::set dimension mis-match");
-  }
-
-
-  void vector::set_all(const double& value)
+  void vector::all(const double& value)
   {
     assert(v_);
@@ -397 +389 @@
   const vector& vector::operator=( const vector& other )
   {
-    set(other);
+    assert(v_);
+    if (gsl_vector_memcpy(v_,other.gsl_vector_p()))
+      throw utility::GSL_error("vector::set dimension mis-match");
     return *this;
   } 
@@ -478 +472 @@
   bool nan(const vector& templat, vector& flag)
   {
-    size_t rows=templat.size();
-    if (rows!=flag.size())
-      flag.clone(vector(rows,1.0));
+    size_t vsize=templat.size();
+    if (vsize!=flag.size())
+      flag.clone(vector(vsize,1.0));
     else
-      flag.set_all(1.0);
+      flag.all(1.0);
     bool nan=false;
-    for (size_t i=0; i<rows; i++)
+    for (size_t i=0; i<vsize; i++)
       if (std::isnan(templat(i))) {
         flag(i)=0;

trunk/yat/utility/vector.h

@@ -282 +282 @@
     void reverse(void);
 
-    /**
-       \brief Set element values to values in \a vec.
-
-       This function is needed for assignment of viewed elements.
-
-       \see const vector& operator=(const vector&)
-
-       \throw GSL_error if dimensions mis-match.
-    */
-    void set(const vector& vec);
-
     ///
     /// Set all elements to \a value.
     ///
-    void set_all(const double& value);
+    void all(const double& value);
 
     ///