Browse Source

started overhaul of cli/api

main
dehnert 9 years ago
parent
commit
ea02ea0838
  1. 2
      resources/3rdparty/sylvan/src/storm_wrapper.cpp
  2. 2
      resources/3rdparty/sylvan/src/sylvan_obj.hpp
  3. 2
      src/storm-dft/builder/DftExplorationHeuristic.cpp
  4. 2
      src/storm-dft/storage/BucketPriorityQueue.cpp
  5. 2
      src/storm-dft/storage/dft/elements/DFTElement.h
  6. 2
      src/storm/abstraction/MenuGame.cpp
  7. 2
      src/storm/abstraction/MenuGameAbstractor.cpp
  8. 2
      src/storm/abstraction/MenuGameRefiner.cpp
  9. 2
      src/storm/abstraction/StateSetAbstractor.cpp
  10. 2
      src/storm/abstraction/jani/AutomatonAbstractor.cpp
  11. 2
      src/storm/abstraction/jani/EdgeAbstractor.cpp
  12. 2
      src/storm/abstraction/jani/JaniMenuGameAbstractor.cpp
  13. 2
      src/storm/abstraction/prism/CommandAbstractor.cpp
  14. 2
      src/storm/abstraction/prism/ModuleAbstractor.cpp
  15. 2
      src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp
  16. 2
      src/storm/adapters/AddExpressionAdapter.cpp
  17. 2
      src/storm/adapters/EigenAdapter.h
  18. 2
      src/storm/adapters/HyproAdapter.h
  19. 3
      src/storm/adapters/RationalFunctionAdapter.h
  20. 0
      src/storm/adapters/RationalNumberAdapter.h
  21. 2
      src/storm/adapters/Smt2ExpressionAdapter.h
  22. 3
      src/storm/analysis/GraphConditions.cpp
  23. 6
      src/storm/analysis/GraphConditions.h
  24. 52
      src/storm/api/bisimulation.h
  25. 103
      src/storm/api/builder.h
  26. 18
      src/storm/api/counterexamples.h
  27. 70
      src/storm/api/export.h
  28. 25
      src/storm/api/model_descriptions.cpp
  29. 22
      src/storm/api/model_descriptions.h
  30. 96
      src/storm/api/properties.cpp
  31. 43
      src/storm/api/properties.h
  32. 9
      src/storm/api/storm.h
  33. 365
      src/storm/api/verification.h
  34. 2
      src/storm/builder/DdJaniModelBuilder.cpp
  35. 2
      src/storm/builder/DdPrismModelBuilder.cpp
  36. 2
      src/storm/builder/RewardModelBuilder.cpp
  37. 2
      src/storm/builder/jit/Choice.cpp
  38. 2
      src/storm/builder/jit/Distribution.cpp
  39. 2
      src/storm/builder/jit/DistributionEntry.cpp
  40. 6
      src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp
  41. 2
      src/storm/builder/jit/ExplicitJitJaniModelBuilder.h
  42. 2
      src/storm/builder/jit/JitModelBuilderInterface.cpp
  43. 2
      src/storm/builder/jit/StateBehaviour.cpp
  44. 752
      src/storm/cli/cli.cpp
  45. 14
      src/storm/cli/cli.h
  46. 12
      src/storm/cli/entrypoints.h
  47. 12
      src/storm/counterexamples/Counterexample.cpp
  48. 16
      src/storm/counterexamples/Counterexample.h
  49. 9
      src/storm/counterexamples/MILPMinimalLabelSetGenerator.h
  50. 16
      src/storm/counterexamples/PrismHighLevelCounterexample.cpp
  51. 21
      src/storm/counterexamples/PrismHighLevelCounterexample.h
  52. 21
      src/storm/counterexamples/SMTMinimalCommandSetGenerator.h
  53. 2
      src/storm/generator/Choice.cpp
  54. 2
      src/storm/generator/NextStateGenerator.cpp
  55. 2
      src/storm/generator/StateBehavior.cpp
  56. 2
      src/storm/logic/OperatorFormula.cpp
  57. 1
      src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp
  58. 2
      src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp
  59. 2
      src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp
  60. 4
      src/storm/modelchecker/hints/ExplicitModelCheckerHint.cpp
  61. 4
      src/storm/modelchecker/hints/ModelCheckerHint.cpp
  62. 2
      src/storm/modelchecker/multiobjective/constraintbased/SparseCbAchievabilityQuery.cpp
  63. 2
      src/storm/modelchecker/multiobjective/constraintbased/SparseCbQuery.cpp
  64. 2
      src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp
  65. 2
      src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp
  66. 2
      src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp
  67. 2
      src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
  68. 2
      src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp
  69. 2
      src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
  70. 2
      src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
  71. 2
      src/storm/modelchecker/parametric/RegionChecker.cpp
  72. 4
      src/storm/modelchecker/parametric/SparseDtmcParameterLiftingModelChecker.cpp
  73. 2
      src/storm/modelchecker/parametric/SparseDtmcRegionChecker.cpp
  74. 4
      src/storm/modelchecker/parametric/SparseInstantiationModelChecker.cpp
  75. 2
      src/storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.cpp
  76. 2
      src/storm/modelchecker/parametric/SparseMdpRegionChecker.cpp
  77. 4
      src/storm/modelchecker/parametric/SparseParameterLiftingModelChecker.cpp
  78. 2
      src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h
  79. 2
      src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp
  80. 2
      src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp
  81. 2
      src/storm/modelchecker/results/CheckResult.cpp
  82. 2
      src/storm/modelchecker/results/ExplicitParetoCurveCheckResult.cpp
  83. 2
      src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp
  84. 2
      src/storm/modelchecker/results/ParetoCurveCheckResult.cpp
  85. 2
      src/storm/modelchecker/results/QuantitativeCheckResult.cpp
  86. 2
      src/storm/modelchecker/results/SymbolicParetoCurveCheckResult.cpp
  87. 2
      src/storm/models/sparse/Ctmc.cpp
  88. 2
      src/storm/models/sparse/DeterministicModel.cpp
  89. 2
      src/storm/models/sparse/Dtmc.cpp
  90. 2
      src/storm/models/sparse/MarkovAutomaton.cpp
  91. 2
      src/storm/models/sparse/Mdp.cpp
  92. 2
      src/storm/models/sparse/Model.cpp
  93. 2
      src/storm/models/sparse/NondeterministicModel.cpp
  94. 2
      src/storm/models/sparse/StandardRewardModel.cpp
  95. 2
      src/storm/models/sparse/StandardRewardModel.h
  96. 2
      src/storm/models/sparse/StochasticTwoPlayerGame.cpp
  97. 2
      src/storm/models/symbolic/Ctmc.cpp
  98. 2
      src/storm/models/symbolic/DeterministicModel.cpp
  99. 2
      src/storm/models/symbolic/Dtmc.cpp
  100. 2
      src/storm/models/symbolic/Mdp.cpp

2
resources/3rdparty/sylvan/src/storm_wrapper.cpp

@ -7,7 +7,7 @@
#include <map>
#include <mutex>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/constants.h"
#include "storm/exceptions/InvalidOperationException.h"

2
resources/3rdparty/sylvan/src/sylvan_obj.hpp

@ -23,7 +23,7 @@
#include <lace.h>
#include <sylvan.h>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace sylvan {

2
src/storm-dft/builder/DftExplorationHeuristic.cpp

@ -1,6 +1,6 @@
#include "DftExplorationHeuristic.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"
#include "storm/utility/constants.h"
#include "storm/exceptions/NotImplementedException.h"

2
src/storm-dft/storage/BucketPriorityQueue.cpp

@ -1,6 +1,6 @@
#include "BucketPriorityQueue.h"
#include "storm/utility/macros.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include <cmath>

2
src/storm-dft/storage/dft/elements/DFTElement.h

@ -15,7 +15,7 @@
#include "../DFTState.h"
#include "../DFTStateSpaceGenerationQueues.h"
#include "storm/utility/constants.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"

2
src/storm/abstraction/MenuGame.cpp

@ -10,7 +10,7 @@
#include "storm/models/symbolic/StandardRewardModel.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/MenuGameAbstractor.cpp

@ -10,7 +10,7 @@
#include "storm/utility/file.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/MenuGameRefiner.cpp

@ -16,7 +16,7 @@
#include "storm/settings/SettingsManager.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/StateSetAbstractor.cpp

@ -8,7 +8,7 @@
#include "storm/utility/solver.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/jani/AutomatonAbstractor.cpp

@ -13,7 +13,7 @@
#include "storm/settings/SettingsManager.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"

2
src/storm/abstraction/jani/EdgeAbstractor.cpp

@ -17,7 +17,7 @@
#include "storm/utility/macros.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/jani/JaniMenuGameAbstractor.cpp

@ -25,7 +25,7 @@
#include "storm/exceptions/NotSupportedException.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/prism/CommandAbstractor.cpp

@ -17,7 +17,7 @@
#include "storm/utility/macros.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/abstraction/prism/ModuleAbstractor.cpp

@ -12,7 +12,7 @@
#include "storm/settings/SettingsManager.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"

2
src/storm/abstraction/prism/PrismMenuGameAbstractor.cpp

@ -23,7 +23,7 @@
#include "storm/exceptions/NotSupportedException.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace abstraction {

2
src/storm/adapters/AddExpressionAdapter.cpp

@ -9,7 +9,7 @@
#include "storm/storage/dd/Bdd.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/constants.h"

2
src/storm/adapters/EigenAdapter.h

@ -3,7 +3,7 @@
#include <memory>
#include "storm/utility/eigen.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/storage/SparseMatrix.h"

2
src/storm/adapters/HyproAdapter.h

@ -11,7 +11,7 @@
#include <hypro/representations/GeometricObject.h>
#include <hypro/representations/Polytopes/HPolytope/HPolytope.h>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/storage/geometry/Halfspace.h"
namespace storm {

3
src/storm/adapters/CarlAdapter.h → src/storm/adapters/RationalFunctionAdapter.h

@ -1,6 +1,6 @@
#pragma once
#include "storm/adapters/NumberAdapter.h"
#include "storm/adapters/RationalNumberAdapter.h"
#include <carl/core/MultivariatePolynomial.h>
#include <carl/core/RationalFunction.h>
@ -9,7 +9,6 @@
#include <carl/core/Relation.h>
#include <carl/core/SimpleConstraint.h>
#include <carl/util/stringparser.h>
#include <carl/formula/Formula.h>
namespace carl {
// Define hash values for all polynomials and rational function.

0
src/storm/adapters/NumberAdapter.h → src/storm/adapters/RationalNumberAdapter.h

2
src/storm/adapters/Smt2ExpressionAdapter.h

@ -4,7 +4,7 @@
#include <unordered_map>
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/storage/expressions/Expressions.h"
#include "storm/storage/expressions/ExpressionManager.h"
#include "storm/utility/macros.h"

3
src/storm/analysis/GraphConditions.cpp

@ -107,7 +107,6 @@ namespace storm {
process(dtmc);
}
template class ConstraintCollector<storm::RationalFunction>;
}
}
}

6
src/storm/analysis/GraphConditions.h

@ -2,9 +2,11 @@
#include <type_traits>
#include <unordered_set>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Dtmc.h"
#include <carl/formula/Formula.h>
namespace storm {
namespace analysis {
@ -73,4 +75,4 @@ public:
}
}
}

52
src/storm/api/bisimulation.h

@ -0,0 +1,52 @@
#pragma once
#include "storm/storage/bisimulation/DeterministicModelBisimulationDecomposition.h"
#include "storm/storage/bisimulation/NondeterministicModelBisimulationDecomposition.h"
namespace storm {
namespace api {
template <typename ModelType>
std::shared_ptr<ModelType> performDeterministicSparseBisimulationMinimization(std::shared_ptr<ModelType> model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas, storm::storage::BisimulationType type) {
typename storm::storage::DeterministicModelBisimulationDecomposition<ModelType>::Options options;
if (!formulas.empty()) {
options = typename storm::storage::DeterministicModelBisimulationDecomposition<ModelType>::Options(*model, formulas);
}
options.setType(type);
storm::storage::DeterministicModelBisimulationDecomposition<ModelType> bisimulationDecomposition(*model, options);
bisimulationDecomposition.computeBisimulationDecomposition();
return bisimulationDecomposition.getQuotient();
}
template<typename ModelType>
std::shared_ptr<ModelType> performNondeterministicSparseBisimulationMinimization(std::shared_ptr<ModelType> model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas, storm::storage::BisimulationType type) {
typename storm::storage::DeterministicModelBisimulationDecomposition<ModelType>::Options options;
if (!formulas.empty()) {
options = typename storm::storage::NondeterministicModelBisimulationDecomposition<ModelType>::Options(*model, formulas);
}
options.setType(type);
storm::storage::NondeterministicModelBisimulationDecomposition<ModelType> bisimulationDecomposition(*model, options);
bisimulationDecomposition.computeBisimulationDecomposition();
return bisimulationDecomposition.getQuotient();
}
template <typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> performBisimulationMinimization(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas, storm::storage::BisimulationType type = storm::storage::BisimulationType::Strong) {
STORM_LOG_THROW(model->isOfType(storm::models::ModelType::Dtmc) || model->isOfType(storm::models::ModelType::Ctmc) || model->isOfType(storm::models::ModelType::Mdp), storm::exceptions::InvalidSettingsException, "Bisimulation minimization is currently only available for DTMCs, CTMCs and MDPs.");
model->reduceToStateBasedRewards();
if (model->isOfType(storm::models::ModelType::Dtmc)) {
return performDeterministicSparseBisimulationMinimization<storm::models::sparse::Dtmc<ValueType>>(model->template as<storm::models::sparse::Dtmc<ValueType>>(), formulas, type);
} else if (model->isOfType(storm::models::ModelType::Ctmc)) {
return performDeterministicSparseBisimulationMinimization<storm::models::sparse::Ctmc<ValueType>>(model->template as<storm::models::sparse::Ctmc<ValueType>>(), formulas, type);
} else {
return performNondeterministicSparseBisimulationMinimization<storm::models::sparse::Mdp<ValueType>>(model->template as<storm::models::sparse::Mdp<ValueType>>(), formulas, type);
}
}
}
}

103
src/storm/api/builder.h

@ -0,0 +1,103 @@
#pragma once
#include "storm/builder/DdPrismModelBuilder.h"
#include "storm/builder/DdJaniModelBuilder.h"
#include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/IOSettings.h"
#include "storm/settings/modules/JitBuilderSettings.h"
#include "storm/utility/macros.h"
#include "storm/exceptions/NotSupportedException.h"
namespace storm {
namespace api {
template<storm::dd::DdType LibraryType, typename ValueType>
std::shared_ptr<storm::models::symbolic::Model<LibraryType, ValueType>> buildSymbolicModel(storm::storage::SymbolicModelDescription const& model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas) {
if (model.isPrismProgram()) {
typename storm::builder::DdPrismModelBuilder<LibraryType, ValueType>::Options options;
options = typename storm::builder::DdPrismModelBuilder<LibraryType, ValueType>::Options(formulas);
storm::builder::DdPrismModelBuilder<LibraryType, ValueType> builder;
return builder.build(model.asPrismProgram(), options);
} else {
STORM_LOG_THROW(model.isJaniModel(), storm::exceptions::InvalidArgumentException, "Cannot build symbolic model for the given symbolic model description.");
typename storm::builder::DdJaniModelBuilder<LibraryType, ValueType>::Options options;
options = typename storm::builder::DdJaniModelBuilder<LibraryType, ValueType>::Options(formulas);
storm::builder::DdJaniModelBuilder<LibraryType, ValueType> builder;
return builder.build(model.asJaniModel(), options);
}
}
template<>
std::shared_ptr<storm::models::symbolic::Model<storm::dd::DdType::CUDD, storm::RationalNumber>> buildSymbolicModel(storm::storage::SymbolicModelDescription const& model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "CUDD does not support rational numbers.");
}
template<>
std::shared_ptr<storm::models::symbolic::Model<storm::dd::DdType::CUDD, storm::RationalFunction>> buildSymbolicModel(storm::storage::SymbolicModelDescription const& model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "CUDD does not support rational functions.");
}
template<typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> buildSparseModel(storm::storage::SymbolicModelDescription const& model, std::vector<std::shared_ptr<storm::logic::Formula const>> const& formulas, bool buildChoiceLabels = false) {
storm::builder::BuilderOptions options(formulas);
if (storm::settings::getModule<storm::settings::modules::IOSettings>().isBuildFullModelSet()) {
options.setBuildAllLabels();
options.setBuildAllRewardModels();
options.clearTerminalStates();
}
options.setBuildChoiceLabels(buildChoiceLabels);
if (storm::settings::getModule<storm::settings::modules::IOSettings>().isJitSet()) {
STORM_LOG_THROW(model.isJaniModel(), storm::exceptions::NotSupportedException, "Cannot use JIT-based model builder for non-JANI model.");
storm::builder::jit::ExplicitJitJaniModelBuilder<ValueType> builder(model.asJaniModel(), options);
if (storm::settings::getModule<storm::settings::modules::JitBuilderSettings>().isDoctorSet()) {
bool result = builder.doctor();
STORM_LOG_THROW(result, storm::exceptions::InvalidSettingsException, "The JIT-based model builder cannot be used on your system.");
STORM_LOG_INFO("The JIT-based model builder seems to be working.");
}
return builder.build();
} else {
std::shared_ptr<storm::generator::NextStateGenerator<ValueType, uint32_t>> generator;
if (model.isPrismProgram()) {
generator = std::make_shared<storm::generator::PrismNextStateGenerator<ValueType, uint32_t>>(model.asPrismProgram(), options);
} else if (model.isJaniModel()) {
generator = std::make_shared<storm::generator::JaniNextStateGenerator<ValueType, uint32_t>>(model.asJaniModel(), options);
} else {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Cannot build sparse model from this symbolic model description.");
}
storm::builder::ExplicitModelBuilder<ValueType> builder(generator);
return builder.build();
}
}
template<typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> buildExplicitModel(std::string const&, std::string const&, boost::optional<std::string> const& = boost::none, boost::optional<std::string> const& = boost::none, boost::optional<std::string> const& = boost::none) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Exact or parametric models with explicit input are not supported.");
}
template<>
std::shared_ptr<storm::models::sparse::Model<double>> buildExplicitModel(std::string const& transitionsFile, std::string const& labelingFile, boost::optional<std::string> const& stateRewardsFile, boost::optional<std::string> const& transitionRewardsFile, boost::optional<std::string> const& choiceLabelingFile) {
return storm::parser::AutoParser<double, double>::parseModel(transitionsFile, labelingFile, stateRewardsFile ? stateRewardsFile.get() : "", transitionRewardsFile ? transitionRewardsFile.get() : "", choiceLabelingFile ? choiceLabelingFile.get() : "" );
}
template<typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> buildExplicitDRNModel(std::string const& drnFile) {
return storm::parser::DirectEncodingParser<ValueType>::parseModel(drnFile);
}
template<>
inline std::shared_ptr<storm::models::sparse::Model<storm::RationalNumber>> buildExplicitDRNModel(std::string const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Exact models with direct encoding are not supported.");
}
}
}

18
src/storm/api/counterexamples.h

@ -0,0 +1,18 @@
#pragma once
#include "storm/counterexamples/MILPMinimalLabelSetGenerator.h"
#include "storm/counterexamples/SMTMinimalCommandSetGenerator.h"
namespace storm {
namespace api {
std::shared_ptr<storm::counterexamples::Counterexample> computePrismHighLevelCounterexampleMilp(storm::prism::Program const& program, std::shared_ptr<storm::models::sparse::Mdp<double>> mdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
return storm::counterexamples::MILPMinimalLabelSetGenerator<double>::computeCounterexample(program, *mdp, formula);
}
std::shared_ptr<storm::counterexamples::Counterexample> computePrismHighLevelCounterexampleMaxSmt(storm::prism::Program const& program, std::shared_ptr<storm::models::sparse::Mdp<double>> mdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
return storm::counterexamples::SMTMinimalCommandSetGenerator<double>::computeCounterexample(program, *mdp, formula);
}
}
}

70
src/storm/api/export.h

@ -0,0 +1,70 @@
#pragma once
#include "storm/utility/macros.h"
#include "storm/exceptions/NotSupportedException.h"
namespace storm {
namespace api {
void exportJaniModel(storm::jani::Model const& model, std::vector<storm::jani::Property> const& properties, std::string const& filename) {
auto janiSettings = storm::settings::getModule<storm::settings::modules::JaniExportSettings>();
if (janiSettings.isExportAsStandardJaniSet()) {
storm::jani::Model normalisedModel = model;
normalisedModel.makeStandardJaniCompliant();
storm::jani::JsonExporter::toFile(normalisedModel, properties, filename);
} else {
storm::jani::JsonExporter::toFile(model, properties, filename);
}
}
void exportJaniModelAsDot(storm::jani::Model const& model, std::string const& filename) {
std::ofstream out;
storm::utility::openFile(filename, out);
model.writeDotToStream(out);
storm::utility::closeFile(out);
}
template <typename ValueType>
void exportParametricResultToFile(ValueType const& result, storm::analysis::ConstraintCollector<ValueType> const& constraintCollector, std::string const& path) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Cannot export non-parametric result.");
}
template <>
void exportParametricResultToFile(storm::RationalFunction const& result, storm::analysis::ConstraintCollector<storm::RationalFunction> const& constraintCollector, std::string const& path) {
std::ofstream filestream;
storm::utility::openFile(path, filestream);
filestream << "!Parameters: ";
std::set<storm::RationalFunctionVariable> vars = result.gatherVariables();
std::copy(vars.begin(), vars.end(), std::ostream_iterator<storm::RationalFunctionVariable>(filestream, "; "));
filestream << std::endl;
filestream << "!Result: " << result << std::endl;
filestream << "!Well-formed Constraints: " << std::endl;
std::vector<std::string> stringConstraints;
std::transform(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) -> std::string { return c.toString();});
std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
filestream << "!Graph-preserving Constraints: " << std::endl;
stringConstraints.clear();
std::transform(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) -> std::string { return c.toString();});
std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
storm::utility::closeFile(filestream);
}
template <typename ValueType>
void exportSparseModelAsDrn(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, std::string const& filename, std::vector<std::string> const& parameterNames) {
std::ofstream stream;
storm::utility::openFile(filename, stream);
storm::exporter::explicitExportSparseModel(stream, model, parameterNames);
storm::utility::closeFile(stream);
}
template <typename ValueType>
void exportSparseModelAsDot(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, std::string const& filename) {
std::ofstream stream;
storm::utility::openFile(filename, stream);
model->writeDotToStream(stream);
storm::utility::closeFile(stream);
}
}
}

25
src/storm/api/model_descriptions.cpp

@ -0,0 +1,25 @@
#include "storm/api/model_descriptions.h"
#include "storm/parser/PrismParser.h"
#include "storm/parser/JaniParser.h"
#include "storm/storage/jani/Model.h"
#include "storm/storage/jani/Property.h"
namespace storm {
namespace api {
storm::prism::Program parseProgram(std::string const& filename) {
storm::prism::Program program = storm::parser::PrismParser::parse(filename).simplify().simplify();
program.checkValidity();
return program;
}
std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> parseJaniModel(std::string const& filename) {
std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> modelAndFormulae = storm::parser::JaniParser::parse(filename);
modelAndFormulae.first.checkValid();
return modelAndFormulae;
}
}
}

22
src/storm/api/model_descriptions.h

@ -0,0 +1,22 @@
#pragma once
#include <string>
#include <map>
namespace storm {
namespace prism {
class Program;
}
namespace jani {
class Model;
class Property;
}
namespace api {
storm::prism::Program parseProgram(std::string const& filename);
std::pair<storm::jani::Model, std::map<std::string, storm::jani::Property>> parseJaniModel(std::string const& filename);
}
}

96
src/storm/api/properties.cpp

@ -0,0 +1,96 @@
#include "storm/api/properties.h"
#include "storm/parser/FormulaParser.h"
#include "storm/storage/SymbolicModelDescription.h"
#include "storm/storage/prism/Program.h"
#include "storm/storage/jani/Model.h"
#include "storm/storage/jani/Property.h"
#include "storm/utility/cli.h"
namespace storm {
namespace api {
boost::optional<std::set<std::string>> parsePropertyFilter(boost::optional<std::string> const& propertyFilter) {
std::vector<std::string> propertyNames = storm::utility::cli::parseCommaSeparatedStrings(propertyFilter.get());
std::set<std::string> propertyNameSet(propertyNames.begin(), propertyNames.end());
return propertyNameSet;
}
std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter) {
// If the given property looks like a file (containing a dot and there exists a file with that name),
// we try to parse it as a file, otherwise we assume it's a property.
std::vector<storm::jani::Property> properties;
if (inputString.find(".") != std::string::npos && std::ifstream(inputString).good()) {
properties = formulaParser.parseFromFile(inputString);
} else {
properties = formulaParser.parseFromString(inputString);
}
return filterProperties(properties, propertyFilter);
}
std::vector<storm::jani::Property> parseProperties(std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter) {
auto exprManager = std::make_shared<storm::expressions::ExpressionManager>();
storm::parser::FormulaParser formulaParser(exprManager);
return parseProperties(formulaParser, inputString, propertyFilter);
}
std::vector<storm::jani::Property> parsePropertiesForJaniModel(std::string const& inputString, storm::jani::Model const& model, boost::optional<std::set<std::string>> const& propertyFilter) {
storm::parser::FormulaParser formulaParser(model.getManager().getSharedPointer());
auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
return substituteConstantsInProperties(formulas, model.getConstantsSubstitution());
}
std::vector<storm::jani::Property> parsePropertiesForPrismProgram(std::string const& inputString, storm::prism::Program const& program, boost::optional<std::set<std::string>> const& propertyFilter) {
storm::parser::FormulaParser formulaParser(program);
auto formulas = parseProperties(formulaParser, inputString, propertyFilter);
return substituteConstantsInProperties(formulas, program.getConstantsSubstitution());
}
std::vector<storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const& inputString, storm::storage::SymbolicModelDescription const& modelDescription, boost::optional<std::set<std::string>> const& propertyFilter) {
std::vector<storm::jani::Property> result;
if (modelDescription.isPrismProgram()) {
result = storm::api::parsePropertiesForPrismProgram(inputString, modelDescription.asPrismProgram(), propertyFilter);
} else {
STORM_LOG_ASSERT(modelDescription.isJaniModel(), "Unknown model description type.");
result = storm::api::parsePropertiesForJaniModel(inputString, modelDescription.asJaniModel(), propertyFilter);
}
return result;
}
std::vector<storm::jani::Property> substituteConstantsInProperties(std::vector<storm::jani::Property> const& properties, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution) {
std::vector<storm::jani::Property> preprocessedProperties;
for (auto const& property : properties) {
preprocessedProperties.emplace_back(property.substitute(substitution));
}
return preprocessedProperties;
}
std::vector<storm::jani::Property> filterProperties(std::vector<storm::jani::Property> const& properties, boost::optional<std::set<std::string>> const& propertyFilter) {
if (propertyFilter) {
std::set<std::string> const& propertyNameSet = propertyFilter.get();
std::vector<storm::jani::Property> result;
std::set<std::string> reducedPropertyNames;
for (auto const& property : properties) {
if (propertyNameSet.find(property.getName()) != propertyNameSet.end()) {
result.push_back(property);
reducedPropertyNames.insert(property.getName());
}
}
if (reducedPropertyNames.size() < propertyNameSet.size()) {
std::set<std::string> missingProperties;
std::set_difference(propertyNameSet.begin(), propertyNameSet.end(), reducedPropertyNames.begin(), reducedPropertyNames.end(), std::inserter(missingProperties, missingProperties.begin()));
STORM_LOG_WARN("Filtering unknown properties " << boost::join(missingProperties, ", ") << ".");
}
return result;
} else {
return properties;
}
}
}
}

