--- trunk/src/selection/SelectionEvaluator.cpp 2005/02/15 17:49:58 350 +++ trunk/src/selection/SelectionEvaluator.cpp 2005/03/09 17:30:29 413 @@ -49,7 +49,9 @@ namespace oopse { namespace oopse { -SelectionEvaluator::SelectionEvaluator(SimInfo* si) : info(si), nameFinder(info), distanceFinder(info), isLoaded_(false){ +SelectionEvaluator::SelectionEvaluator(SimInfo* si) + : info(si), nameFinder(info), distanceFinder(info), indexFinder(info), isLoaded_(false){ + nStuntDouble = info->getNGlobalAtoms() + info->getNRigidBodies(); } @@ -300,7 +302,7 @@ void SelectionEvaluator::define() { std::string variable = boost::any_cast(statement[1].value); - variables.insert(std::make_pair(variable, expression(statement, 2))); + variables.insert(VariablesType::value_type(variable, expression(statement, 2))); } @@ -401,7 +403,7 @@ BitSet SelectionEvaluator::indexInstruction(const boos if (index < 0 || index >= bs.size()) { invalidIndex(index); } else { - bs.setBitOn(index); + indexFinder.find(index); } } else if (value.type() == typeid(std::pair)) { std::pair indexRange= boost::any_cast >(value); @@ -409,15 +411,11 @@ BitSet SelectionEvaluator::indexInstruction(const boos if (indexRange.first < 0 || indexRange.second >= bs.size()) { invalidIndexRange(indexRange); }else { - bs.setRangeOn(indexRange.first, indexRange.second); + indexFinder.find(indexRange.first, indexRange.second); } } return bs; } -//BitSet SelectionEvaluator::evaluate(int frameNo) { -// -//} - }