diff --git a/src/builder/ExplicitDFTModelBuilder.cpp b/src/builder/ExplicitDFTModelBuilder.cpp index c6d59d6cb..cbb9b69d0 100644 --- a/src/builder/ExplicitDFTModelBuilder.cpp +++ b/src/builder/ExplicitDFTModelBuilder.cpp @@ -145,7 +145,6 @@ namespace storm { } } - model->printModelInformationToStream(std::cout); return model; } diff --git a/src/storm-dyftee.cpp b/src/storm-dyftee.cpp index 805ef7570..2160ed210 100644 --- a/src/storm-dyftee.cpp +++ b/src/storm-dyftee.cpp @@ -16,12 +16,19 @@ */ template void analyzeDFT(std::string filename, std::string property, bool symred = false) { + storm::settings::SettingsManager& manager = storm::settings::mutableManager(); + manager.setFromString(""); + // Parsing DFT std::cout << "Parsing DFT file..." << std::endl; storm::parser::DFTGalileoParser parser; storm::storage::DFT dft = parser.parseDFT(filename); std::cout << "Built data structure" << std::endl; - + std::cout << "Parse formula..." << std::endl; + std::vector> parsedFormulas = storm::parseFormulasForExplicit(property); + std::vector> formulas(parsedFormulas.begin(), parsedFormulas.end()); + assert(formulas.size() == 1); + std::cout << "parsed formula." << std::endl; if(symred) { std::cout << dft.getElementsString() << std::endl; auto colouring = dft.colourDFT(); @@ -36,10 +43,20 @@ void analyzeDFT(std::string filename, std::string property, bool symred = false) std::shared_ptr> model = builder.buildModel(labeloptions); std::cout << "Built Model" << std::endl; + + model->printModelInformationToStream(std::cout); + + std::cout << "Bisimulation..." << std::endl; + + if (model->isOfType(storm::models::ModelType::Ctmc)) { + model = storm::performDeterministicSparseBisimulationMinimization>(model->template as>(), formulas, storm::storage::BisimulationType::Weak)->template as>(); + } + + + model->printModelInformationToStream(std::cout); + // Model checking std::cout << "Model checking..." << std::endl; - std::vector> formulas = storm::parseFormulasForExplicit(property); - assert(formulas.size() == 1); std::unique_ptr result(storm::verifySparseModel(model, formulas[0])); assert(result); std::cout << "Result: ";