Now officially made the iterator over bit vectors an input iterator so that it can be used for constructing STL containers and other containers.

Former-commit-id: 1bcd8c43b3

src/counterexamples/PathBasedSubsystemGenerator.h

@@ -617,7 +617,7 @@ public:
 		// If so the init state represents a subsystem with probability mass 1.
 		// -> return it
 		if((initStates & targetStates).getNumberOfSetBits() != 0) {
-			subSys.set((initStates & targetStates).getSetIndicesList().front(), true);
+			subSys.set(*(initStates & targetStates).begin());
 
 			LOG4CPLUS_INFO(logger, "Critical subsystem found.");
 			LOG4CPLUS_INFO(logger, "Paths needed: " << pathCount);

src/storage/BitVector.cpp

@@ -34,6 +34,10 @@ namespace storm {
 		bool BitVector::const_iterator::operator!=(const_iterator const& otherIterator) const {
 			return currentIndex != otherIterator.currentIndex;
 		}
+        
+        bool BitVector::const_iterator::operator==(const_iterator const& otherIterator) const {
+            return currentIndex == otherIterator.currentIndex;
+        }
 
         BitVector::BitVector() : bitCount(0), bucketVector() {
             // Intentionally left empty.
@@ -350,22 +354,7 @@ namespace storm {
                 element = 0;
             }
         }
-        
-        std::vector<uint_fast64_t> BitVector::getSetIndicesList() const {
-            std::vector<uint_fast64_t> result;
-            result.reserve(this->getNumberOfSetBits());
-            for (auto index : *this) {
-                result.push_back(index);
-            }
-            return result;
-        }
-        
-        void BitVector::addSetIndicesToVector(std::vector<uint_fast64_t>& vector) const {
-            for (auto index : *this) {
-                vector.push_back(index);
-            }
-        }
-        
+                
         uint_fast64_t BitVector::getNumberOfSetBits() const {
             return getNumberOfSetBitsBeforeIndex(bucketVector.size() << 6);
         }

src/storage/BitVector.h

@@ -5,6 +5,7 @@
 #include <cstdint>
 #include <ostream>
 #include <vector>
+#include <iterator>
 
 namespace storm {
     namespace storage {
@@ -18,7 +19,7 @@ namespace storm {
              * A class that enables iterating over the indices of the bit vector whose corresponding bits are set to true.
              * Note that this is a const iterator, which cannot alter the bit vector.
              */
-            class const_iterator {
+            class const_iterator : public std::iterator<std::input_iterator_tag, uint_fast64_t> {
                 // Declare the BitVector class as a friend class to access its internal storage.
                 friend class BitVector;
                 
@@ -56,7 +57,15 @@ namespace storm {
                  * @param otherIterator The iterator with respect to which inequality is checked.
                  * @return True if the two iterators are unequal.
                  */
-                bool operator!=(const const_iterator& otherIterator) const;
+                bool operator!=(const_iterator const& otherIterator) const;
+                
+                /*!
+                 * Compares the iterator with another iterator for equality.
+                 *
+                 * @param otherIterator The iterator with respect to which equality is checked.
+                 * @return True if the two iterators are equal.
+                 */
+                bool operator==(const_iterator const& otherIterator) const;
                 
             private:
                 // The underlying bit vector of this iterator.
@@ -286,22 +295,7 @@ namespace storm {
              * Removes all set bits from the bit vector.
              */
             void clear();
-            
-            /*!
-             * Returns a list containing all indices such that the bits at these indices are set to true
-             * in the bit vector.
-             *
-             * @return A vector of indices of set bits in the bit vector.
-             */
-            std::vector<uint_fast64_t> getSetIndicesList() const;
-            
-            /*!
-             * Adds all indices of bits set to one to the given list.
-             *
-             * @param list The list to which to append the indices.
-             */
-            void addSetIndicesToVector(std::vector<uint_fast64_t>& vector) const;
-            
+                        
             /*!
              * Returns the number of bits that are set (to one) in this bit vector.
              *

src/storage/MaximalEndComponentDecomposition.cpp

@@ -103,8 +103,7 @@ namespace storm {
                         
                         // Now erase the states that have no option to stay inside the MEC with all successors.
                         mecChanged |= !statesToRemove.empty();
-                        std::vector<uint_fast64_t> statesToRemoveList = statesToRemove.getSetIndicesList();
-                        scc.erase(storm::storage::VectorSet<uint_fast64_t>(statesToRemoveList));
+                        scc.erase(storm::storage::VectorSet<uint_fast64_t>(statesToRemove.begin(), statesToRemove.end()));
                         
                         // Now check which states should be reconsidered, because successors of them were removed.
                         statesToCheck.clear();

src/storage/VectorSet.cpp

@@ -13,6 +13,12 @@ namespace storm {
             data.reserve(size);
         }
         
+        template<typename ValueType>
+        template<typename InputIterator>
+        VectorSet<ValueType>::VectorSet(InputIterator first, InputIterator last) : dirty(true) {
+            this->data.insert(this->data.end(), first, last);
+        }
+        
         template<typename ValueType>
         VectorSet<ValueType>::VectorSet(std::vector<ValueType> const& data) : data(data), dirty(true) {
             ensureSet();
@@ -286,6 +292,7 @@ namespace storm {
         
         template class VectorSet<uint_fast64_t>;
         template class VectorSet<VectorSet<uint_fast64_t>>;
+        template VectorSet<uint_fast64_t>::VectorSet(storm::storage::BitVector::const_iterator, storm::storage::BitVector::const_iterator);
         template std::ostream& operator<<(std::ostream& stream, VectorSet<uint_fast64_t> const& set);
         template std::ostream& operator<<(std::ostream& stream, VectorSet<VectorSet<uint_fast64_t>> const& set);
     }

src/storage/VectorSet.h

@@ -36,6 +36,9 @@ namespace storm  {
             
             VectorSet(uint_fast64_t size);
             
+            template<typename InputIterator>
+            VectorSet(InputIterator first, InputIterator last);
+            
             VectorSet(std::vector<ValueType> const& data);
             
             VectorSet(std::set<ValueType> const& data);

src/utility/graph.h

@@ -56,7 +56,7 @@ namespace storm {
                 statesWithProbabilityGreater0 |= psiStates;
                 
                 // Initialize the stack used for the DFS with the states.
-                std::vector<uint_fast64_t> stack = psiStates.getSetIndicesList();
+                std::vector<uint_fast64_t> stack(psiStates.begin(), psiStates.end());
                 
                 // Initialize the stack for the step bound, if the number of steps is bounded.
                 std::vector<uint_fast64_t> stepStack;
@@ -187,7 +187,7 @@ namespace storm {
                 statesWithProbabilityGreater0 |= psiStates;
                 
                 // Initialize the stack used for the DFS with the states
-                std::vector<uint_fast64_t> stack = psiStates.getSetIndicesList();
+                std::vector<uint_fast64_t> stack(psiStates.begin(), psiStates.end());
                 
                 // Initialize the stack for the step bound, if the number of steps is bounded.
                 std::vector<uint_fast64_t> stepStack;
@@ -285,7 +285,7 @@ namespace storm {
                 while (!done) {
                     stack.clear();
                     storm::storage::BitVector nextStates(psiStates);
-                    psiStates.addSetIndicesToVector(stack);
+                    stack.insert(stack.end(), psiStates.begin(), psiStates.end());
                     
                     while (!stack.empty()) {
                         currentState = stack.back();
@@ -377,7 +377,7 @@ namespace storm {
                 statesWithProbabilityGreater0 |= psiStates;
                 
                 // Initialize the stack used for the DFS with the states
-                std::vector<uint_fast64_t> stack = psiStates.getSetIndicesList();
+                std::vector<uint_fast64_t> stack(psiStates.begin(), psiStates.end());
                 
                 // Initialize the stack for the step bound, if the number of steps is bounded.
                 std::vector<uint_fast64_t> stepStack;
@@ -496,7 +496,7 @@ namespace storm {
                 while (!done) {
                     stack.clear();
                     storm::storage::BitVector nextStates(psiStates);
-                    psiStates.addSetIndicesToVector(stack);
+                    stack.insert(stack.end(), psiStates.begin(), psiStates.end());
                     
                     while (!stack.empty()) {
                         currentState = stack.back();