Browse Source

Do not sort BEs anymore

Former-commit-id: 1789ad3644
tempestpy_adaptions
Mavo 8 years ago
parent
commit
ef7d4ac87b
  1. 14
      src/storage/dft/DFTState.cpp
  2. 5
      src/storage/dft/DFTState.h

14
src/storage/dft/DFTState.cpp

@ -32,8 +32,6 @@ namespace storm {
STORM_LOG_ASSERT(it != mCurrentlyNotFailableBE.end(), "Id not found."); STORM_LOG_ASSERT(it != mCurrentlyNotFailableBE.end(), "Id not found.");
mCurrentlyNotFailableBE.erase(it); mCurrentlyNotFailableBE.erase(it);
} }
sortFailableBEs();
} }
template<typename ValueType> template<typename ValueType>
@ -69,8 +67,7 @@ namespace storm {
STORM_LOG_TRACE("Spare " << index << " uses " << useId); STORM_LOG_TRACE("Spare " << index << " uses " << useId);
} }
} }
sortFailableBEs();
// Initialize failable dependencies // Initialize failable dependencies
for (size_t dependencyId : mDft.getDependencies()) { for (size_t dependencyId : mDft.getDependencies()) {
std::shared_ptr<DFTDependency<ValueType> const> dependency = mDft.getDependency(dependencyId); std::shared_ptr<DFTDependency<ValueType> const> dependency = mDft.getDependency(dependencyId);
@ -324,7 +321,6 @@ namespace storm {
propagateActivation(uses(elem)); propagateActivation(uses(elem));
} }
} }
sortFailableBEs();
} }
template<typename ValueType> template<typename ValueType>
@ -422,14 +418,6 @@ namespace storm {
} }
return changed; return changed;
} }
template<typename ValueType>
void DFTState<ValueType>::sortFailableBEs() {
std::sort(mCurrentlyFailableBE.begin( ), mCurrentlyFailableBE.end( ), [&](size_t const& lhs, size_t const& rhs) {
// Sort decreasing
return getBERate(rhs, true) < getBERate(lhs, true);
});
}
// Explicitly instantiate the class. // Explicitly instantiate the class.

5
src/storage/dft/DFTState.h

@ -313,11 +313,6 @@ namespace storm {
*/ */
ValueType getBERate(size_t id, bool considerPassive) const; ValueType getBERate(size_t id, bool considerPassive) const;
/*!
* Sort failable BEs in decreasing order of their active failure rate.
*/
void sortFailableBEs();
}; };
} }

Loading…
Cancel
Save