Changeset 772 for trunk/yat

Timestamp:

Feb 25, 2007, 7:29:47 PM (16 years ago)

Author:

Peter

Message:

fixes #126 and added some functions in AveragerPair? and AveragerPairWeighted?

Location:

trunk/yat/statistics

Files:

• AveragerPair.cc (modified) (2 diffs)
• AveragerPair.h (modified) (1 diff)
• AveragerPairWeighted.cc (modified) (1 diff)
• AveragerPairWeighted.h (modified) (1 diff)
• AveragerWeighted.h (modified) (2 diffs)
• Euclidean.cc (added)
• Euclidean.h (added)
• Makefile.am (modified) (2 diffs)

trunk/yat/statistics/AveragerPair.cc

@@ -72 +72 @@
   double AveragerPair::msd(void) const
   {
-    return ( x_averager().sum_xx()+y_averager().sum_xx()-2*sum_xy() )/n();
+    return sum_squared_deviation()/n();
   }
 
@@ -89 +89 @@
     x_=a.x_; y_=a.y_; xy_=a.xy_;
     return *this;
+  }
+
+  double AveragerPair::sum_squared_deviation(void) const
+  {
+    return x_averager().sum_xx()+y_averager().sum_xx()-2*sum_xy() ;
   }
 

trunk/yat/statistics/AveragerPair.h

@@ -130 +130 @@
 
     ///
+    /// @return Sum of squared deviation between x and y \f$
+    /// \sum (x-y)^2 \f$
+    ///
+    double sum_squared_deviation(void) const;
+
+    ///
     /// @return \f$ \sum_i (x_i-m_x)(y_i-m_y) \f$
     ///

trunk/yat/statistics/AveragerPairWeighted.cc

@@ -90 +90 @@
 
 
+  double AveragerPairWeighted::msd(void) const
+  {
+    return ( x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/w_;
+  }
+
+
   void AveragerPairWeighted::reset(void)
   {

trunk/yat/statistics/AveragerPairWeighted.h

@@ -120 +120 @@
     double covariance(void) const;
 
+    /**
+       @return \f$ \frac{\sum w_xw_y(x-y)^2}{\sum w_xw_y} \f$
+    */
+    double msd(void) const;
+
     ///
     /// @brief Reset everything to zero

trunk/yat/statistics/AveragerWeighted.h

@@ -163 +163 @@
 
     ///
+    ///  @return \f$ \sum w_i x_i^2 \f$
+    ///
+    double sum_wxx(void) const;
+
+    ///
     /// @return \f$ \sum_i w_i (x_i-m)^2\f$
     ///
@@ -198 +203 @@
     double sum_wwxx(void) const;
     
-    ///
-    ///  @return \f$ \sum w_i x_i^2 \f$
-    ///
-    double sum_wxx(void) const;
-
     const Averager& wx(void) const;
     const Averager& w(void) const;

trunk/yat/statistics/Makefile.am

@@ -26 +26 @@
 libstatistics_la_SOURCES = Averager.cc AveragerPair.cc      \
   AveragerWeighted.cc AveragerPairWeighted.cc Distance.cc   \
-  Fisher.cc FoldChange.cc Histogram.cc Pearson.cc     \
+  Euclidean.cc Fisher.cc FoldChange.cc Histogram.cc Pearson.cc      \
   PearsonDistance.cc ROC.cc SAM.cc Score.cc SNR.cc tScore.cc  \
   utility.cc WilcoxonFoldChange.cc
@@ -33 +33 @@
 
 include_statistics_HEADERS = Averager.h AveragerPair.h      \
-  AveragerWeighted.h AveragerPairWeighted.h Distance.h Fisher.h \
+  AveragerWeighted.h AveragerPairWeighted.h Distance.h Euclidean.h \
+  Fisher.h  \
   FoldChange.h Histogram.h Pearson.h PearsonDistance.h ROC.h  \
   SAM.h Score.h SNR.h tScore.h utility.h WilcoxonFoldChange.h