Browse Source

Fixed one of the remaining bugs introduced by refactoring.

tempestpy_adaptions
dehnert 12 years ago
parent
commit
2b4d26023a
  1. 3
      CMakeLists.txt
  2. 4
      src/models/Dtmc.h
  3. 4
      src/storage/SparseMatrix.h

3
CMakeLists.txt

@ -158,6 +158,9 @@ target_link_libraries(storm-tests ${Boost_LIBRARIES})
set (STORM_USE_COTIRE ON) set (STORM_USE_COTIRE ON)
if (APPLE) if (APPLE)
set(STORM_USE_COTIRE OFF) set(STORM_USE_COTIRE OFF)
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
endif(APPLE) endif(APPLE)
# Print Cotire Usage Status # Print Cotire Usage Status

4
src/models/Dtmc.h

@ -62,7 +62,7 @@ public:
* Copy Constructor. Performs a deep copy of the given DTMC. * Copy Constructor. Performs a deep copy of the given DTMC.
* @param dtmc A reference to the DTMC that is to be copied. * @param dtmc A reference to the DTMC that is to be copied.
*/ */
Dtmc(const Dtmc<T> &dtmc) : AbstractDeterministicModel<T>(dtmc) {
Dtmc(Dtmc<T> const& dtmc) : AbstractDeterministicModel<T>(dtmc) {
// Intentionally left empty. // Intentionally left empty.
} }
@ -95,7 +95,7 @@ private:
return false; return false;
} }
for (uint_fast64_t row = 0; row < this->getTransitionMatrix()->getRowCount(); row++) {
for (uint_fast64_t row = 0; row < this->getTransitionMatrix()->getRowCount(); ++row) {
T sum = this->getTransitionMatrix()->getRowSum(row); T sum = this->getTransitionMatrix()->getRowSum(row);
if (sum == 0) { if (sum == 0) {
LOG4CPLUS_ERROR(logger, "Row " << row << " has sum 0"); LOG4CPLUS_ERROR(logger, "Row " << row << " has sum 0");

4
src/storage/SparseMatrix.h

@ -1005,7 +1005,7 @@ public:
* @returns An iterator that points to the first element after the matrix. * @returns An iterator that points to the first element after the matrix.
*/ */
ConstValueIterator constValueIteratorEnd(uint_fast64_t row) const { ConstValueIterator constValueIteratorEnd(uint_fast64_t row) const {
return &(this->valueStorage[0]) + this->rowIndications[row];
return &(this->valueStorage[0]) + this->rowIndications[row + 1];
} }
/*! /*!
@ -1071,7 +1071,7 @@ public:
* given, rows of different groups will be separated by a dashed line. * given, rows of different groups will be separated by a dashed line.
* @returns A (non-compressed) string representation of the matrix. * @returns A (non-compressed) string representation of the matrix.
*/ */
std::string toString(std::vector<uint_fast64_t> const* rowGroupIndices) const {
std::string toString(std::vector<uint_fast64_t> const* rowGroupIndices = nullptr) const {
std::stringstream result; std::stringstream result;
uint_fast64_t currentNondeterministicChoiceIndex = 0; uint_fast64_t currentNondeterministicChoiceIndex = 0;

Loading…
Cancel
Save