[ViewVC] Diff of: OpenMD/branches/development/src/selection/TokenMap.cpp

Comparing branches/development/src/selection/TokenMap.cpp (file contents):
Revision 1629 by gezelter, Wed Sep 14 21:15:17 2011 UTC vs.
Revision 1868 by gezelter, Tue Apr 30 15:56:54 2013 UTC

#	Line 35 \| Line 35
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).
38	>	* [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (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
43		#include "selection/TokenMap.hpp"
#	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("wrappedx", Token(Token::wrappedX, std::string("wrappedx"))));
85	+	tokenMap_.insert(TokenMapType::value_type("wrappedy", Token(Token::wrappedY, std::string("wrappedy"))));
86	+	tokenMap_.insert(TokenMapType::value_type("wrappedz", Token(Token::wrappedZ, std::string("wrappedz"))));
87		tokenMap_.insert(TokenMapType::value_type("r", Token(Token::r, std::string("r"))));
88		tokenMap_.insert(TokenMapType::value_type("to", Token(Token::to, std::string("to"))));
89
#	Line 92 \| Line 96 \| namespace OpenMD {
96
97		return i != tokenMap_.end() ? &(i->second) : NULL;
98		}
99	+
100	+	TokenMap::~TokenMap() {
101	+	tokenMap_.clear();
102	+	}
103		}

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