Changeset 97 for trunk/src/Averager.cc
- Timestamp:
- Jun 9, 2004, 6:30:41 PM (19 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/Averager.cc
r95 r97 47 47 double var=(variance()*NM*NM+N.variance()*M*M); 48 48 49 *this=Averager(Rn ,Rn*x ,var*Rn*(Rn-1)+x*x*Rn);49 *this=Averager(Rn*x ,var*Rn*(Rn-1)+x*x*Rn, Rn); 50 50 return *this; 51 51 } … … 59 59 double x=mean()/NM; 60 60 double var=(variance()+N.variance()*x*x)/(NM*NM); 61 *this=Averager(Rn ,Rn*x ,var*Rn*(Rn-1)+x*x*Rn);61 *this=Averager(Rn*x ,var*Rn*(Rn-1)+x*x*Rn, Rn); 62 62 } 63 63 else
Note: See TracChangeset
for help on using the changeset viewer.