From 49dac54e8b80cea8c5209447de1b70ad5b770161 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Mon, 20 Apr 2020 19:40:42 +0200 Subject: [PATCH] Fixed typos --- src/storm-dft-cli/storm-dft.cpp | 1 + src/storm-dft/builder/ExplicitDFTModelBuilder.cpp | 4 ++-- src/storm-dft/storage/dft/DFT.cpp | 2 +- src/storm-dft/storage/dft/elements/BEExponential.h | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/storm-dft-cli/storm-dft.cpp b/src/storm-dft-cli/storm-dft.cpp index 5d835b4c7..87338ff30 100644 --- a/src/storm-dft-cli/storm-dft.cpp +++ b/src/storm-dft-cli/storm-dft.cpp @@ -87,6 +87,7 @@ void processOptions() { // Apply transformations // TODO transform later before actual analysis dft = storm::api::applyTransformations(*dft, faultTreeSettings.isUniqueFailedBE(), true); + STORM_LOG_DEBUG(dft->getElementsString()); dft->setDynamicBehaviorInfo(); diff --git a/src/storm-dft/builder/ExplicitDFTModelBuilder.cpp b/src/storm-dft/builder/ExplicitDFTModelBuilder.cpp index b5ed7c298..a1bd445d4 100644 --- a/src/storm-dft/builder/ExplicitDFTModelBuilder.cpp +++ b/src/storm-dft/builder/ExplicitDFTModelBuilder.cpp @@ -59,14 +59,14 @@ namespace storm { // Consider all children of the top level gate std::vector isubdft; if (child->nrParents() > 1 || child->hasOutgoingDependencies()) { - STORM_LOG_TRACE("child " << child->name() << "does not allow modularisation."); + STORM_LOG_TRACE("child " << child->name() << " does not allow modularisation."); isubdft.clear(); } else if (dft.isGate(child->id())) { isubdft = dft.getGate(child->id())->independentSubDft(false); } else { STORM_LOG_ASSERT(dft.isBasicElement(child->id()), "Child is no BE."); if(dft.getBasicElement(child->id())->hasIngoingDependencies()) { - STORM_LOG_TRACE("child " << child->name() << "does not allow modularisation."); + STORM_LOG_TRACE("child " << child->name() << " does not allow modularisation."); isubdft.clear(); } else { isubdft = {child->id()}; diff --git a/src/storm-dft/storage/dft/DFT.cpp b/src/storm-dft/storage/dft/DFT.cpp index daa6c33f2..6b79e1c1e 100644 --- a/src/storm-dft/storage/dft/DFT.cpp +++ b/src/storm-dft/storage/dft/DFT.cpp @@ -416,7 +416,7 @@ namespace storm { } else { STORM_LOG_ASSERT(isBasicElement(child->id()), "Child is no BE."); if (getBasicElement(child->id())->hasIngoingDependencies()) { - STORM_LOG_TRACE("child " << child->name() << "does not allow modularisation."); + STORM_LOG_TRACE("child " << child->name() << " does not allow modularisation."); return {*this}; } else { isubdft = {child->id()}; diff --git a/src/storm-dft/storage/dft/elements/BEExponential.h b/src/storm-dft/storage/dft/elements/BEExponential.h index 8347f3179..1ed6221d6 100644 --- a/src/storm-dft/storage/dft/elements/BEExponential.h +++ b/src/storm-dft/storage/dft/elements/BEExponential.h @@ -67,7 +67,8 @@ namespace storm { } bool canFail() const override { - return !storm::utility::isZero(this->activeFailureRate()); + STORM_LOG_ASSERT(!storm::utility::isZero(this->activeFailureRate()), "BEExp should have failure rate > 0"); + return true; } /*!