ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/dynamicProps/VCorrFunc.hpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/dynamicProps/VCorrFunc.hpp (file contents):
Revision 2002 by tim, Sun Feb 13 06:57:48 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 41 | Line 41
41   #ifndef APPLICATIONS_DYNAMICPROPS_VCORRFUNC_HPP
42   #define APPLICATIONS_DYNAMICPROPS_VCORRFUNC_HPP
43  
44 < #include "applications/dynamicProps/CorrelationFunction.hpp"
44 > #include "applications/dynamicProps/ParticleTimeCorrFunc.hpp"
45   namespace oopse {
46  
47 < class VCorrFunc : public CorrelationFunction {
48 <    public:
49 <        VCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);  
50 <
51 <    protected:
52 <        virtual void postCorrelate();
47 >  class VCorrFunc : public ParticleTimeCorrFunc {
48 >  public:
49 >    VCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);  
50          
51 <   private:
52 <         virtual double calcCorrVal(StuntDouble* sd1, int frame1, StuntDouble* sd2, int frame2);
56 <          void calcDiffConst();
51 >  private:
52 >    virtual double calcCorrVal(int frame1, int frame2, StuntDouble* sd1,  StuntDouble* sd2);
53          
54 < };
54 >  };
55  
56   }
57   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines