From 1f221db28043d4098388b794f164c723ea147894 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Thu, 21 Jun 2018 13:39:36 +0200 Subject: [PATCH] Disable transformation of DFT properties to JANI --- src/storm-dft/api/storm-dft.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/storm-dft/api/storm-dft.cpp b/src/storm-dft/api/storm-dft.cpp index 9d0b88fed..d40597684 100644 --- a/src/storm-dft/api/storm-dft.cpp +++ b/src/storm-dft/api/storm-dft.cpp @@ -56,18 +56,21 @@ 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_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); storm::settings::modules::JaniExportSettings const& janiSettings = storm::settings::getModule(); if (janiSettings.isJaniFileSet()) { - storm::api::exportJaniModel(*model, {storm::jani::Property("time-bounded", tbUntil), storm::jani::Property("mttf", rewFormula)}, janiSettings.getJaniFilename()); + // Currently no properties are set + storm::api::exportJaniModel(*model, {}, janiSettings.getJaniFilename()); } return model;