Browse Source

Changed suffix label for failed elements to '_failed'

tempestpy_adaptions
Matthias Volk 6 years ago
parent
commit
c272e65d30
  1. 2
      src/storm-dft-cli/storm-dft.cpp
  2. 4
      src/storm-dft/builder/ExplicitDFTModelBuilder.cpp

2
src/storm-dft-cli/storm-dft.cpp

@ -150,7 +150,7 @@ void processOptions() {
if (label == "failed") { if (label == "failed") {
// Ignore as this label will always be added // Ignore as this label will always be added
} else { } else {
std::size_t foundIndex = label.find("_fail");
std::size_t foundIndex = label.find("_failed");
if (foundIndex != std::string::npos) { if (foundIndex != std::string::npos) {
relevantEventNames.push_back(label.substr(0, foundIndex)); relevantEventNames.push_back(label.substr(0, foundIndex));
} else { } else {

4
src/storm-dft/builder/ExplicitDFTModelBuilder.cpp

@ -476,7 +476,7 @@ namespace storm {
for (size_t id = 0; id < dft.nrElements(); ++id) { for (size_t id = 0; id < dft.nrElements(); ++id) {
std::shared_ptr<storage::DFTElement<ValueType> const> element = dft.getElement(id); std::shared_ptr<storage::DFTElement<ValueType> const> element = dft.getElement(id);
if (element->isRelevant()) { if (element->isRelevant()) {
modelComponents.stateLabeling.addLabel(element->name() + "_fail");
modelComponents.stateLabeling.addLabel(element->name() + "_failed");
modelComponents.stateLabeling.addLabel(element->name() + "_dc"); modelComponents.stateLabeling.addLabel(element->name() + "_dc");
} }
} }
@ -498,7 +498,7 @@ namespace storm {
storm::storage::DFTElementState elementState = storm::storage::DFTState<ValueType>::getElementState(state, *stateGenerationInfo, element->id()); storm::storage::DFTElementState elementState = storm::storage::DFTState<ValueType>::getElementState(state, *stateGenerationInfo, element->id());
switch (elementState) { switch (elementState) {
case storm::storage::DFTElementState::Failed: case storm::storage::DFTElementState::Failed:
modelComponents.stateLabeling.addLabelToState(element->name() + "_fail", stateId);
modelComponents.stateLabeling.addLabelToState(element->name() + "_failed", stateId);
break; break;
case storm::storage::DFTElementState::DontCare: case storm::storage::DFTElementState::DontCare:
modelComponents.stateLabeling.addLabelToState(element->name() + "_dc", stateId); modelComponents.stateLabeling.addLabelToState(element->name() + "_dc", stateId);

Loading…
Cancel
Save