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

Comparing branches/development/src/selection/TokenMap.cpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 36 | Line 36
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).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #include "selection/TokenMap.hpp"
# Line 69 | Line 70 | namespace OpenMD {
70      tokenMap_.insert(TokenMapType::value_type("<", Token(Token::opLT, std::string("<"))));
71      tokenMap_.insert(TokenMapType::value_type("<=", Token(Token::opLE, std::string("<="))));
72      tokenMap_.insert(TokenMapType::value_type(">=", Token(Token::opGE, std::string(">="))));
73 <    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">="))));
73 >    tokenMap_.insert(TokenMapType::value_type(">", Token(Token::opGT, std::string(">"))));
74      tokenMap_.insert(TokenMapType::value_type("==", Token(Token::opEQ, std::string("=="))));
75      tokenMap_.insert(TokenMapType::value_type("!=", Token(Token::opNE, std::string("!="))));
76      tokenMap_.insert(TokenMapType::value_type("within", Token(Token::within, std::string("within"))));
# Line 80 | Line 81 | namespace OpenMD {
81      tokenMap_.insert(TokenMapType::value_type("x", Token(Token::x, std::string("x"))));
82      tokenMap_.insert(TokenMapType::value_type("y", Token(Token::y, std::string("y"))));
83      tokenMap_.insert(TokenMapType::value_type("z", Token(Token::z, std::string("z"))));
84 +    tokenMap_.insert(TokenMapType::value_type("r", Token(Token::r, std::string("r"))));
85      tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
86      
87      tokenMap_.insert(TokenMapType::value_type("all", Token(Token::all, std::string("all"))));

Diff Legend

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