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

Timestamp:

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

Author:

Jari Häkkinen

Message:

Fixes #206.

File:

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

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;