Changeset 731 for trunk/yat/regression

Timestamp:

Jan 6, 2007, 5:06:19 PM (17 years ago)

Author:

Peter

Message:

added test for multidimensional weighted and straight version

Location:

trunk/yat/regression

Files:

• MultiDimensional.cc (modified) (3 diffs)
• MultiDimensional.h (modified) (1 diff)
• MultiDimensionalWeighted.cc (modified) (3 diffs)
• MultiDimensionalWeighted.h (modified) (1 diff)
• PolynomialWeighted.cc (modified) (1 diff)

trunk/yat/regression/MultiDimensional.cc

@@ -26 +26 @@
 #include "yat/utility/vector.h"
 
+#include <cassert>
+
 namespace theplu {
 namespace yat {
@@ -52 +54 @@
   void MultiDimensional::fit(const utility::matrix& x, const utility::vector& y)
   {
+    assert(x.rows()==y.size());
     covariance_=utility::matrix(x.columns(),x.columns());
     fit_parameters_=utility::vector(x.columns());
@@ -76 +79 @@
   double MultiDimensional::predict(const utility::vector& x) const 
   {
+    assert(x.size()==fit_parameters_.size());
     return fit_parameters_ * x;
   }

trunk/yat/regression/MultiDimensional.h

@@ -68 +68 @@
 
     /**
-       @brief Mean Squared Error
+       @brief Summed Squared Error
      */
     double chisq(void) const;

trunk/yat/regression/MultiDimensionalWeighted.cc

@@ -62 +62 @@
   double MultiDimensionalWeighted::predict(const utility::vector& x) const
   {
+    assert(x.size()==fit_parameters_.size());
     return fit_parameters_ * x;
   }
@@ -78 +79 @@
 
 
-  double MultiDimensionalWeighted::standard_error(const utility::vector& x) const
+  double 
+  MultiDimensionalWeighted::standard_error2(const utility::vector& x) const
   {
     double s2 = 0;
@@ -86 +88 @@
         s2 += 2*covariance_(i,j)*x(i)*x(j);
     }
-    return sqrt(s2);
+    return s2;
   }
 

trunk/yat/regression/MultiDimensionalWeighted.h

@@ -70 +70 @@
     /// @return error of model value in @a x
     ///
-    double standard_error(const utility::vector& x) const;
+    double standard_error2(const utility::vector& x) const;
 
     ///

trunk/yat/regression/PolynomialWeighted.cc

@@ -81 +81 @@
     for (size_t i=1; i<=power_; ++i)
       vec(i) = vec(i-1)*x;
-    return md_.standard_error(vec);
+    return md_.standard_error2(vec);
   }