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

Comparing trunk/OOPSE-4/src/applications/dynamicProps/DipoleCorrFunc.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_DIPOLECORRFUNC_HPP
42   #define APPLICATIONS_DYNAMICPROPS_DIPOLECORRFUNC_HPP
43  
44 < #include "applications/dynamicProps/CorrelationFunction.hpp"
44 > #include "applications/dynamicProps/ParticleTimeCorrFunc.hpp"
45   namespace oopse {
46  
47 < class DipoleCorrFunc : public CorrelationFunction {
48 <    public:
49 <        DipoleCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);  
47 >  class DipoleCorrFunc : public ParticleTimeCorrFunc {
48 >  public:
49 >    DipoleCorrFunc(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);
51 >  private:
52 >    virtual double calcCorrVal(int frame1, int frame2, StuntDouble* sd1,  StuntDouble* sd2);
53  
54 <        virtual void validateSelection(const SelectionManager& seleMan);
54 >    virtual void validateSelection(const SelectionManager& seleMan);
55  
56 < };
56 >  };
57  
58   }
59   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines