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

Comparing trunk/src/selection/SelectionEvaluator.hpp (property svn:keywords):
Revision 278 by tim, Tue Feb 1 22:49:23 2005 UTC vs.
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines