Changeset 213

Timestamp:

Nov 4, 2004, 8:58:08 PM (19 years ago)

Author:

Peter

Message:

moving minor stuff to base class

Location:

trunk/src

Files:

• Regression.cc (modified) (1 diff)
• Regression.h (modified) (1 diff)
• RegressionLinear.cc (modified) (1 diff)
• RegressionLinear.h (modified) (3 diffs)
• RegressionNaive.h (modified) (1 diff)

trunk/src/Regression.cc

@@ -8 +8 @@
   
   Regression::Regression()
+    : sumsq_(0)
   {
   }

trunk/src/Regression.h

@@ -51 +51 @@
                              const gslapi::vector& w)=0;
 
+    inline double sumsq() const { return sumsq_; }
          
-  private:
-
+  protected:
+    double sumsq_;
 
   };

trunk/src/RegressionLinear.cc

@@ -16 +16 @@
   
   RegressionLinear::RegressionLinear(void)
-    : Regression(), cov00_(0), cov01_(0), cov11_(0), k_(0), m_(0), sumsq_(0)
+    : Regression(), cov00_(0), cov01_(0), cov11_(0), k_(0), m_(0)
   {
   }

trunk/src/RegressionLinear.h

@@ -47 +47 @@
     ///
     inline int fit(const gslapi::vector& x, const gslapi::vector& y) 
-    { return gsl_fit_linear_vector(x.gsl_vector_pointer(), 
-                                   y.gsl_vector_pointer(), &m_, &k_, 
-                                   &cov00_, &cov01_, &cov11_, &sumsq_); }  
+    { return gsl_fit_linear(x.gsl_vector_pointer()->data, 
+                            x.gsl_vector_pointer()->stride,
+                            y.gsl_vector_pointer()->data, 
+                            y.gsl_vector_pointer()->stride,
+                            x.gsl_vector_pointer()->size,
+                            &m_, &k_, &cov00_, &cov01_, &cov11_, &sumsq_); }
 
     inline double k(void) const { return k_; }
@@ -64 +67 @@
     inline int fit_weighted(const gslapi::vector& x, const gslapi::vector& y,
                             const gslapi::vector& w)
-    { return gsl_fit_wlinear_vector(x.gsl_vector_pointer(), 
-                                    w.gsl_vector_pointer(), 
-                                    y.gsl_vector_pointer(),
-                                    &m_, &k_, 
-                                    &cov00_, &cov01_, &cov11_, &sumsq_); }  
+    { return gsl_fit_wlinear(x.gsl_vector_pointer()->data, 
+                             x.gsl_vector_pointer()->stride,
+                             w.gsl_vector_pointer()->data, 
+                             w.gsl_vector_pointer()->stride,
+                             y.gsl_vector_pointer()->data, 
+                             y.gsl_vector_pointer()->stride,
+                             x.gsl_vector_pointer()->size,
+                             &m_, &k_,  &cov00_, &cov01_, &cov11_, &sumsq_); }
+
          
   private:
@@ -76 +83 @@
     double k_;
     double m_;
-    double sumsq_;
 
   };

trunk/src/RegressionNaive.h

@@ -78 +78 @@
     double var_;
     double m_;
-    double sumsq_;
 
   };