Changeset 97 for trunk/src/Averager.cc

Timestamp:

Jun 9, 2004, 6:30:41 PM (18 years ago)

Author:

Peter

Message:

removed the weights

File:

• trunk/src/Averager.cc (modified) (2 diffs)

trunk/src/Averager.cc

@@ -47 +47 @@
     double  var=(variance()*NM*NM+N.variance()*M*M);
 
-    *this=Averager(Rn ,Rn*x ,var*Rn*(Rn-1)+x*x*Rn);
+    *this=Averager(Rn*x ,var*Rn*(Rn-1)+x*x*Rn, Rn);
     return *this;
   }
@@ -59 +59 @@
       double x=mean()/NM;
       double var=(variance()+N.variance()*x*x)/(NM*NM);
-      *this=Averager(Rn ,Rn*x ,var*Rn*(Rn-1)+x*x*Rn);
+      *this=Averager(Rn*x ,var*Rn*(Rn-1)+x*x*Rn, Rn);
     }
     else