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 2032 by tim, Tue Feb 15 17:24:12 2005 UTC vs.
Revision 2045 by tim, Thu Feb 17 18:30:54 2005 UTC

# Line 79 | Line 79 | class RadialDistrFunc {
79          virtual void preProcess() {}
80          virtual void postProcess() {}
81  
82 <        int getNRealPairs();
82 >        int getNPairs() { return nPairs_;}
83          
84          SimInfo* info_;
85          Snapshot* currentSnapshot_;
# Line 90 | Line 90 | class RadialDistrFunc {
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 <        int nRealPairs_;
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