Browse Source

Jani Export settings and code

Former-commit-id: ccd9955a99 [formerly 64edf38f14]
Former-commit-id: 0d3de2ad09
tempestpy_adaptions
sjunges 8 years ago
parent
commit
1557983f8b
  1. 6
      src/cli/cli.cpp
  2. 2
      src/settings/SettingsManager.cpp

6
src/cli/cli.cpp

@ -9,8 +9,10 @@
#include "src/settings/modules/IOSettings.h"
#include "src/settings/modules/CoreSettings.h"
#include "src/exceptions/OptionParserException.h"
#include "src/settings/modules/JaniExportSettings.h"
#include "src/utility/storm-version.h"
#include "src/storage/jani/JSONExporter.h"
// Includes for the linked libraries and versions header.
@ -220,6 +222,10 @@ namespace storm {
model = storm::parseJaniModel(ioSettings.getJaniInputFilename()).first;
}
if(model.isJaniModel() && storm::settings::getModule<storm::settings::modules::JaniExportSettings>().isJaniFileSet()) {
storm::jani::JsonExporter::toFile(model.asJaniModel(), storm::settings::getModule<storm::settings::modules::JaniExportSettings>().getJaniFilename());
}
// Get the string that assigns values to the unknown currently undefined constants in the model.
std::string constantDefinitionString = ioSettings.getConstantDefinitionString();
model = model.preprocess(constantDefinitionString);

2
src/settings/SettingsManager.cpp

@ -33,6 +33,7 @@
#include "src/settings/modules/RegionSettings.h"
#include "src/settings/modules/TopologicalValueIterationEquationSolverSettings.h"
#include "src/settings/modules/ExplorationSettings.h"
#include "src/settings/modules/JaniExportSettings.h"
#include "src/utility/macros.h"
#include "src/settings/Option.h"
@ -524,6 +525,7 @@ namespace storm {
storm::settings::addModule<storm::settings::modules::RegionSettings>();
storm::settings::addModule<storm::settings::modules::Smt2SmtSolverSettings>();
storm::settings::addModule<storm::settings::modules::ExplorationSettings>();
storm::settings::addModule<storm::settings::modules::JaniExportSettings>();
}
}

Loading…
Cancel
Save