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

Comparing trunk/src/selection/SelectionManager.cpp (file contents):
Revision 317 by tim, Sat Feb 12 20:09:28 2005 UTC vs.
Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 43 | Line 43 | namespace oopse {
43   #include "primitives/Molecule.hpp"
44   #include "brains/SimInfo.hpp"
45   namespace oopse {
46 < SelectionManager::SelectionManager(SimInfo* info) : info_(info){
46 >  SelectionManager::SelectionManager(SimInfo* info) : info_(info){
47  
48      int nStuntDoubles = info_->getNGlobalAtoms() + info_->getNGlobalRigidBodies();
49  
# Line 60 | Line 60 | SelectionManager::SelectionManager(SimInfo* info) : in
60      
61      for (mol = info_->beginMolecule(mi); mol != NULL; mol = info_->nextMolecule(mi)) {
62          
63 <        for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
64 <            stuntdoubles_[atom->getGlobalIndex()] = atom;
65 <        }
63 >      for(atom = mol->beginAtom(ai); atom != NULL; atom = mol->nextAtom(ai)) {
64 >        stuntdoubles_[atom->getGlobalIndex()] = atom;
65 >      }
66  
67 <        for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
68 <            stuntdoubles_[rb->getGlobalIndex()] = rb;
69 <        }
67 >      for (rb = mol->beginRigidBody(rbIter); rb != NULL; rb = mol->nextRigidBody(rbIter)) {
68 >        stuntdoubles_[rb->getGlobalIndex()] = rb;
69 >      }
70          
71      }    
72      
73 < }
73 >  }
74  
75  
76 < StuntDouble* SelectionManager::beginSelected(int& i) {
76 >  StuntDouble* SelectionManager::beginSelected(int& i) {
77      i = bsSelection_.firstOnBit();
78      return i == -1 ? NULL : stuntdoubles_[i];
79 < }
80 < StuntDouble* SelectionManager::nextSelected(int& i) {
79 >  }
80 >  StuntDouble* SelectionManager::nextSelected(int& i) {
81      i = bsSelection_.nextOnBit(i);
82      return i == -1 ? NULL : stuntdoubles_[i];
83 < }
83 >  }
84  
85 < StuntDouble* SelectionManager::beginUnselected(int& i) {
85 >  StuntDouble* SelectionManager::beginUnselected(int& i){
86      i = bsSelection_.firstOffBit();
87      return i == -1 ? NULL : stuntdoubles_[i];
88 < }
89 < StuntDouble* SelectionManager::nextUnSelected(int& i) {
88 >  }
89 >  StuntDouble* SelectionManager::nextUnSelected(int& i) {
90      i = bsSelection_.nextOffBit(i);
91      return i == -1 ? NULL : stuntdoubles_[i];
92 < }
92 >  }
93  
94 +
95 +  SelectionManager operator| (const SelectionManager& sman1, const SelectionManager& sman2) {
96 +    SelectionManager result(sman1);
97 +    result |= sman2;
98 +    return result;
99 +  }
100 +  SelectionManager operator& (const SelectionManager& sman1, const SelectionManager& sman2) {
101 +    SelectionManager result(sman1);
102 +    result &= sman2;
103 +    return result;
104 +
105 +  }
106 +  SelectionManager operator^ (const SelectionManager& sman1, const SelectionManager& sman2) {
107 +    SelectionManager result(sman1);
108 +    result ^= sman2;
109 +    return result;
110 +
111 +  }
112 +  SelectionManager operator-(const SelectionManager& sman1, const SelectionManager& sman2){
113 +    SelectionManager result(sman1);
114 +    result -= sman2;
115 +    return result;
116 +
117 +  }
118 +
119   }

Diff Legend

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