ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/BitSet.hpp
(Generate patch)

Comparing trunk/src/utils/BitSet.hpp (file contents):
Revision 290 by tim, Fri Feb 4 22:42:12 2005 UTC vs.
Revision 324 by tim, Sun Feb 13 19:10:25 2005 UTC

# Line 42 | Line 42
42   #ifndef UTILS_BITSET_HPP
43   #define UTILS_BITSET_HPP
44  
45 < #include <functional>
45 > #include <iostream>
46   #include <vector>
47   namespace oopse {
48  
# Line 80 | Line 80 | class BitSet {
80  
81          /** Returns true if no bits are set to true */
82          bool none();
83 +
84 +        int firstOffBit() { return !bitset_[0] ? 0 : nextOffBit(0); }
85          
86          /** Returns the index of the first bit that is set to false that occurs on or after the specified starting index.*/
87 <        int nextOffBit(int fromIndex);
88 <        
87 >        int nextOffBit(int fromIndex) const;
88 >
89 >        int firstOnBit() { return bitset_[0] ? 0 : nextOnBit(0); }
90 >        
91          /** Returns the index of the first bit that is set to true that occurs on or after the specified starting index. */
92 <        int nextOnBit(int fromIndex);
92 >        int nextOnBit(int fromIndex) const;
93          
94          /** Performs a logical AND of this target bit set with the argument bit set. */
95          void andOperator (const BitSet& bs);
# Line 118 | Line 122 | class BitSet {
122          BitSet& operator&= (const BitSet &bs) {  andOperator (bs); return *this; }
123          BitSet& operator|= (const BitSet &bs) { orOperator (bs); return *this; }
124          BitSet& operator^= (const BitSet &bs) { xorOperator (bs); return *this; }
125 <        bool operator[] (int bitIndex) {  return bitset_[bitIndex];  }
122 <
125 >        bool operator[] (int bitIndex)  const {  return bitset_[bitIndex];  }
126          friend BitSet operator| (const BitSet& bs1, const BitSet& bs2);
127          friend BitSet operator& (const BitSet& bs1, const BitSet& bs2);
128          friend BitSet operator^ (const BitSet& bs1, const BitSet& bs2);
# Line 139 | Line 142 | class BitSet {
142          std::vector<char> bitset_;
143   };
144  
142 – template<typename T>
143 – struct logical_xor :public std::binary_function<T, T, bool> {
144 –    double operator()(T x, T y) { return x ^ y; }
145 – };
145  
146   }
147   #endif

Diff Legend

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