Browse Source

fixed error messages in shield handling

tempestpy_adaptions
Stefan Pranger 3 years ago
parent
commit
8ffcabc79d
  1. 5
      src/storm/shields/shield-handling.h

5
src/storm/shields/shield-handling.h

@ -37,7 +37,7 @@ namespace tempest {
PostSafetyShield<ValueType, IndexType> shield(model->getTransitionMatrix().getRowGroupIndices(), choiceValues, shieldingExpression, optimizationDirection, relevantStates, coalitionStates); PostSafetyShield<ValueType, IndexType> shield(model->getTransitionMatrix().getRowGroupIndices(), choiceValues, shieldingExpression, optimizationDirection, relevantStates, coalitionStates);
shield.construct().printToStream(stream, shieldingExpression, model); shield.construct().printToStream(stream, shieldingExpression, model);
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Cannot create " + shieldingExpression->typeToString() + " shields yet");
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Unknown Shielding Type: " + shieldingExpression->typeToString());
storm::utility::closeFile(stream); storm::utility::closeFile(stream);
} }
storm::utility::closeFile(stream); storm::utility::closeFile(stream);
@ -48,11 +48,10 @@ namespace tempest {
std::ofstream stream; std::ofstream stream;
storm::utility::openFile(shieldFilename(shieldingExpression), stream); storm::utility::openFile(shieldFilename(shieldingExpression), stream);
if(shieldingExpression->isOptimalShield()) { if(shieldingExpression->isOptimalShield()) {
STORM_LOG_DEBUG("createOptimalShield");
OptimalShield<ValueType, IndexType> shield(model->getTransitionMatrix().getRowGroupIndices(), precomputedChoices, shieldingExpression, optimizationDirection, relevantStates, coalitionStates); OptimalShield<ValueType, IndexType> shield(model->getTransitionMatrix().getRowGroupIndices(), precomputedChoices, shieldingExpression, optimizationDirection, relevantStates, coalitionStates);
shield.construct().printToStream(stream, shieldingExpression, model); shield.construct().printToStream(stream, shieldingExpression, model);
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Cannot create " + shieldingExpression->typeToString() + " shields yet");
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Unknown Shielding Type: " + shieldingExpression->typeToString());
storm::utility::closeFile(stream); storm::utility::closeFile(stream);
} }
storm::utility::closeFile(stream); storm::utility::closeFile(stream);

Loading…
Cancel
Save