Changeset 775

Timestamp:

Mar 2, 2007, 12:53:03 AM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes #200.

Location:

trunk

Files:

• test/averager_test.cc (modified) (2 diffs)
• test/regression_test.cc (modified) (2 diffs)
• yat/utility/vector.cc (modified) (5 diffs)
• yat/utility/vector.h (modified) (6 diffs)

trunk/test/averager_test.cc

@@ -152 +152 @@
       
   aw2->reset();
-  w.scale(17);
+  w*=17;
   aw2->add_values(x,w);
   if (!equal(aw,*aw2,tol,error)){
@@ -208 +208 @@
       
   apw2->reset();
-  w.scale(17);
+  w*=17;
   apw2->add_values(x,y,w,w);
   if (!equal(apw,*apw2,tol,error)){

trunk/test/regression_test.cc

@@ -316 +316 @@
   double standard_error2 = wr.standard_error2(2000);
 
-  w.scale(2);
+  w*=2;
   wr.fit(x,y,w);
   if (fabs(wr.predict(2000)-predict)>10e-11){
@@ -459 +459 @@
   double standard_error2 = mdw.standard_error2(z);
 
-  w.scale(2);
+  w*=2;
   mdw.fit(data,y,w);
   if (fabs(mdw.predict(z)-predict)>10e-10){

trunk/yat/utility/vector.cc

@@ -198 +198 @@
 
 
-  void vector::add(const vector& other)
-  {
-    int status=gsl_vector_add(v_,other.v_);
-    if (status)
-      throw utility::GSL_error(std::string("vector::add",status));
-  }
-
-
-  void vector::add(double term)
-  {
-    gsl_vector_add_constant(v_,term);
-  }
-
-
   gsl_vector* vector::create_gsl_vector_copy(void) const
   {
@@ -309 +295 @@
 
 
-  void vector::scale(double factor)
-  {
-    gsl_vector_scale(v_,factor);
-  }
-
-
   void vector::set(const vector& vec)
   {
@@ -351 +331 @@
   {
     gsl_sort_vector(v_);
-  }
-
-
-  void vector::sub(const vector& other)
-  {
-    int status=gsl_vector_sub(v_,other.v_);
-    if (status)
-      throw utility::GSL_error(std::string("vector::sub",status));
   }
 
@@ -457 +429 @@
   const vector& vector::operator+=(const vector& other)
   {
-    add(other);
+    int status=gsl_vector_add(v_,other. v_);
+    if (status)
+      throw utility::GSL_error(std::string("vector::add", status));
     return *this;
   }
 
 
+  const vector& vector::operator+=(double d)
+  {
+    gsl_vector_add_constant(v_, d);
+    return *this;
+  }
+
+
   const vector& vector::operator-=(const vector& other)
   {
-    sub(other);
+    int status=gsl_vector_sub(v_, other.v_);
+    if (status)
+      throw utility::GSL_error(std::string("vector::sub", status));
     return *this;
   }
@@ -471 +454 @@
   const vector& vector::operator*=(const double d)
   {
-    scale(d);
+    gsl_vector_scale(v_, d);
     return *this;
   }

trunk/yat/utility/vector.h

@@ -216 +216 @@
 
     /**
-       \brief Vector addition, \f$ this_i = this_i + other_i \;
-       \forall i \f$.
-
-       \throw GSL_error if dimensions mis-match.
-    */
-    void add(const vector& other);
-
-    /**
-       \brief Add a constant to a vector, \f$ this_i = this_i + term \;
-       \forall i \f$.
-    */
-    void add(double term);
-
-    /**
        \brief This function performs element-wise division, \f$ this_i =
        this_i/other_i \; \forall i \f$.
@@ -311 +297 @@
 
     /**
-       \brief Rescale vector, \f$ this_i = this_i * factor \; \forall i \f$.
-    */
-    void scale(double factor);
-
-    /**
        \brief Set element values to values in \a vec.
 
@@ -354 +335 @@
     ///
     void sort(void);
-
-    /**
-       \brief Vector subtraction, \f$ this_i = this_i - other_i \;
-       \forall i \f$.
-
-       \throw GSL_error if dimensions mis-match.
-    */
-    void sub(const vector& other);
 
     ///
@@ -455 +428 @@
 
     /**
-       \brief Addition and assign operator.
+       \brief Addition and assign operator. Vector addition, \f$
+       this_i = this_i + other_i \; \forall i \f$.
 
        \return A const reference to the resulting vector.
@@ -464 +438 @@
 
     /**
-       \brief Subtract and assign operator.
+       \brief Add a constant to a vector, \f$ this_i = this_i + d \;
+       \forall i \f$.
 
        \return A const reference to the resulting vector.
+    */
+    const vector& operator+=(double d);
+
+    /**
+       \brief Subtract and assign operator. Vector subtraction, \f$
+       this_i = this_i - other_i \; \forall i \f$.
+
+       \return A const reference to the resulting vector.
 
        \throw GSL_error if dimensions mis-match.
@@ -472 +455 @@
     const vector& operator-=(const vector&);
 
-    ///
-    /// Multiply with scalar and assign operator.
-    ///
-    /// @return A const reference to the resulting vector.
-    ///
-    const vector& operator*=(const double);
+    /**
+       \brief Subtract a constant to a vector, \f$ this_i = this_i - d
+       \; \forall i \f$.
+
+       \return A const reference to the resulting vector.
+    */
+    const vector& operator-=(double d);
+
+    /**
+       \brief Multiply with scalar and assign operator, \f$ this_i =
+       this_i * d \; \forall i \f$.
+
+       \return A const reference to the resulting vector.
+    */
+    const vector& operator*=(double d);