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

Comparing:
trunk/src/selection/TokenMap.cpp (file contents), Revision 295 by tim, Mon Feb 7 19:13:18 2005 UTC vs.
branches/development/src/selection/TokenMap.cpp (file contents), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

# Line 1 | Line 1
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
# 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]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #include "selection/TokenMap.hpp"
43  
44 < namespace oopse {
44 > namespace OpenMD {
45  
46 < TokenMap* TokenMap::instance_ = NULL;
46 >  TokenMap* TokenMap::instance_ = NULL;
47  
48 < TokenMap::TokenMap() {
49 <    tokenMap_.insert(std::make_pair("define", Token(Token::define, std::string("define"))));
50 <    tokenMap_.insert(std::make_pair("select", Token(Token::select, std::string("select"))));
51 <    //tokenMap_.insert(std::make_pair("selected", Token(Token::selected, std::string("selected"))));
48 >  TokenMap::TokenMap() {
49 >    tokenMap_.insert(TokenMapType::value_type("define", Token(Token::define, std::string("define"))));
50 >    tokenMap_.insert(TokenMapType::value_type("select", Token(Token::select, std::string("select"))));
51 >    //tokenMap_.insert(TokenMapType::value_type("selected", Token(Token::selected, std::string("selected"))));
52      
53      //expressions
54 <    tokenMap_.insert(std::make_pair("(", Token(Token::leftparen, std::string("("))));
55 <    tokenMap_.insert(std::make_pair(")", Token(Token::rightparen, std::string(")"))));
56 <    tokenMap_.insert(std::make_pair("-", Token(Token::hyphen, std::string("-"))));
54 >    tokenMap_.insert(TokenMapType::value_type("(", Token(Token::leftparen, std::string("("))));
55 >    tokenMap_.insert(TokenMapType::value_type(")", Token(Token::rightparen, std::string(")"))));
56  
57 <    tokenMap_.insert(std::make_pair("and", Token(Token::opAnd, std::string("and"))));
58 <    tokenMap_.insert(std::make_pair("&", Token(Token::opAnd, std::string("and"))));
59 <    tokenMap_.insert(std::make_pair("&&", Token(Token::opAnd, std::string("and"))));
57 >    tokenMap_.insert(TokenMapType::value_type("and", Token(Token::opAnd, std::string("and"))));
58 >    tokenMap_.insert(TokenMapType::value_type("&", Token(Token::opAnd, std::string("and"))));
59 >    tokenMap_.insert(TokenMapType::value_type("&&", Token(Token::opAnd, std::string("and"))));
60  
61 <    tokenMap_.insert(std::make_pair("or", Token(Token::opOr, std::string("or"))));
62 <    tokenMap_.insert(std::make_pair(",", Token(Token::opOr, std::string("or"))));
63 <    tokenMap_.insert(std::make_pair("|", Token(Token::opOr, std::string("or"))));
64 <    tokenMap_.insert(std::make_pair("||", Token(Token::opOr, std::string("or"))));
61 >    tokenMap_.insert(TokenMapType::value_type("or", Token(Token::opOr, std::string("or"))));
62 >    tokenMap_.insert(TokenMapType::value_type(",", Token(Token::opOr, std::string("or"))));
63 >    tokenMap_.insert(TokenMapType::value_type("|", Token(Token::opOr, std::string("or"))));
64 >    tokenMap_.insert(TokenMapType::value_type("||", Token(Token::opOr, std::string("or"))));
65  
66 <    tokenMap_.insert(std::make_pair("not", Token(Token::opNot, std::string("not"))));
67 <    tokenMap_.insert(std::make_pair("!", Token(Token::opNot, std::string("not"))));
66 >    tokenMap_.insert(TokenMapType::value_type("not", Token(Token::opNot, std::string("not"))));
67 >    tokenMap_.insert(TokenMapType::value_type("!", Token(Token::opNot, std::string("not"))));
68      
69 <    tokenMap_.insert(std::make_pair("<", Token(Token::opLT, std::string("<"))));
70 <    tokenMap_.insert(std::make_pair("<=", Token(Token::opLE, std::string("<="))));
71 <    tokenMap_.insert(std::make_pair(">=", Token(Token::opGE, std::string(">="))));
72 <    tokenMap_.insert(std::make_pair(">", Token(Token::opGT, std::string(">="))));
73 <    tokenMap_.insert(std::make_pair("==", Token(Token::opEQ, std::string("=="))));
74 <    tokenMap_.insert(std::make_pair("!=", Token(Token::opNE, std::string("!="))));
75 <    tokenMap_.insert(std::make_pair("within", Token(Token::within, std::string("within"))));
76 <    tokenMap_.insert(std::make_pair(".", Token(Token::dot, std::string("."))));
77 <    tokenMap_.insert(std::make_pair("mass", Token(Token::mass, std::string("mass"))));
78 <    tokenMap_.insert(std::make_pair("dipole", Token(Token::dipole, std::string("dipole"))));
79 <    tokenMap_.insert(std::make_pair("charge", Token(Token::charge, std::string("charge"))));
80 <    tokenMap_.insert(std::make_pair("to", Token(Token::to, std::string("to"))));
69 >    tokenMap_.insert(TokenMapType::value_type("<", Token(Token::opLT, std::string("<"))));
70 >    tokenMap_.insert(TokenMapType::value_type("<=", Token(Token::opLE, std::string("<="))));
71 >    tokenMap_.insert(TokenMapType::value_type(">=", Token(Token::opGE, std::string(">="))));
72 >    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">"))));
73 >    tokenMap_.insert(TokenMapType::value_type("==", Token(Token::opEQ, std::string("=="))));
74 >    tokenMap_.insert(TokenMapType::value_type("!=", Token(Token::opNE, std::string("!="))));
75 >    tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
76 >    tokenMap_.insert(TokenMapType::value_type(".", Token(Token::dot, std::string("."))));
77 >    tokenMap_.insert(TokenMapType::value_type("mass", Token(Token::mass, std::string("mass"))));
78 >    tokenMap_.insert(TokenMapType::value_type("charge", Token(Token::charge, std::string("charge"))));
79 >    tokenMap_.insert(TokenMapType::value_type("hull", Token(Token::hull, std::string("hull"))));
80 >    tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
81 >    tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
82 >    tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
83 >    tokenMap_.insert(TokenMapType::value_type("r", Token(Token::r, std::string("r"))));
84 >    tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
85      
86 <    //tokenMap_.insert(std::make_pair("name", Token(Token::name, std::string("name"))));
87 <    //tokenMap_.insert(std::make_pair("index", Token(Token::index, std::string("index"))));
88 <    //tokenMap_.insert(std::make_pair("molname", Token(Token::molname, std::string("molname"))));
86 <    //tokenMap_.insert(std::make_pair("molindex", Token(Token::molindex, std::string("molindex"))));
86 >    tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));
87 >    tokenMap_.insert(TokenMapType::value_type("none", Token(Token::none, std::string("none"))));
88 >  }
89  
90 <    tokenMap_.insert(std::make_pair("*", Token(Token::asterisk, std::string("*"))));
89 <    tokenMap_.insert(std::make_pair("all", Token(Token::all, std::string("all"))));
90 <    tokenMap_.insert(std::make_pair("none", Token(Token::none, std::string("none"))));
91 < }
92 <
93 < Token* TokenMap::getToken(const std::string& ident) {
90 >  Token* TokenMap::getToken(const std::string& ident) {
91      std::map<std::string, Token>::iterator i = tokenMap_.find(ident);
92  
93      return i != tokenMap_.end() ? &(i->second) : NULL;
94 +  }
95   }
98 – }

Comparing:
trunk/src/selection/TokenMap.cpp (property svn:keywords), Revision 295 by tim, Mon Feb 7 19:13:18 2005 UTC vs.
branches/development/src/selection/TokenMap.cpp (property svn:keywords), Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC

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

Diff Legend

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