diff --git a/src/storm-dft/api/storm-dft.cpp b/src/storm-dft/api/storm-dft.cpp index ad32f6231..051aed13e 100644 --- a/src/storm-dft/api/storm-dft.cpp +++ b/src/storm-dft/api/storm-dft.cpp @@ -65,7 +65,6 @@ namespace storm { } std::shared_ptr transformToJani(storm::gspn::GSPN const& gspn, uint64_t toplevelFailedPlace) { - // Build Jani model storm::builder::JaniGSPNBuilder builder(gspn); std::shared_ptr model(builder.build("dft_gspn")); @@ -74,23 +73,15 @@ namespace storm { std::shared_ptr const& exprManager = gspn.getExpressionManager(); storm::jani::Variable const& topfailedVar = builder.getPlaceVariable(toplevelFailedPlace); storm::expressions::Expression targetExpression = exprManager->integer(1) == topfailedVar.getExpressionVariable().getExpression(); - storm::jani::Variable const& failedVar = builder.addTransientVariable(model.get(), "failed", targetExpression); - STORM_LOG_TRACE("Target expression: " << targetExpression); - - auto evtlFormula = std::make_shared(targetExpression); - auto tbFormula = std::make_shared(std::make_shared(true), evtlFormula, storm::logic::TimeBound(false, exprManager->integer(0)), storm::logic::TimeBound(false, exprManager->integer(10)), storm::logic::TimeBoundReference(storm::logic::TimeBoundType::Time)); - auto tbUntil = std::make_shared(tbFormula); - auto evFormula = std::make_shared(evtlFormula, storm::logic::FormulaContext::Time); - auto rewFormula = std::make_shared(evFormula, storm::logic::OperatorInformation(), storm::logic::RewardMeasureType::Expectation); - - auto timeBoundedProperty = storm::jani::Property("time-bounded", tbUntil); - auto mttfProperty = storm::jani::Property("mttf", rewFormula); + // Add variable for easier access to 'failed' state + builder.addTransientVariable(model.get(), "failed", targetExpression); + auto failedFormula = std::make_shared(targetExpression); + auto properties = builder.getStandardProperties(model.get(), failedFormula, "Failed", "a failed state", true); // Export Jani to file storm::settings::modules::DftGspnSettings const& dftGspnSettings = storm::settings::getModule(); if (dftGspnSettings.isWriteToJaniSet()) { - // Currently no properties are set - storm::api::exportJaniToFile(*model, {}, dftGspnSettings.getWriteToJaniFilename()); + storm::api::exportJaniToFile(*model, properties, dftGspnSettings.getWriteToJaniFilename()); } return model;