ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-2.0/src/visitors/CompositeVisitor.cpp
(Generate patch)

Comparing trunk/OOPSE-2.0/src/visitors/CompositeVisitor.cpp (file contents):
Revision 1492 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 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 < CompositeVisitor::~CompositeVisitor(){
47 <  VisitorIterator i;
48 <  BaseVisitor* curVisitor;
46 >
47 > namespace oopse {
48 >
49 >  CompositeVisitor::~CompositeVisitor(){
50 >    VisitorIterator i;
51 >    BaseVisitor* curVisitor;
52    
53 <  for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
54 <    delete curVisitor;  
53 >    for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
54 >      delete curVisitor;  
55  
56 <  visitorList.clear();
56 >    visitorList.clear();
57    
58 < }
59 < void CompositeVisitor::addVisitor(BaseVisitor* newVisitor, int priority){
60 <  VisitorIterator i;
61 <  int curPriority;
58 >  }
59 >  void CompositeVisitor::addVisitor(BaseVisitor* newVisitor, int priority){
60 >    VisitorIterator i;
61 >    int curPriority;
62    
63 <  for(i = visitorList.begin(); i != visitorList.end(); i++){
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));
63 >    for(i = visitorList.begin(); i != visitorList.end(); i++){
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, 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(), std::make_pair(newVisitor, priority));
73    }
74  
75 <  //if new visitor has lowest priority, insert it at the end of the list
76 <  visitorList.insert(visitorList.end(), make_pair(newVisitor, priority));
77 < }
75 >  BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
76 >    i = visitorList.begin();
77 >    return i != visitorList.end() ? (*i).first : NULL;
78 >  }
79  
80 < BaseVisitor* CompositeVisitor::beginVisitor(VisitorIterator& i){
81 <  i = visitorList.begin();
82 <  return i != visitorList.end() ? (*i).first : NULL;
34 < }
80 >  BaseVisitor* CompositeVisitor::nextVisitor(VisitorIterator& i){
81 >    ++i;
82 >    return i != visitorList.end() ? (*i).first : NULL;
83  
84 < BaseVisitor* CompositeVisitor::nextVisitor(VisitorIterator& i){
37 <  ++i;
38 <  return i != visitorList.end() ? (*i).first : NULL;
84 >  }
85  
86 < }
86 >  void CompositeVisitor::visit(Atom* atom){
87 >    VisitorIterator i;
88 >    BaseVisitor* curVisitor;
89  
90 < void CompositeVisitor::visit(Atom* atom){
91 < VisitorIterator i;
92 <  BaseVisitor* curVisitor;
90 >    for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
91 >      atom->accept(curVisitor);
92 >  }
93  
94 <  for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
95 <    atom->accept(curVisitor);
96 < }
94 >  void CompositeVisitor::visit(DirectionalAtom* datom){
95 >    VisitorIterator i;
96 >    BaseVisitor* curVisitor;
97  
98 < void CompositeVisitor::visit(DirectionalAtom* datom){
99 < VisitorIterator i;
100 <  BaseVisitor* curVisitor;
98 >    for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
99 >      datom->accept(curVisitor);
100 >  }
101 >  void CompositeVisitor::visit(RigidBody* rb){
102 >    VisitorIterator i;
103 >    BaseVisitor* curVisitor;
104 >    std::vector<Atom*> myAtoms;
105 >    std::vector<Atom*>::iterator atomIter;
106  
107 <  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();
107 >    myAtoms = rb->getAtoms();
108    
109 <  for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i)){
110 <    rb->accept(curVisitor);
109 >    for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i)){
110 >      rb->accept(curVisitor);
111      
112 <    for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
113 <      (*atomIter)->accept(curVisitor);
114 <  }
112 >      for(atomIter = myAtoms.begin(); atomIter != myAtoms.end(); ++atomIter)
113 >        (*atomIter)->accept(curVisitor);
114 >    }
115  
116    
117    
118 < }
118 >  }
119  
120 < const string CompositeVisitor::toString(){
121 <  VisitorIterator i;
122 <  string result;
123 <  char buffer[65535];
120 >  const  std::string CompositeVisitor::toString(){
121 >    VisitorIterator i;
122 >    std::string result;
123 >    char buffer[65535];
124  
125 <  sprintf(buffer ,"******************************************************************\n");
126 <  result += buffer;
125 >    sprintf(buffer ,"******************************************************************\n");
126 >    result += buffer;
127    
128 <  sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
129 <  result += buffer;
128 >    sprintf(buffer ,"Visitor name: %s\n", visitorName.c_str());
129 >    result += buffer;
130  
131 <  sprintf(buffer , "Visitor Description: visitor manager  maintaining a priority  list\n");
132 <  result += buffer;
131 >    sprintf(buffer , "Visitor Description: visitor manager  maintaining a priority  list\n");
132 >    result += buffer;
133  
134 <  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());
134 >    sprintf(buffer , "visitors in current priority list:\n");
135      result += buffer;
136 <  }
136 >  
137 >    for(i = visitorList.begin(); i != visitorList.end(); i++){
138 >      sprintf(buffer, "Priority = %d\tvisitor = %s\n",  (*i).second, ((*i).first->getVisitorName()).c_str());
139 >      result += buffer;
140 >    }
141  
142 <  sprintf(buffer, "Detail information about every visitor:\n");
142 >    sprintf(buffer, "Detail information about every visitor:\n");
143  
144  
145 <  for(i = visitorList.begin(); i != visitorList.end(); i++)
146 <    result += ((*i).first)->toString();
145 >    for(i = visitorList.begin(); i != visitorList.end(); i++)
146 >      result += ((*i).first)->toString();
147  
148 <  sprintf(buffer ,"******************************************************************\n");
149 <  result += buffer;
148 >    sprintf(buffer ,"******************************************************************\n");
149 >    result += buffer;
150    
151 <  return result;
152 < }
151 >    return result;
152 >  }
153  
154 < void CompositeVisitor::update(){
155 <  VisitorIterator i;
156 <  BaseVisitor* curVisitor;  
154 >  void CompositeVisitor::update(){
155 >    VisitorIterator i;
156 >    BaseVisitor* curVisitor;  
157    
158 <  for(curVisitor = beginVisitor(i); curVisitor; curVisitor = nextVisitor(i))
159 <    curVisitor->update();
160 < }
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