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 413 by tim, Wed Mar 9 17:30:29 2005 UTC vs.
Revision 1816 by gezelter, Fri Dec 7 18:33:33 2012 UTC

# 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef SELECTION_SELECTIONEVALUATOR_HPP
# Line 48 | Line 49
49   #include <fstream>
50  
51   #include "brains/SimInfo.hpp"
52 < #include "selection/Token.hpp"
52 > #include "selection/SelectionToken.hpp"
53   #include "selection/SelectionCompiler.hpp"
54   #include "selection/NameFinder.hpp"
55   #include "selection/DistanceFinder.hpp"
56 + #include "selection/HullFinder.hpp"
57   #include "selection/IndexFinder.hpp"
58 < #include "utils/BitSet.hpp"
58 > #include "utils/OpenMDBitSet.hpp"
59   #include "primitives/StuntDouble.hpp"
60   #include "utils/StringUtils.hpp"
61 < namespace oopse {
61 > namespace OpenMD {
62  
63  
64 < /**
65 < * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator"
66 < * @brief Evalute the tokens compiled by SelectionCompiler and return a BitSet
67 < */
68 < class SelectionEvaluator{
69 <    public:
64 >  /**
65 >   * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator"
66 >   * @brief Evalute the tokens compiled by SelectionCompiler and return a OpenMDBitSet
67 >   */
68 >  class SelectionEvaluator{
69 >  public:
70  
71 <        SelectionEvaluator(SimInfo* info);
71 >    SelectionEvaluator(SimInfo* info);
72  
73 <
74 <        bool loadScriptString(const std::string& script);
73 <        bool loadScriptFile(const std::string& filename);
73 >    bool loadScriptString(const std::string& script);
74 >    bool loadScriptFile(const std::string& filename);
75          
76 <        BitSet evaluate();
76 >    OpenMDBitSet evaluate();
77 >    OpenMDBitSet evaluate(int frame);
78          
79 <        /**
80 <         * Tests if the result from evaluation of script is dynamic.
81 <         */        
82 <        bool isDynamic() {
83 <            return isDynamic_;
84 <        }
79 >    /**
80 >     * Tests if the result from evaluation of script is dynamic.
81 >     */        
82 >    bool isDynamic() {
83 >      return isDynamic_;
84 >    }
85  
86 <        bool hadRuntimeError() const{
87 <            return error;
88 <        }
86 >    bool hadRuntimeError() const{
87 >      return error;
88 >    }
89  
90 <        std::string getErrorMessage() const {
91 <            return errorMessage;
92 <        }
90 >    std::string getErrorMessage() const {
91 >      return errorMessage;
92 >    }
93  
94  
95 <        int getLinenumber() {
96 <            return linenumbers[pc];
97 <        }
95 >    int getLinenumber() {
96 >      return linenumbers[pc];
97 >    }
98  
99 <        std::string getLine() {
100 <            int ichBegin = lineIndices[pc];
101 <            int ichEnd;
102 <            if ((ichEnd = script.find('\r', ichBegin)) == std::string::npos &&
103 <                (ichEnd = script.find('\n', ichBegin)) == std::string::npos) {
104 <                ichEnd = script.size();
105 <            }            
106 <            return script.substr(ichBegin, ichEnd);
107 <        }
99 >    std::string getLine() {
100 >      int ichBegin = lineIndices[pc];
101 >      int ichEnd;
102 >      if ((ichEnd = script.find('\r', ichBegin)) == std::string::npos &&
103 >          (ichEnd = script.find('\n', ichBegin)) == std::string::npos) {
104 >        ichEnd = script.size();
105 >      }            
106 >      return script.substr(ichBegin, ichEnd);
107 >    }
108    
109 <    private:
109 >  private:
110  
111 <        void clearState();
111 >    void clearState();
112          
113 <        bool loadScript(const std::string& filename, const std::string& script);
113 >    bool loadScript(const std::string& filename, const std::string& script);
114  
115 <        bool loadScriptFileInternal(const std::string& filename);
115 >    bool loadScriptFileInternal(const std::string& filename);
116  
117  
118 <        void clearDefinitionsAndLoadPredefined();
118 >    void clearDefinitionsAndLoadPredefined();
119          
120 <        void define();
121 <        void select(BitSet& bs);
122 <        void predefine(const std::string& script);
120 >    void define();
121 >    void select(OpenMDBitSet& bs);
122 >    void select(OpenMDBitSet& bs, int frame);
123 >    void predefine(const std::string& script);
124  
125 <        void instructionDispatchLoop(BitSet& bs);
125 >    void instructionDispatchLoop(OpenMDBitSet& bs);
126 >    void instructionDispatchLoop(OpenMDBitSet& bs, int frame);
127  
128 <        void withinInstruction(const Token& instruction, BitSet& bs);
128 >    void withinInstruction(const Token& instruction, OpenMDBitSet& bs);
129 >    void withinInstruction(const Token& instruction, OpenMDBitSet& bs, int frame);
130 >    OpenMDBitSet allInstruction();
131          
132 <        BitSet comparatorInstruction(const Token& instruction);
133 <        void compareProperty(StuntDouble* sd, BitSet& bs, int property, int comparator, float comparisonValue);
134 <        BitSet nameInstruction(const std::string& name);
135 <        BitSet indexInstruction(const boost::any& value);
136 <        BitSet expression(const std::vector<Token>& tokens, int pc);
132 >    OpenMDBitSet comparatorInstruction(const Token& instruction);
133 >    OpenMDBitSet comparatorInstruction(const Token& instruction, int frame);
134 >    void compareProperty(StuntDouble* sd, OpenMDBitSet& bs, int property, int comparator, float comparisonValue);
135 >    void compareProperty(StuntDouble* sd, OpenMDBitSet& bs, int property, int comparator, float comparisonValue, int frame);
136 >    OpenMDBitSet nameInstruction(const std::string& name);
137 >    OpenMDBitSet indexInstruction(const boost::any& value);
138 >    OpenMDBitSet expression(const std::vector<Token>& tokens, int pc);
139 >    OpenMDBitSet expression(const std::vector<Token>& tokens, int pc, int frame);
140  
141 <        BitSet lookupValue(const std::string& variable);
141 >    OpenMDBitSet lookupValue(const std::string& variable);
142 >
143 >    OpenMDBitSet hull();
144 >    OpenMDBitSet hull(int frame);
145          
146 <        void evalError(const std::string& message) {
147 <            std::cerr << "SelectionEvaulator Error: " << message <<  std::endl;
148 <        }
146 >    void evalError(const std::string& message) {
147 >      sprintf( painCave.errMsg,
148 >               "SelectionEvaluator Error: %s\n", message.c_str());
149 >      painCave.severity = OPENMD_ERROR;
150 >      painCave.isFatal = 1;
151 >      simError();
152 >    }
153  
154 <        void unrecognizedCommand(const Token& token) {
155 <            evalError("unrecognized command:" + boost::any_cast<std::string>(token.value));
156 <        }        
154 >    void unrecognizedCommand(const Token& token) {
155 >      evalError("unrecognized command:" + boost::any_cast<std::string>(token.value));
156 >    }        
157  
158 <        void unrecognizedExpression() {
159 <            evalError("unrecognized expression");
160 <        }
158 >    void unrecognizedExpression() {
159 >      evalError("unrecognized expression");
160 >    }
161  
162 <        void unrecognizedAtomProperty(int property){
163 <            evalError("unrecognized atom property");
164 <        }
162 >    void unrecognizedAtomProperty(int property){
163 >      evalError("unrecognized atom property");
164 >    }
165  
166 <        void unrecognizedIdentifier(const std::string& identifier) {
167 <            evalError("unrecognized identifier:" + identifier);
168 <        }    
166 >    void unrecognizedIdentifier(const std::string& identifier) {
167 >      evalError("unrecognized identifier:" + identifier);
168 >    }    
169  
170 <        void invalidIndexRange(std::pair<int, int> range) {
171 <            evalError("invalid index range: [" + toString(range.first) + ", " + toString(range.second) + ")");
172 <        }
170 >    void invalidIndexRange(std::pair<int, int> range) {
171 >      evalError("invalid index range: [" + toString(range.first) + ", " + toString(range.second) + ")");
172 >    }
173  
174 <        void invalidIndex(int index) {
175 <            evalError("invalid index : " + toString(index) );
176 <        }
174 >    void invalidIndex(int index) {
175 >      evalError("invalid index : " + toString(index) );
176 >    }
177  
178          
179 <        bool containDynamicToken(const std::vector<Token>& tokens);
179 >    bool containDynamicToken(const std::vector<Token>& tokens);
180 >
181 >    RealType getCharge(Atom* atom);
182 >    RealType getCharge(Atom* atom, int frame);
183          
184 <        SelectionCompiler compiler;
184 >    SelectionCompiler compiler;
185  
186 <        //const static int scriptLevelMax = 10;
187 <        //int scriptLevel;
186 >    //const static int scriptLevelMax = 10;
187 >    //int scriptLevel;
188  
189 <        //Context stack[scriptLevelMax];
189 >    //Context stack[scriptLevelMax];
190  
191 <        std::string filename;
192 <        std::string script;
193 <        std::vector<int> linenumbers;
194 <        std::vector<int> lineIndices;
195 <        std::vector<std::vector<Token> > aatoken;
196 <        int pc; // program counter
191 >    std::string filename;
192 >    std::string script;
193 >    std::vector<int> linenumbers;
194 >    std::vector<int> lineIndices;
195 >    std::vector<std::vector<Token> > aatoken;
196 >    unsigned int pc; // program counter
197  
198 <        bool error;
199 <        std::string errorMessage;
198 >    bool error;
199 >    std::string errorMessage;
200  
201 <        std::vector<Token> statement;
202 <        int statementLength;
201 >    std::vector<Token> statement;
202 >    int statementLength;
203  
204 <        SimInfo* info;
205 <        NameFinder nameFinder;
206 <        DistanceFinder distanceFinder;
207 <        IndexFinder indexFinder;
208 <        int nStuntDouble;   //natoms + nrigidbodies
204 >    SimInfo* info;
205 >    NameFinder nameFinder;
206 >    DistanceFinder distanceFinder;
207 >    HullFinder hullFinder;
208 >    IndexFinder indexFinder;
209 >    int nStuntDouble;   //nGLOBALatoms + nGLOBALrigidbodies
210  
211 <        typedef std::map<std::string, boost::any > VariablesType;
212 <        VariablesType variables;
211 >    typedef std::map<std::string, boost::any > VariablesType;
212 >    VariablesType variables;
213  
214 <        bool isDynamic_;
215 <        bool isLoaded_;
214 >    bool isDynamic_;
215 >    bool isLoaded_;
216          
217 < };
217 >  };
218  
219   }
220   #endif

Comparing trunk/src/selection/SelectionEvaluator.hpp (property svn:keywords):
Revision 413 by tim, Wed Mar 9 17:30:29 2005 UTC vs.
Revision 1816 by gezelter, Fri Dec 7 18:33:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines