Changeset 2567
- Timestamp:
- Sep 26, 2011, 3:22:30 AM (11 years ago)
- Location:
- trunk/yat/statistics
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yat/statistics/AveragerPairWeighted.cc
r2119 r2567 35 35 36 36 AveragerPairWeighted::AveragerPairWeighted(void) 37 : wxy_(0) , w_(0)37 : wxy_(0) 38 38 { 39 39 } … … 52 52 double w=wx*wy; 53 53 x_.add(x,w); 54 y_.add(y,w); 55 wxy_ += w*x*y; 56 w_ +=w; 54 y_.add(y,w); 55 wxy_ += w*x*y; 57 56 } 58 57 … … 72 71 double AveragerPairWeighted::msd(void) const 73 72 { 74 return (x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/ w_;73 return (x_.sum_wxx()+y_.sum_wxx()-2*wxy_)/sum_w(); 75 74 } 76 75 … … 84 83 void AveragerPairWeighted::reset(void) 85 84 { 86 x_.reset(); y_.reset(); wxy_=0; w_=0;85 x_.reset(); y_.reset(); wxy_=0; 87 86 } 88 87 … … 90 89 double AveragerPairWeighted::sum_w(void) const 91 90 { 92 return w_;91 return x_.sum_w(); 93 92 } 94 93 -
trunk/yat/statistics/AveragerPairWeighted.h
r2202 r2567 135 135 AveragerWeighted y_; // weighted averager with w = w_x*w_y 136 136 double wxy_; 137 double w_;138 139 137 }; 140 138
Note: See TracChangeset
for help on using the changeset viewer.