--- trunk/src/selection/SelectionEvaluator.cpp 2012/12/05 21:10:30 1815 +++ trunk/src/selection/SelectionEvaluator.cpp 2012/12/07 18:33:33 1816 @@ -47,7 +47,10 @@ #include "primitives/RigidBody.hpp" #include "primitives/Molecule.hpp" #include "io/ifstrstream.hpp" +#include "types/FixedChargeAdapter.hpp" +#include "types/FluctuatingChargeAdapter.hpp" + namespace OpenMD { @@ -145,6 +148,27 @@ namespace OpenMD { } + void SelectionEvaluator::instructionDispatchLoop(OpenMDBitSet& bs, int frame){ + + while ( pc < aatoken.size()) { + statement = aatoken[pc++]; + statementLength = statement.size(); + Token token = statement[0]; + switch (token.tok) { + case Token::define: + define(); + break; + case Token::select: + select(bs, frame); + break; + default: + unrecognizedCommand(token); + return; + } + } + + } + OpenMDBitSet SelectionEvaluator::expression(const std::vector& code, int pcStart) { OpenMDBitSet bs; @@ -204,7 +228,78 @@ namespace OpenMD { case Token::opEQ: case Token::opNE: stack.push(comparatorInstruction(instruction)); + break; + default: + unrecognizedExpression(); + } + } + if (stack.size() != 1) + evalError("atom expression compiler error - stack over/underflow"); + + return stack.top(); + } + + + OpenMDBitSet SelectionEvaluator::expression(const std::vector& code, + int pcStart, int frame) { + OpenMDBitSet bs; + std::stack stack; + + for (unsigned int pc = pcStart; pc < code.size(); ++pc) { + Token instruction = code[pc]; + + switch (instruction.tok) { + case Token::expressionBegin: + break; + case Token::expressionEnd: + break; + case Token::all: + bs = allInstruction(); + stack.push(bs); + break; + case Token::none: + bs = OpenMDBitSet(nStuntDouble); + stack.push(bs); + break; + case Token::opOr: + bs = stack.top(); + stack.pop(); + stack.top() |= bs; + break; + case Token::opAnd: + bs = stack.top(); + stack.pop(); + stack.top() &= bs; + break; + case Token::opNot: + stack.top().flip(); + break; + case Token::within: + withinInstruction(instruction, stack.top(), frame); break; + case Token::hull: + stack.push(hull(frame)); + break; + //case Token::selected: + // stack.push(getSelectionSet()); + // break; + case Token::name: + stack.push(nameInstruction(boost::any_cast(instruction.value))); + break; + case Token::index: + stack.push(indexInstruction(instruction.value)); + break; + case Token::identifier: + stack.push(lookupValue(boost::any_cast(instruction.value))); + break; + case Token::opLT: + case Token::opLE: + case Token::opGE: + case Token::opGT: + case Token::opEQ: + case Token::opNE: + stack.push(comparatorInstruction(instruction, frame)); + break; default: unrecognizedExpression(); } @@ -247,6 +342,36 @@ namespace OpenMD { return bs; } + OpenMDBitSet SelectionEvaluator::comparatorInstruction(const Token& instruction, int frame) { + int comparator = instruction.tok; + int property = instruction.intValue; + float comparisonValue = boost::any_cast(instruction.value); + OpenMDBitSet bs(nStuntDouble); + bs.clearAll(); + + SimInfo::MoleculeIterator mi; + Molecule* mol; + Molecule::AtomIterator ai; + Atom* atom; + Molecule::RigidBodyIterator rbIter; + RigidBody* rb; + + for (mol = info->beginMolecule(mi); mol != NULL; + mol = info->nextMolecule(mi)) { + + for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) { + compareProperty(atom, bs, property, comparator, comparisonValue, frame); + } + + for (rb = mol->beginRigidBody(rbIter); rb != NULL; + rb = mol->nextRigidBody(rbIter)) { + compareProperty(rb, bs, property, comparator, comparisonValue, frame); + } + } + + return bs; + } + void SelectionEvaluator::compareProperty(StuntDouble* sd, OpenMDBitSet& bs, int property, int comparator, float comparisonValue) { @@ -305,8 +430,73 @@ namespace OpenMD { match = propertyValue != comparisonValue; break; } - if (match) + if (match) + bs.setBitOn(sd->getGlobalIndex()); + + + } + + void SelectionEvaluator::compareProperty(StuntDouble* sd, OpenMDBitSet& bs, + int property, int comparator, + float comparisonValue, int frame) { + RealType propertyValue = 0.0; + switch (property) { + case Token::mass: + propertyValue = sd->getMass(); + break; + case Token::charge: + if (sd->isAtom()){ + Atom* atom = static_cast(sd); + propertyValue = getCharge(atom,frame); + } else if (sd->isRigidBody()) { + RigidBody* rb = static_cast(sd); + RigidBody::AtomIterator ai; + Atom* atom; + for (atom = rb->beginAtom(ai); atom != NULL; atom = rb->nextAtom(ai)) { + propertyValue+= getCharge(atom,frame); + } + } + break; + case Token::x: + propertyValue = sd->getPos(frame).x(); + break; + case Token::y: + propertyValue = sd->getPos(frame).y(); + break; + case Token::z: + propertyValue = sd->getPos(frame).z(); + break; + case Token::r: + propertyValue = sd->getPos(frame).length(); + break; + default: + unrecognizedAtomProperty(property); + } + + bool match = false; + switch (comparator) { + case Token::opLT: + match = propertyValue < comparisonValue; + break; + case Token::opLE: + match = propertyValue <= comparisonValue; + break; + case Token::opGE: + match = propertyValue >= comparisonValue; + break; + case Token::opGT: + match = propertyValue > comparisonValue; + break; + case Token::opEQ: + match = propertyValue == comparisonValue; + break; + case Token::opNE: + match = propertyValue != comparisonValue; + break; + } + if (match) bs.setBitOn(sd->getGlobalIndex()); + } @@ -326,6 +516,23 @@ namespace OpenMD { bs = distanceFinder.find(bs, distance); } + + void SelectionEvaluator::withinInstruction(const Token& instruction, + OpenMDBitSet& bs, int frame){ + + boost::any withinSpec = instruction.value; + float distance; + if (withinSpec.type() == typeid(float)){ + distance = boost::any_cast(withinSpec); + } else if (withinSpec.type() == typeid(int)) { + distance = boost::any_cast(withinSpec); + } else { + evalError("casting error in withinInstruction"); + bs.clearAll(); + } + + bs = distanceFinder.find(bs, distance, frame); + } void SelectionEvaluator::define() { assert(statement.size() >= 3); @@ -371,6 +578,10 @@ namespace OpenMD { void SelectionEvaluator::select(OpenMDBitSet& bs){ bs = expression(statement, 1); } + + void SelectionEvaluator::select(OpenMDBitSet& bs, int frame){ + bs = expression(statement, 1, frame); + } OpenMDBitSet SelectionEvaluator::lookupValue(const std::string& variable){ @@ -419,7 +630,15 @@ namespace OpenMD { pc = 0; instructionDispatchLoop(bs); } + return bs; + } + OpenMDBitSet SelectionEvaluator::evaluate(int frame) { + OpenMDBitSet bs(nStuntDouble); + if (isLoaded_) { + pc = 0; + instructionDispatchLoop(bs, frame); + } return bs; } @@ -482,27 +701,44 @@ namespace OpenMD { return bs; } + + OpenMDBitSet SelectionEvaluator::hull(int frame) { + OpenMDBitSet bs(nStuntDouble); + + bs = hullFinder.findHull(frame); + + return bs; + } + RealType SelectionEvaluator::getCharge(Atom* atom) { - RealType charge =0.0; + RealType charge = 0.0; AtomType* atomType = atom->getAtomType(); - if (atomType->isCharge()) { - GenericData* data = atomType->getPropertyByName("Charge"); - if (data != NULL) { - DoubleGenericData* doubleData= dynamic_cast(data); - if (doubleData != NULL) { - charge = doubleData->getData(); - - } else { - sprintf( painCave.errMsg, - "Can not cast GenericData to DoubleGenericData\n"); - painCave.severity = OPENMD_ERROR; - painCave.isFatal = 1; - simError(); - } - } + FixedChargeAdapter fca = FixedChargeAdapter(atomType); + if ( fca.isFixedCharge() ) { + charge = fca.getCharge(); } + + FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter(atomType); + if ( fqa.isFluctuatingCharge() ) { + charge += atom->getFlucQPos(); + } + return charge; + } + RealType SelectionEvaluator::getCharge(Atom* atom, int frame) { + RealType charge = 0.0; + AtomType* atomType = atom->getAtomType(); + + FixedChargeAdapter fca = FixedChargeAdapter(atomType); + if ( fca.isFixedCharge() ) { + charge = fca.getCharge(); + } + + FluctuatingChargeAdapter fqa = FluctuatingChargeAdapter(atomType); + if ( fqa.isFluctuatingCharge() ) { + charge += atom->getFlucQPos(frame); + } return charge; }