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

Comparing:
trunk/src/selection/NameFinder.cpp (file contents), Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
branches/development/src/selection/NameFinder.cpp (file contents), Revision 1803 by gezelter, Wed Oct 3 14:20:07 2012 UTC

# Line 6 | Line 6
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
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
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.
# Line 37 | Line 28
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, 24107 (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   #include "selection/NameFinder.hpp"
43   #include "utils/wildcards.hpp"
44   #include "utils/StringTokenizer.hpp"
45   #include "primitives/Molecule.hpp"
46   #include "utils/StringUtils.hpp"
47 < namespace oopse {
47 > namespace OpenMD {
48  
49    TreeNode::~TreeNode(){
50      std::map<std::string, TreeNode*>::iterator i;
# Line 53 | Line 54 | namespace oopse {
54      children.clear();
55    }
56  
56
57    NameFinder::NameFinder(SimInfo* info) : info_(info), root_(NULL){
58      nStuntDouble_ = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
59      loadNames();
60    }
61  
62
62    NameFinder::~NameFinder(){
63      delete root_;
64    }
# Line 78 | Line 77 | namespace oopse {
77      root_->bs.resize(nStuntDouble_);
78      root_->bs.setAll(); //
79      
80 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
80 >    for (mol = info_->beginMolecule(mi); mol != NULL;
81 >         mol = info_->nextMolecule(mi)) {
82            
83        std::string molName = mol->getMoleculeName();
84        TreeNode* currentMolNode = createNode(root_, molName);
# Line 91 | Line 91 | namespace oopse {
91          currentAtomNode->bs.setBitOn(atom->getGlobalIndex());
92        }
93  
94 <      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
94 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL;
95 >           rb = mol->nextRigidBody(rbIter)) {
96          std::string rbName = rb->getType();
97          TreeNode* currentRbNode = createNode(currentMolNode, rbName);
98              
# Line 105 | Line 106 | namespace oopse {
106  
107            currentRbAtomNode->bs.setBitOn(atom->getGlobalIndex());
108          }
108
109        }
110 <        
111 <    }    
112 <
110 >    }
111    }
112  
113    TreeNode* NameFinder::createNode(TreeNode* parent, const std::string& name) {
# Line 127 | Line 125 | namespace oopse {
125      return node;
126    }
127  
128 <  OOPSEBitSet NameFinder::match(const std::string& name){
129 <    OOPSEBitSet bs(nStuntDouble_);
128 >  OpenMDBitSet NameFinder::match(const std::string& name){
129 >    OpenMDBitSet bs(nStuntDouble_);
130    
131      StringTokenizer tokenizer(name, ".");
132  
# Line 173 | Line 171 | namespace oopse {
171      return bs;
172    }
173  
174 <  void NameFinder::matchMolecule(const std::string& molName, OOPSEBitSet& bs) {
174 >  void NameFinder::matchMolecule(const std::string& molName, OpenMDBitSet& bs) {
175      std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName);            
176      std::vector<TreeNode*>::iterator i;
177      for( i = molNodes.begin(); i != molNodes.end(); ++i ) {
# Line 181 | Line 179 | namespace oopse {
179      }    
180    }
181  
182 <  void NameFinder::matchStuntDouble(const std::string& molName, const std::string& sdName, OOPSEBitSet& bs){
182 >  void NameFinder::matchStuntDouble(const std::string& molName, const std::string& sdName, OpenMDBitSet& bs){
183      std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName);            
184      std::vector<TreeNode*>::iterator i;
185      for( i = molNodes.begin(); i != molNodes.end(); ++i ) {
# Line 194 | Line 192 | namespace oopse {
192  
193    }
194  
195 <  void NameFinder::matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, OOPSEBitSet& bs){
195 >  void NameFinder::matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, OpenMDBitSet& bs){
196      std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName);            
197      std::vector<TreeNode*>::iterator i;
198      for( i = molNodes.begin(); i != molNodes.end(); ++i ) {
# Line 225 | Line 223 | namespace oopse {
223    }
224  
225    bool NameFinder::isMatched(const std::string& str, const std::string& wildcard) {
226 <    return Wildcard::wildcardfit (wildcard.c_str(), str.c_str());
226 >    return Wildcard::wildcardfit(wildcard.c_str(), str.c_str()) > 0 ? true : false;
227    }
228  
229  
230 <  void NameFinder::matchInternalIndex(const std::string& name, int internalIndex, OOPSEBitSet& bs){
230 >  void NameFinder::matchInternalIndex(const std::string& name, int internalIndex, OpenMDBitSet& bs){
231  
232      std::map<std::string, TreeNode*>::iterator foundIter;
233      SimInfo::MoleculeIterator mi;
234      Molecule* mol;
235  
236 <    for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
236 >    for (mol = info_->beginMolecule(mi); mol != NULL;
237 >         mol = info_->nextMolecule(mi)) {
238            
239        if (isMatched(mol->getMoleculeName(), name) ) {
240          int natoms = mol->getNAtoms();
# Line 249 | Line 248 | namespace oopse {
248            bs.setBitOn(mol->getRigidBodyAt(internalIndex - natoms)->getGlobalIndex());
249          }
250        }
251 <        
253 <    }    
254 <    
251 >    }
252    }
253  
254    bool NameFinder::isInteger(const std::string str) {
255 <    for(int i =0; i < str.size(); ++i){
255 >    for(unsigned int i = 0; i < str.size(); ++i){
256        if (!std::isdigit(str[i])) {
257          return false;
258        }
259      }
263
260      return true;
261    }
266
262   }

Comparing:
trunk/src/selection/NameFinder.cpp (property svn:keywords), Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC vs.
branches/development/src/selection/NameFinder.cpp (property svn:keywords), Revision 1803 by gezelter, Wed Oct 3 14:20:07 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines