Changeset 206

Timestamp:

Nov 2, 2004, 7:31:09 PM (19 years ago)

Author:

Peter

Message:

.

Location:

trunk/src

Files:

• Regression.h (modified) (1 diff)
• RegressionLocal.cc (modified) (2 diffs)
• RegressionLocal.h (modified) (4 diffs)
• RegressionNaive.h (modified) (1 diff)

trunk/src/Regression.h

@@ -49 +49 @@
     /// to the inverse of the variance for \f$ y_i \f$
     ///
-    virtual int 
-    fit_weighted(const gslapi::vector& x, const gslapi::vector& y, 
-                 const gslapi::vector& w)=0;
+    virtual int fit_weighted(const gslapi::vector& x, const gslapi::vector& y, 
+                             const gslapi::vector& w)=0;
 
          

trunk/src/RegressionLocal.cc

@@ -3 +3 @@
 #include "RegressionLocal.h"
 
-
+#include "Regression.h"
+#include "RegressionKernel.h"
 #include "RegressionLinear.h"
 #include "vector.h"
@@ -9 +10 @@
 
 namespace theplu {
-namespace cpptools {
+namespace statistics {
 
-  
+  RegressionLocal::RegressionLocal(const gslapi::vector& x, 
+                                   const gslapi::vector& y, 
+                                   const Regression& r, 
+                                   const RegressionKernel& k)
+    : kernel_(&k), regression_(&r)
+  {
+  }
 
 

trunk/src/RegressionLocal.h

@@ -6 +6 @@
 // C++ tools include
 /////////////////////
+#include "Regression.h"
+#include "RegressionKernel.h"
 #include "vector.h"
 
@@ -15 +17 @@
 namespace statistics {  
   
-  class RegressionKernel;
-  class Regression;
-
-
+  
   ///
   /// Class for Locally-weighted regression.   
@@ -33 +32 @@
 
     ///
-    /// Constructor.
+    /// Constructor doing the thing.
     ///
-    RegressionLocal(Regression&, const RegressionKernel&);
+    RegressionLocal(const gslapi::vector& x, const gslapi::vector& y, 
+                    const Regression&, const RegressionKernel&);
 
     ///
@@ -46 +46 @@
     ///
     virtual ~RegressionLocal(void) {};
-         
+
          
   private:
-
+    gslapi::vector data_x_;
+    gslapi::vector data_y_;
+    const RegressionKernel* kernel_;
+    const Regression* regression_;
+    gslapi::vector estimated_x_;
+    gslapi::vector estimated_y_;
+    
   };
 

trunk/src/RegressionNaive.h

@@ -62 +62 @@
     /// variance for \f$ y_i \f$
     ///
-    inline int  fit_weighted(gslapi::vector x,gslapi::vector y,gslapi::vector w)
+    inline int fit_weighted(const gslapi::vector& x,
+                            const gslapi::vector& y,
+                            const gslapi::vector& w)
     {
       WeightedAverager a;