ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/SelectionEvaluator.cpp
(Generate patch)

Comparing trunk/src/selection/SelectionEvaluator.cpp (file contents):
Revision 413 by tim, Wed Mar 9 17:30:29 2005 UTC vs.
Revision 418 by tim, Thu Mar 10 16:14:07 2005 UTC

# Line 86 | Line 86 | void SelectionEvaluator::clearState() {
86   }
87  
88   void SelectionEvaluator::clearState() {
89    //for (int i = scriptLevelMax; --i >= 0; )
90    //    stack[i].clear();
91    //scriptLevel = 0;
89      error = false;
90      errorMessage = "";
91   }
# Line 230 | Line 227 | BitSet SelectionEvaluator::comparatorInstruction(const
227              compareProperty(atom, bs, property, comparator, comparisonValue);
228          }
229          
233        //change the positions of atoms which belong to the rigidbodies
230          for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
231              compareProperty(rb, bs, property, comparator, comparisonValue);
232          }        
# Line 403 | Line 399 | BitSet SelectionEvaluator::indexInstruction(const boos
399          if (index < 0 || index >= bs.size()) {
400              invalidIndex(index);
401          } else {
402 <            indexFinder.find(index);
402 >            bs = indexFinder.find(index);
403          }
404      } else if (value.type() == typeid(std::pair<int, int>)) {
405          std::pair<int, int> indexRange= boost::any_cast<std::pair<int, int> >(value);
# Line 411 | Line 407 | BitSet SelectionEvaluator::indexInstruction(const boos
407          if (indexRange.first < 0 || indexRange.second >= bs.size()) {
408              invalidIndexRange(indexRange);
409          }else {
410 <            indexFinder.find(indexRange.first, indexRange.second);
410 >            bs = indexFinder.find(indexRange.first, indexRange.second);
411          }
412      }
413  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines