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 288 by tim, Fri Feb 4 22:39:26 2005 UTC vs.
Revision 413 by tim, Wed Mar 9 17:30:29 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   #include "primitives/StuntDouble.hpp"
58 + #include "utils/StringUtils.hpp"
59   namespace oopse {
60  
61  
58 //class Context {
59 //    public:
60 //        
61 //        void clear() {
62 //            linenumbers.clear();
63 //            lineIndices.clear();
64 //            aatoken.clear();
65 //        }
66 //        
67 //        std::string filename;
68 //        std::string script;
69 //        std::vector<int> linenumbers;
70 //        std::vector<int> lineIndices;
71 //        std::vector<std::vector<Token> > aatoken;
72 //        int pc;
73 //};
74
75
62   /**
63   * @class SelectionEvaluator SelectionEvaluator.hpp "selection/SelectionEvaluator"
64   * @brief Evalute the tokens compiled by SelectionCompiler and return a BitSet
# Line 88 | Line 74 | class SelectionEvaluator{
74          
75          BitSet evaluate();
76          
91        //BitSet evaluate(Snapshot* snapshot);
92
77          /**
78           * Tests if the result from evaluation of script is dynamic.
79           */        
# Line 142 | Line 126 | class SelectionEvaluator{
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 <
129 >        BitSet indexInstruction(const boost::any& value);
130          BitSet expression(const std::vector<Token>& tokens, int pc);
131  
132          BitSet lookupValue(const std::string& variable);
# Line 167 | Line 151 | class SelectionEvaluator{
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          SelectionCompiler compiler;
# Line 190 | Line 183 | class SelectionEvaluator{
183          int statementLength;
184  
185          SimInfo* info;
186 <        NameFinder finder;
186 >        NameFinder nameFinder;
187 >        DistanceFinder distanceFinder;
188 >        IndexFinder indexFinder;
189          int nStuntDouble;   //natoms + nrigidbodies
195        std::map<std::string, boost::any > variables;
190  
191 +        typedef std::map<std::string, boost::any > VariablesType;
192 +        VariablesType variables;
193 +
194          bool isDynamic_;
195          bool isLoaded_;
196          

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines