|
@ -268,7 +268,6 @@ namespace storm { |
|
|
template<typename ValueType> |
|
|
template<typename ValueType> |
|
|
SparseMatrix<ValueType>::SparseMatrix(SparseMatrix<ValueType> const& other) : rowCount(other.rowCount), columnCount(other.columnCount), entryCount(other.entryCount), nonzeroEntryCount(other.nonzeroEntryCount), columnsAndValues(other.columnsAndValues), rowIndications(other.rowIndications), nontrivialRowGrouping(other.nontrivialRowGrouping), rowGroupIndices(other.rowGroupIndices) { |
|
|
SparseMatrix<ValueType>::SparseMatrix(SparseMatrix<ValueType> const& other) : rowCount(other.rowCount), columnCount(other.columnCount), entryCount(other.entryCount), nonzeroEntryCount(other.nonzeroEntryCount), columnsAndValues(other.columnsAndValues), rowIndications(other.rowIndications), nontrivialRowGrouping(other.nontrivialRowGrouping), rowGroupIndices(other.rowGroupIndices) { |
|
|
// Intentionally left empty.
|
|
|
// Intentionally left empty.
|
|
|
std::cout << "!!!! copying matrix (constructor)" << std::endl; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template<typename ValueType> |
|
|
template<typename ValueType> |
|
@ -276,7 +275,6 @@ namespace storm { |
|
|
storm::storage::BitVector rowConstraint(other.getRowCount(), true); |
|
|
storm::storage::BitVector rowConstraint(other.getRowCount(), true); |
|
|
storm::storage::BitVector columnConstraint(other.getColumnCount(), true); |
|
|
storm::storage::BitVector columnConstraint(other.getColumnCount(), true); |
|
|
*this = other.getSubmatrix(false, rowConstraint, columnConstraint, insertDiagonalElements); |
|
|
*this = other.getSubmatrix(false, rowConstraint, columnConstraint, insertDiagonalElements); |
|
|
std::cout << "!!!! copying matrix (insertingDiagElements)" << std::endl; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template<typename ValueType> |
|
|
template<typename ValueType> |
|
@ -290,7 +288,6 @@ namespace storm { |
|
|
template<typename ValueType> |
|
|
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, bool nontrivialRowGrouping) : rowCount(rowIndications.size() - 1), columnCount(columnCount), entryCount(columnsAndValues.size()), nonzeroEntryCount(0), columnsAndValues(columnsAndValues), rowIndications(rowIndications), nontrivialRowGrouping(nontrivialRowGrouping), rowGroupIndices(rowGroupIndices) { |
|
|
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, bool nontrivialRowGrouping) : rowCount(rowIndications.size() - 1), columnCount(columnCount), entryCount(columnsAndValues.size()), nonzeroEntryCount(0), columnsAndValues(columnsAndValues), rowIndications(rowIndications), nontrivialRowGrouping(nontrivialRowGrouping), rowGroupIndices(rowGroupIndices) { |
|
|
this->updateNonzeroEntryCount(); |
|
|
this->updateNonzeroEntryCount(); |
|
|
std::cout << "!!!! copying matrix (copying Ingredients)" << std::endl; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template<typename ValueType> |
|
|
template<typename ValueType> |
|
@ -300,7 +297,6 @@ namespace storm { |
|
|
|
|
|
|
|
|
template<typename ValueType> |
|
|
template<typename ValueType> |
|
|
SparseMatrix<ValueType>& SparseMatrix<ValueType>::operator=(SparseMatrix<ValueType> const& other) { |
|
|
SparseMatrix<ValueType>& SparseMatrix<ValueType>::operator=(SparseMatrix<ValueType> const& other) { |
|
|
std::cout << "!!!! copying matrix (operator=)" << std::endl; |
|
|
|
|
|
// Only perform assignment if source and target are not the same.
|
|
|
// Only perform assignment if source and target are not the same.
|
|
|
if (this != &other) { |
|
|
if (this != &other) { |
|
|
rowCount = other.rowCount; |
|
|
rowCount = other.rowCount; |
|
|