ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/visitors/CompositeVisitor.cpp
(Generate patch)

Comparing trunk/src/visitors/CompositeVisitor.cpp (file contents):
Revision 3 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 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. Acknowledgement of the program authors must be made in any
10 + *    publication of scientific results based in part on use of the
11 + *    program.  An acceptable form of acknowledgement is citation of
12 + *    the article in which the program was described (Matthew
13 + *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 + *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 + *    Parallel Simulation Engine for Molecular Dynamics,"
16 + *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 + *
18 + * 2. Redistributions of source code must retain the above copyright
19 + *    notice, this list of conditions and the following disclaimer.
20 + *
21 + * 3. Redistributions in binary form must reproduce the above copyright
22 + *    notice, this list of conditions and the following disclaimer in the
23 + *    documentation and/or other materials provided with the
24 + *    distribution.
25 + *
26 + * This software is provided "AS IS," without a warranty of any
27 + * kind. All express or implied conditions, representations and
28 + * warranties, including any implied warranty of merchantability,
29 + * fitness for a particular purpose or non-infringement, are hereby
30 + * excluded.  The University of Notre Dame and its licensors shall not
31 + * be liable for any damages suffered by licensee as a result of
32 + * using, modifying or distributing the software or its
33 + * derivatives. In no event will the University of Notre Dame or its
34 + * licensors be liable for any lost revenue, profit or data, or for
35 + * direct, indirect, special, consequential, incidental or punitive
36 + * damages, however caused and regardless of the theory of liability,
37 + * arising out of the use of or inability to use software, even if the
38 + * University of Notre Dame has been advised of the possibility of
39 + * such damages.
40 + */
41 +
42   #include <cstring>
43   #include "visitors/CompositeVisitor.hpp"
44   #include "primitives/RigidBody.hpp"
45   #include "primitives/DirectionalAtom.hpp"
46 +
47 + namespace oopse {
48 +
49   CompositeVisitor::~CompositeVisitor(){
50    VisitorIterator i;
51    BaseVisitor* curVisitor;
# Line 20 | Line 64 | void CompositeVisitor::addVisitor(BaseVisitor* newVisi
64      curPriority = (*i).second;
65      //if new visitor has higher priority, just insert it before current visitor
66      if(priority > curPriority){      
67 <      visitorList.insert(i, make_pair(newVisitor, priority));
67 >      visitorList.insert(i, std::make_pair(newVisitor, priority));
68      }
69    }
70  
71    //if new visitor has lowest priority, insert it at the end of the list
72 <  visitorList.insert(visitorList.end(), make_pair(newVisitor, priority));
72 >  visitorList.insert(visitorList.end(), std::make_pair(newVisitor, priority));
73   }
74  
75   BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
# Line 57 | Line 101 | void CompositeVisitor::visit(RigidBody* rb){
101   void CompositeVisitor::visit(RigidBody* rb){
102    VisitorIterator i;
103    BaseVisitor* curVisitor;
104 <  vector<Atom*> myAtoms;
105 <  vector<Atom*>::iterator atomIter;
104 >   std::vector<Atom*> myAtoms;
105 >   std::vector<Atom*>::iterator atomIter;
106  
107    myAtoms = rb->getAtoms();
108    
# Line 73 | Line 117 | void CompositeVisitor::visit(RigidBody* rb){
117    
118   }
119  
120 < const string CompositeVisitor::toString(){
120 > const  std::string CompositeVisitor::toString(){
121    VisitorIterator i;
122 <  string result;
122 >   std::string result;
123    char buffer[65535];
124  
125    sprintf(buffer ,"******************************************************************\n");
# Line 114 | Line 158 | void CompositeVisitor::update(){
158    for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
159      curVisitor->update();
160   }
161 +
162 + }//namespace oopse

Diff Legend

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