Merge branch 'master' of https://sselab.de/lab9/private/git/storm

Former-commit-id: 7f21cf8dbe

src/storage/SparseMatrix.cpp

@@ -987,13 +987,31 @@ namespace storm {
             return getRows(row, row);
         }
         
+        template<typename ValueType>
+        typename SparseMatrix<ValueType>::const_rows SparseMatrix<ValueType>::getRow(index_type rowGroup, index_type offset) const {
+            assert(rowGroup < this->getRowGroupCount());
+            assert(offset < this->getRowGroupEntryCount(rowGroup));
+            return getRow(rowGroupIndices[rowGroup] + offset);
+        }
+        
+        
+        template<typename ValueType>
+        typename SparseMatrix<ValueType>::rows SparseMatrix<ValueType>::getRow(index_type rowGroup, index_type offset) {
+            assert(rowGroup < this->getRowGroupCount());
+            assert(offset < this->getRowGroupEntryCount(rowGroup));
+            return getRow(rowGroupIndices[rowGroup] + offset);
+        }
+        
+        
         template<typename ValueType>
         typename SparseMatrix<ValueType>::const_rows SparseMatrix<ValueType>::getRowGroup(index_type rowGroup) const {
+            assert(rowGroup < this->getRowGroupCount());
             return getRows(rowGroupIndices[rowGroup], rowGroupIndices[rowGroup + 1] - 1);
         }
         
         template<typename ValueType>
         typename SparseMatrix<ValueType>::rows SparseMatrix<ValueType>::getRowGroup(index_type rowGroup) {
+            assert(rowGroup < this->getRowGroupCount());
             return getRows(rowGroupIndices[rowGroup], rowGroupIndices[rowGroup + 1] - 1);
         }
         

src/storage/SparseMatrix.h

@@ -799,6 +799,22 @@ namespace storm {
              */
             rows getRow(index_type row);
             
+            /*!
+             * Returns an object representing the offset'th row in the rowgroup
+             * @param rowGroup the row group
+             * @param offset which row in the group
+             * @return An object representing the given row.
+             */
+            const_rows getRow(index_type rowGroup, index_type offset) const;
+            
+            /*!
+             * Returns an object representing the offset'th row in the rowgroup
+             * @param rowGroup the row group
+             * @param offset which row in the group
+             * @return An object representing the given row.
+             */
+            rows getRow(index_type rowGroup, index_type entryInGroup);
+            
             /*!
              * Returns an object representing the given row group.
              *