43
src/storm/api/properties.h

@ -0,0 +1,43 @@
#pragma once
#include <string>
#include <set>
#include <map>
#include <vector>
#include <boost/optional.hpp>
namespace storm {
namespace parser {
class FormulaParser;
}
namespace jani {
class Property;
class Model;
}
namespace expressions {
class Variable;
class Expression;
}
namespace prism {
class Program;
}
namespace storage {
class SymbolicModelDescription;
}
namespace api {
boost::optional<std::set<std::string>> parsePropertyFilter(boost::optional<std::string> const& propertyFilter);
// Parsing properties.
std::vector<storm::jani::Property> parseProperties(storm::parser::FormulaParser& formulaParser, std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
std::vector<storm::jani::Property> parseProperties(std::string const& inputString, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
std::vector<storm::jani::Property> parsePropertiesForPrismProgram(std::string const& inputString, storm::prism::Program const& program, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
std::vector<storm::jani::Property> parsePropertiesForJaniModel(std::string const& inputString, storm::jani::Model const& model, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
std::vector<storm::jani::Property> parsePropertiesForSymbolicModelDescription(std::string const& inputString, storm::storage::SymbolicModelDescription const& modelDescription, boost::optional<std::set<std::string>> const& propertyFilter = boost::none);
// Process properties.
std::vector<storm::jani::Property> substituteConstantsInProperties(std::vector<storm::jani::Property> const& properties, std::map<storm::expressions::Variable, storm::expressions::Expression> const& substitution);
std::vector<storm::jani::Property> filterProperties(std::vector<storm::jani::Property> const& properties, boost::optional<std::set<std::string>> const& propertyFilter);
}
}

9
src/storm/api/storm.h

@ -0,0 +1,9 @@
#pragma once
#include "storm/api/model_descriptions.h"
#include "storm/api/properties.h"
#include "storm/api/builder.h"
#include "storm/api/bisimulation.h"
#include "storm/api/verification.h"
#include "storm/api/counterexamples.h"
#include "storm/api/export.h"

365
src/storm/api/verification.h

@ -0,0 +1,365 @@
#pragma once
#include <type_traits>
#include "storm/modelchecker/abstraction/GameBasedMdpModelChecker.h"
#include "storm/utility/macros.h"
#include "storm/exceptions/NotSupportedException.h"
#include "storm/exceptions/NotImplementedException.h"
namespace storm {
namespace api {
template<typename ValueType>
storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> createTask(std::shared_ptr<const storm::logic::Formula> const& formula, bool onlyInitialStatesRelevant = false) {
return storm::modelchecker::CheckTask<storm::logic::Formula, ValueType>(*formula, onlyInitialStatesRelevant);
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<std::is_same<ValueType, double>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithAbstractionRefinementEngine(storm::storage::SymbolicModelDescription const& model, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
STORM_LOG_THROW(model.getModelType() == storm::storage::SymbolicModelDescription::ModelType::DTMC || model.getModelType() == storm::storage::SymbolicModelDescription::ModelType::MDP, storm::exceptions::NotSupportedException, "Can only treat DTMCs/MDPs using the abstraction refinement engine.");
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (model.getModelType() == storm::storage::SymbolicModelDescription::ModelType::DTMC) {
storm::modelchecker::GameBasedMdpModelChecker<DdType, storm::models::symbolic::Dtmc<DdType, ValueType>> modelchecker(model);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
} else {
storm::modelchecker::GameBasedMdpModelChecker<DdType, storm::models::symbolic::Mdp<DdType, ValueType>> modelchecker(model);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<!std::is_same<ValueType, double>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithAbstractionRefinementEngine(storm::storage::SymbolicModelDescription const&, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Abstraction-refinement engine does not support data type.");
}
template<typename ValueType>
typename std::enable_if<std::is_same<ValueType, double>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithExplorationEngine(storm::storage::SymbolicModelDescription const& model, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
STORM_LOG_THROW(model.isPrismProgram(), storm::exceptions::InvalidSettingsException, "Exploration engine is currently only applicable to PRISM models.");
storm::prism::Program const& program = model.asPrismProgram();
STORM_LOG_THROW(program.getModelType() == storm::prism::Program::ModelType::DTMC || program.getModelType() == storm::prism::Program::ModelType::MDP, storm::exceptions::InvalidSettingsException, "Currently exploration-based verification is only available for DTMCs and MDPs.");
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (program.getModelType() == storm::prism::Program::ModelType::DTMC) {
storm::modelchecker::SparseExplorationModelChecker<storm::models::sparse::Dtmc<ValueType>> checker(program);
if (checker.canHandle(task)) {
result = checker.check(task);
}
} else {
storm::modelchecker::SparseExplorationModelChecker<storm::models::sparse::Mdp<ValueType>> checker(program);
if (checker.canHandle(task)) {
result = checker.check(task);
}
}
return result;
}
template<typename ValueType>
typename std::enable_if<!std::is_same<ValueType, double>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithExplorationEngine(storm::storage::SymbolicModelDescription const&, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Exploration engine does not support data type.");
}
template<typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::Dtmc<ValueType>> const& dtmc, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (storm::settings::getModule<storm::settings::modules::CoreSettings>().getEquationSolver() == storm::solver::EquationSolverType::Elimination && storm::settings::getModule<storm::settings::modules::EliminationSettings>().isUseDedicatedModelCheckerSet()) {
storm::modelchecker::SparseDtmcEliminationModelChecker<storm::models::sparse::Dtmc<ValueType>> modelchecker(*dtmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
} else {
storm::modelchecker::SparseDtmcPrctlModelChecker<storm::models::sparse::Dtmc<ValueType>> modelchecker(*dtmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
}
return result;
}
template<typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::Ctmc<ValueType>> const& ctmc, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::SparseCtmcCslModelChecker<storm::models::sparse::Ctmc<ValueType>> modelchecker(*ctmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<typename ValueType>
typename std::enable_if<!std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::Mdp<ValueType>> const& mdp, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::SparseMdpPrctlModelChecker<storm::models::sparse::Mdp<ValueType>> modelchecker(*mdp);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<typename ValueType>
typename std::enable_if<std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::Mdp<ValueType>> const&, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Sparse engine cannot verify MDPs with this data type.");
}
template<typename ValueType>
typename std::enable_if<!std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::MarkovAutomaton<ValueType>> const& ma, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
// Close the MA, if it is not already closed.
if (!ma->isClosed()) {
STORM_LOG_WARN("Closing Markov automaton. Consider closing the MA before verification.");
ma->close();
}
storm::modelchecker::SparseMarkovAutomatonCslModelChecker<storm::models::sparse::MarkovAutomaton<ValueType>> modelchecker(*ma);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<typename ValueType>
typename std::enable_if<std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::MarkovAutomaton<ValueType>> const& ma, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Sparse engine cannot verify MAs with this data type.");
}
template<typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithSparseEngine(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (model->getType() == storm::models::ModelType::Dtmc) {
result = verifyWithSparseEngine(model->template as<storm::models::sparse::Dtmc<ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::Mdp) {
result = verifyWithSparseEngine(model->template as<storm::models::sparse::Mdp<ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::Ctmc) {
result = verifyWithSparseEngine(model->template as<storm::models::sparse::Ctmc<ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::MarkovAutomaton) {
result = verifyWithSparseEngine(model->template as<storm::models::sparse::MarkovAutomaton<ValueType>>(), task);
} else {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "The model type " << model->getType() << " is not supported.");
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithHybridEngine(std::shared_ptr<storm::models::symbolic::Dtmc<DdType, ValueType>> const& dtmc, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::HybridDtmcPrctlModelChecker<storm::models::symbolic::Dtmc<DdType, ValueType>> modelchecker(*dtmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithHybridEngine(std::shared_ptr<storm::models::symbolic::Ctmc<DdType, ValueType>> const& ctmc, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::HybridCtmcCslModelChecker<storm::models::symbolic::Ctmc<DdType, ValueType>> modelchecker(*ctmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<!std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithHybridEngine(std::shared_ptr<storm::models::symbolic::Mdp<DdType, ValueType>> const& mdp, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::HybridMdpPrctlModelChecker<storm::models::symbolic::Mdp<DdType, ValueType>> modelchecker(*mdp);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithHybridEngine(std::shared_ptr<storm::models::symbolic::Mdp<DdType, ValueType>> const&, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Hybrid engine cannot verify MDPs with this data type.");
}
template<storm::dd::DdType DdType, typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithHybridEngine(std::shared_ptr<storm::models::symbolic::Model<DdType, ValueType>> const& model, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (model->getType() == storm::models::ModelType::Dtmc) {
result = verifyWithHybridEngine(model->template as<storm::models::symbolic::Dtmc<DdType, ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::Ctmc) {
result = verifyWithHybridEngine(model->template as<storm::models::symbolic::Ctmc<DdType, ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::Mdp) {
result = verifyWithHybridEngine(model->template as<storm::models::symbolic::Mdp<DdType, ValueType>>(), task);
} else {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "The model type is not supported by the hybrid engine.");
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithDdEngine(std::shared_ptr<storm::models::symbolic::Dtmc<DdType, ValueType>> const& dtmc, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::SymbolicDtmcPrctlModelChecker<storm::models::symbolic::Dtmc<DdType, ValueType>> modelchecker(*dtmc);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<!std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithDdEngine(std::shared_ptr<storm::models::symbolic::Mdp<DdType, ValueType>> const& mdp, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
storm::modelchecker::SymbolicMdpPrctlModelChecker<storm::models::symbolic::Mdp<DdType, ValueType>> modelchecker(*mdp);
if (modelchecker.canHandle(task)) {
result = modelchecker.check(task);
}
return result;
}
template<storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<std::is_same<ValueType, storm::RationalFunction>::value, std::unique_ptr<storm::modelchecker::CheckResult>>::type verifyWithDdEngine(std::shared_ptr<storm::models::symbolic::Mdp<DdType, ValueType>> const&, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Dd engine cannot verify MDPs with this data type.");
}
template<storm::dd::DdType DdType, typename ValueType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithDdEngine(std::shared_ptr<storm::models::symbolic::Model<DdType, ValueType>> const& model, storm::modelchecker::CheckTask<storm::logic::Formula, ValueType> const& task) {
std::unique_ptr<storm::modelchecker::CheckResult> result;
if (model->getType() == storm::models::ModelType::Dtmc) {
result = verifyWithDdEngine(model->template as<storm::models::symbolic::Dtmc<DdType, ValueType>>(), task);
} else if (model->getType() == storm::models::ModelType::Mdp) {
result = verifyWithDdEngine(model->template as<storm::models::symbolic::Mdp<DdType, ValueType>>(), task);
} else {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "The model type is not supported by the dd engine.");
}
return result;
}
template<typename ParametricType>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithParameterLifting(std::shared_ptr<storm::models::sparse::Model<ParametricType>>, std::shared_ptr<storm::logic::Formula const> const&) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Parameter-lifting is unavailable for this data-type.");
}
template<>
std::unique_ptr<storm::modelchecker::CheckResult> verifyWithParameterLifting(std::shared_ptr<storm::models::sparse::Model<storm::RationalFunction>> markovModel, std::shared_ptr<storm::logic::Formula const> const& formula) {
STORM_LOG_THROW(false, storm::exceptions::NotImplementedException, "Parameter-lifting is currently unavailable from the API.");
// storm::utility::Stopwatch parameterLiftingStopWatch(true);
// std::shared_ptr<storm::logic::Formula const> consideredFormula = formula;
//
// STORM_LOG_WARN_COND(storm::utility::parameterlifting::validateParameterLiftingSound(markovModel, formula), "Could not validate whether parameter lifting is sound on the input model and the formula " << *formula);
//
// if (markovModel->isOfType(storm::models::ModelType::Ctmc) || markovModel->isOfType(storm::models::ModelType::MarkovAutomaton)) {
// STORM_PRINT_AND_LOG("Transforming continuous model to discrete model...");
// storm::transformer::transformContinuousToDiscreteModelInPlace(markovModel, consideredFormula);
// STORM_PRINT_AND_LOG(" done!" << std::endl);
// markovModel->printModelInformationToStream(std::cout);
// }
//
// auto modelParameters = storm::models::sparse::getProbabilityParameters(*markovModel);
// auto rewParameters = storm::models::sparse::getRewardParameters(*markovModel);
// modelParameters.insert(rewParameters.begin(), rewParameters.end());
//
// STORM_LOG_THROW(storm::settings::getModule<storm::settings::modules::ParametricSettings>().isParameterSpaceSet(), storm::exceptions::InvalidSettingsException, "Invoked Parameter lifting but no parameter space was defined.");
// auto parameterSpaceAsString = storm::settings::getModule<storm::settings::modules::ParametricSettings>().getParameterSpace();
// auto parameterSpace = storm::storage::ParameterRegion<storm::RationalFunction>::parseRegion(parameterSpaceAsString, modelParameters);
// auto refinementThreshold = storm::utility::convertNumber<typename storm::storage::ParameterRegion<storm::RationalFunction>::CoefficientType>(storm::settings::getModule<storm::settings::modules::ParametricSettings>().getRefinementThreshold());
// std::vector<std::pair<storm::storage::ParameterRegion<storm::RationalFunction>, storm::modelchecker::parametric::RegionCheckResult>> result;
//
// STORM_PRINT_AND_LOG("Performing parameter lifting for property " << *consideredFormula << " with parameter space " << parameterSpace.toString(true) << " and refinement threshold " << storm::utility::convertNumber<double>(refinementThreshold) << " ..." << std::endl);
//
// storm::modelchecker::CheckTask<storm::logic::Formula, storm::RationalFunction> task(*consideredFormula, true);
// std::string resultVisualization;
//
// if (markovModel->isOfType(storm::models::ModelType::Dtmc)) {
// if (storm::settings::getModule<storm::settings::modules::GeneralSettings>().isExactSet()) {
// storm::modelchecker::parametric::SparseDtmcRegionChecker <storm::models::sparse::Dtmc<storm::RationalFunction>, storm::RationalNumber> regionChecker(*markovModel->template as<storm::models::sparse::Dtmc<storm::RationalFunction>>());
// regionChecker.specifyFormula(task);
// result = regionChecker.performRegionRefinement(parameterSpace, refinementThreshold);
// parameterLiftingStopWatch.stop();
// if (modelParameters.size() == 2) {
// resultVisualization = regionChecker.visualizeResult(result, parameterSpace, *modelParameters.begin(), *(modelParameters.rbegin()));
// }
// } else {
// storm::modelchecker::parametric::SparseDtmcRegionChecker <storm::models::sparse::Dtmc<storm::RationalFunction>, double, storm::RationalNumber> regionChecker(*markovModel->template as<storm::models::sparse::Dtmc<storm::RationalFunction>>());
// regionChecker.specifyFormula(task);
// result = regionChecker.performRegionRefinement(parameterSpace, refinementThreshold);
// parameterLiftingStopWatch.stop();
// if (modelParameters.size() == 2) {
// resultVisualization = regionChecker.visualizeResult(result, parameterSpace, *modelParameters.begin(), *(modelParameters.rbegin()));
// }
// }
// } else if (markovModel->isOfType(storm::models::ModelType::Mdp)) {
// if (storm::settings::getModule<storm::settings::modules::GeneralSettings>().isExactSet()) {
// storm::modelchecker::parametric::SparseMdpRegionChecker<storm::models::sparse::Mdp<storm::RationalFunction>, storm::RationalNumber> regionChecker(*markovModel->template as<storm::models::sparse::Mdp<storm::RationalFunction>>());
// regionChecker.specifyFormula(task);
// result = regionChecker.performRegionRefinement(parameterSpace, refinementThreshold);
// parameterLiftingStopWatch.stop();
// if (modelParameters.size() == 2) {
// resultVisualization = regionChecker.visualizeResult(result, parameterSpace, *modelParameters.begin(), *(modelParameters.rbegin()));
// }
// } else {
// storm::modelchecker::parametric::SparseMdpRegionChecker<storm::models::sparse::Mdp<storm::RationalFunction>, double, storm::RationalNumber> regionChecker(*markovModel->template as<storm::models::sparse::Mdp<storm::RationalFunction>>());
// regionChecker.specifyFormula(task);
// result = regionChecker.performRegionRefinement(parameterSpace, refinementThreshold);
// parameterLiftingStopWatch.stop();
// if (modelParameters.size() == 2) {
// resultVisualization = regionChecker.visualizeResult(result, parameterSpace, *modelParameters.begin(), *(modelParameters.rbegin()));
// }
// }
// } else {
// STORM_LOG_THROW(false, storm::exceptions::InvalidSettingsException, "Unable to perform parameterLifting on the provided model type.");
// }
//
//
// auto satArea = storm::utility::zero<typename storm::storage::ParameterRegion<storm::RationalFunction>::CoefficientType>();
// auto unsatArea = storm::utility::zero<typename storm::storage::ParameterRegion<storm::RationalFunction>::CoefficientType>();
// uint_fast64_t numOfSatRegions = 0;
// uint_fast64_t numOfUnsatRegions = 0;
// for (auto const& res : result) {
// switch (res.second) {
// case storm::modelchecker::parametric::RegionCheckResult::AllSat:
// satArea += res.first.area();
// ++numOfSatRegions;
// break;
// case storm::modelchecker::parametric::RegionCheckResult::AllViolated:
// unsatArea += res.first.area();
// ++numOfUnsatRegions;
// break;
// default:
// STORM_LOG_ERROR("Unexpected result for region " << res.first.toString(true) << " : " << res.second << ".");
// break;
// }
// }
// typename storm::storage::ParameterRegion<storm::RationalFunction>::CoefficientType satAreaFraction = satArea / parameterSpace.area();
// typename storm::storage::ParameterRegion<storm::RationalFunction>::CoefficientType unsatAreaFraction = unsatArea / parameterSpace.area();
// STORM_PRINT_AND_LOG("Done! Found " << numOfSatRegions << " safe regions and "
// << numOfUnsatRegions << " unsafe regions." << std::endl);
// STORM_PRINT_AND_LOG(storm::utility::convertNumber<double>(satAreaFraction) * 100 << "% of the parameter space is safe, and "
// << storm::utility::convertNumber<double>(unsatAreaFraction) * 100 << "% of the parameter space is unsafe." << std::endl);
// STORM_PRINT_AND_LOG("Model checking with parameter lifting took " << parameterLiftingStopWatch << " seconds." << std::endl);
// STORM_PRINT_AND_LOG(resultVisualization);
//
// if (storm::settings::getModule<storm::settings::modules::ParametricSettings>().exportResultToFile()) {
// std::string path = storm::settings::getModule<storm::settings::modules::ParametricSettings>().exportResultPath();
// STORM_PRINT_AND_LOG("Exporting result to path " << path << "." << std::endl);
// std::ofstream filestream;
// storm::utility::openFile(path, filestream);
//
// for (auto const& res : result) {
// switch (res.second) {
// case storm::modelchecker::parametric::RegionCheckResult::AllSat:
// filestream << "safe: " << res.first.toString(true) << std::endl;
// break;
// case storm::modelchecker::parametric::RegionCheckResult::AllViolated:
// filestream << "unsafe: " << res.first.toString(true) << std::endl;
// break;
// default:
// break;
// }
// }
// }
// }
}
}
}

2
src/storm/builder/DdJaniModelBuilder.cpp

@ -40,7 +40,7 @@
#include "storm/exceptions/InvalidStateException.h"
#include "storm/exceptions/NotSupportedException.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/DdPrismModelBuilder.cpp

@ -26,7 +26,7 @@
#include "storm/settings/modules/CoreSettings.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/RewardModelBuilder.cpp

@ -1,6 +1,6 @@
#include "storm/builder/RewardModelBuilder.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/builder/jit/Choice.cpp

@ -1,6 +1,6 @@
#include "storm/builder/jit/Choice.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/constants.h"

2
src/storm/builder/jit/Distribution.cpp

@ -1,6 +1,6 @@
#include "storm/builder/jit/Distribution.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/jit/DistributionEntry.cpp

@ -1,6 +1,6 @@
#include "storm/builder/jit/DistributionEntry.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace builder {

6
src/storm/builder/jit/ExplicitJitJaniModelBuilder.cpp

@ -372,7 +372,7 @@ namespace storm {
std::string problem = "Unable to compile program using Carl data structures. Is Carls's include directory '" + carlIncludeDirectory + "' set correctly?";
try {
std::string program = R"(
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
int main() {
return 0;
@ -1651,10 +1651,10 @@ namespace storm {
#include <boost/dll/alias.hpp>
{% if exact %}
#include "storm/adapters/NumberAdapter.h"
#include "storm/adapters/RationalNumberAdapter.h"
{% endif %}
{% if parametric %}
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
{% endif %}
#include "resources/3rdparty/sparsepp/sparsepp.h"

2
src/storm/builder/jit/ExplicitJitJaniModelBuilder.h

@ -8,7 +8,7 @@
#include "cpptempl.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/storage/jani/Model.h"
#include "storm/storage/jani/ParallelComposition.h"

2
src/storm/builder/jit/JitModelBuilderInterface.cpp

@ -1,6 +1,6 @@
#include "storm/builder/jit/JitModelBuilderInterface.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace builder {

2
src/storm/builder/jit/StateBehaviour.cpp

@ -1,6 +1,6 @@
#include "storm/builder/jit/StateBehaviour.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/constants.h"

752
src/storm/cli/cli.cpp

@ -1,11 +1,11 @@
#include "cli.h"
#include "entrypoints.h"
#include "storm/cli/cli.h"
#include "storm/cli/entrypoints.h"
#include "../utility/storm.h"
#include "storm/utility/storm.h"
#include "storm/storage/SymbolicModelDescription.h"
#include "storm/models/ModelBase.h"
#include "storm/settings/modules/DebugSettings.h"
#include "storm/settings/modules/IOSettings.h"
@ -17,7 +17,18 @@
#include "storm/utility/resources.h"
#include "storm/utility/file.h"
#include "storm/utility/storm-version.h"
#include "storm/utility/cli.h"
#include "storm/utility/initialize.h"
#include "storm/utility/Stopwatch.h"
#include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/ResourceSettings.h"
#include <type_traits>
#include "storm/utility/macros.h"
// Includes for the linked libraries and versions header.
#ifdef STORM_HAVE_INTELTBB
@ -46,11 +57,29 @@
namespace storm {
namespace cli {
std::string getCurrentWorkingDirectory() {
char temp[512];
return (GetCurrentDir(temp, 512 - 1) ? std::string(temp) : std::string(""));
int64_t process(const int argc, const char** argv) {
storm::utility::setUp();
storm::cli::printHeader("Storm", argc, argv);
storm::settings::initializeAll("Storm", "storm");
storm::utility::Stopwatch totalTimer(true);
if (!storm::cli::parseOptions(argc, argv)) {
return -1;
}
processOptions();
totalTimer.stop();
if (storm::settings::getModule<storm::settings::modules::ResourceSettings>().isPrintTimeAndMemorySet()) {
storm::cli::printTimeAndMemoryStatistics(totalTimer.getTimeInMilliseconds());
}
storm::utility::cleanUp();
return 0;
}
void printHeader(std::string const& name, const int argc, const char* argv[]) {
STORM_PRINT(name << " " << storm::utility::StormVersion::shortVersionString() << std::endl << std::endl);
@ -64,7 +93,7 @@ namespace storm {
if (!command.empty()) {
STORM_PRINT("Command line arguments: " << commandStream.str() << std::endl);
STORM_PRINT("Current working directory: " << getCurrentWorkingDirectory() << std::endl << std::endl);
STORM_PRINT("Current working directory: " << storm::utility::cli::getCurrentWorkingDirectory() << std::endl << std::endl);
}
}
@ -135,26 +164,6 @@ namespace storm {
#endif
}
void showTimeAndMemoryStatistics(uint64_t wallclockMilliseconds) {
struct rusage ru;
getrusage(RUSAGE_SELF, &ru);
std::cout << std::endl << "Performance statistics:" << std::endl;
#ifdef MACOS
// For Mac OS, this is returned in bytes.
uint64_t maximumResidentSizeInMegabytes = ru.ru_maxrss / 1024 / 1024;
#endif
#ifdef LINUX
// For Linux, this is returned in kilobytes.
uint64_t maximumResidentSizeInMegabytes = ru.ru_maxrss / 1024;
#endif
std::cout << " * peak memory usage: " << maximumResidentSizeInMegabytes << "MB" << std::endl;
std::cout << " * CPU time: " << ru.ru_utime.tv_sec << "." << std::setw(3) << std::setfill('0') << ru.ru_utime.tv_usec/1000 << "s" << std::endl;
if (wallclockMilliseconds != 0) {
std::cout << " * wallclock time: " << (wallclockMilliseconds/1000) << "." << std::setw(3) << std::setfill('0') << (wallclockMilliseconds % 1000) << "s" << std::endl;
}
}
bool parseOptions(const int argc, const char* argv[]) {
try {
storm::settings::mutableManager().setFromCommandLine(argc, argv);
@ -165,22 +174,33 @@ namespace storm {
}
storm::settings::modules::GeneralSettings const& general = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
storm::settings::modules::ResourceSettings const& resources = storm::settings::getModule<storm::settings::modules::ResourceSettings>();
storm::settings::modules::DebugSettings const& debug = storm::settings::getModule<storm::settings::modules::DebugSettings>();
bool result = true;
if (general.isHelpSet()) {
storm::settings::manager().printHelp(storm::settings::getModule<storm::settings::modules::GeneralSettings>().getHelpModuleName());
return false;
}
// If we were given a time limit, we put it in place now.
if (resources.isTimeoutSet()) {
storm::utility::resources::setCPULimit(resources.getTimeoutInSeconds());
result = false;
}
if (general.isVersionSet()) {
printVersion("storm");
return false;
result = false;;
}
return result;
}
void setResourceLimits() {
storm::settings::modules::ResourceSettings const& resources = storm::settings::getModule<storm::settings::modules::ResourceSettings>();
// If we were given a time limit, we put it in place now.
if (resources.isTimeoutSet()) {
storm::utility::resources::setCPULimit(resources.getTimeoutInSeconds());
}
}
void setLogLevel() {
storm::settings::modules::GeneralSettings const& general = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
storm::settings::modules::DebugSettings const& debug = storm::settings::getModule<storm::settings::modules::DebugSettings>();
if (general.isVerboseSet()) {
storm::utility::setLogLevel(l3pp::LogLevel::INFO);
@ -194,147 +214,603 @@ namespace storm {
if (debug.isLogfileSet()) {
storm::utility::initializeFileLogging();
}
return true;
}
void processOptions() {
STORM_LOG_TRACE("Processing options.");
if (storm::settings::getModule<storm::settings::modules::DebugSettings>().isLogfileSet()) {
void setFileLogging() {
storm::settings::modules::DebugSettings const& debug = storm::settings::getModule<storm::settings::modules::DebugSettings>();
if (debug.isLogfileSet()) {
storm::utility::initializeFileLogging();
}
}
void setUrgentOptions() {
setResourceLimits();
setLogLevel();
setFileLogging();
}
void rest();
boost::optional<std::set<std::string>> parsePropertyFilter(storm::settings::modules::IOSettings const& ioSettings) {
boost::optional<std::set<std::string>> propertyFilter;
std::string propertyFilterString = storm::settings::getModule<storm::settings::modules::IOSettings>().getPropertyFilter();
std::string propertyFilterString = ioSettings.getPropertyFilter();
if (propertyFilterString != "all") {
propertyFilter = storm::parsePropertyFilter(storm::settings::getModule<storm::settings::modules::IOSettings>().getPropertyFilter());
propertyFilter = storm::parsePropertyFilter(propertyFilterString);
}
return propertyFilter;
}
struct SymbolicInput {
// The symbolic model description.
boost::optional<storm::storage::SymbolicModelDescription> model;
auto coreSettings = storm::settings::getModule<storm::settings::modules::CoreSettings>();
auto generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
// The properties to check.
std::vector<storm::jani::Property> properties;
};
void parseSymbolicModelDescription(storm::settings::modules::IOSettings const& ioSettings, SymbolicInput& input) {
if (ioSettings.isPrismOrJaniInputSet()) {
storm::storage::SymbolicModelDescription model;
std::vector<storm::jani::Property> properties;
STORM_LOG_TRACE("Parsing symbolic input.");
boost::optional<std::map<std::string, std::string>> labelRenaming;
if (ioSettings.isPrismInputSet()) {
model = storm::parseProgram(ioSettings.getPrismInputFilename());
bool transformToJani = ioSettings.isPrismToJaniSet();
bool transformToJaniForJit = coreSettings.getEngine() == storm::settings::modules::CoreSettings::Engine::Sparse && ioSettings.isJitSet();
STORM_LOG_WARN_COND(transformToJani || !transformToJaniForJit, "The JIT-based model builder is only available for JANI models, automatically converting the PRISM input model.");
transformToJani |= transformToJaniForJit;
input.model = storm::api::parseProgram(ioSettings.getPrismInputFilename());
} else {
auto janiInput = storm::api::parseJaniModel(ioSettings.getJaniInputFilename());
input.model = janiInput.first;
auto const& janiPropertyInput = janiInput.second;
if (transformToJani) {
auto modelAndRenaming = model.toJaniWithLabelRenaming(true);
if (!modelAndRenaming.second.empty()) {
labelRenaming = modelAndRenaming.second;
}
model = modelAndRenaming.first;
}
} else if (ioSettings.isJaniInputSet()) {
auto input = storm::parseJaniModel(ioSettings.getJaniInputFilename());
model = input.first;
if (ioSettings.isJaniPropertiesSet()) {
for (auto const& propName : ioSettings.getJaniProperties()) {
STORM_LOG_THROW(input.second.count(propName) == 1, storm::exceptions::InvalidArgumentException, "No property with name " << propName << " known.");
properties.push_back(input.second.at(propName));
auto propertyIt = janiPropertyInput.find(propName);
STORM_LOG_THROW(propertyIt != janiPropertyInput.end(), storm::exceptions::InvalidArgumentException, "No JANI property with name '" << propName << "' is known.");
input.properties.emplace_back(propertyIt->second);
}
}
if(ioSettings.isExportJaniDotSet()) {
std::ofstream out;
storm::utility::openFile(ioSettings.getExportJaniDotFilename(), out);
model.asJaniModel().writeDotToStream(out);
storm::utility::closeFile(out);
}
}
}
}
void parseProperties(storm::settings::modules::IOSettings const& ioSettings, SymbolicInput& input, boost::optional<std::set<std::string>> const& propertyFilter) {
if (ioSettings.isPropertySet()) {
std::vector<storm::jani::Property> newProperties;
if (input.model) {
newProperties = storm::api::parsePropertiesForSymbolicModelDescription(ioSettings.getProperty(), input.model.get(), propertyFilter);
} else {
newProperties = storm::api::parseProperties(ioSettings.getProperty(), propertyFilter);
}
// Get the string that assigns values to the unknown currently undefined constants in the model and formula.
std::string constantDefinitionString = ioSettings.getConstantDefinitionString();
std::map<storm::expressions::Variable, storm::expressions::Expression> constantDefinitions;
input.properties.insert(input.properties.end(), newProperties.begin(), newProperties.end());
}
}
SymbolicInput parseSymbolicInput() {
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
// Parse the property filter, if any is given.
boost::optional<std::set<std::string>> propertyFilter = parsePropertyFilter(ioSettings);
SymbolicInput input;
parseSymbolicModelDescription(ioSettings, input);
parseProperties(ioSettings, input, propertyFilter);
return input;
}
SymbolicInput preprocessSymbolicInput(SymbolicInput const& input) {
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
auto coreSettings = storm::settings::getModule<storm::settings::modules::CoreSettings>();
SymbolicInput output = input;
// Substitute constant definitions in symbolic input.
std::string constantDefinitionString = ioSettings.getConstantDefinitionString();
std::map<storm::expressions::Variable, storm::expressions::Expression> constantDefinitions;
if (output.model) {
constantDefinitions = output.model.get().parseConstantDefinitions(constantDefinitionString);
output.model.get().preprocess(constantDefinitions);
}
if (!output.properties.empty()) {
output.properties = substituteConstantsInProperties(output.properties, constantDefinitions);
}
// Check whether conversion for PRISM to JANI is requested or necessary.
if (input.model && input.model.get().isPrismProgram()) {
bool transformToJani = ioSettings.isPrismToJaniSet();
bool transformToJaniForJit = coreSettings.getEngine() == storm::settings::modules::CoreSettings::Engine::Sparse && ioSettings.isJitSet();
STORM_LOG_WARN_COND(transformToJani || !transformToJaniForJit, "The JIT-based model builder is only available for JANI models, automatically converting the PRISM input model.");
transformToJani |= transformToJaniForJit;
// Then proceed to parsing the properties (if given), since the model we are building may depend on the property.
STORM_LOG_TRACE("Parsing properties.");
if (ioSettings.isPropertySet()) {
if (model.isJaniModel()) {
properties = storm::parsePropertiesForJaniModel(ioSettings.getProperty(), model.asJaniModel(), propertyFilter);
if (labelRenaming) {
std::vector<storm::jani::Property> amendedProperties;
for (auto const& property : properties) {
amendedProperties.emplace_back(property.substituteLabels(labelRenaming.get()));
}
properties = std::move(amendedProperties);
if (transformToJani) {
SymbolicInput output;
storm::prism::Program const& model = output.model.get().asPrismProgram();
auto modelAndRenaming = model.toJaniWithLabelRenaming(true);
output.model = modelAndRenaming.first;
if (!modelAndRenaming.second.empty()) {
std::map<std::string, std::string> const& labelRenaming = modelAndRenaming.second;
std::vector<storm::jani::Property> amendedProperties;
for (auto const& property : output.properties) {
amendedProperties.emplace_back(property.substituteLabels(labelRenaming));
}
output.properties = std::move(amendedProperties);
}
}
}
return output;
}
void exportSymbolicInput(SymbolicInput const& input) {
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
if (input.model && input.model.get().isJaniModel()) {
storm::storage::SymbolicModelDescription const& model = input.model.get();
if (ioSettings.isExportJaniDotSet()) {
storm::api::exportJaniModelAsDot(model.asJaniModel(), ioSettings.getExportJaniDotFilename());
}
if (model.isJaniModel() && storm::settings::getModule<storm::settings::modules::JaniExportSettings>().isJaniFileSet()) {
storm::api::exportJaniModel(model.asJaniModel(), input.properties, storm::settings::getModule<storm::settings::modules::JaniExportSettings>().getJaniFilename());
}
}
}
SymbolicInput parseAndPreprocessSymbolicInput() {
SymbolicInput input = parseSymbolicInput();
input = preprocessSymbolicInput(input);
exportSymbolicInput(input);
return input;
}
template <storm::dd::DdType DdType, typename ValueType>
std::shared_ptr<storm::models::ModelBase> buildModelDd(SymbolicInput const& input) {
return storm::api::buildSymbolicModel<DdType, ValueType>(input.model.get(), extractFormulasFromProperties(input.properties));
}
template <typename ValueType>
std::shared_ptr<storm::models::ModelBase> buildModelSparse(SymbolicInput const& input) {
auto counterexampleGeneratorSettings = storm::settings::getModule<storm::settings::modules::CounterexampleGeneratorSettings>();
return storm::api::buildSparseModel<ValueType>(input.model.get(), extractFormulasFromProperties(input.properties), counterexampleGeneratorSettings.isMinimalCommandSetGenerationSet());
}
template <typename ValueType>
std::shared_ptr<storm::models::ModelBase> buildModelExplicit(storm::settings::modules::IOSettings const& ioSettings) {
std::shared_ptr<storm::models::ModelBase> result;
if (ioSettings.isExplicitSet()) {
result = storm::api::buildExplicitModel<ValueType>(ioSettings.getTransitionFilename(), ioSettings.getLabelingFilename(), ioSettings.isStateRewardsSet() ? boost::optional<std::string>(ioSettings.getStateRewardsFilename()) : boost::none, ioSettings.isTransitionRewardsSet() ? boost::optional<std::string>(ioSettings.getTransitionRewardsFilename()) : boost::none, ioSettings.isChoiceLabelingSet() ? boost::optional<std::string>(ioSettings.getChoiceLabelingFilename()) : boost::none);
} else {
result = storm::api::buildExplicitDRNModel<ValueType>(ioSettings.getExplicitDRNFilename());
}
return result;
}
template <storm::dd::DdType DdType, typename ValueType>
std::shared_ptr<storm::models::ModelBase> buildModel(storm::settings::modules::CoreSettings::Engine const& engine, SymbolicInput const& input, storm::settings::modules::IOSettings const& ioSettings) {
storm::utility::Stopwatch modelBuildingWatch(true);
std::shared_ptr<storm::models::ModelBase> result;
if (input.model) {
if (engine == storm::settings::modules::CoreSettings::Engine::Dd || engine == storm::settings::modules::CoreSettings::Engine::Hybrid) {
result = buildModelDd<DdType, ValueType>(input);
} else if (engine == storm::settings::modules::CoreSettings::Engine::Sparse) {
result = buildModelSparse<ValueType>(input);
}
} else if (ioSettings.isExplicitSet() || ioSettings.isExplicitDRNSet()) {
STORM_LOG_THROW(engine == storm::settings::modules::CoreSettings::Engine::Sparse, storm::exceptions::InvalidSettingsException, "Can only use sparse engine with explicit input.");
result = buildModelExplicit<ValueType>(ioSettings);
}
modelBuildingWatch.stop();
if (result) {
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl);
}
return result;
}
template <typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> preprocessSparseMarkovAutomaton(std::shared_ptr<storm::models::sparse::MarkovAutomaton<ValueType>> const& model) {
std::shared_ptr<storm::models::sparse::Model<ValueType>> result = model;
model->close();
if (model->hasOnlyTrivialNondeterminism()) {
result = model->convertToCTMC();
}
return result;
}
template <typename ValueType>
std::shared_ptr<storm::models::sparse::Model<ValueType>> preprocessSparseModelBisimulation(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, SymbolicInput const& input, storm::settings::modules::BisimulationSettings const& bisimulationSettings) {
storm::storage::BisimulationType bisimType = storm::storage::BisimulationType::Strong;
if (bisimulationSettings.isWeakBisimulationSet()) {
bisimType = storm::storage::BisimulationType::Weak;
}
STORM_LOG_INFO("Performing bisimulation minimization...");
return storm::api::performBisimulationMinimization<ValueType>(model, extractFormulasFromProperties(input.properties), bisimType);
}
template <typename ValueType>
std::pair<std::shared_ptr<storm::models::sparse::Model<ValueType>>, bool> preprocessSparseModel(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, SymbolicInput const& input) {
auto generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
auto bisimulationSettings = storm::settings::getModule<storm::settings::modules::BisimulationSettings>();
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
std::pair<std::shared_ptr<storm::models::sparse::Model<ValueType>>, bool> result = std::make_pair(model, false);
if (result.first->isOfType(storm::models::ModelType::MarkovAutomaton)) {
result.first = preprocessSparseMarkovAutomaton(result.first->template as<storm::models::sparse::MarkovAutomaton<ValueType>>());
result.second = true;
}
if (generalSettings.isBisimulationSet()) {
result.first = preprocessSparseModelBisimulation(result.first, input, bisimulationSettings);
result.second = true;
}
return result;
}
template <typename ValueType>
void exportSparseModel(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, SymbolicInput const& input) {
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
if (ioSettings.isExportExplicitSet()) {
storm::api::exportSparseModelAsDrn(model, ioSettings.getExportExplicitFilename(), input.model ? input.model.get().getParameterNames() : std::vector<std::string>());
}
if (ioSettings.isExportDotSet()) {
storm::api::exportSparseModelAsDot(model, ioSettings.getExportDotFilename());
}
}
template <storm::dd::DdType DdType, typename ValueType>
void exportDdModel(std::shared_ptr<storm::models::symbolic::Model<DdType, ValueType>> const& model, SymbolicInput const& input) {
// Intentionally left empty.
}
template <storm::dd::DdType DdType, typename ValueType>
void exportModel(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
if (model->isSparseModel()) {
exportSparseModel<ValueType>(model->as<storm::models::sparse::Model<ValueType>>(), input);
} else {
exportDdModel<DdType, ValueType>(model->as<storm::models::symbolic::Model<DdType, ValueType>>(), input);
}
}
template <storm::dd::DdType DdType, typename ValueType>
std::pair<std::shared_ptr<storm::models::ModelBase>, bool> preprocessDdModel(std::shared_ptr<storm::models::symbolic::Model<DdType, ValueType>> const& model, SymbolicInput const& input) {
return std::make_pair(model, false);
}
template <storm::dd::DdType DdType, typename ValueType>
std::pair<std::shared_ptr<storm::models::ModelBase>, bool> preprocessModel(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
storm::utility::Stopwatch preprocessingWatch(true);
std::pair<std::shared_ptr<storm::models::ModelBase>, bool> result = std::make_pair(model, false);
if (model->isSparseModel()) {
result = preprocessSparseModel<ValueType>(result.first->as<storm::models::sparse::Model<ValueType>>(), input);
} else {
STORM_LOG_ASSERT(model->isSymbolicModel(), "Unexpected model type.");
result = preprocessDdModel<DdType, ValueType>(result.first->as<storm::models::symbolic::Model<DdType, ValueType>>(), input);
}
if (result.second) {
STORM_PRINT_AND_LOG(std::endl << "Time for model preprocessing: " << preprocessingWatch << "." << std::endl);
}
return result;
}
void printComputingCounterexample(storm::jani::Property const& property) {
STORM_PRINT_AND_LOG("Computing counterexample for property " << *property.getRawFormula() << " ..." << std::endl);
}
void printCounterexample(std::shared_ptr<storm::counterexamples::Counterexample> const& counterexample, storm::utility::Stopwatch* watch = nullptr) {
if (counterexample) {
STORM_PRINT_AND_LOG(counterexample << std::endl);
if (watch) {
STORM_PRINT_AND_LOG("Time for computation: " << *watch << "." << std::endl);
}
} else {
STORM_PRINT_AND_LOG(" failed." << std::endl);
}
}
template <typename ValueType>
void generateCounterexamples(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Counterexample generation is not supported for this data-type.");
}
template <>
void generateCounterexamples<double>(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
typedef double ValueType;
STORM_LOG_THROW(model->isSparseModel(), storm::exceptions::NotSupportedException, "Counterexample generation is currently only supported for sparse models.");
auto sparseModel = model->as<storm::models::sparse::Model<ValueType>>();
STORM_LOG_THROW(sparseModel->isOfType(storm::models::ModelType::Mdp), storm::exceptions::NotSupportedException, "Counterexample is currently only supported for MDPs.");
auto mdp = sparseModel->template as<storm::models::sparse::Mdp<ValueType>>();
auto counterexampleSettings = storm::settings::getModule<storm::settings::modules::CounterexampleGeneratorSettings>();
if (counterexampleSettings.isMinimalCommandSetGenerationSet()) {
STORM_LOG_THROW(input.model && input.model.get().isPrismProgram(), storm::exceptions::NotSupportedException, "Minimal command set counterexamples are only supported for PRISM model input.");
storm::prism::Program const& program = input.model.get().asPrismProgram();
bool useMilp = counterexampleSettings.isUseMilpBasedMinimalCommandSetGenerationSet();
for (auto const& property : input.properties) {
std::shared_ptr<storm::counterexamples::Counterexample> counterexample;
printComputingCounterexample(property);
storm::utility::Stopwatch watch(true);
if (useMilp) {
counterexample = storm::api::computePrismHighLevelCounterexampleMilp(program, mdp, property.getRawFormula());
} else {
properties = storm::parsePropertiesForPrismProgram(ioSettings.getProperty(), model.asPrismProgram(), propertyFilter);
counterexample = storm::api::computePrismHighLevelCounterexampleMaxSmt(program, mdp, property.getRawFormula());
}
constantDefinitions = model.parseConstantDefinitions(constantDefinitionString);
properties = substituteConstantsInProperties(properties, constantDefinitions);
} else {
constantDefinitions = model.parseConstantDefinitions(constantDefinitionString);
watch.stop();
printCounterexample(counterexample, &watch);
}
} else {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "The selected counterexample formalism is unsupported.");
}
}
template<typename ValueType>
void printFilteredResult(std::unique_ptr<storm::modelchecker::CheckResult> const& result, storm::modelchecker::FilterType ft) {
if (result->isQuantitative()) {
switch (ft) {
case storm::modelchecker::FilterType::VALUES:
STORM_PRINT_AND_LOG(*result);
break;
case storm::modelchecker::FilterType::SUM:
STORM_PRINT_AND_LOG(result->asQuantitativeCheckResult<ValueType>().sum());
break;
case storm::modelchecker::FilterType::AVG:
STORM_PRINT_AND_LOG(result->asQuantitativeCheckResult<ValueType>().average());
break;
case storm::modelchecker::FilterType::MIN:
STORM_PRINT_AND_LOG(result->asQuantitativeCheckResult<ValueType>().getMin());
break;
case storm::modelchecker::FilterType::MAX:
STORM_PRINT_AND_LOG(result->asQuantitativeCheckResult<ValueType>().getMax());
break;
case storm::modelchecker::FilterType::ARGMIN:
case storm::modelchecker::FilterType::ARGMAX:
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Outputting states is not supported.");
case storm::modelchecker::FilterType::EXISTS:
case storm::modelchecker::FilterType::FORALL:
case storm::modelchecker::FilterType::COUNT:
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Filter type only defined for qualitative results.");
}
} else {
switch (ft) {
case storm::modelchecker::FilterType::VALUES:
STORM_PRINT_AND_LOG(*result << std::endl);
break;
case storm::modelchecker::FilterType::EXISTS:
STORM_PRINT_AND_LOG(result->asQualitativeCheckResult().existsTrue());
break;
case storm::modelchecker::FilterType::FORALL:
STORM_PRINT_AND_LOG(result->asQualitativeCheckResult().forallTrue());
break;
case storm::modelchecker::FilterType::COUNT:
STORM_PRINT_AND_LOG(result->asQualitativeCheckResult().count());
break;
case storm::modelchecker::FilterType::ARGMIN:
case storm::modelchecker::FilterType::ARGMAX:
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Outputting states is not supported.");
case storm::modelchecker::FilterType::SUM:
case storm::modelchecker::FilterType::AVG:
case storm::modelchecker::FilterType::MIN:
case storm::modelchecker::FilterType::MAX:
STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Filter type only defined for quantitative results.");
}
}
STORM_PRINT_AND_LOG(std::endl);
}
void printModelCheckingProperty(storm::jani::Property const& property) {
STORM_PRINT_AND_LOG(std::endl << "Model checking property " << *property.getRawFormula() << " ..." << std::endl);
}
if (model.isJaniModel() && storm::settings::getModule<storm::settings::modules::JaniExportSettings>().isJaniFileSet()) {
exportJaniModel(model.asJaniModel(), properties, storm::settings::getModule<storm::settings::modules::JaniExportSettings>().getJaniFilename());
template<typename ValueType>
void printInitialStatesResult(std::unique_ptr<storm::modelchecker::CheckResult> const& result, storm::jani::Property const& property, storm::utility::Stopwatch* watch = nullptr) {
if (result) {
STORM_PRINT_AND_LOG("Result (initial states): ");
printFilteredResult<ValueType>(result, property.getFilter().getFilterType());
if (watch) {
STORM_PRINT_AND_LOG("Time for model checking: " << *watch << "." << std::endl);
}
} else {
STORM_PRINT_AND_LOG(" failed, property is unsupported by selected engine/settings." << std::endl);
}
}
template<typename ValueType>
void verifyProperties(std::vector<storm::jani::Property> const& properties, std::function<std::unique_ptr<storm::modelchecker::CheckResult>(std::shared_ptr<storm::logic::Formula const> const& formula)> const& verificationCallback, std::function<void(std::unique_ptr<storm::modelchecker::CheckResult> const&)> const& postprocessingCallback = [](std::unique_ptr<storm::modelchecker::CheckResult> const&){}) {
for (auto const& property : properties) {
printModelCheckingProperty(property);
storm::utility::Stopwatch watch(true);
std::unique_ptr<storm::modelchecker::CheckResult> result = verificationCallback(property.getRawFormula());
watch.stop();
printInitialStatesResult<ValueType>(result, property, &watch);
postprocessingCallback(result);
}
}
template <storm::dd::DdType DdType, typename ValueType>
void verifyWithAbstractionRefinementEngine(SymbolicInput const& input) {
STORM_LOG_ASSERT(input.model, "Expected symbolic model description.");
verifyProperties<ValueType>(input.properties, [&input] (std::shared_ptr<storm::logic::Formula const> const& formula) {
return storm::api::verifyWithAbstractionRefinementEngine<DdType, ValueType>(input.model.get(), storm::api::createTask<ValueType>(formula, true));
});
}
model = model.preprocess(constantDefinitions);
template <typename ValueType>
void verifyWithExplorationEngine(SymbolicInput const& input) {
STORM_LOG_ASSERT(input.model, "Expected symbolic model description.");
STORM_LOG_THROW((std::is_same<ValueType, double>::value), storm::exceptions::NotSupportedException, "Exploration does not support other data-types than floating points.");
verifyProperties<ValueType>(input.properties, [&input] (std::shared_ptr<storm::logic::Formula const> const& formula) {
return storm::api::verifyWithExplorationEngine<ValueType>(input.model.get(), storm::api::createTask<ValueType>(formula, true));
});
}
template <typename ValueType>
void verifyWithSparseEngine(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
auto sparseModel = model->as<storm::models::sparse::Model<ValueType>>();
verifyProperties<ValueType>(input.properties,
[&sparseModel] (std::shared_ptr<storm::logic::Formula const> const& formula) {
std::unique_ptr<storm::modelchecker::CheckResult> result = storm::api::verifyWithSparseEngine<ValueType>(sparseModel, storm::api::createTask<ValueType>(formula, true));
result->filter(storm::modelchecker::ExplicitQualitativeCheckResult(sparseModel->getInitialStates()));
return result;
},
[&sparseModel] (std::unique_ptr<storm::modelchecker::CheckResult> const& result) {
if (std::is_same<ValueType, storm::RationalFunction>::value && sparseModel->isOfType(storm::models::ModelType::Dtmc) && storm::settings::getModule<storm::settings::modules::ParametricSettings>().exportResultToFile()) {
auto dtmc = sparseModel->template as<storm::models::sparse::Dtmc<storm::RationalFunction>>();
storm::api::exportParametricResultToFile(result->asExplicitQuantitativeCheckResult<storm::RationalFunction>()[*sparseModel->getInitialStates().begin()], storm::analysis::ConstraintCollector<storm::RationalFunction>(*dtmc), storm::settings::getModule<storm::settings::modules::ParametricSettings>().exportResultPath());
}
});
}
template <storm::dd::DdType DdType, typename ValueType>
void verifyWithHybridEngine(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
verifyProperties<ValueType>(input.properties, [&model] (std::shared_ptr<storm::logic::Formula const> const& formula) {
auto symbolicModel = model->as<storm::models::symbolic::Model<DdType, ValueType>>();
std::unique_ptr<storm::modelchecker::CheckResult> result = storm::api::verifyWithHybridEngine<DdType, ValueType>(symbolicModel, storm::api::createTask<ValueType>(formula, true));
result->filter(storm::modelchecker::SymbolicQualitativeCheckResult<DdType>(symbolicModel->getReachableStates(), symbolicModel->getInitialStates()));
return result;
});
}
template <storm::dd::DdType DdType, typename ValueType>
void verifyWithDdEngine(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input) {
verifyProperties<ValueType>(input.properties, [&model] (std::shared_ptr<storm::logic::Formula const> const& formula) {
auto symbolicModel = model->as<storm::models::symbolic::Model<DdType, ValueType>>();
std::unique_ptr<storm::modelchecker::CheckResult> result = storm::api::verifyWithDdEngine<DdType, ValueType>(model->as<storm::models::symbolic::Model<DdType, ValueType>>(), storm::api::createTask<ValueType>(formula, true));
result->filter(storm::modelchecker::SymbolicQualitativeCheckResult<DdType>(symbolicModel->getReachableStates(), symbolicModel->getInitialStates()));
return result;
});
}
template <storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<DdType != storm::dd::DdType::CUDD || std::is_same<ValueType, double>::value, void>::type verifySymbolicModel(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input, storm::settings::modules::CoreSettings const& coreSettings) {
bool hybrid = coreSettings.getEngine() == storm::settings::modules::CoreSettings::Engine::Hybrid;
if (hybrid) {
verifyWithHybridEngine<DdType, ValueType>(model, input);
} else {
verifyWithDdEngine<DdType, ValueType>(model, input);
}
}
template <storm::dd::DdType DdType, typename ValueType>
typename std::enable_if<DdType == storm::dd::DdType::CUDD && !std::is_same<ValueType, double>::value, void>::type verifySymbolicModel(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input, storm::settings::modules::CoreSettings const& coreSettings) {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "CUDD does not support the selected data-type.");
}
template <storm::dd::DdType DdType, typename ValueType>
void verifyModel(std::shared_ptr<storm::models::ModelBase> const& model, SymbolicInput const& input, storm::settings::modules::CoreSettings const& coreSettings) {
if (model->isSparseModel()) {
verifyWithSparseEngine<ValueType>(model, input);
} else {
STORM_LOG_ASSERT(model->isSymbolicModel(), "Unexpected model type.");
verifySymbolicModel<DdType, ValueType>(model, input, coreSettings);
}
}
template <storm::dd::DdType DdType, typename ValueType>
void processInputWithValueTypeAndDdlib(SymbolicInput const& input) {
auto coreSettings = storm::settings::getModule<storm::settings::modules::CoreSettings>();
// For several engines, no model building step is performed, but the verification is started right away.
storm::settings::modules::CoreSettings::Engine engine = coreSettings.getEngine();
if (engine == storm::settings::modules::CoreSettings::Engine::AbstractionRefinement) {
verifyWithAbstractionRefinementEngine<DdType, ValueType>(input);
} else if (engine == storm::settings::modules::CoreSettings::Engine::Exploration) {
verifyWithExplorationEngine<ValueType>(input);
} else {
auto ioSettings = storm::settings::getModule<storm::settings::modules::IOSettings>();
if (ioSettings.isNoBuildModelSet()) {
return;
std::shared_ptr<storm::models::ModelBase> model;
if (!ioSettings.isNoBuildModelSet()) {
model = buildModel<DdType, ValueType>(engine, input, ioSettings);
}
STORM_LOG_TRACE("Building and checking symbolic model.");
if (generalSettings.isParametricSet()) {
#ifdef STORM_HAVE_CARL
buildAndCheckSymbolicModel<storm::RationalFunction>(model, properties, true);
#else
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No parameters are supported in this build.");
#endif
} else if (generalSettings.isExactSet()) {
#ifdef STORM_HAVE_CARL
buildAndCheckSymbolicModel<storm::RationalNumber>(model, properties, true);
#else
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No exact numbers are supported in this build.");
#endif
} else {
buildAndCheckSymbolicModel<double>(model, properties, true);
if (model) {
model->printModelInformationToStream(std::cout);
}
} else if (ioSettings.isExplicitSet() || ioSettings.isExplicitDRNSet()) {
STORM_LOG_THROW(coreSettings.getEngine() == storm::settings::modules::CoreSettings::Engine::Sparse, storm::exceptions::InvalidSettingsException, "Only the sparse engine supports explicit model input.");
// If the model is given in an explicit format, we parse the properties without allowing expressions
// in formulas.
std::vector<storm::jani::Property> properties;
if (ioSettings.isPropertySet()) {
properties = storm::parsePropertiesForExplicit(ioSettings.getProperty(), propertyFilter);
STORM_LOG_THROW(model || input.properties.empty(), storm::exceptions::InvalidSettingsException, "No input model.");
if (model) {
auto preprocessingResult = preprocessModel<DdType, ValueType>(model, input);
if (preprocessingResult.second) {
model = preprocessingResult.first;
model->printModelInformationToStream(std::cout);
}
}
if (generalSettings.isParametricSet()) {
if (model) {
exportModel<DdType, ValueType>(model, input);
if (coreSettings.isCounterexampleSet()) {
generateCounterexamples<ValueType>(model, input);
} else {
verifyModel<DdType, ValueType>(model, input, coreSettings);
}
}
}
}
template <typename ValueType>
void processInputWithValueType(SymbolicInput const& input) {
auto coreSettings = storm::settings::getModule<storm::settings::modules::CoreSettings>();
if (coreSettings.getDdLibraryType() == storm::dd::DdType::CUDD) {
processInputWithValueTypeAndDdlib<storm::dd::DdType::CUDD, ValueType>(input);
} else {
STORM_LOG_ASSERT(coreSettings.getDdLibraryType() == storm::dd::DdType::Sylvan, "Unknown DD library.");
processInputWithValueTypeAndDdlib<storm::dd::DdType::Sylvan, ValueType>(input);
}
}
void processOptions() {
// Start by setting some urgent options (log levels, resources, etc.)
setUrgentOptions();
// Parse and preprocess symbolic input (PRISM, JANI, properties, etc.)
SymbolicInput symbolicInput = parseAndPreprocessSymbolicInput();
auto generalSettings = storm::settings::getModule<storm::settings::modules::GeneralSettings>();
if (generalSettings.isParametricSet()) {
#ifdef STORM_HAVE_CARL
buildAndCheckExplicitModel<storm::RationalFunction>(properties, true);
processInputWithValueType<storm::RationalFunction>(symbolicInput);
#else
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No parameters are supported in this build.");
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No parameters are supported in this build.");
#endif
} else if (generalSettings.isExactSet()) {
} else if (generalSettings.isExactSet()) {
#ifdef STORM_HAVE_CARL
buildAndCheckExplicitModel<storm::RationalNumber>(properties, true);
processInputWithValueType<storm::RationalNumber>(symbolicInput);
#else
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No exact numbers are supported in this build.");
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "No exact numbers are supported in this build.");
#endif
} else {
buildAndCheckExplicitModel<double>(properties, true);
}
} else {
processInputWithValueType<double>(symbolicInput);
}
}
STORM_LOG_THROW(false, storm::exceptions::InvalidSettingsException, "No input model.");
void printTimeAndMemoryStatistics(uint64_t wallclockMilliseconds) {
struct rusage ru;
getrusage(RUSAGE_SELF, &ru);
std::cout << std::endl << "Performance statistics:" << std::endl;
#ifdef MACOS
// For Mac OS, this is returned in bytes.
uint64_t maximumResidentSizeInMegabytes = ru.ru_maxrss / 1024 / 1024;
#endif
#ifdef LINUX
// For Linux, this is returned in kilobytes.
uint64_t maximumResidentSizeInMegabytes = ru.ru_maxrss / 1024;
#endif
std::cout << " * peak memory usage: " << maximumResidentSizeInMegabytes << "MB" << std::endl;
std::cout << " * CPU time: " << ru.ru_utime.tv_sec << "." << std::setw(3) << std::setfill('0') << ru.ru_utime.tv_usec/1000 << "s" << std::endl;
if (wallclockMilliseconds != 0) {
std::cout << " * wallclock time: " << (wallclockMilliseconds/1000) << "." << std::setw(3) << std::setfill('0') << (wallclockMilliseconds % 1000) << "s" << std::endl;
}
}

14
src/storm/cli/cli.h

@ -5,14 +5,17 @@
namespace storm {
namespace cli {
std::string getCurrentWorkingDirectory();
/*!
* Processes the options and returns the exit code.
*/
int64_t process(const int argc, const char** argv);
void printHeader(std::string const& name, const int argc, const char* argv[]);
void printVersion(std::string const& name);
void showTimeAndMemoryStatistics(uint64_t wallclockMilliseconds = 0);
void printTimeAndMemoryStatistics(uint64_t wallclockMilliseconds = 0);
/*!
* Parses the given command line arguments.
@ -22,8 +25,9 @@ namespace storm {
* @return True iff the program should continue to run after parsing the options.
*/
bool parseOptions(const int argc, const char* argv[]);
void processOptions();
}
}

12
src/storm/cli/entrypoints.h

@ -9,6 +9,8 @@
#include "storm/utility/DirectEncodingExporter.h"
#include "storm/utility/Stopwatch.h"
#include "storm/api/storm.h"
#include "storm/exceptions/NotImplementedException.h"
#include "storm/exceptions/InvalidSettingsException.h"
#include "storm/exceptions/UnexpectedException.h"
@ -125,7 +127,7 @@ namespace storm {
STORM_PRINT_AND_LOG(std::endl << "Model checking property " << *property.getRawFormula() << " ..." << std::endl);
std::cout.flush();
storm::utility::Stopwatch modelCheckingWatch(true);
std::unique_ptr<storm::modelchecker::CheckResult> result(storm::verifySymbolicModelWithAbstractionRefinementEngine<DdType, ValueType>(model, property.getFilter().getFormula(), onlyInitialStatesRelevant));
std::unique_ptr<storm::modelchecker::CheckResult> result(storm::api::verifyWithAbstractionRefinementEngine<DdType, ValueType>(model, property.getFilter().getFormula(), onlyInitialStatesRelevant));
modelCheckingWatch.stop();
if (result) {
STORM_PRINT_AND_LOG("Result (initial states): ");
@ -281,7 +283,7 @@ namespace storm {
void buildAndCheckSymbolicModelWithSymbolicEngine(bool hybrid, storm::storage::SymbolicModelDescription const& model, std::vector<storm::jani::Property> const& properties, bool onlyInitialStatesRelevant = false) {
// Start by building the model.
storm::utility::Stopwatch modelBuildingWatch(true);
auto markovModel = buildSymbolicModel<ValueType, LibraryType>(model, extractFormulasFromProperties(properties));
auto markovModel = storm::api::buildSymbolicModel<LibraryType, ValueType>(model, extractFormulasFromProperties(properties));
modelBuildingWatch.stop();
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl << std::endl);
@ -311,7 +313,7 @@ namespace storm {
auto formulas = extractFormulasFromProperties(properties);
// Start by building the model.
storm::utility::Stopwatch modelBuildingWatch(true);
std::shared_ptr<storm::models::ModelBase> markovModel = buildSparseModel<ValueType>(model, formulas);
std::shared_ptr<storm::models::ModelBase> markovModel = storm::api::buildSparseModel<ValueType>(model, formulas);
modelBuildingWatch.stop();
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl << std::endl);
@ -419,9 +421,9 @@ namespace storm {
storm::utility::Stopwatch modelBuildingWatch(true);
std::shared_ptr<storm::models::ModelBase> model;
if (settings.isExplicitSet()) {
model = buildExplicitModel<ValueType>(settings.getTransitionFilename(), settings.getLabelingFilename(), settings.isStateRewardsSet() ? boost::optional<std::string>(settings.getStateRewardsFilename()) : boost::none, settings.isTransitionRewardsSet() ? boost::optional<std::string>(settings.getTransitionRewardsFilename()) : boost::none, settings.isChoiceLabelingSet() ? boost::optional<std::string>(settings.getChoiceLabelingFilename()) : boost::none);
model = api::buildExplicitModel<ValueType>(settings.getTransitionFilename(), settings.getLabelingFilename(), settings.isStateRewardsSet() ? boost::optional<std::string>(settings.getStateRewardsFilename()) : boost::none, settings.isTransitionRewardsSet() ? boost::optional<std::string>(settings.getTransitionRewardsFilename()) : boost::none, settings.isChoiceLabelingSet() ? boost::optional<std::string>(settings.getChoiceLabelingFilename()) : boost::none);
} else {
model = buildExplicitDRNModel<ValueType>(settings.getExplicitDRNFilename());
model = api::buildExplicitDRNModel<ValueType>(settings.getExplicitDRNFilename());
}
modelBuildingWatch.stop();
STORM_PRINT_AND_LOG("Time for model construction: " << modelBuildingWatch << "." << std::endl);

12
src/storm/counterexamples/Counterexample.cpp

@ -0,0 +1,12 @@
#include "storm/counterexamples/Counterexample.h"
namespace storm {
namespace counterexamples {
std::ostream& operator<<(std::ostream& out, Counterexample const& counterexample) {
counterexample.writeToStream(out);
return out;
}
}
}

16
src/storm/counterexamples/Counterexample.h

@ -0,0 +1,16 @@
#pragma once
#include <ostream>
namespace storm {
namespace counterexamples {
class Counterexample {
public:
virtual void writeToStream(std::ostream& out) const = 0;
};
std::ostream& operator<<(std::ostream& out, Counterexample const& counterexample);
}
}

9
src/storm/counterexamples/MILPMinimalLabelSetGenerator.h

@ -14,6 +14,8 @@
#include "storm/exceptions/InvalidArgumentException.h"
#include "storm/exceptions/InvalidStateException.h"
#include "storm/counterexamples/PrismHighLevelCounterexample.h"
#include "storm/utility/graph.h"
#include "storm/utility/counterexamples.h"
#include "storm/utility/solver.h"
@ -968,7 +970,7 @@ namespace storm {
* @param formulaPtr A pointer to a safety formula. The outermost operator must be a probabilistic bound operator with a strict upper bound. The nested
* formula can be either an unbounded until formula or an eventually formula.
*/
static void computeCounterexample(storm::prism::Program const& program, storm::models::sparse::Mdp<T> const& labeledMdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
static std::shared_ptr<PrismHighLevelCounterexample> computeCounterexample(storm::prism::Program const& program, storm::models::sparse::Mdp<T> const& labeledMdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
std::cout << std::endl << "Generating minimal label counterexample for formula " << *formula << std::endl;
STORM_LOG_THROW(formula->isProbabilityOperatorFormula(), storm::exceptions::InvalidPropertyException, "Counterexample generation does not support this kind of formula. Expecting a probability operator as the outermost formula element.");
@ -1013,10 +1015,7 @@ namespace storm {
auto endTime = std::chrono::high_resolution_clock::now();
std::cout << std::endl << "Computed minimal label set of size " << usedLabelSet.size() << " in " << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count() << "ms." << std::endl;
std::cout << "Resulting program:" << std::endl;
storm::prism::Program restrictedProgram = program.restrictCommands(usedLabelSet);
std::cout << restrictedProgram << std::endl;
std::cout << std::endl << "-------------------------------------------" << std::endl;
return std::make_shared<PrismHighLevelCounterexample>(program.restrictCommands(usedLabelSet));
}
};

16
src/storm/counterexamples/PrismHighLevelCounterexample.cpp

@ -0,0 +1,16 @@
#include "storm/counterexamples/PrismHighLevelCounterexample.h"
namespace storm {
namespace counterexamples {
PrismHighLevelCounterexample::PrismHighLevelCounterexample(storm::prism::Program const& program) : program(program) {
// Intentionally left empty.
}
void PrismHighLevelCounterexample::writeToStream(std::ostream& out) const {
out << "High-level counterexample (PRISM program): " << std::endl;
out << program;
}
}
}

21
src/storm/counterexamples/PrismHighLevelCounterexample.h

@ -0,0 +1,21 @@
#pragma once
#include "storm/counterexamples/Counterexample.h"
#include "storm/storage/prism/Program.h"
namespace storm {
namespace counterexamples {
class PrismHighLevelCounterexample : public Counterexample {
public:
PrismHighLevelCounterexample(storm::prism::Program const& program);
void writeToStream(std::ostream& out) const override;
private:
storm::prism::Program program;
};
}
}

21
src/storm/counterexamples/SMTMinimalCommandSetGenerator.h

@ -6,6 +6,8 @@
#include "storm/solver/Z3SmtSolver.h"
#include "storm/counterexamples/PrismHighLevelCounterexample.h"
#include "storm/storage/prism/Program.h"
#include "storm/storage/expressions/Expression.h"
#include "storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h"
@ -1583,7 +1585,6 @@ namespace storm {
* Computes the minimal command set that is needed in the given MDP to exceed the given probability threshold for satisfying phi until psi.
*
* @param program The program that was used to build the MDP.
* @param constantDefinitionString A string defining the undefined constants in the given program.
* @param labeledMdp The MDP in which to find the minimal command set.
* @param phiStates A bit vector characterizing all phi states in the model.
* @param psiStates A bit vector characterizing all psi states in the model.
@ -1593,7 +1594,7 @@ namespace storm {
* @param checkThresholdFeasible If set, it is verified that the model can actually achieve/exceed the given probability value. If this check
* is made and fails, an exception is thrown.
*/
static boost::container::flat_set<uint_fast64_t> getMinimalCommandSet(storm::prism::Program program, std::string const& constantDefinitionString, storm::models::sparse::Mdp<T> const& labeledMdp, storm::storage::BitVector const& phiStates, storm::storage::BitVector const& psiStates, double probabilityThreshold, bool strictBound, bool checkThresholdFeasible = false, bool includeReachabilityEncoding = false) {
static boost::container::flat_set<uint_fast64_t> getMinimalCommandSet(storm::prism::Program program, storm::models::sparse::Mdp<T> const& labeledMdp, storm::storage::BitVector const& phiStates, storm::storage::BitVector const& psiStates, double probabilityThreshold, bool strictBound, bool checkThresholdFeasible = false, bool includeReachabilityEncoding = false) {
#ifdef STORM_HAVE_Z3
// Set up all clocks used for time measurement.
auto totalClock = std::chrono::high_resolution_clock::now();
@ -1612,10 +1613,6 @@ namespace storm {
auto analysisClock = std::chrono::high_resolution_clock::now();
decltype(std::chrono::high_resolution_clock::now() - analysisClock) totalAnalysisTime(0);
std::map<storm::expressions::Variable, storm::expressions::Expression> constantDefinitions = storm::utility::cli::parseConstantDefinitionString(program.getManager(), constantDefinitionString);
storm::prism::Program preparedProgram = program.defineUndefinedConstants(constantDefinitions);
preparedProgram = preparedProgram.substituteConstants();
// (0) Check whether the MDP is indeed labeled.
if (!labeledMdp.hasChoiceLabeling()) {
throw storm::exceptions::InvalidArgumentException() << "Minimal command set generation is impossible for unlabeled model.";
@ -1655,7 +1652,7 @@ namespace storm {
STORM_LOG_DEBUG("Asserting cuts.");
assertExplicitCuts(labeledMdp, psiStates, variableInformation, relevancyInformation, *solver);
STORM_LOG_DEBUG("Asserted explicit cuts.");
assertSymbolicCuts(preparedProgram, labeledMdp, variableInformation, relevancyInformation, *solver);
assertSymbolicCuts(program, labeledMdp, variableInformation, relevancyInformation, *solver);
STORM_LOG_DEBUG("Asserted symbolic cuts.");
if (includeReachabilityEncoding) {
assertReachabilityCuts(labeledMdp, psiStates, variableInformation, relevancyInformation, *solver);
@ -1749,7 +1746,7 @@ namespace storm {
#endif
}
static void computeCounterexample(storm::prism::Program program, std::string const& constantDefinitionString, storm::models::sparse::Mdp<T> const& labeledMdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
static std::shared_ptr<PrismHighLevelCounterexample> computeCounterexample(storm::prism::Program program, storm::models::sparse::Mdp<T> const& labeledMdp, std::shared_ptr<storm::logic::Formula const> const& formula) {
#ifdef STORM_HAVE_Z3
std::cout << std::endl << "Generating minimal label counterexample for formula " << *formula << std::endl;
@ -1791,15 +1788,11 @@ namespace storm {
// Delegate the actual computation work to the function of equal name.
auto startTime = std::chrono::high_resolution_clock::now();
auto labelSet = getMinimalCommandSet(program, constantDefinitionString, labeledMdp, phiStates, psiStates, threshold, strictBound, true, storm::settings::getModule<storm::settings::modules::CounterexampleGeneratorSettings>().isEncodeReachabilitySet());
auto labelSet = getMinimalCommandSet(program, labeledMdp, phiStates, psiStates, threshold, strictBound, true, storm::settings::getModule<storm::settings::modules::CounterexampleGeneratorSettings>().isEncodeReachabilitySet());
auto endTime = std::chrono::high_resolution_clock::now();
std::cout << std::endl << "Computed minimal label set of size " << labelSet.size() << " in " << std::chrono::duration_cast<std::chrono::milliseconds>(endTime - startTime).count() << "ms." << std::endl;
std::cout << "Resulting program:" << std::endl << std::endl;
storm::prism::Program restrictedProgram = program.restrictCommands(labelSet);
std::cout << restrictedProgram << std::endl;
std::cout << std::endl << "-------------------------------------------" << std::endl;
return std::make_shared<PrismHighLevelCounterexample>(program.restrictCommands(labelSet));
#else
throw storm::exceptions::NotImplementedException() << "This functionality is unavailable since storm has been compiled without support for Z3.";
#endif

2
src/storm/generator/Choice.cpp

@ -1,6 +1,6 @@
#include "storm/generator/Choice.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/constants.h"

2
src/storm/generator/NextStateGenerator.cpp

@ -1,6 +1,6 @@
#include "storm/generator/NextStateGenerator.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/logic/Formulas.h"

2
src/storm/generator/StateBehavior.cpp

@ -1,6 +1,6 @@
#include "storm/generator/StateBehavior.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace generator {

2
src/storm/logic/OperatorFormula.cpp

@ -1,6 +1,6 @@
#include "storm/logic/OperatorFormula.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/exceptions/InvalidOperationException.h"

1
src/storm/modelchecker/csl/HybridCtmcCslModelChecker.cpp

@ -133,6 +133,7 @@ namespace storm {
template class HybridCtmcCslModelChecker<storm::models::symbolic::Ctmc<storm::dd::DdType::Sylvan, double>>;
template class HybridCtmcCslModelChecker<storm::models::symbolic::Ctmc<storm::dd::DdType::Sylvan, storm::RationalNumber>>;
template class HybridCtmcCslModelChecker<storm::models::symbolic::Ctmc<storm::dd::DdType::Sylvan, storm::RationalFunction>>;
} // namespace modelchecker
} // namespace storm

2
src/storm/modelchecker/csl/SparseCtmcCslModelChecker.cpp

@ -15,7 +15,7 @@
#include "storm/logic/FragmentSpecification.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/exceptions/InvalidStateException.h"
#include "storm/exceptions/InvalidPropertyException.h"

2
src/storm/modelchecker/csl/helper/SparseCtmcCslHelper.cpp

@ -12,7 +12,7 @@
#include "storm/storage/StronglyConnectedComponentDecomposition.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"
#include "storm/utility/vector.h"

4
src/storm/modelchecker/hints/ExplicitModelCheckerHint.cpp

@ -1,5 +1,5 @@
#include "storm/modelchecker/hints/ExplicitModelCheckerHint.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"
#include "storm/exceptions/InvalidOperationException.h"
@ -119,4 +119,4 @@ namespace storm {
template class ExplicitModelCheckerHint<storm::RationalFunction>;
}
}
}

4
src/storm/modelchecker/hints/ModelCheckerHint.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/hints/ModelCheckerHint.h"
#include "storm/modelchecker/hints/ExplicitModelCheckerHint.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace modelchecker {
@ -31,4 +31,4 @@ namespace storm {
template ExplicitModelCheckerHint<storm::RationalFunction>& ModelCheckerHint::asExplicitModelCheckerHint();
}
}
}

2
src/storm/modelchecker/multiobjective/constraintbased/SparseCbAchievabilityQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/constraintbased/SparseCbAchievabilityQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/constraintbased/SparseCbQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/constraintbased/SparseCbQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparseMaPcaaWeightVectorChecker.cpp

@ -2,7 +2,7 @@
#include <cmath>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/utility/macros.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/pcaa/SparseMdpPcaaWeightVectorChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/utility/macros.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/pcaa/SparsePcaaAchievabilityQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/pcaa/SparsePcaaQuantitativeQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp

@ -2,7 +2,7 @@
#include <map>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/modelchecker/parametric/RegionChecker.cpp

@ -3,7 +3,7 @@
#include "storm/modelchecker/parametric/RegionChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"

4
src/storm/modelchecker/parametric/SparseDtmcParameterLiftingModelChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/parametric/SparseDtmcParameterLiftingModelChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
@ -256,4 +256,4 @@ namespace storm {
}
}
}
}

2
src/storm/modelchecker/parametric/SparseDtmcRegionChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/parametric/SparseDtmcRegionChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/parametric/SparseDtmcParameterLiftingModelChecker.h"
#include "storm/modelchecker/parametric/SparseDtmcInstantiationModelChecker.h"

4
src/storm/modelchecker/parametric/SparseInstantiationModelChecker.cpp

@ -1,6 +1,6 @@
#include "SparseInstantiationModelChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Dtmc.h"
#include "storm/models/sparse/Mdp.h"
#include "storm/models/sparse/StandardRewardModel.h"
@ -41,4 +41,4 @@ namespace storm {
}
}
}
}

2
src/storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"

2
src/storm/modelchecker/parametric/SparseMdpRegionChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/parametric/SparseMdpRegionChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/parametric/SparseMdpParameterLiftingModelChecker.h"
#include "storm/modelchecker/parametric/SparseMdpInstantiationModelChecker.h"

4
src/storm/modelchecker/parametric/SparseParameterLiftingModelChecker.cpp

@ -1,6 +1,6 @@
#include "SparseParameterLiftingModelChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/logic/FragmentSpecification.h"
#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
@ -91,4 +91,4 @@ namespace storm {
}
}
}
}

2
src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.h

@ -11,7 +11,7 @@
#include "storm/utility/solver.h"
#include "storm/solver/SolveGoal.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace storage {

2
src/storm/modelchecker/propositional/SparsePropositionalModelChecker.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/propositional/SparsePropositionalModelChecker.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/Dtmc.h"
#include "storm/models/sparse/Ctmc.h"

2
src/storm/modelchecker/reachability/SparseDtmcEliminationModelChecker.cpp

@ -4,7 +4,7 @@
#include <random>
#include <chrono>
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/settings/modules/EliminationSettings.h"
#include "storm/settings/modules/CoreSettings.h"

2
src/storm/modelchecker/results/CheckResult.cpp

@ -1,7 +1,7 @@
#include "storm/modelchecker/results/CheckResult.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"

2
src/storm/modelchecker/results/ExplicitParetoCurveCheckResult.cpp

@ -1,7 +1,7 @@
#include "storm/modelchecker/results/ExplicitParetoCurveCheckResult.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
#include "storm/utility/macros.h"
#include "storm/utility/vector.h"

2
src/storm/modelchecker/results/ExplicitQuantitativeCheckResult.cpp

@ -7,7 +7,7 @@
#include "storm/utility/vector.h"
#include "storm/exceptions/InvalidOperationException.h"
#include "storm/exceptions/InvalidAccessException.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {

2
src/storm/modelchecker/results/ParetoCurveCheckResult.cpp

@ -1,6 +1,6 @@
#include "storm/modelchecker/results/ParetoCurveCheckResult.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/vector.h"
namespace storm {

2
src/storm/modelchecker/results/QuantitativeCheckResult.cpp

@ -1,7 +1,7 @@
#include "storm/modelchecker/results/QuantitativeCheckResult.h"
#include "storm-config.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"
#include "storm/exceptions/InvalidOperationException.h"

2
src/storm/modelchecker/results/SymbolicParetoCurveCheckResult.cpp

@ -1,7 +1,7 @@
#include "storm/modelchecker/results/SymbolicParetoCurveCheckResult.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
#include "storm/utility/macros.h"
#include "storm/storage/dd/DdManager.h"

2
src/storm/models/sparse/Ctmc.cpp

@ -1,6 +1,6 @@
#include "storm/models/sparse/Ctmc.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/macros.h"
namespace storm {

2
src/storm/models/sparse/DeterministicModel.cpp

@ -1,7 +1,7 @@
#include "storm/models/sparse/DeterministicModel.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/utility/constants.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/sparse/Dtmc.cpp

@ -1,6 +1,6 @@
#include "storm/models/sparse/Dtmc.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/exceptions/NotImplementedException.h"
#include "storm/exceptions/InvalidArgumentException.h"
#include "storm/utility/constants.h"

2
src/storm/models/sparse/MarkovAutomaton.cpp

@ -1,6 +1,6 @@
#include "storm/models/sparse/MarkovAutomaton.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/solver/stateelimination/StateEliminator.h"
#include "storm/storage/FlexibleSparseMatrix.h"

2
src/storm/models/sparse/Mdp.cpp

@ -3,7 +3,7 @@
#include "storm/exceptions/InvalidArgumentException.h"
#include "storm/utility/constants.h"
#include "storm/utility/vector.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/models/sparse/StandardRewardModel.h"

2
src/storm/models/sparse/Model.cpp

@ -5,7 +5,7 @@
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/utility/vector.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/utility/NumberTraits.h"
#include "storm/exceptions/IllegalArgumentException.h"

2
src/storm/models/sparse/NondeterministicModel.cpp

@ -2,7 +2,7 @@
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
#include "storm/exceptions/InvalidOperationException.h"

2
src/storm/models/sparse/StandardRewardModel.cpp

@ -4,7 +4,7 @@
#include "storm/exceptions/InvalidOperationException.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/sparse/StandardRewardModel.h

@ -5,7 +5,7 @@
#include "storm/storage/SparseMatrix.h"
#include "storm/utility/OsDetection.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/sparse/StochasticTwoPlayerGame.cpp

@ -2,7 +2,7 @@
#include "storm/models/sparse/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/symbolic/Ctmc.cpp

@ -6,7 +6,7 @@
#include "storm/models/symbolic/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/symbolic/DeterministicModel.cpp

@ -6,7 +6,7 @@
#include "storm/models/symbolic/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/symbolic/Dtmc.cpp

@ -6,7 +6,7 @@
#include "storm/models/symbolic/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

2
src/storm/models/symbolic/Mdp.cpp

@ -6,7 +6,7 @@
#include "storm/models/symbolic/StandardRewardModel.h"
#include "storm/adapters/CarlAdapter.h"
#include "storm/adapters/RationalFunctionAdapter.h"
namespace storm {
namespace models {

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save