Added methods to update nonzero entry count and update it when necessary

And a fix for a compile error on gcc&clang.


Former-commit-id: 2a095ca864

src/modelchecker/prctl/SparseDtmcPrctlModelChecker.cpp

@@ -451,7 +451,7 @@ namespace storm {
 		}
 
 		template<typename ValueType>
-		std::unique_ptr<CheckResult> SparseDtmcPrctlModelChecker<ValueType>::computeLongRunAverage(storm::logic::StateFormula const& stateFormula, bool qualitative, boost::optional<storm::logic::OptimalityType> const& optimalityType = boost::optional<storm::logic::OptimalityType>()) {
+		std::unique_ptr<CheckResult> SparseDtmcPrctlModelChecker<ValueType>::computeLongRunAverage(storm::logic::StateFormula const& stateFormula, bool qualitative, boost::optional<storm::logic::OptimalityType> const& optimalityType) {
 			std::unique_ptr<CheckResult> subResultPointer = this->check(stateFormula);
 			ExplicitQualitativeCheckResult const& subResult = subResultPointer->asExplicitQualitativeCheckResult();
 

src/storage/SparseMatrix.cpp

@@ -239,20 +239,12 @@ namespace storm {
         
         template<typename ValueType>
         SparseMatrix<ValueType>::SparseMatrix(index_type columnCount, std::vector<index_type> const& rowIndications, std::vector<MatrixEntry<index_type, ValueType>> const& columnsAndValues, std::vector<index_type> const& rowGroupIndices) : rowCount(rowIndications.size() - 1), columnCount(columnCount), entryCount(columnsAndValues.size()), nonzeroEntryCount(0), columnsAndValues(columnsAndValues), rowIndications(rowIndications), rowGroupIndices(rowGroupIndices) {
-            for (auto const& element : *this) {
-                if (element.getValue() != storm::utility::zero<ValueType>()) {
-                    ++this->nonzeroEntryCount;
-                }
-            }
+			this->updateNonzeroEntryCount();
         }
         
         template<typename ValueType>
         SparseMatrix<ValueType>::SparseMatrix(index_type columnCount, std::vector<index_type>&& rowIndications, std::vector<MatrixEntry<index_type, ValueType>>&& columnsAndValues, std::vector<index_type>&& rowGroupIndices) : rowCount(rowIndications.size() - 1), columnCount(columnCount), entryCount(columnsAndValues.size()), nonzeroEntryCount(0), columnsAndValues(std::move(columnsAndValues)), rowIndications(std::move(rowIndications)), rowGroupIndices(std::move(rowGroupIndices)) {
-            for (auto const& element : *this) {
-                if (element.getValue() != storm::utility::zero<ValueType>()) {
-                    ++this->nonzeroEntryCount;
-                }
-            }
+			this->updateNonzeroEntryCount();
         }
                 
         template<typename ValueType>
@@ -368,6 +360,22 @@ namespace storm {
             return nonzeroEntryCount;
 		}
 
+		template<typename ValueType>
+		void SparseMatrix<ValueType>::updateNonzeroEntryCount() const {
+			//SparseMatrix<ValueType>* self = const_cast<SparseMatrix<ValueType>*>(this);
+			this->nonzeroEntryCount = 0;
+			for (auto const& element : *this) {
+				if (element.getValue() != storm::utility::zero<ValueType>()) {
+					++this->nonzeroEntryCount;
+				}
+			}
+		}
+
+		template<typename ValueType>
+		void SparseMatrix<ValueType>::updateNonzeroEntryCount(std::make_signed<index_type>::type difference) {
+			this->nonzeroEntryCount += difference;
+		}
+        
         template<typename ValueType>
         typename SparseMatrix<ValueType>::index_type SparseMatrix<ValueType>::getRowGroupCount() const {
             return rowGroupIndices.size() - 1;
@@ -416,6 +424,7 @@ namespace storm {
             columnValuePtr->setValue(storm::utility::one<ValueType>());
             ++columnValuePtr;
             for (; columnValuePtr != columnValuePtrEnd; ++columnValuePtr) {
+				++this->nonzeroEntryCount;
                 columnValuePtr->setColumn(0);
                 columnValuePtr->setValue(storm::utility::zero<ValueType>());
             }
@@ -606,8 +615,12 @@ namespace storm {
         SparseMatrix<ValueType> SparseMatrix<ValueType>::transpose(bool joinGroups, bool keepZeros) const {
             index_type rowCount = this->getColumnCount();
             index_type columnCount = joinGroups ? this->getRowGroupCount() : this->getRowCount();
-            //index_type entryCount = keepZeros ? this->getEntryCount() : this->getNonzeroEntryCount(); this wont work if someone modified the matrix after creation...
+			if (keepZeros) {
 				index_type entryCount = this->getEntryCount();
+			} else {
+				this->updateNonzeroEntryCount();
+				index_type entryCount = this->getNonzeroEntryCount();
+			}
             
             std::vector<index_type> rowIndications(rowCount + 1);
             std::vector<MatrixEntry<index_type, ValueType>> columnsAndValues(entryCount);
@@ -662,11 +675,20 @@ namespace storm {
             // Now iterate over all row groups and set the diagonal elements to the inverted value.
 			// If there is a row without the diagonal element, an exception is thrown.
 			ValueType one = storm::utility::one<ValueType>();
+			ValueType zero = storm::utility::zero<ValueType>();
             bool foundDiagonalElement = false;
             for (index_type group = 0; group < this->getRowGroupCount(); ++group) {
                 for (auto& entry : this->getRowGroup(group)) {
                     if (entry.getColumn() == group) {
+						if (entry.getValue() == one) {
+							--this->nonzeroEntryCount;
+							entry.setValue(zero);
+						} else if (entry.getValue() == zero) {
+							++this->nonzeroEntryCount;
+							entry.setValue(one);
+						} else {
 							entry.setValue(one - entry.getValue());
+						}
                         foundDiagonalElement = true;
                     }
                 }
@@ -696,6 +718,7 @@ namespace storm {
             for (index_type group = 0; group < this->getRowGroupCount(); ++group) {
                 for (auto& entry : this->getRowGroup(group)) {
                     if (entry.getColumn() == group) {
+						--this->nonzeroEntryCount;
                         entry.setValue(storm::utility::zero<ValueType>());
                     }
                 }

src/storage/SparseMatrix.h

@@ -466,12 +466,26 @@ namespace storm {
 			uint_fast64_t getRowGroupEntryCount(uint_fast64_t const group) const;
 
 			/*!
-             * Returns the number of nonzero entries in the matrix.
+			* Returns the cached number of nonzero entries in the matrix.
+			*
+			* @see updateNonzeroEntryCount()
 			*
 			* @return The number of nonzero entries in the matrix.
 			*/
 			index_type getNonzeroEntryCount() const;
 
+			/*!
+			* Recompute the nonzero entry count
+			*/
+			void updateNonzeroEntryCount() const;
+
+			/*!
+			* Change the nonzero entry count by the provided value.
+			*
+			* @param difference Difference between old and new nonzero entry count.
+			*/
+			void updateNonzeroEntryCount(std::make_signed<index_type>::type difference);
+            
             /*!
              * Returns the number of row groups in the matrix.
              *
@@ -827,7 +841,7 @@ namespace storm {
             index_type entryCount;
             
             // The number of nonzero entries in the matrix.
-            index_type nonzeroEntryCount;
+            mutable index_type nonzeroEntryCount;
             
             // The storage for the columns and values of all entries in the matrix.
             std::vector<MatrixEntry<index_type, value_type>> columnsAndValues;