Changeset 1021

Timestamp:

Feb 1, 2008, 6:58:38 PM (15 years ago)

Author:

Peter

Message:

passing VectorBase? in regression::MultiDimesional? - refs #256

Location:

trunk/yat/regression

Files:

• MultiDimensional.cc (modified) (5 diffs)
• MultiDimensional.h (modified) (4 diffs)

trunk/yat/regression/MultiDimensional.cc

@@ -26 +26 @@
 #include "yat/utility/Exception.h"
 #include "yat/utility/matrix.h"
+#include "yat/utility/VectorBase.h"
 #include "yat/utility/vector.h"
 
@@ -54 +55 @@
 
 
-  void MultiDimensional::fit(const utility::matrix& x, const utility::vector& y)
+  void MultiDimensional::fit(const utility::matrix& x, 
+                             const utility::VectorBase& y)
   {
     assert(x.rows()==y.size());
@@ -86 +88 @@
 
 
-  double MultiDimensional::predict(const utility::vector& x) const 
+  double MultiDimensional::predict(const utility::VectorBase& x) const 
   {
     assert(x.size()==fit_parameters_.size());
@@ -93 +95 @@
 
 
-  double MultiDimensional::prediction_error2(const utility::vector& x) const
+  double MultiDimensional::prediction_error2(const utility::VectorBase& x) const
   {
     return standard_error2(x) + s2_;
@@ -99 +101 @@
 
 
-  double MultiDimensional::standard_error2(const utility::vector& x) const
+  double MultiDimensional::standard_error2(const utility::VectorBase& x) const
   {
     double s2 = 0;

trunk/yat/regression/MultiDimensional.h

@@ -26 +26 @@
 
 #include "yat/utility/matrix.h"
-#include "yat/utility/vector.h"
+#include "yat/utility/VectorBase.h"
 
 #include <gsl/gsl_multifit.h>
@@ -64 +64 @@
        dimension errors).
     */
-    void fit(const utility::matrix& X, const utility::vector& y);
+    void fit(const utility::matrix& X, const utility::VectorBase& y);
 
     ///
@@ -79 +79 @@
     /// @return value in @a x according to fitted model
     ///
-    double predict(const utility::vector& x) const;
+    double predict(const utility::VectorBase& x) const;
 
     ///
@@ -85 +85 @@
     /// in @a x
     ///
-    double prediction_error2(const utility::vector& x) const;
+    double prediction_error2(const utility::VectorBase& x) const;
 
     ///
     /// @return squared error of model value in @a x
     ///
-    double standard_error2(const utility::vector& x) const;
+    double standard_error2(const utility::VectorBase& x) const;
 
   private: