Browse Source

Cleanup after processing options

main
Matthias Volk 7 years ago
parent
commit
e9a57aa3e5
  1. 6
      src/storm-dft-cli/storm-dft.cpp

6
src/storm-dft-cli/storm-dft.cpp

@ -99,13 +99,13 @@ void processOptions() {
std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>(); std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>();
// Export to json // Export to json
storm::storage::DftJsonExporter<double>::toFile(*dft, dftIOSettings.getExportJsonFilename()); storm::storage::DftJsonExporter<double>::toFile(*dft, dftIOSettings.getExportJsonFilename());
storm::utility::cleanUp();
return; return;
} }
if (dftIOSettings.isTransformToGspn()) { if (dftIOSettings.isTransformToGspn()) {
std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>(); std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>();
// Transform to GSPN
storm::transformations::dft::DftToGspnTransformator<double> gspnTransformator(*dft); storm::transformations::dft::DftToGspnTransformator<double> gspnTransformator(*dft);
gspnTransformator.transform(); gspnTransformator.transform();
storm::gspn::GSPN* gspn = gspnTransformator.obtainGSPN(); storm::gspn::GSPN* gspn = gspnTransformator.obtainGSPN();
@ -118,7 +118,6 @@ void processOptions() {
storm::jani::Model* model = builder.build(); storm::jani::Model* model = builder.build();
storm::jani::Variable const& topfailedVar = builder.getPlaceVariable(toplevelFailedPlace); storm::jani::Variable const& topfailedVar = builder.getPlaceVariable(toplevelFailedPlace);
storm::expressions::Expression targetExpression = exprManager->integer(1) == topfailedVar.getExpressionVariable().getExpression(); storm::expressions::Expression targetExpression = exprManager->integer(1) == topfailedVar.getExpressionVariable().getExpression();
auto evtlFormula = std::make_shared<storm::logic::AtomicExpressionFormula>(targetExpression); auto evtlFormula = std::make_shared<storm::logic::AtomicExpressionFormula>(targetExpression);
auto tbFormula = std::make_shared<storm::logic::BoundedUntilFormula>(std::make_shared<storm::logic::BooleanLiteralFormula>(true), evtlFormula, storm::logic::TimeBound(false, exprManager->integer(0)), storm::logic::TimeBound(false, exprManager->integer(10)), storm::logic::TimeBoundReference(storm::logic::TimeBoundType::Time)); auto tbFormula = std::make_shared<storm::logic::BoundedUntilFormula>(std::make_shared<storm::logic::BooleanLiteralFormula>(true), evtlFormula, storm::logic::TimeBound(false, exprManager->integer(0)), storm::logic::TimeBound(false, exprManager->integer(10)), storm::logic::TimeBoundReference(storm::logic::TimeBoundType::Time));
@ -134,7 +133,6 @@ void processOptions() {
delete model; delete model;
delete gspn; delete gspn;
storm::utility::cleanUp();
return; return;
} }
@ -153,7 +151,6 @@ void processOptions() {
std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>(); std::shared_ptr<storm::storage::DFT<double>> dft = loadDFT<double>();
analyzeWithSMT<double>(dft); analyzeWithSMT<double>(dft);
} }
storm::utility::cleanUp();
return; return;
} }
#endif #endif
@ -234,7 +231,6 @@ int main(const int argc, const char** argv) {
} }
processOptions(); processOptions();
//storm::pars::processOptions();
totalTimer.stop(); totalTimer.stop();
if (storm::settings::getModule<storm::settings::modules::ResourceSettings>().isPrintTimeAndMemorySet()) { if (storm::settings::getModule<storm::settings::modules::ResourceSettings>().isPrintTimeAndMemorySet()) {

Loading…
Cancel
Save