[ViewVC] Diff of: group/trunk/OOPSE-3.0/src/applications/dynamicProps/CorrelationFunction.hpp

Comparing trunk/OOPSE-3.0/src/applications/dynamicProps/CorrelationFunction.hpp (file contents):
Revision 2002 by tim, Sun Feb 13 06:57:48 2005 UTC vs.
Revision 2008 by tim, Sun Feb 13 19:10:25 2005 UTC

#	Line 41 \| Line 41 \| namespace oopse {
41		#ifndef APPLICATIONS_DYNAMICPROPS_CORRELATIONFUNCTION_HPP
42		#define APPLICATIONS_DYNAMICPROPS_CORRELATIONFUNCTION_HPP
43
44	+	#include <string>
45	+	#include <vector>
46	+
47	+	#include "brains/SimInfo.hpp"
48	+	#include "brains/BlockSnapshotManager.hpp"
49	+
50	+	#include "primitives/StuntDouble.hpp"
51	+	#include "selection/SelectionEvaluator.hpp"
52	+	#include "selection/SelectionManager.hpp"
53	+
54		namespace oopse {
55
56		/**
#	Line 86 \| Line 96 \| class CorrelationFunction {
96		int nTimeBins_;
97		std::vector<double> histogram_;
98		std::vector<int> count_;
99	+	std::vector<int> time_;
100
101	+	SimInfo* info_;
102	+	int storageLayout_;
103	+	std::string dumpFilename_;
104	+	SelectionManager seleMan1_;
105	+	SelectionManager seleMan2_;
106	+
107		private:
108
109	<	void correlateBlocks(SnapshotBlock* block1, SnapshotBlock* block2);
109	>	void correlateBlocks(int block1, int block2);
110		void correlateFrames(int frame1, int frame2);
111		void updateFrame(int frame);
112
#	Line 99 \| Line 116 \| class CorrelationFunction {
116
117		virtual void validateSelection(const SelectionManager& seleMan) {}
118
119	<	SimInfo* info_;
103	<	int storageLayout_;
104	<	std::string dumpFilename_;
119	>
120		std::string selectionScript1_;
121		std::string selectionScript2_;
122
123		SelectionEvaluator evaluator1_;
124		SelectionEvaluator evaluator2_;
110	–	SelectionManager seleMan1_;
111	–	SelectionManager seleMan2_;
125
126		BlockSnapshotManager* bsMan_;
127
115	–
128		std::string outputFilename_;
129
130		std::string corrFuncType_;

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