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

Comparing trunk/OOPSE-4/src/applications/staticProps/RadialDistrFunc.cpp (file contents):
Revision 2031 by tim, Tue Feb 15 17:11:35 2005 UTC vs.
Revision 2032 by tim, Tue Feb 15 17:24:12 2005 UTC

# Line 63 | Line 63 | RadialDistrFunc::        RadialDistrFunc(SimInfo* info
63      if (!evaluator1_.isDynamic() && !evaluator2_.isDynamic()) {
64          //if all selections are static,  we can precompute the number of real pairs    
65  
66 <        int nSelected1 = seleMan1_->getSelectionCount();
67 <        int nSelected2 = seleMan2_->getSelectionCount();
66 >        int nSelected1 = seleMan1_.getSelectionCount();
67 >        int nSelected2 = seleMan2_.getSelectionCount();
68  
69          BitSet bs = seleMan1_.getSelectionSet();
70          bs &= seleMan2_.getSelectionSet();
# Line 133 | Line 133 | int RadialDistrFunc::getNRealPairs() {
133      if (evaluator1_.isDynamic() || evaluator2_.isDynamic()) {
134          //if one of the selection is static,  need to recompute it    
135  
136 <        int nSelected1 = seleMan1_->getSelectionCount();
137 <        int nSelected2 = seleMan2_->getSelectionCount();
136 >        int nSelected1 = seleMan1_.getSelectionCount();
137 >        int nSelected2 = seleMan2_.getSelectionCount();
138  
139          BitSet bs = seleMan1_.getSelectionSet();
140          bs &= seleMan2_.getSelectionSet();
# Line 143 | Line 143 | int RadialDistrFunc::getNRealPairs() {
143          nRealPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2;
144      }
145  
146 <    return nRealPairs_
146 >    return nRealPairs_;
147   }
148  
149   }

Diff Legend

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