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

Comparing trunk/OOPSE-3.0/src/applications/dynamicProps/TimeCorrFunc.hpp (file contents):
Revision 2017 by tim, Mon Feb 14 17:35:25 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 53 | Line 53 | namespace oopse {
53  
54   namespace oopse {
55  
56 < /**
57 < * @class TimeCorrFunc TimeCorrFunc.hpp "applications/dynamicProps/TimeCorrFunc"
58 < * @brief Base class for Correlation function
59 < */
56 >  /**
57 >   * @class TimeCorrFunc TimeCorrFunc.hpp "applications/dynamicProps/TimeCorrFunc"
58 >   * @brief Base class for Correlation function
59 >   */
60  
61 < class TimeCorrFunc {
62 <    public:
63 <        TimeCorrFunc(SimInfo* info, const std::string& filename,
64 <            const std::string& sele1, const std::string& sele2, int storageLayout);
61 >  class TimeCorrFunc {
62 >  public:
63 >    TimeCorrFunc(SimInfo* info, const std::string& filename,
64 >                 const std::string& sele1, const std::string& sele2, int storageLayout);
65          
66 <        void doCorrelate();
66 >    void doCorrelate();
67  
68  
69 <        void setOutputName(const std::string& filename) {
70 <            outputFilename_ = filename;
71 <        }
69 >    void setOutputName(const std::string& filename) {
70 >      outputFilename_ = filename;
71 >    }
72  
73 <        const std::string& getOutputFileName() const {
74 <            return outputFilename_;
75 <        }
73 >    const std::string& getOutputFileName() const {
74 >      return outputFilename_;
75 >    }
76  
77  
78 <        const std::string& getCorrFuncType() const {
79 <            return corrFuncType_;
80 <        }
78 >    const std::string& getCorrFuncType() const {
79 >      return corrFuncType_;
80 >    }
81  
82 <        void setCorrFuncType(const std::string& type) {
83 <            corrFuncType_ = type;
84 <        }
82 >    void setCorrFuncType(const std::string& type) {
83 >      corrFuncType_ = type;
84 >    }
85  
86 <        void setExtraInfo(const std::string& extra) {
87 <            extra_ = extra;
88 <        }
86 >    void setExtraInfo(const std::string& extra) {
87 >      extra_ = extra;
88 >    }
89              
90 <    protected:
90 >  protected:
91          
92 <        virtual void preCorrelate();        
93 <        virtual void postCorrelate();
94 <        virtual void updateFrame(int frame);
92 >    virtual void preCorrelate();        
93 >    virtual void postCorrelate();
94 >    virtual void updateFrame(int frame);
95  
96 <        double deltaTime_;
97 <        int nTimeBins_;
98 <        std::vector<double> histogram_;
99 <        std::vector<int> count_;
100 <        std::vector<double> time_;
96 >    double deltaTime_;
97 >    int nTimeBins_;
98 >    std::vector<double> histogram_;
99 >    std::vector<int> count_;
100 >    std::vector<double> time_;
101          
102 <        SimInfo* info_;
103 <        int storageLayout_;
104 <        std::string dumpFilename_;        
105 <        SelectionManager seleMan1_;
106 <        SelectionManager seleMan2_;          
102 >    SimInfo* info_;
103 >    int storageLayout_;
104 >    std::string dumpFilename_;        
105 >    SelectionManager seleMan1_;
106 >    SelectionManager seleMan2_;          
107  
108 <        BlockSnapshotManager* bsMan_;      
108 >    BlockSnapshotManager* bsMan_;      
109          
110 <    private:
110 >  private:
111  
112 <        void correlateBlocks(int block1, int block2);
113 <        virtual void correlateFrames(int frame1, int frame2) = 0;      
112 >    void correlateBlocks(int block1, int block2);
113 >    virtual void correlateFrames(int frame1, int frame2) = 0;      
114          
115 <        virtual void writeCorrelate();
115 >    virtual void writeCorrelate();
116  
117 <        virtual void validateSelection(const SelectionManager& seleMan) {}
117 >    virtual void validateSelection(const SelectionManager& seleMan) {}
118  
119  
120 <        std::string selectionScript1_;
121 <        std::string selectionScript2_;
120 >    std::string selectionScript1_;
121 >    std::string selectionScript2_;
122          
123 <        SelectionEvaluator evaluator1_;
124 <        SelectionEvaluator evaluator2_;
123 >    SelectionEvaluator evaluator1_;
124 >    SelectionEvaluator evaluator2_;
125  
126  
127 <        std::string outputFilename_;
127 >    std::string outputFilename_;
128  
129 <        std::string corrFuncType_;
130 <        std::string extra_;
131 < };
129 >    std::string corrFuncType_;
130 >    std::string extra_;
131 >  };
132  
133   }
134   #endif

Diff Legend

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