ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/SelectionEvaluator.hpp
(Generate patch)

Comparing trunk/src/selection/SelectionEvaluator.hpp (file contents):
Revision 1953 by gezelter, Thu Dec 5 18:19:26 2013 UTC vs.
Revision 2067 by gezelter, Thu Mar 5 15:35:37 2015 UTC

# Line 97 | Line 97 | namespace OpenMD {
97      }
98  
99      std::string getLine() {
100 <      int ichBegin = lineIndices[pc];
101 <      int ichEnd;
100 >      std::size_t ichBegin = lineIndices[pc];
101 >      std::size_t ichEnd;
102        if ((ichEnd = script.find('\r', ichBegin)) == std::string::npos &&
103            (ichEnd = script.find('\n', ichBegin)) == std::string::npos) {
104          ichEnd = script.size();
# Line 147 | Line 147 | namespace OpenMD {
147      SelectionSet comparatorInstruction(const Token& instruction, int frame);
148      void compareProperty(StuntDouble* sd, SelectionSet& bs, int property, int comparator, float comparisonValue);
149      void compareProperty(StuntDouble* sd, SelectionSet& bs, int property, int comparator, float comparisonValue, int frame);
150 +    void compareProperty(Molecule* mol, SelectionSet& bs, int property, int comparator, float comparisonValue);
151 +    void compareProperty(Molecule* mol, SelectionSet& bs, int property, int comparator, float comparisonValue, int frame);
152      SelectionSet nameInstruction(const std::string& name);
153      SelectionSet indexInstruction(const boost::any& value);
154      SelectionSet expression(const std::vector<Token>& tokens, int pc);
# Line 176 | Line 178 | namespace OpenMD {
178      void unrecognizedAtomProperty(int property){
179        evalError("unrecognized atom property");
180      }
181 +    
182 +    void unrecognizedMoleculeProperty(int property){
183 +      evalError("unrecognized molecule property");
184 +    }
185  
186      void unrecognizedIdentifier(const std::string& identifier) {
187        evalError("unrecognized identifier:" + identifier);

Diff Legend

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