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

Comparing trunk/src/applications/staticProps/RadialDistrFunc.hpp (file contents):
Revision 310 by tim, Thu Feb 10 18:14:03 2005 UTC vs.
Revision 363 by tim, Thu Feb 17 19:09:07 2005 UTC

#	Line 46 \| Line 46
46
47		#include "selection/SelectionEvaluator.hpp"
48		#include "selection/SelectionManager.hpp"
49	+	#include "utils/NumericConstant.hpp"
50		namespace oopse {
51
52		/**
#	Line 78 \| 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
#	Line 87 \| 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;
100	>	virtual void processHistogram() {}
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

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