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

Timestamp:

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

Author:

Jari Häkkinen

Message:

Fixes #195.

File:

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

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