Browse Source

changed some debug output

tempestpy_adaptions
Stefan Pranger 4 years ago
parent
commit
dccb9e5f8b
  1. 4
      src/storm-cli-utilities/model-handling.h
  2. 4
      src/storm/storage/jani/Property.cpp

4
src/storm-cli-utilities/model-handling.h

@ -838,7 +838,7 @@ namespace storm {
void printModelCheckingProperty(storm::jani::Property const& property) { void printModelCheckingProperty(storm::jani::Property const& property) {
if(property.isShieldingProperty()) { if(property.isShieldingProperty()) {
STORM_PRINT(std::endl << "Creating " << *(property.getShieldingExpression()) << " for ...");
STORM_PRINT(std::endl << "Creating a " << *(property.getShieldingExpression()) << " for:");
} }
STORM_PRINT(std::endl << "Model checking property \"" << property.getName() << "\": " << *property.getRawFormula() << " ..." << std::endl); STORM_PRINT(std::endl << "Model checking property \"" << property.getName() << "\": " << *property.getRawFormula() << " ..." << std::endl);
} }
@ -1002,12 +1002,10 @@ namespace storm {
auto const& ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>(); auto const& ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
auto verificationCallback = [&sparseModel,&ioSettings,&mpi] (std::shared_ptr<storm::logic::Formula const> const& formula, std::shared_ptr<storm::logic::Formula const> const& states, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression) { auto verificationCallback = [&sparseModel,&ioSettings,&mpi] (std::shared_ptr<storm::logic::Formula const> const& formula, std::shared_ptr<storm::logic::Formula const> const& states, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression) {
bool filterForInitialStates = states->isInitialFormula(); bool filterForInitialStates = states->isInitialFormula();
std::cout << "verificationCallback shieldingExpression: " << *shieldingExpression << " ";
auto task = storm::api::createTask<ValueType>(formula, filterForInitialStates); auto task = storm::api::createTask<ValueType>(formula, filterForInitialStates);
if(shieldingExpression) { if(shieldingExpression) {
task.setShieldingExpression(shieldingExpression); task.setShieldingExpression(shieldingExpression);
} }
std::cout << "isShieldingTask ? " << task.isShieldingTask() << std::endl;
if (ioSettings.isExportSchedulerSet()) { if (ioSettings.isExportSchedulerSet()) {
task.setProduceSchedulers(true); task.setProduceSchedulers(true);
} }

4
src/storm/storage/jani/Property.cpp

@ -9,16 +9,12 @@ namespace storm {
Property::Property(std::string const& name, std::shared_ptr<storm::logic::Formula const> const& formula, std::set<storm::expressions::Variable> const& undefinedConstants, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, std::string const& comment) Property::Property(std::string const& name, std::shared_ptr<storm::logic::Formula const> const& formula, std::set<storm::expressions::Variable> const& undefinedConstants, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, std::string const& comment)
: name(name), comment(comment), filterExpression(FilterExpression(formula)), undefinedConstants(undefinedConstants), shieldingExpression(shieldingExpression) { : name(name), comment(comment), filterExpression(FilterExpression(formula)), undefinedConstants(undefinedConstants), shieldingExpression(shieldingExpression) {
std::cout << "In Property ctor: " << *(this->shieldingExpression.get()) << std::endl;
std::cout << "In Property ctor: " << *(shieldingExpression.get()) << std::endl;
// Intentionally left empty. // Intentionally left empty.
} }
Property::Property(std::string const& name, FilterExpression const& fe, std::set<storm::expressions::Variable> const& undefinedConstants, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, std::string const& comment) Property::Property(std::string const& name, FilterExpression const& fe, std::set<storm::expressions::Variable> const& undefinedConstants, std::shared_ptr<storm::logic::ShieldExpression const> const& shieldingExpression, std::string const& comment)
: name(name), comment(comment), filterExpression(fe), undefinedConstants(undefinedConstants), shieldingExpression(shieldingExpression) { : name(name), comment(comment), filterExpression(fe), undefinedConstants(undefinedConstants), shieldingExpression(shieldingExpression) {
// Intentionally left empty. // Intentionally left empty.
std::cout << "In Property ctor with filterExpression: " << *(this->shieldingExpression.get()) << std::endl;
std::cout << "In Property ctor with filterExpression: " << *(shieldingExpression.get()) << std::endl;
} }
std::string const& Property::getName() const { std::string const& Property::getName() const {

Loading…
Cancel
Save