Changeset 899 for trunk/yat/statistics/AveragerPairWeighted.cc

Timestamp:

Sep 26, 2007, 11:26:25 PM (15 years ago)

Author:

Peter

Message:

changed euclidean to fulfill design criteria, removes sum_squared_deviation from AveragerPairWeighted?, also changed vector::sort to use stl rather than gsl. refs #248 and fixes #253

File:

• trunk/yat/statistics/AveragerPairWeighted.cc (modified) (2 diffs)

trunk/yat/statistics/AveragerPairWeighted.cc

@@ -96 +96 @@
   double AveragerPairWeighted::msd(void) const
   {
-    return sum_squared_deviation()/w_;
+    return (x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/w_;
+  }
+
+
+  double AveragerPairWeighted::n(void) const
+  {
+    return x_.n();
   }
 
@@ -105 +111 @@
   }
 
-  double AveragerPairWeighted::sum_squared_deviation(void) const
-  {
-    return x_.sum_wxx()+y_.sum_wxx()-2*wxy_;
-  }
-  
 
   double AveragerPairWeighted::sum_w(void) const