ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/OpenMD/branches/development/src/visitors/CompositeVisitor.cpp

Comparing:
trunk/src/visitors/CompositeVisitor.cpp (file contents), Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/visitors/CompositeVisitor.cpp (file contents), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3	+	*
4	+	* The University of Notre Dame grants you ("Licensee") a
5	+	* non-exclusive, royalty free, license to use, modify and
6	+	* redistribute this software in source and binary code form, provided
7	+	* that the following conditions are met:
8	+	*
9	+	* 1. Redistributions of source code must retain the above copyright
10	+	*    notice, this list of conditions and the following disclaimer.
11	+	*
12	+	* 2. Redistributions in binary form must reproduce the above copyright
13	+	*    notice, this list of conditions and the following disclaimer in the
14	+	*    documentation and/or other materials provided with the
15	+	*    distribution.
16	+	*
17	+	* This software is provided "AS IS," without a warranty of any
18	+	* kind. All express or implied conditions, representations and
19	+	* warranties, including any implied warranty of merchantability,
20	+	* fitness for a particular purpose or non-infringement, are hereby
21	+	* excluded.  The University of Notre Dame and its licensors shall not
22	+	* be liable for any damages suffered by licensee as a result of
23	+	* using, modifying or distributing the software or its
24	+	* derivatives. In no event will the University of Notre Dame or its
25	+	* licensors be liable for any lost revenue, profit or data, or for
26	+	* direct, indirect, special, consequential, incidental or punitive
27	+	* damages, however caused and regardless of the theory of liability,
28	+	* arising out of the use of or inability to use software, even if the
29	+	* University of Notre Dame has been advised of the possibility of
30	+	* such damages.
31	+	*
32	+	* SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33	+	* research, please cite the appropriate papers when you publish your
34	+	* work.  Good starting points are:
35	+	*
36	+	* [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).
37	+	* [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).
38	+	* [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).
39	+	* [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40	+	* [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41	+	*/
42	+
43		#include <cstring>
44		#include "visitors/CompositeVisitor.hpp"
45		#include "primitives/RigidBody.hpp"
46		#include "primitives/DirectionalAtom.hpp"
47	<	CompositeVisitor::~CompositeVisitor(){
48	<	VisitorIterator i;
49	<	BaseVisitor* curVisitor;
47	>
48	>	namespace OpenMD {
49	>
50	>	CompositeVisitor::~CompositeVisitor(){
51	>	VisitorIterator i;
52	>	BaseVisitor* curVisitor;
53
54	<	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
55	<	delete curVisitor;
54	>	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
55	>	delete curVisitor;
56
57	<	visitorList.clear();
57	>	visitorList.clear();
58
59	<	}
60	<	void CompositeVisitor::addVisitor(BaseVisitor* newVisitor, int priority){
61	<	VisitorIterator i;
62	<	int curPriority;
59	>	}
60	>	void CompositeVisitor::addVisitor(BaseVisitor* newVisitor, int priority){
61	>	VisitorIterator i;
62	>	int curPriority;
63
64	<	for(i = visitorList.begin(); i != visitorList.end(); i++){
65	<	curPriority = (*i).second;
66	<	//if new visitor has higher priority, just insert it before current visitor
67	<	if(priority > curPriority){
68	<	visitorList.insert(i, make_pair(newVisitor, priority));
64	>	for(i = visitorList.begin(); i != visitorList.end(); ++i){
65	>	curPriority = (*i).second;
66	>	//if new visitor has higher priority, just insert it before current visitor
67	>	if(priority > curPriority){
68	>	visitorList.insert(i, std::make_pair(newVisitor, priority));
69	>	}
70		}
71	+
72	+	//if new visitor has lowest priority, insert it at the end of the list
73	+	visitorList.insert(visitorList.end(), std::make_pair(newVisitor, priority));
74		}
75
76	<	//if new visitor has lowest priority, insert it at the end of the list
77	<	visitorList.insert(visitorList.end(), make_pair(newVisitor, priority));
78	<	}
76	>	BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
77	>	i = visitorList.begin();
78	>	return i != visitorList.end() ? (*i).first : NULL;
79	>	}
80
81	<	BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
82	<	i = visitorList.begin();
83	<	return i != visitorList.end() ? (*i).first : NULL;
34	<	}
81	>	BaseVisitor* CompositeVisitor::nextVisitor(VisitorIterator& i){
82	>	++i;
83	>	return i != visitorList.end() ? (*i).first : NULL;
84
85	<	BaseVisitor* CompositeVisitor::nextVisitor(VisitorIterator& i){
37	<	++i;
38	<	return i != visitorList.end() ? (*i).first : NULL;
85	>	}
86
87	<	}
87	>	void CompositeVisitor::visit(Atom* atom){
88	>	VisitorIterator i;
89	>	BaseVisitor* curVisitor;
90
91	<	void CompositeVisitor::visit(Atom* atom){
92	<	VisitorIterator i;
93	<	BaseVisitor* curVisitor;
91	>	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
92	>	atom->accept(curVisitor);
93	>	}
94
95	<	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
96	<	atom->accept(curVisitor);
97	<	}
95	>	void CompositeVisitor::visit(DirectionalAtom* datom){
96	>	VisitorIterator i;
97	>	BaseVisitor* curVisitor;
98
99	<	void CompositeVisitor::visit(DirectionalAtom* datom){
100	<	VisitorIterator i;
101	<	BaseVisitor* curVisitor;
99	>	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
100	>	datom->accept(curVisitor);
101	>	}
102	>	void CompositeVisitor::visit(RigidBody* rb){
103	>	VisitorIterator i;
104	>	BaseVisitor* curVisitor;
105	>	std::vector<Atom*> myAtoms;
106	>	std::vector<Atom*>::iterator atomIter;
107
108	<	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
55	<	datom->accept(curVisitor);
56	<	}
57	<	void CompositeVisitor::visit(RigidBody* rb){
58	<	VisitorIterator i;
59	<	BaseVisitor* curVisitor;
60	<	vector<Atom*> myAtoms;
61	<	vector<Atom*>::iterator atomIter;
62	<
63	<	myAtoms = rb->getAtoms();
108	>	myAtoms = rb->getAtoms();
109
110	<	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i)){
111	<	rb->accept(curVisitor);
110	>	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i)){
111	>	rb->accept(curVisitor);
112
113	<	for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
114	<	(*atomIter)->accept(curVisitor);
115	<	}
113	>	for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
114	>	(*atomIter)->accept(curVisitor);
115	>	}
116
117
118
119	<	}
119	>	}
120
121	<	const string CompositeVisitor::toString(){
122	<	VisitorIterator i;
123	<	string result;
124	<	char buffer[65535];
121	>	const  std::string CompositeVisitor::toString(){
122	>	VisitorIterator i;
123	>	std::string result;
124	>	char buffer[65535];
125
126	<	sprintf(buffer ,"******************************************************************\n");
127	<	result += buffer;
126	>	sprintf(buffer ,"******************************************************************\n");
127	>	result += buffer;
128
129	<	sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
130	<	result += buffer;
129	>	sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
130	>	result += buffer;
131
132	<	sprintf(buffer , "Visitor Description: visitor manager  maintaining a priority  list\n");
133	<	result += buffer;
132	>	sprintf(buffer , "Visitor Description: visitor manager  maintaining a priority  list\n");
133	>	result += buffer;
134
135	<	sprintf(buffer , "visitors in current priority list:\n");
91	<	result += buffer;
92	<
93	<	for(i = visitorList.begin(); i != visitorList.end(); i++){
94	<	sprintf(buffer, "Priority = %d\tvisitor = %s\n",  (*i).second, ((*i).first->getVisitorName()).c_str());
135	>	sprintf(buffer , "visitors in current priority list:\n");
136		result += buffer;
137	<	}
137	>
138	>	for(i = visitorList.begin(); i != visitorList.end(); ++i){
139	>	sprintf(buffer, "Priority = %d\tvisitor = %s\n",  (*i).second, ((*i).first->getVisitorName()).c_str());
140	>	result += buffer;
141	>	}
142
143	<	sprintf(buffer, "Detail information about every visitor:\n");
143	>	sprintf(buffer, "Detail information about every visitor:\n");
144
145
146	<	for(i = visitorList.begin(); i != visitorList.end(); i++)
147	<	result += ((*i).first)->toString();
146	>	for(i = visitorList.begin(); i != visitorList.end(); ++i)
147	>	result += ((*i).first)->toString();
148
149	<	sprintf(buffer ,"******************************************************************\n");
150	<	result += buffer;
149	>	sprintf(buffer ,"******************************************************************\n");
150	>	result += buffer;
151
152	<	return result;
153	<	}
152	>	return result;
153	>	}
154
155	<	void CompositeVisitor::update(){
156	<	VisitorIterator i;
157	<	BaseVisitor* curVisitor;
155	>	void CompositeVisitor::update(){
156	>	VisitorIterator i;
157	>	BaseVisitor* curVisitor;
158
159	<	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
160	<	curVisitor->update();
161	<	}
159	>	for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
160	>	curVisitor->update();
161	>	}
162	>
163	>	}//namespace OpenMD

Comparing:
trunk/src/visitors/CompositeVisitor.cpp (property svn:keywords), Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
branches/development/src/visitors/CompositeVisitor.cpp (property svn:keywords), Revision 1874 by gezelter, Wed May 15 15:09:35 2013 UTC

#	Line 0 | Line 1
1	+	Author Id Revision Date

Diff Legend

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