| 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. | 
| 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; | 
| 128 |  | return node; | 
| 129 |  | } | 
| 130 |  |  | 
| 131 | < | BitSet NameFinder::match(const std::string& name){ | 
| 132 | < | BitSet bs(nStuntDouble_); | 
| 131 | > | OpenMDBitSet NameFinder::match(const std::string& name){ | 
| 132 | > | OpenMDBitSet bs(nStuntDouble_); | 
| 133 |  |  | 
| 134 |  | StringTokenizer tokenizer(name, "."); | 
| 135 |  |  | 
| 174 |  | return bs; | 
| 175 |  | } | 
| 176 |  |  | 
| 177 | < | void NameFinder::matchMolecule(const std::string& molName, BitSet& bs) { | 
| 177 | > | void NameFinder::matchMolecule(const std::string& molName, OpenMDBitSet& bs) { | 
| 178 |  | std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName); | 
| 179 |  | std::vector<TreeNode*>::iterator i; | 
| 180 |  | for( i = molNodes.begin(); i != molNodes.end(); ++i ) { | 
| 182 |  | } | 
| 183 |  | } | 
| 184 |  |  | 
| 185 | < | void NameFinder::matchStuntDouble(const std::string& molName, const std::string& sdName, BitSet& bs){ | 
| 185 | > | void NameFinder::matchStuntDouble(const std::string& molName, const std::string& sdName, OpenMDBitSet& bs){ | 
| 186 |  | std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName); | 
| 187 |  | std::vector<TreeNode*>::iterator i; | 
| 188 |  | for( i = molNodes.begin(); i != molNodes.end(); ++i ) { | 
| 195 |  |  | 
| 196 |  | } | 
| 197 |  |  | 
| 198 | < | void NameFinder::matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, BitSet& bs){ | 
| 198 | > | void NameFinder::matchRigidAtoms(const std::string& molName, const std::string& rbName, const std::string& rbAtomName, OpenMDBitSet& bs){ | 
| 199 |  | std::vector<TreeNode*> molNodes = getMatchedChildren(root_, molName); | 
| 200 |  | std::vector<TreeNode*>::iterator i; | 
| 201 |  | for( i = molNodes.begin(); i != molNodes.end(); ++i ) { | 
| 226 |  | } | 
| 227 |  |  | 
| 228 |  | bool NameFinder::isMatched(const std::string& str, const std::string& wildcard) { | 
| 229 | < | return Wildcard::wildcardfit (wildcard.c_str(), str.c_str()); | 
| 229 | > | return Wildcard::wildcardfit(wildcard.c_str(), str.c_str()) > 0 ? true : false; | 
| 230 |  | } | 
| 231 |  |  | 
| 232 |  |  | 
| 233 | < | void NameFinder::matchInternalIndex(const std::string& name, int internalIndex, BitSet& bs){ | 
| 233 | > | void NameFinder::matchInternalIndex(const std::string& name, int internalIndex, OpenMDBitSet& bs){ | 
| 234 |  |  | 
| 235 |  | std::map<std::string, TreeNode*>::iterator foundIter; | 
| 236 |  | SimInfo::MoleculeIterator mi; | 
| 256 |  | } | 
| 257 |  |  | 
| 258 |  | bool NameFinder::isInteger(const std::string str) { | 
| 259 | < | for(int i =0; i < str.size(); ++i){ | 
| 259 | > | for(unsigned int i = 0; i < str.size(); ++i){ | 
| 260 |  | if (!std::isdigit(str[i])) { | 
| 261 |  | return false; | 
| 262 |  | } |