Changeset 2567

Timestamp:

Sep 26, 2011, 3:22:30 AM (10 years ago)

Author:

Peter

Message:

remove redundant variable

Location:

trunk/yat/statistics

Files:

• AveragerPairWeighted.cc (modified) (5 diffs)
• AveragerPairWeighted.h (modified) (1 diff)

trunk/yat/statistics/AveragerPairWeighted.cc

@@ -35 +35 @@
 
   AveragerPairWeighted::AveragerPairWeighted(void)
-    : wxy_(0), w_(0)
+    : wxy_(0)
   {
   }
@@ -52 +52 @@
     double w=wx*wy;
     x_.add(x,w);
-    y_.add(y,w); 
-    wxy_ += w*x*y;    
-    w_ +=w;
+    y_.add(y,w);
+    wxy_ += w*x*y;
   }
 
@@ -72 +71 @@
   double AveragerPairWeighted::msd(void) const
   {
-    return (x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/w_;
+    return (x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/sum_w();
   }
 
@@ -84 +83 @@
   void AveragerPairWeighted::reset(void)
   {
-    x_.reset(); y_.reset(); wxy_=0; w_=0;
+    x_.reset(); y_.reset(); wxy_=0;
   }
 
@@ -90 +89 @@
   double AveragerPairWeighted::sum_w(void) const
   {
-    return w_;
+    return x_.sum_w();
   }
 

trunk/yat/statistics/AveragerPairWeighted.h

@@ -135 +135 @@
     AveragerWeighted y_; // weighted averager with w = w_x*w_y
     double wxy_;
-    double w_;
-
   };