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 282 by tim, Thu Feb 3 14:04:59 2005 UTC vs.
Revision 432 by tim, Fri Mar 11 15:00:20 2005 UTC

# Line 45 | Line 45
45   #include <map>
46   #include <string>
47   #include <vector>
48 + #include <fstream>
49  
50   #include "brains/SimInfo.hpp"
51   #include "selection/Token.hpp"
52   #include "selection/SelectionCompiler.hpp"
53 + #include "selection/NameFinder.hpp"
54 + #include "selection/DistanceFinder.hpp"
55 + #include "selection/IndexFinder.hpp"
56   #include "utils/BitSet.hpp"
57 <
57 > #include "primitives/StuntDouble.hpp"
58 > #include "utils/StringUtils.hpp"
59   namespace oopse {
60  
56 – class Context {
57 –    public:
58 –        
59 –        void clear() {
60 –            linenumbers.clear();
61 –            lineIndices.clear();
62 –            aatoken.clear();
63 –        }
64 –        
65 –        std::string filename;
66 –        std::string script;
67 –        std::vector<int> linenumbers;
68 –        std::vector<int> lineIndices;
69 –        std::vector<std::vector<Token> > aatoken;
70 –        int pc;
71 – };
61  
62   /**
63   * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator"
# Line 77 | Line 66 | class SelectionEvaluator{
66   class SelectionEvaluator{
67      public:
68  
69 <        SelectionEvaluator(SimInfo* info, const std::string& script);
69 >        SelectionEvaluator(SimInfo* info);
70  
71  
72 +        bool loadScriptString(const std::string& script);
73 +        bool loadScriptFile(const std::string& filename);
74 +        
75          BitSet evaluate();
76          
85 –        BitSet evaluate(int frameNo);
86 –
77          /**
78 <         * Tests if the result from evaluation of script is static.
89 <         * @return true if the result keeps the same even the frame change, otherwise return false
78 >         * Tests if the result from evaluation of script is dynamic.
79           */        
80 <        bool isStatic();
80 >        bool isDynamic() {
81 >            return isDynamic_;
82 >        }
83  
84          bool hadRuntimeError() const{
85              return error;
# Line 118 | Line 109 | class SelectionEvaluator{
109          void clearState();
110          
111          bool loadScript(const std::string& filename, const std::string& script);
112 <        bool loadScriptString(const std::string& script);
112 >
113          bool loadScriptFileInternal(const std::string& filename);
123 –        bool loadScriptFile(const std::string& filename);
114  
115 +
116          void clearDefinitionsAndLoadPredefined();
117          
118          void define();
119 <        void select();
120 <        void predefine();
119 >        void select(BitSet& bs);
120 >        void predefine(const std::string& script);
121  
122 <        void instructionDispatchLoop();
122 >        void instructionDispatchLoop(BitSet& bs);
123  
124 <        void withinInstruction(const Token& instruction, BitSet& , BitSet&);
124 >        void withinInstruction(const Token& instruction, BitSet& 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);
131  
132 <        BitSet expression(std::vector<Token>& tokens, int pc);
132 >        BitSet lookupValue(const std::string& variable);
133 >        
134 >        void evalError(const std::string& message) {
135 >            std::cerr << "SelectionEvaulator Error: " << message <<  std::endl;
136 >        }
137  
137 –
138 –        void evalError(const std::string& message);
139 –
138          void unrecognizedCommand(const Token& token) {
139 <            evalError("unrecognized command:" + token.value);
139 >            evalError("unrecognized command:" + boost::any_cast<std::string>(token.value));
140          }        
141 +
142 +        void unrecognizedExpression() {
143 +            evalError("unrecognized expression");
144 +        }
145 +
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 +        }    
153 +
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 +        }
161 +
162          
163 +        bool containDynamicToken(const std::vector<Token>& tokens);
164 +
165 +        double getCharge(Atom* atom);
166 +        
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;
# Line 162 | Line 185 | class SelectionEvaluator{
185          int statementLength;
186  
187          SimInfo* info;
188 +        NameFinder nameFinder;
189 +        DistanceFinder distanceFinder;
190 +        IndexFinder indexFinder;
191 +        int nStuntDouble;   //natoms + nrigidbodies
192  
193 <        std::map<std::string, std::vector<Token> > variables;
193 >        typedef std::map<std::string, boost::any > VariablesType;
194 >        VariablesType variables;
195 >
196 >        bool isDynamic_;
197 >        bool isLoaded_;
198 >        
199   };
200  
201   }

Diff Legend

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