From 4079a3f9cc2c228ae2730b3c7b80b1479f4506bc Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Fri, 29 Jan 2016 13:50:49 +0100
Subject: [PATCH] Refactoring
Former-commit-id: ef3aa2c516c474f4e9d3444addc16a1887840c64
---
src/builder/ExplicitDFTModelBuilder.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/builder/ExplicitDFTModelBuilder.cpp b/src/builder/ExplicitDFTModelBuilder.cpp
index a203c93e8..107baa4bb 100644
--- a/src/builder/ExplicitDFTModelBuilder.cpp
+++ b/src/builder/ExplicitDFTModelBuilder.cpp
@@ -97,16 +97,16 @@ namespace storm {
STORM_LOG_TRACE("exploring from: " << mDft.getStateString(state));
storm::storage::DFTState<ValueType> newState(state);
- std::pair<std::shared_ptr<storm::storage::DFTBE<ValueType>>, bool> nextBE = newState.letNextBEFail(smallest++);
- if (nextBE.first == nullptr) {
+ std::pair<std::shared_ptr<storm::storage::DFTBE<ValueType>>, bool> nextBEPair = newState.letNextBEFail(smallest++);
+ std::shared_ptr<storm::storage::DFTBE<ValueType>> nextBE = nextBEPair.first;
+ if (nextBE == nullptr) {
break;
-
}
- STORM_LOG_TRACE("with the failure of: " << nextBE.first->name() << " [" << nextBE.first->id() << "]");
+ STORM_LOG_TRACE("with the failure of: " << nextBE->name() << " [" << nextBE->id() << "]");
storm::storage::DFTStateSpaceGenerationQueues<ValueType> queues;
- for (DFTGatePointer parent : nextBE.first->parents()) {
+ for (DFTGatePointer parent : nextBE->parents()) {
if (newState.isOperational(parent->id())) {
queues.propagateFailure(parent);
}
@@ -144,7 +144,7 @@ namespace storm {
}
// Set transition
- ValueType rate = nextBE.first->activeFailureRate();
+ ValueType rate = nextBE->activeFailureRate();
auto resultFind = outgoingTransitions.find(it->getId());
if (resultFind != outgoingTransitions.end()) {
// Add to existing transition