ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/Accumulator.hpp
(Generate patch)

Comparing trunk/src/utils/Accumulator.hpp (file contents):
Revision 1979 by gezelter, Sat Apr 5 20:56:01 2014 UTC vs.
Revision 2071 by gezelter, Sat Mar 7 21:41:51 2015 UTC

# Line 59 | Line 59 | namespace OpenMD {
59      virtual size_t count()  {
60        return Count_;
61      }
62 +    virtual ~BaseAccumulator() {};
63    protected:
64      size_t Count_;
65  
# Line 79 | Line 80 | namespace OpenMD {
80      Accumulator() : BaseAccumulator() {
81        this->clear();
82      }
83 +    
84 +    ~Accumulator() {};
85  
86      /**
87       * Accumulate another value
# Line 176 | Line 179 | namespace OpenMD {
179        assert(Count_ != 0);
180        RealType sd;
181        this->getStdDev(sd);
182 <      ret = 1.960 * sd / sqrt(Count_);
182 >      ret = 1.960 * sd / sqrt(RealType(Count_));
183        return;
184      }
185  
# Line 289 | Line 292 | namespace OpenMD {
292        assert(Count_ != 0);
293        ResultType sd;
294        this->getStdDev(sd);
295 <      ret[0] = 1.960 * sd[0] / sqrt(Count_);
296 <      ret[1] = 1.960 * sd[1] / sqrt(Count_);
297 <      ret[2] = 1.960 * sd[2] / sqrt(Count_);
295 >      ret[0] = 1.960 * sd[0] / sqrt(RealType(Count_));
296 >      ret[1] = 1.960 * sd[1] / sqrt(RealType(Count_));
297 >      ret[2] = 1.960 * sd[2] / sqrt(RealType(Count_));
298        return;
299      }
300  
# Line 355 | Line 358 | namespace OpenMD {
358        assert(Count_ != 0);
359        RealType sd;
360        this->getLengthStdDev(sd);
361 <      ret = 1.960 * sd / sqrt(Count_);
361 >      ret = 1.960 * sd / sqrt(RealType(Count_));
362        return;
363      }
364  
# Line 465 | Line 468 | namespace OpenMD {
468        this->getStdDev(sd);
469        for (unsigned int i = 0; i < 3; i++) {
470          for (unsigned int j = 0; j < 3; j++) {
471 <          ret(i,j) = 1.960 * sd(i,j) / sqrt(Count_);
471 >          ret(i,j) = 1.960 * sd(i,j) / sqrt(RealType(Count_));
472          }
473        }
474        return;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines