Changeset 791

Timestamp:

Mar 11, 2007, 1:12:34 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Addresses #193. Added missing implementations.

Location:

trunk/yat/utility

Files:

• vector.cc (modified) (4 diffs)
• vector.h (modified) (1 diff)

trunk/yat/utility/vector.cc

@@ -199 +199 @@
 
 
-  gsl_vector* vector::create_gsl_vector_copy(void) const
-  {
-    gsl_vector* vec = gsl_vector_alloc(size());
-    if (!vec)
-      throw utility::GSL_error("vector::create_gsl_vector_copy failed to allocate memory");
-    if (gsl_vector_memcpy(vec, proxy_v_))
-      throw utility::GSL_error("vector::create_gsl_matrix_copy dimension mis-match");
-    return vec;
-  }
-
-
   const vector& vector::clone(const vector& other)
   {
@@ -236 +225 @@
     return *this;
   } 
+
+
+  gsl_vector* vector::create_gsl_vector_copy(void) const
+  {
+    gsl_vector* vec = gsl_vector_alloc(size());
+    if (!vec)
+      throw utility::GSL_error("vector::create_gsl_vector_copy failed to allocate memory");
+    if (gsl_vector_memcpy(vec, proxy_v_))
+      throw utility::GSL_error("vector::create_gsl_matrix_copy dimension mis-match");
+    return vec;
+  }
 
 
@@ -417 +417 @@
 
 
+  const vector& vector::operator-=(const double d)
+  {
+    assert(v_);
+    gsl_vector_add_constant(v_, -d);
+    return *this;
+  }
+
+
   const vector& vector::operator*=(const double d)
   {
@@ -468 +476 @@
     gsl_vector_minmax_index(v.gsl_vector_p(), &minmax.first, &minmax.second);
     return minmax;
+  }
+
+
+  bool nan(const vector& templat, vector& flag)
+  {
+    size_t rows=templat.size();
+    if (rows!=flag.size())
+      flag.clone(vector(rows,1.0));
+    else
+      flag.set_all(1.0);
+    bool nan=false;
+    for (size_t i=0; i<rows; i++)
+      if (std::isnan(templat(i))) {
+        flag(i)=0;
+        nan=true;
+      }
+    return nan;
   }
 

trunk/yat/utility/vector.h

@@ -512 +512 @@
 
   /**
+     \brief Create a vector \a flag indicating NaN's in another vector
+     \a templat.
+
+     The \a flag vector is changed to contain 1's and 0's only. A 1
+     means that the corresponding element in the \a templat vector is
+     valid and a zero means that the corresponding element is a NaN.
+
+     \note Space for vector \a flag is reallocated to fit the size of
+     vector \a templat if sizes mismatch.
+
+     \return True if the \a templat vector contains at least one NaN.
+  */
+  bool nan(const matrix& templat, matrix& flag);
+
+  /**
      \brief Transforms a vector to a basis vector.