setting jani conversion options from settings

src/storm-conv-cli/storm-conv.cpp

@@ -48,9 +48,7 @@ namespace storm {
             storm::converter::PrismToJaniConverterOptions options;
             options.allVariablesGlobal = true;
             options.suffix = "";
-            options.janiOptions.standardCompliant = jani.isExportAsStandardJaniSet();
-            options.janiOptions.locationVariables = jani.getLocationVariables();
-            options.janiOptions.exportFlattened = jani.isExportFlattenedSet();
+            options.janiOptions = storm::converter::JaniConversionOptions(jani);
             auto janiModelProperties = storm::api::convertPrismToJani(prismProg, properties, options);
             
             std::string outputFilename = "";

src/storm-conv/converter/options/JaniConversionOptions.cpp

@@ -6,6 +6,10 @@ namespace storm {
         JaniConversionOptions::JaniConversionOptions() : standardCompliant(false), exportFlattened(false) {
             // Intentionally left empty
         };
+
+        JaniConversionOptions::JaniConversionOptions(storm::settings::modules::JaniExportSettings const& settings) : locationVariables(settings.getLocationVariables()), standardCompliant(settings.isExportAsStandardJaniSet()), exportFlattened(settings.isExportFlattenedSet()) {
+            // Intentionally left empty
+        };
     }
 }
 

src/storm-conv/converter/options/JaniConversionOptions.h

@@ -2,6 +2,7 @@
 
 #include <string>
 #include <vector>
+#include "storm-conv/settings/modules/JaniExportSettings.h"
 
 namespace storm {
     namespace converter {
@@ -9,6 +10,7 @@ namespace storm {
         struct JaniConversionOptions {
             
             JaniConversionOptions();
+            JaniConversionOptions(storm::settings::modules::JaniExportSettings const& settings);
             
             /// (Automaton,Variable)-pairs that will be transformed to location variables of the respective automaton.
             std::vector<std::pair<std::string, std::string>> locationVariables;