Browse Source

fixed compilation of storm-conv

main
TimQu 7 years ago
parent
commit
aa6fd3cbb2
  1. 8
      src/storm-conv-cli/storm-conv.cpp

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

@ -191,15 +191,17 @@ namespace storm {
} }
} }
storm::storage::SymbolicModelDescription symbDescr(janiModelProperties.first);
// Substitute constant definitions in model and properties. // Substitute constant definitions in model and properties.
std::string constantDefinitionString = input.getConstantDefinitionString(); std::string constantDefinitionString = input.getConstantDefinitionString();
auto constantDefinitions = janiModelProperties.first.parseConstantDefinitions(constantDefinitionString);
auto janiModel = janiModelProperties.first..defineUndefinedConstants(constantDefinitions).substituteConstants();
auto constantDefinitions = symbDescr.parseConstantDefinitions(constantDefinitionString);
auto janiModel = janiModelProperties.first.defineUndefinedConstants(constantDefinitions).substituteConstants();
if (!properties.empty()) { if (!properties.empty()) {
properties = storm::api::substituteConstantsInProperties(properties, constantDefinitions); properties = storm::api::substituteConstantsInProperties(properties, constantDefinitions);
} }
// Branch on the type of output // Branch on the type of output
auto const& output = storm::settings::getModule<storm::settings::modules::ConversionOutputSettings>(); auto const& output = storm::settings::getModule<storm::settings::modules::ConversionOutputSettings>();
if (output.isJaniOutputSet()) { if (output.isJaniOutputSet()) {
processJaniInputJaniOutput(janiModel, properties); processJaniInputJaniOutput(janiModel, properties);

Loading…
Cancel
Save