Changeset 782 for trunk/yat/utility

Timestamp:

Mar 5, 2007, 10:17:31 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #195.

Location:

trunk/yat/utility

Files:

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

trunk/yat/utility/PCA.cc

@@ -142 +142 @@
     utility::vector A_row_sum(A_.rows());
     for (size_t i=0; i<A_row_sum.size(); ++i)
-      A_row_sum(i)=utility::vector(A_,i).sum();
+      A_row_sum(i)=utility::sum(utility::vector(A_,i));
     for( size_t i = 0; i < A_center.rows(); ++i ) {
       meanvalues_[i] = A_row_sum(i) / static_cast<double>(A_.columns());

trunk/yat/utility/vector.cc

@@ -229 +229 @@
 
 
-  bool vector::isnull(void) const
-  {
-    return gsl_vector_isnull(proxy_v_);
-  }
-
-
   bool vector::isview(void) const
   {
     return view_ || view_const_;
-  }
-
-
-  double vector::max(void) const
-  {
-    return gsl_vector_max(proxy_v_);
-  }
-
-
-  size_t vector::max_index(void) const
-  {
-    return gsl_vector_max_index(proxy_v_);
-  }
-
-
-  double vector::min(void) const
-  {
-    return gsl_vector_min(proxy_v_);
-  }
-
-
-  size_t vector::min_index(void) const
-  {
-    return gsl_vector_min_index(proxy_v_);
-  }
-
-
-  std::pair<double,double> vector::minmax(void) const
-  {
-    double min, max;
-    gsl_vector_minmax(proxy_v_, &min, &max);
-    return std::pair<double,double>(min,max);
-  }
-
-
-  std::pair<size_t,size_t> vector::minmax_index(void) const
-  {
-    size_t min_index, max_index;
-    gsl_vector_minmax_index(proxy_v_, &min_index, &max_index);
-    return std::pair<size_t,size_t>(min_index,max_index);
   }
 
@@ -305 +259 @@
   {
     gsl_vector_set_all(v_,value);
-  }
-
-
-  void vector::set_basis(const size_t i)
-  {
-    gsl_vector_set_basis(v_,i);
-  }
-
-
-  void vector::set_zero(void)
-  {
-    gsl_vector_set_zero(v_);
   }
 
@@ -328 +270 @@
 
 
-  void vector::sort(void)
-  {
-    gsl_sort_vector(v_);
-  }
-
-
-  double vector::sum(void) const
-  {
-    double sum = 0;
-    for (size_t i=0; i<size(); i++)
-      sum += (*this)(i);
-    return( sum );
-  }
-
-
-  void vector::swap(vector& other)
-  {
-    int status=gsl_vector_swap(v_,other.v_);
-    if (status)
-      throw utility::GSL_error(std::string("vector::swap",status));
-  }
-
-
-  void vector::swap_elements(size_t i, size_t j)
+  void vector::swap(size_t i, size_t j)
   {
     int status=gsl_vector_swap_elements(v_, i, j);
@@ -459 +378 @@
 
 
+  bool isnull(const vector& v)
+  {
+    return gsl_vector_isnull(v.gsl_vector_p());
+  }
+
+
+  double max(const vector& v)
+  {
+    return gsl_vector_max(v.gsl_vector_p());
+  }
+
+
+  size_t max_index(const vector& v)
+  {
+    return gsl_vector_max_index(v.gsl_vector_p());
+  }
+
+
+  double min(const vector& v)
+  {
+    return gsl_vector_min(v.gsl_vector_p());
+  }
+
+
+  size_t min_index(const vector& v)
+  {
+    return gsl_vector_min_index(v.gsl_vector_p());
+  }
+
+
+  std::pair<double,double> minmax(const vector& v)
+  {
+    std::pair<double,double> minmax;
+    gsl_vector_minmax(v.gsl_vector_p(), &minmax.first, &minmax.second);
+    return minmax;
+  }
+
+
+  std::pair<size_t,size_t> minmax_index(const vector& v)
+  {
+    std::pair<size_t,size_t> minmax;
+    gsl_vector_minmax_index(v.gsl_vector_p(), &minmax.first, &minmax.second);
+    return minmax;
+  }
+
+
+  void set_basis(vector& v, size_t i)
+  {
+    gsl_vector_set_basis(v.gsl_vector_p(),i);
+  }
+
+
+  void sort(vector& v)
+  {
+    gsl_sort_vector(v.gsl_vector_p());
+  }
+
+
+  double sum(const vector& v)
+  {
+    double sum = 0;
+    size_t vsize=v.size();
+    for (size_t i=0; i<vsize; ++i)
+      sum += v[i];
+    return sum;
+  }
+
+
+  void swap(vector& v, vector& w)
+  {
+    int status=gsl_vector_swap(v.gsl_vector_p(),w.gsl_vector_p());
+    if (status)
+      throw utility::GSL_error(std::string("swap(vector&,vector&)",status));
+  }
+
+
   std::ostream& operator<<(std::ostream& s, const vector& a)
   {

trunk/yat/utility/vector.h

@@ -62 +62 @@
 
      \par
-     Currently there is no restriction on how a vector is used in
-     cases when the vector is a const view into another vector or
+     Currently there is no restriction on how a vector is used when
+     the vector is a const view into another vector or
      matrix. To avoid unexpected runtime errors, the programmer must
      declare const view vectors as const in order to get compile time
@@ -234 +234 @@
 
     ///
-    /// @return True if all elements in the vector is zero, false
-    /// othwerwise;
-    ///
-    bool isnull(void) const;
-
-    ///
     /// Check if the vector object is a view (sub-vector) to another
     /// vector.
@@ -247 +241 @@
     bool isview(void) const;
 
-    ///
-    /// @return The maximum value of the vector.
-    ///
-    double max(void) const;
-
-    ///
-    /// @return The element index to the maximum value of the
-    /// vector. The lowest index has precedence.
-    ///
-    size_t max_index(void) const;
-
-    ///
-    /// @return The minimum value of the vector.
-    ///
-    double min(void) const;
-
-    ///
-    /// @return The element index to the minimum value of the
-    /// vector. The lowest index has precedence.
-    ///
-    size_t min_index(void) const;
-
-    ///
-    /// @return The minimum and maximum values of the vector, as the
-    /// \a first and \a second member of the returned \a pair,
-    /// respectively.
-    ///
-    std::pair<double,double> minmax(void) const;
-
-    ///
-    /// @return The indecies to the minimum and maximum values of the
-    /// vector, as the \a first and \a second member of the returned
-    /// \a pair, respectively. The lowest index has precedence.
-    ///
-    std::pair<size_t,size_t> minmax_index(void) const;
-
     /**
        \brief This function performs element-wise multiplication, \f$
@@ -313 +271 @@
 
     ///
-    /// Makes a basis vector by setting all elements to
-    /// zero except the \a i-th element which is set to
-    /// one.
-    ///
-    void set_basis(const size_t i);
-    
-    ///
-    /// Set all elements to zero.
-    ///
-    void set_zero(void);
-
-    ///
     /// @return the number of elements in the vector.
     ///
     size_t size(void) const;
 
-    ///
-    /// Sort the elements in the vector.
-    ///
-    /// Bug in gsl: if vector contains NaN an infinite loop is entered.
-    ///
-    void sort(void);
-
-    ///
-    /// Calculate the sum of all vector elements.
-    ///
-    /// @return The sum.
-    ///
-    double sum(void) const;
-
-    /**
-       \brief Swap vector elements by copying.
-
-       The two vectors must have the same length.
+    /**
+       \brief Exchange elements \a i and \a j.
 
        \throw GSL_error if vector lengths differs.
     */
-    void swap(vector& other);
-
-    /**
-       \brief Exchange elements \a i and \a j.
-
-       \throw GSL_error if vector lengths differs.
-    */
-    void swap_elements(size_t i, size_t j);
+    void swap(size_t i, size_t j);
 
     /**
@@ -496 +419 @@
   };
 
-  ///
-  /// The output operator for the vector class.
-  ///
-  std::ostream& operator<<(std::ostream&, const vector& );
-
+  /**
+     \brief Check if all elements of the vector are zero.
+
+     \return True if all elements in the vector is zero, false
+     othwerwise.
+  */
+  bool isnull(const vector&);
+
+  /**
+     \brief Get the maximum value of the vector.
+
+     \return The maximum value of the vector.
+  */
+  double max(const vector&);
+
+  /**
+     \brief Locate the maximum value in the vector.
+
+     \return The index to the maximum value of the vector.
+
+     \note Lower index has precedence.
+  */
+  size_t max_index(const vector&);
+
+  /**
+     \brief Get the minimum value of the vector.
+
+     \return The minimum value of the vector.
+  */
+  double min(const vector&);
+
+  /**
+     \brief Locate the minimum value in the vector.
+
+     \return The index to the minimum value of the vector.
+
+     \note Lower index has precedence.
+  */
+  size_t min_index(const vector&);
+
+  /**
+     \brief Get the minimum and maximim values of the vector.
+
+     \return The minimum and maximum values of the vector,
+     respectively.
+  */
+  std::pair<double,double> minmax(const vector&);
+
+  /**
+     \brief Locate the maximum and minumum element in the vector.
+
+     \return The indecies to the element with the minimum and maximum
+     values of the vector, respectively.
+
+     \note Lower index has precedence.
+  */
+  std::pair<size_t,size_t> minmax_index(const vector&);
+
+  /**
+     \brief Transforms a vector to a basis vector.
+
+     All elements are set to zero except the \a i-th element which is
+     set to one.
+  */
+  void set_basis(vector&, size_t i);
+
+  /**
+     Sort the elements in the vector.
+
+     \note Bug in GSL: if the vector contains one ore more NaNs the
+     call never returns.
+  */
+  void sort(vector&);
+
+  /**
+     \brief Calculate the sum of all vector elements.
+
+     \return The sum.
+  */
+  double sum(const vector&);
+
+  /**
+     \brief Swap vector elements by copying.
+
+     The two vectors must have the same length.
+
+     \throw GSL_error if vector lengths differs.
+  */
+  void swap(vector&, vector&);
+
+  /**
+     \brief The output operator for the vector class.
+  */
+  std::ostream& operator<<(std::ostream&, const vector&);
 
 }}} // of namespace utility, yat, and theplu