Browse Source

renaming sanity check, fix brackets

tempestpy_adaptions
gereon 12 years ago
parent
commit
4d4219991c
  1. 18
      src/models/Dtmc.h

18
src/models/Dtmc.h

@ -41,9 +41,8 @@ public:
*/ */
Dtmc(std::shared_ptr<mrmc::storage::SquareSparseMatrix<T>> probabilityMatrix, std::shared_ptr<mrmc::models::AtomicPropositionsLabeling> stateLabeling) Dtmc(std::shared_ptr<mrmc::storage::SquareSparseMatrix<T>> probabilityMatrix, std::shared_ptr<mrmc::models::AtomicPropositionsLabeling> stateLabeling)
: probabilityMatrix(probabilityMatrix), stateLabeling(stateLabeling), backwardTransitions(nullptr) { : probabilityMatrix(probabilityMatrix), stateLabeling(stateLabeling), backwardTransitions(nullptr) {
if (! this->sanityCheck())
{
std::cerr << "sanity check failed" << std::endl;
if (! this->checkValidityProbabilityMatrix()) {
std::cerr << "Probability matrix is invalid" << std::endl;
} }
} }
@ -57,9 +56,8 @@ public:
if (dtmc.backardTransitions != nullptr) { if (dtmc.backardTransitions != nullptr) {
this->backwardTransitions = new mrmc::models::GraphTransitions<T>(*dtmc.backwardTransitions); this->backwardTransitions = new mrmc::models::GraphTransitions<T>(*dtmc.backwardTransitions);
} }
if (! this->sanityCheck())
{
std::cerr << "sanity check failed" << std::endl;
if (! this->checkValidityProbabilityMatrix()) {
std::cerr << "Probability matrix is invalid" << std::endl;
} }
} }
@ -154,12 +152,10 @@ private:
* *
* Checks probability matrix if all rows sum up to one. * Checks probability matrix if all rows sum up to one.
*/ */
bool sanityCheck() {
for (uint_fast64_t row = 0; row < this->probabilityMatrix->getRowCount(); row++)
{
bool checkValidityProbabilityMatrix() {
for (uint_fast64_t row = 0; row < this->probabilityMatrix->getRowCount(); row++) {
T sum = this->probabilityMatrix->getDiagonalStoragePointer()[row]; T sum = this->probabilityMatrix->getDiagonalStoragePointer()[row];
for (uint_fast64_t id = this->probabilityMatrix->getRowIndicationsPointer()[row]; id < this->probabilityMatrix->getRowIndicationsPointer()[row+1]; id++)
{
for (uint_fast64_t id = this->probabilityMatrix->getRowIndicationsPointer()[row]; id < this->probabilityMatrix->getRowIndicationsPointer()[row+1]; id++) {
sum += this->probabilityMatrix->getStoragePointer()[id]; sum += this->probabilityMatrix->getStoragePointer()[id];
} }
if (sum == 0) continue; if (sum == 0) continue;

Loading…
Cancel
Save