Changeset 1020

Timestamp:

Feb 1, 2008, 6:17:26 PM (16 years ago)

Author:

Peter

Message:

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

Location:

trunk/yat/regression

Files:

• LinearWeighted.cc (modified) (1 diff)
• LinearWeighted.h (modified) (2 diffs)
• NaiveWeighted.cc (modified) (1 diff)
• NaiveWeighted.h (modified) (2 diffs)
• OneDimensionalWeighted.h (modified) (2 diffs)
• PolynomialWeighted.cc (modified) (1 diff)
• PolynomialWeighted.h (modified) (2 diffs)

trunk/yat/regression/LinearWeighted.cc

@@ -64 +64 @@
   }
 
-  void LinearWeighted::fit(const utility::vector& x,
-                           const utility::vector& y,
-                           const utility::vector& w)
+  void LinearWeighted::fit(const utility::VectorBase& x,
+                           const utility::VectorBase& y,
+                           const utility::VectorBase& w)
   {
     assert(x.size()==y.size());

trunk/yat/regression/LinearWeighted.h

@@ -32 +32 @@
 namespace yat {
   namespace utility {
-    class vector;
+    class VectorBase;
   }
 namespace regression {
@@ -97 +97 @@
     **/
     /// @todo calculate mse
-    void fit(const utility::vector& x, const utility::vector& y,
-             const utility::vector& w);
+    void fit(const utility::VectorBase& x, const utility::VectorBase& y,
+             const utility::VectorBase& w);
     
     ///

trunk/yat/regression/NaiveWeighted.cc

@@ -44 +44 @@
   }
 
-  void NaiveWeighted::fit(const utility::vector& x,
-                          const utility::vector& y,
-                          const utility::vector& w)
+  void NaiveWeighted::fit(const utility::VectorBase& x,
+                          const utility::VectorBase& y,
+                          const utility::VectorBase& w)
   {
     assert(x.size()==y.size());

trunk/yat/regression/NaiveWeighted.h

@@ -36 +36 @@
 namespace yat {
   namespace utility {
-    class vector;
+    class VectorBase;
   }
 namespace regression {
@@ -65 +65 @@
        the inverse of the variance for \f$ y_i \f$
     */
-    void fit(const utility::vector& x,
-             const utility::vector& y,
-             const utility::vector& w);
+    void fit(const utility::VectorBase& x,
+             const utility::VectorBase& y,
+             const utility::VectorBase& w);
 
     ///

trunk/yat/regression/OneDimensionalWeighted.h

@@ -34 +34 @@
 namespace yat {
 namespace utility {
-  class vector;
+  class VectorBase;
 }
 namespace regression {
@@ -63 +63 @@
        to the inverse of the variance for \f$ y_i \f$
     */
-    virtual void fit(const utility::vector& x, const utility::vector& y, 
-                     const utility::vector& w)=0;
+    virtual void fit(const utility::VectorBase& x, const utility::VectorBase& y, 
+                     const utility::VectorBase& w)=0;
 
     ///

trunk/yat/regression/PolynomialWeighted.cc

@@ -42 +42 @@
   }
 
-  void PolynomialWeighted::fit(const utility::vector& x,
-                               const utility::vector& y,
-                               const utility::vector& w)
+  void PolynomialWeighted::fit(const utility::VectorBase& x,
+                               const utility::VectorBase& y,
+                               const utility::VectorBase& w)
   {
     assert(x.size()==y.size());

trunk/yat/regression/PolynomialWeighted.h

@@ -57 +57 @@
     /// y_i \f$
     ///
-    void fit(const utility::vector& x, const utility::vector& y,
-             const utility::vector& w);
+    void fit(const utility::VectorBase& x, const utility::VectorBase& y,
+             const utility::VectorBase& w);
 
     ///
@@ -66 +66 @@
     ///
     const utility::vector& fit_parameters(void) const;
-
-    ///
-    /// @return parameters for polynomial model
-    ///
-    utility::vector fit_parameters(void) { return md_.fit_parameters(); }
 
     ///