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 350 by tim, Tue Feb 15 17:49:58 2005 UTC vs.
Revision 963 by tim, Wed May 17 21:51:42 2006 UTC

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

Diff Legend

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