[ViewVC] Diff of: OpenMD/trunk/src/applications/staticProps/RadialDistrFunc.cpp

Comparing trunk/src/applications/staticProps/RadialDistrFunc.cpp (file contents):
Revision 1212 by tim, Thu May 26 22:45:00 2005 UTC vs.
Revision 1213 by xsun, Wed Jan 23 21:21:50 2008 UTC

#	Line 131 \| Line 131 \| namespace oopse {
131		//stage 3 are completely overlapping
132
133		if (evaluator1_.isDynamic() \|\| evaluator2_.isDynamic()) {
134	–
134		common_ = seleMan1_ & seleMan2_;
135		sele1_minus_common_ = seleMan1_ - common_;
136		sele2_minus_common_ = seleMan2_ - common_;
#	Line 139 \| Line 138 \| namespace oopse {
138		int nSelected2 = seleMan2_.getSelectionCount();
139		int nIntersect = common_.getSelectionCount();
140
141	<	nPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2;
141	>	nPairs_ = nSelected1 * nSelected2 - (nIntersect +1) * nIntersect/2;
142		}
144	–
143		processNonOverlapping(sele1_minus_common_, seleMan2_);
144		processNonOverlapping(common_, sele2_minus_common_);
145		processOverlapping(common_);
146	<
149	<
146	>
147		processHistogram();
148
149		}

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