Browse Source

Consistent use of printInfo in DFTModelChecker

tempestpy_adaptions
Matthias Volk 5 years ago
parent
commit
61a99a9b9d
  1. 21
      src/storm-dft/modelchecker/dft/DFTModelChecker.cpp

21
src/storm-dft/modelchecker/dft/DFTModelChecker.cpp

@ -262,7 +262,9 @@ namespace storm {
} }
} }
//composedModel->printModelInformationToStream(std::cout);
if (printInfo) {
composedModel->printModelInformationToStream(std::cout);
}
return composedModel; return composedModel;
} else { } else {
// No composition was possible // No composition was possible
@ -283,7 +285,9 @@ namespace storm {
allowDCForRelevantEvents); allowDCForRelevantEvents);
builder.buildModel(0, 0.0); builder.buildModel(0, 0.0);
std::shared_ptr<storm::models::sparse::Model<ValueType>> model = builder.getModel(); std::shared_ptr<storm::models::sparse::Model<ValueType>> model = builder.getModel();
//model->printModelInformationToStream(std::cout);
if (printInfo) {
model->printModelInformationToStream(std::cout);
}
explorationTimer.stop(); explorationTimer.stop();
STORM_LOG_THROW(model->isOfType(storm::models::ModelType::Ctmc), STORM_LOG_THROW(model->isOfType(storm::models::ModelType::Ctmc),
storm::exceptions::NotSupportedException, storm::exceptions::NotSupportedException,
@ -351,9 +355,18 @@ namespace storm {
STORM_LOG_DEBUG("Getting model for lower bound..."); STORM_LOG_DEBUG("Getting model for lower bound...");
model = builder.getModelApproximation(true, !probabilityFormula); model = builder.getModelApproximation(true, !probabilityFormula);
// We only output the info from the lower bound as the info for the upper bound is the same // We only output the info from the lower bound as the info for the upper bound is the same
//model->printModelInformationToStream(std::cout);
if (printInfo) {
model->printModelInformationToStream(std::cout);
}
buildingTimer.stop(); buildingTimer.stop();
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
if (ioSettings.isExportExplicitSet()) {
std::vector<std::string> parameterNames;
// TODO fill parameter names
storm::api::exportSparseModelAsDrn(model, ioSettings.getExportExplicitFilename(), parameterNames);
}
// Check lower bounds // Check lower bounds
newResult = checkModel(model, {property}); newResult = checkModel(model, {property});
STORM_LOG_ASSERT(newResult.size() == 1, "Wrong size for result vector."); STORM_LOG_ASSERT(newResult.size() == 1, "Wrong size for result vector.");
@ -381,7 +394,7 @@ namespace storm {
"Under-approximation " << approxResult.first "Under-approximation " << approxResult.first
<< " is greater than over-approximation " << " is greater than over-approximation "
<< approxResult.second); << approxResult.second);
//STORM_LOG_INFO("Result after iteration " << iteration << ": (" << std::setprecision(10) << approxResult.first << ", " << approxResult.second << ")");
STORM_LOG_DEBUG("Result after iteration " << iteration << ": (" << std::setprecision(10) << approxResult.first << ", " << approxResult.second << ")");
totalTimer.stop(); totalTimer.stop();
printTimings(); printTimings();
totalTimer.start(); totalTimer.start();

Loading…
Cancel
Save