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

Comparing trunk/OOPSE-3.0/src/selection/SelectionEvaluator.hpp (file contents):
Revision 1967 by tim, Thu Feb 3 23:14:05 2005 UTC vs.
Revision 1985 by chrisfen, Mon Feb 7 20:39:36 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 "utils/BitSet.hpp"
56   #include "primitives/StuntDouble.hpp"
57 + #include "utils/StringUtils.hpp"
58   namespace oopse {
59  
60  
61 < class Context {
62 <    public:
63 <        
64 <        void clear() {
65 <            linenumbers.clear();
66 <            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 < };
61 > //class Context {
62 > //    public:
63 > //        
64 > //        void clear() {
65 > //            linenumbers.clear();
66 > //            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 > //};
77  
78  
79   /**
# Line 80 | Line 83 | class SelectionEvaluator{
83   class SelectionEvaluator{
84      public:
85  
86 <        SelectionEvaluator(SimInfo* info, const std::string& script);
86 >        SelectionEvaluator(SimInfo* info);
87  
88  
89 +        bool loadScriptString(const std::string& script);
90 +        bool loadScriptFile(const std::string& filename);
91 +        
92          BitSet evaluate();
93          
94 <        BitSet evaluate(int frameNo);
94 >        //BitSet evaluate(Snapshot* snapshot);
95  
96          /**
97 <         * Tests if the result from evaluation of script is static.
92 <         * @return true if the result keeps the same even the frame change, otherwise return false
97 >         * Tests if the result from evaluation of script is dynamic.
98           */        
99 <        bool isStatic();
99 >        bool isDynamic() {
100 >            return isDynamic_;
101 >        }
102  
103          bool hadRuntimeError() const{
104              return error;
# Line 121 | Line 128 | class SelectionEvaluator{
128          void clearState();
129          
130          bool loadScript(const std::string& filename, const std::string& script);
131 <        bool loadScriptString(const std::string& script);
131 >
132          bool loadScriptFileInternal(const std::string& filename);
126 –        bool loadScriptFile(const std::string& filename);
133  
134 +
135          void clearDefinitionsAndLoadPredefined();
136          
137          void define();
138 <        void select();
138 >        void select(BitSet& bs);
139          void predefine(const std::string& script);
140  
141 <        void instructionDispatchLoop();
141 >        void instructionDispatchLoop(BitSet& bs);
142  
143          void withinInstruction(const Token& instruction, BitSet& bs);
144          
145          BitSet comparatorInstruction(const Token& instruction);
146          void compareProperty(StuntDouble* sd, BitSet& bs, int property, int comparator, float comparisonValue);
147          BitSet nameInstruction(const std::string& name);
148 <
148 >        BitSet indexInstruction(const boost::any& value);
149          BitSet expression(const std::vector<Token>& tokens, int pc);
150  
151          BitSet lookupValue(const std::string& variable);
152          
153 <        void evalError(const std::string& message);
153 >        void evalError(const std::string& message) {
154 >            std::cerr << "SelectionEvaulator Error: " << message <<  std::endl;
155 >        }
156  
157          void unrecognizedCommand(const Token& token) {
158              evalError("unrecognized command:" + boost::any_cast<std::string>(token.value));
# Line 160 | Line 169 | class SelectionEvaluator{
169          void unrecognizedIdentifier(const std::string& identifier) {
170              evalError("unrecognized identifier:" + identifier);
171          }    
172 +
173 +        void invalidIndexRange(std::pair<int, int> range) {
174 +            evalError("invalid index range: [" + toString(range.first) + ", " + toString(range.second) + ")");
175 +        }
176 +
177 +        void invalidIndex(int index) {
178 +            evalError("invalid index : " + toString(index) );
179 +        }
180 +
181 +        
182 +        bool containDynamicToken(const std::vector<Token>& tokens);
183 +        
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;
# Line 181 | Line 202 | class SelectionEvaluator{
202          int statementLength;
203  
204          SimInfo* info;
205 <        NameFinder finder;
205 >        NameFinder nameFinder;
206 >        DistanceFinder distanceFinder;
207          int nStuntDouble;   //natoms + nrigidbodies
208          std::map<std::string, boost::any > variables;
209 +
210 +        bool isDynamic_;
211 +        bool isLoaded_;
212 +        
213   };
214  
215   }

Diff Legend

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