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 2045 by tim, Thu Feb 17 18:30:54 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   namespace oopse {
51  
52   /**
# Line 54 | Line 55 | class RadialDistrFunc {
55   */
56   class RadialDistrFunc {
57      public:
58 <        RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2. double len);
58 >        RadialDistrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2);
59  
60 +        virtual ~RadialDistrFunc() {}
61 +        
62          void process();        
63  
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 –        }
70 –        
64          void setOutputName(const std::string& filename) {
65              outputFilename_ = filename;
66          }
# Line 86 | Line 79 | class RadialDistrFunc {
79          virtual void preProcess() {}
80          virtual void postProcess() {}
81  
82 +        int getNPairs() { return nPairs_;}
83 +        
84          SimInfo* info_;
85          Snapshot* currentSnapshot_;
86 <        double len_;
92 <        int nbins_;
93 <        double deltaR_;
86 >
87          std::string dumpFilename_;
88          std::string outputFilename_;
89          int step_;
90          std::string selectionScript1_;
91          std::string selectionScript2_;
92          int nProcessed_;
93 +        SelectionManager seleMan1_;
94 +        SelectionManager seleMan2_;
95 +        
96      private:
97  
98          virtual void initalizeHistogram() {}
99          virtual void collectHistogram(StuntDouble* sd1, StuntDouble* sd2) =0;
100          virtual void processHistogram() = 0;
101 +        void processNonOverlapping(SelectionManager& sman1, SelectionManager& sman2);
102 +        void processOverlapping(SelectionManager& sman);
103  
104 +        virtual void validateSelection1(SelectionManager& sman) {}
105 +        virtual void validateSelection2(SelectionManager& sman) {}
106          virtual void writeRdf() = 0;
107  
108          
109          SelectionEvaluator evaluator1_;
110          SelectionEvaluator evaluator2_;
111 <        SelectionManager seleMan1_;
112 <        SelectionManager seleMan2_;
113 <        
111 >
112 >        SelectionManager sele1_minus_common_;
113 >        SelectionManager sele2_minus_common_;
114 >        SelectionManager common_;        
115 >        int nPairs_;
116   };
117  
118  

Diff Legend

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