Changeset 97 for trunk/src/Averager.cc


Ignore:
Timestamp:
Jun 9, 2004, 6:30:41 PM (18 years ago)
Author:
Peter
Message:

removed the weights

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Averager.cc

    r95 r97  
    4747    double  var=(variance()*NM*NM+N.variance()*M*M);
    4848
    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);
    5050    return *this;
    5151  }
     
    5959      double x=mean()/NM;
    6060      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);
    6262    }
    6363    else
Note: See TracChangeset for help on using the changeset viewer.