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

Comparing:
trunk/src/selection/SelectionManager.hpp (file contents), Revision 315 by tim, Fri Feb 11 22:39:03 2005 UTC vs.
branches/development/src/selection/SelectionManager.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef SELECTION_SELECTIONMANAGER_HPP
44   #define SELECTION_SELECTIONMANAGER_HPP
45  
46 < #include "utils/BitSet.hpp"
46 > #include "utils/OpenMDBitSet.hpp"
47   #include "primitives/StuntDouble.hpp"
48 < namespace oopse {
48 > namespace OpenMD {
49  
50 < class SimInfo;
51 < /**
52 < * @class SelectionManager SelectionManager.hpp "selection/SelectionManager.hpp"
53 < * @brief
54 < */
55 < class SelectionManager {
56 <    public:
57 <        SelectionManager(SimInfo* info);
50 >  class SimInfo;
51 >  /**
52 >   * @class SelectionManager SelectionManager.hpp "selection/SelectionManager.hpp"
53 >   * @brief
54 >   */
55 >  class SelectionManager {
56 >  public:
57 >    SelectionManager(SimInfo* info);
58  
59 <        void addSelection(StuntDouble* sd) {
60 <            bsSelection_.setBitOn(sd->getGlobalIndex());
61 <        }
59 >    void addSelection(StuntDouble* sd) {
60 >      bsSelection_.setBitOn(sd->getGlobalIndex());
61 >    }
62          
63 <        void addSelectionSet(const BitSet& bs) {
64 <            bsSelection_ |= bs;
65 <        }
63 >    void addSelectionSet(const OpenMDBitSet& bs) {
64 >      bsSelection_ |= bs;
65 >    }
66  
67 <        void setSelection(StuntDouble* sd) {
68 <            bsSelection_.clearAll();
69 <            bsSelection_.setBitOn(sd->getGlobalIndex());
70 <        }
67 >    void setSelection(StuntDouble* sd) {
68 >      bsSelection_.clearAll();
69 >      bsSelection_.setBitOn(sd->getGlobalIndex());
70 >    }
71          
72 <        void setSelectionSet(const BitSet& bs) {
73 <            bsSelection_ = bs;          
74 <        }
72 >    void setSelectionSet(const OpenMDBitSet& bs) {
73 >      bsSelection_ = bs;          
74 >    }
75  
76 <        void toggleSelection(StuntDouble* sd) {
77 <            bsSelection_.flip(sd->getGlobalIndex());
78 <        }
76 >    void toggleSelection(StuntDouble* sd) {
77 >      bsSelection_.flip(sd->getGlobalIndex());
78 >    }
79  
80 <        void toggleSelection() {
81 <            bsSelection_.flip();
82 <        }
80 >    void toggleSelection() {
81 >      bsSelection_.flip();
82 >    }
83          
84 <        void selectAll() {
85 <            bsSelection_.setAll();                
86 <        }
84 >    void selectAll() {
85 >      bsSelection_.setAll();                
86 >    }
87  
88 <        void clearSelection() {
89 <           bsSelection_.clearAll();
90 <        }
88 >    void clearSelection() {
89 >      bsSelection_.clearAll();
90 >    }
91  
92 <        void clearSelection(StuntDouble* sd) {
93 <            bsSelection_.setBitOff(sd->getGlobalIndex());
94 <        }
92 >    void clearSelection(StuntDouble* sd) {
93 >      bsSelection_.setBitOff(sd->getGlobalIndex());
94 >    }
95  
96 <        bool isSelected(StuntDouble* sd) {
97 <            return bsSelection_[sd->getGlobalIndex()];
98 <        }
96 >    bool isSelected(StuntDouble* sd) {
97 >      return bsSelection_[sd->getGlobalIndex()];
98 >    }
99  
100 <        bool isEmpty() {
101 <            return bsSelection_.none();
102 <        }
100 >    bool isEmpty() {
101 >      return bsSelection_.none();
102 >    }
103  
104 <        int getSelectionCount() {
105 <            return bsSelection_.countBits();
106 <        }
104 >    int getSelectionCount() {
105 >      return bsSelection_.countBits();
106 >    }
107  
108 <        BitSet getSelectionSet() {
109 <            return bsSelection_;
110 <        }
108 >    OpenMDBitSet getSelectionSet() {
109 >      return bsSelection_;
110 >    }
111  
112  
113 <        StuntDouble* beginSelected(int& i);
114 <        StuntDouble* nextSelected(int& i);
113 >    StuntDouble* beginSelected(int& i);
114 >    StuntDouble* nextSelected(int& i);
115  
116 <        StuntDouble* beginUnselected(int& i);
117 <        StuntDouble* nextUnSelected(int& i);
116 >    StuntDouble* beginUnselected(int& i);
117 >    StuntDouble* nextUnSelected(int& i);
118 >
119 >    SelectionManager& operator&= (const SelectionManager &sman) {
120 >      bsSelection_ &= sman.bsSelection_;
121 >      return *this;
122 >    }
123          
124 <    private:
125 <        SimInfo* info_;
126 <        BitSet bsSelection_;
127 <        std::vector<StuntDouble*> stuntdoubles_;
128 < };
124 >    SelectionManager& operator|= (const SelectionManager &sman) {
125 >      bsSelection_ |= sman.bsSelection_;
126 >      return *this;
127 >    }
128 >        
129 >    SelectionManager& operator^= (const SelectionManager &sman) {
130 >      bsSelection_ ^= sman.bsSelection_;
131 >      return *this;
132 >    }
133  
134 +    SelectionManager& operator-= (const SelectionManager &sman) {
135 +      bsSelection_ -= sman.bsSelection_;
136 +      return *this;
137 +    }
138 +        
139 +    friend SelectionManager operator| (const SelectionManager& sman1, const SelectionManager& sman2);
140 +    friend SelectionManager operator& (const SelectionManager& sman1, const SelectionManager& sman2);
141 +    friend SelectionManager operator^ (const SelectionManager& sman1, const SelectionManager& sman2);
142 +    friend SelectionManager operator-(const SelectionManager& sman1, const SelectionManager& sman2);
143 +        
144 +  private:
145 +    SimInfo* info_;
146 +    OpenMDBitSet bsSelection_;
147 +    std::vector<StuntDouble*> stuntdoubles_;
148 +  };
149 +
150   }
151   #endif

Comparing:
trunk/src/selection/SelectionManager.hpp (property svn:keywords), Revision 315 by tim, Fri Feb 11 22:39:03 2005 UTC vs.
branches/development/src/selection/SelectionManager.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines