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

Comparing trunk/OOPSE-4/src/applications/staticProps/RadialDistrFunc.hpp (file contents):
Revision 1993 by tim, Thu Feb 10 14:15:52 2005 UTC vs.
Revision 2240 by tim, Thu May 26 22:45:00 2005 UTC

# Line 46 | Line 46 | namespace oopse {
46  
47   #include "selection/SelectionEvaluator.hpp"
48   #include "selection/SelectionManager.hpp"
49 + #include "utils/NumericConstant.hpp"
50 + #include "applications/staticProps/StaticAnalyser.hpp"
51 +
52   namespace oopse {
53  
54 < /**
55 < * @class RadialDistrFunc
56 < * @brief Radial Distribution Function
57 < */
58 < class RadialDistrFunc {
59 <    public:
60 <        RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2. double len);
54 >  /**
55 >   * @class RadialDistrFunc
56 >   * @brief Radial Distribution Function
57 >   */
58 >  class RadialDistrFunc : public StaticAnalyser {
59 >  public:
60 >    RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
61  
62 <        void process();        
62 >    virtual ~RadialDistrFunc() {}
63 >        
64 >    void process();        
65  
61 –        void setNBins(int nbins) {
62 –            assert(nbins > 0);
63 –            nbins_ = nbins;
64 –            deltaR_ = len_ / nbins_;
65 –        }
66  
67 –        int getNBins() {
68 –            return nbins_;
69 –        }
67          
68 <        void setOutputName(const std::string& filename) {
72 <            outputFilename_ = filename;
73 <        }
68 >  protected:
69  
70 <        const std::string& getOutputFileName() const {
71 <            return outputFilename_;
77 <        }
70 >    virtual void preProcess() {}
71 >    virtual void postProcess() {}
72  
73 <        void setStep(int step) {
80 <            assert(step > 0);
81 <            step_ =step;    
82 <        }
73 >    int getNPairs() { return nPairs_;}
74          
75 <    protected:
75 >    Snapshot* currentSnapshot_;
76  
77 <        virtual void preProcess() {}
78 <        virtual void postProcess() {}
77 >    std::string selectionScript1_;
78 >    std::string selectionScript2_;
79 >    int nProcessed_;
80 >    SelectionManager seleMan1_;
81 >    SelectionManager seleMan2_;
82 >        
83 >  private:
84  
85 <        SimInfo* info_;
86 <        Snapshot* currentSnapshot_;
87 <        double len_;
88 <        int nbins_;
89 <        double deltaR_;
94 <        std::string dumpFilename_;
95 <        std::string outputFilename_;
96 <        int step_;
97 <        std::string selectionScript1_;
98 <        std::string selectionScript2_;
99 <        int nProcessed_;
100 <    private:
85 >    virtual void initalizeHistogram() {}
86 >    virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2) =0;
87 >    virtual void processHistogram() {}
88 >    void processNonOverlapping(SelectionManager& sman1, SelectionManager& sman2);
89 >    void processOverlapping(SelectionManager& sman);
90  
91 <        virtual void initalizeHistogram() {}
92 <        virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2) =0;
93 <        virtual void processHistogram() = 0;
91 >    virtual void validateSelection1(SelectionManager& sman) {}
92 >    virtual void validateSelection2(SelectionManager& sman) {}
93 >    virtual void writeRdf() = 0;
94  
106 –        virtual void writeRdf() = 0;
107 –
95          
96 <        SelectionEvaluator evaluator1_;
97 <        SelectionEvaluator evaluator2_;
111 <        SelectionManager seleMan1_;
112 <        SelectionManager seleMan2_;
113 <        
114 < };
96 >    SelectionEvaluator evaluator1_;
97 >    SelectionEvaluator evaluator2_;
98  
99 +    SelectionManager sele1_minus_common_;
100 +    SelectionManager sele2_minus_common_;
101 +    SelectionManager common_;        
102 +    int nPairs_;
103 +  };
104  
105 +
106   }
107   #endif

Diff Legend

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