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

Comparing trunk/src/applications/staticProps/RadialDistrFunc.hpp (file contents):
Revision 2022 by gezelter, Sun Jun 16 15:15:42 2013 UTC vs.
Revision 2023 by gezelter, Thu Oct 2 14:35:14 2014 UTC

# Line 58 | Line 58 | namespace OpenMD {
58     */
59    class RadialDistrFunc : public StaticAnalyser {
60    public:
61 <    RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
61 >    RadialDistrFunc(SimInfo* info, const std::string& filename,
62 >                    const std::string& sele1, const std::string& sele2);
63  
64      virtual ~RadialDistrFunc() {}
65          
# Line 70 | Line 71 | namespace OpenMD {
71  
72      virtual void preProcess() {}
73      virtual void postProcess() {}
74 +    virtual void processNonOverlapping(SelectionManager& sman1,
75 +                                       SelectionManager& sman2);
76 +    virtual void processOverlapping(SelectionManager& sman);
77  
78      int getNPairs() { return nPairs_;}
79          
# Line 78 | Line 82 | namespace OpenMD {
82      std::string selectionScript1_;
83      std::string selectionScript2_;
84      int nProcessed_;
85 +    SelectionEvaluator evaluator1_;
86 +    SelectionEvaluator evaluator2_;
87 +
88      SelectionManager seleMan1_;
89      SelectionManager seleMan2_;
90 +    SelectionManager sele1_minus_common_;
91 +    SelectionManager sele2_minus_common_;
92 +    SelectionManager common_;        
93          
94    private:
95  
96      virtual void initializeHistogram() {}
97      virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2) =0;
98      virtual void processHistogram() {}
89 –    void processNonOverlapping(SelectionManager& sman1, SelectionManager& sman2);
90 –    void processOverlapping(SelectionManager& sman);
99  
100      virtual void validateSelection1(SelectionManager& sman) {}
101      virtual void validateSelection2(SelectionManager& sman) {}
102      virtual void writeRdf() = 0;
95 –
103          
97 –    SelectionEvaluator evaluator1_;
98 –    SelectionEvaluator evaluator2_;
99 –
100 –    SelectionManager sele1_minus_common_;
101 –    SelectionManager sele2_minus_common_;
102 –    SelectionManager common_;        
104      int nPairs_;
105    };
106  

Diff Legend

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