From 2febe36a655b222e1ce449f653fe38c68e07e179 Mon Sep 17 00:00:00 2001 From: TimQu Date: Fri, 14 Sep 2018 08:54:46 +0200 Subject: [PATCH] removed dependency on storm-conv --- src/storm-cli-utilities/CMakeLists.txt | 2 +- src/storm-cli-utilities/model-handling.h | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/storm-cli-utilities/CMakeLists.txt b/src/storm-cli-utilities/CMakeLists.txt index ee67568ba..de4c0fde1 100644 --- a/src/storm-cli-utilities/CMakeLists.txt +++ b/src/storm-cli-utilities/CMakeLists.txt @@ -17,7 +17,7 @@ set_target_properties(storm-cli-utilities PROPERTIES DEFINE_SYMBOL "") list(APPEND STORM_TARGETS storm-cli-utilities) set(STORM_TARGETS ${STORM_TARGETS} PARENT_SCOPE) -target_link_libraries(storm-cli-utilities PUBLIC storm storm-counterexamples storm-parsers storm-conv) +target_link_libraries(storm-cli-utilities PUBLIC storm storm-counterexamples storm-parsers) # Install storm headers to include directory. foreach(HEADER ${STORM_CLI_UTIL_HEADERS}) diff --git a/src/storm-cli-utilities/model-handling.h b/src/storm-cli-utilities/model-handling.h index 14cd9aa3f..057f3f436 100644 --- a/src/storm-cli-utilities/model-handling.h +++ b/src/storm-cli-utilities/model-handling.h @@ -4,7 +4,6 @@ #include "storm-counterexamples/api/counterexamples.h" #include "storm-parsers/api/storm-parsers.h" -#include "storm-conv/api/storm-conv.h" #include "storm/utility/resources.h" #include "storm/utility/file.h" @@ -156,13 +155,11 @@ namespace storm { } if (output.model && output.model.get().isJaniModel()) { - storm::converter::JaniConversionOptions options; - options.allowFunctions = false; - options.allowArrays = coreSettings.getEngine() == storm::settings::modules::CoreSettings::Engine::Sparse && !buildSettings.isJitSet(); - options.standardCompliant = false; - options.flatten = false; - output.preprocessedProperties = output.properties; - storm::api::transformJani(output.model.get().asJaniModel(), output.preprocessedProperties.get(), options); + // Check if arrays need to be eliminated + if (coreSettings.getEngine() != storm::settings::modules::CoreSettings::Engine::Sparse || buildSettings.isJitSet()) { + output.preprocessedProperties = output.properties; + output.model.get().asJaniModel().eliminateArrays(output.preprocessedProperties.get()); + } } return output; }