Changeset 207

Timestamp:

Nov 2, 2004, 8:26:44 PM (19 years ago)

Author:

Peter

Message:

fixed minor bugs

Location:

trunk/src

Files:

• Makefile.am (modified) (2 diffs)
• Regression.h (modified) (2 diffs)
• RegressionLinear.h (modified) (2 diffs)

trunk/src/Makefile.am

@@ -17 +17 @@
   Score.cc Statistics.cc \
   PolynomialKernelFunction.cc random_singleton.cc \
-  RegressionKernel.cc RegressionLinear.cc ROC.cc Score.cc Statistics.cc \
+  Regression.cc RegressionKernel.cc RegressionLinear.cc ROC.cc Score.cc \
+  Statistics.cc \
   SVD.cc SVM.cc tScore.cc vector.cc WeightedAverager.cc WeNNI.cc
 
@@ -33 +34 @@
   Regression.h RegressionLinear.h RegressionLocal.h RegressionNaive.h \
   ROC.h Score.h \
-  PolynomialKernelFunction.h random_singleton.h \
+  PolynomialKernelFunction.h random_singleton.h Regression.h \
   RegressionKernel.h RegressionLinear.h ROC.h Score.h \
   Statistics.h stl_utility.h SVD.h SVM.h tScore.h vector.h WeNNI.h \

trunk/src/Regression.h

@@ -10 +10 @@
 // Standard C++ includes
 ////////////////////////
-//#include <gsl/gsl_fit.h>
+
 
 namespace theplu {
 namespace statistics {  
 
-  class gslapi::vector;
   
   ///
@@ -28 +27 @@
     /// Default Constructor.
     ///
-    Regression(void);
+    Regression();
 
     ///

trunk/src/RegressionLinear.h

@@ -51 +51 @@
                                    &cov00_, &cov01_, &cov11_, &sumsq_); }  
 
+    inline double k(void) const { return k_; }
+    inline double m(void) const { return m_; }
+
+
     ///
     /// This function computes the best-fit linear regression
@@ -58 +62 @@
     /// \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)
     { return gsl_fit_wlinear_vector(x.gsl_vector_pointer(), 
                                     w.gsl_vector_pointer(),