Fixed a few Rebasing Issues.

Former-commit-id: 288b4d0e82

src/models/AbstractDeterministicModel.h

@@ -90,7 +90,7 @@ class AbstractDeterministicModel: public AbstractModel<T> {
         virtual void writeDotToStream(std::ostream& outStream, bool includeLabeling = true, storm::storage::BitVector const* subsystem = nullptr, std::vector<T> const* firstValue = nullptr, std::vector<T> const* secondValue = nullptr, std::vector<uint_fast64_t> const* stateColoring = nullptr, std::vector<std::string> const* colors = nullptr, std::vector<uint_fast64_t>* scheduler = nullptr, bool finalizeOutput = true) const override {
             AbstractModel<T>::writeDotToStream(outStream, includeLabeling, subsystem, firstValue, secondValue, stateColoring, colors, scheduler, false);
             
-            for (auto const& transition : *this->transitionMatrix) {
+            for (auto const& transition : this->transitionMatrix) {
                 if (transition.value() != storm::utility::constGetZero<T>()) {
                     if (subsystem == nullptr || subsystem->get(transition.column())) {
                         outStream << "\t" << transition.row() << " -> " << transition.column() << " [ label= \"" << transition.value() << "\" ];" << std::endl;

src/models/AbstractNondeterministicModel.h

@@ -148,7 +148,7 @@ class AbstractNondeterministicModel: public AbstractModel<T> {
             typename storm::storage::SparseMatrix<T>::ConstRowsIterator transitionIte = this->getTransitionMatrix().begin();
 
             for (uint_fast64_t state = 0, highestStateIndex = this->getNumberOfStates() - 1; state <= highestStateIndex; ++state) {
-                uint_fast64_t rowCount = (*nondeterministicChoiceIndices)[state + 1] - (*nondeterministicChoiceIndices)[state];
+                uint_fast64_t rowCount = nondeterministicChoiceIndices[state + 1] - nondeterministicChoiceIndices[state];
                 bool highlightChoice = true;
                 for (uint_fast64_t row = 0; row < rowCount; ++row) {
                     if (scheduler != nullptr) {

src/models/AtomicPropositionsLabeling.h

@@ -138,7 +138,7 @@ public:
 	 * @param state The index of a state.
 	 * @returns The set of atomic propositions for the given state.
 	 */
-	std::set<std::string> getPropositionsForState(uint_fast64_t state) {
+	std::set<std::string> getPropositionsForState(uint_fast64_t state) const {
 		if (state >= stateCount) {
 			LOG4CPLUS_ERROR(logger, "State index out of range.");
 			throw storm::exceptions::OutOfRangeException("State index out of range.");