Browse Source

Remove bool for stateElimination

tempestpy_adaptions
Jip Spel 6 years ago
parent
commit
ab14245350
  1. 2
      src/storm-pars-cli/storm-pars.cpp
  2. 2
      src/storm-pars/analysis/MonotonicityChecker.cpp
  3. 4
      src/storm-pars/analysis/MonotonicityChecker.h

2
src/storm-pars-cli/storm-pars.cpp

@ -638,7 +638,7 @@ namespace storm {
std::ofstream outfile; std::ofstream outfile;
outfile.open("results.txt", std::ios_base::app); outfile.open("results.txt", std::ios_base::app);
storm::utility::Stopwatch monotonicityWatch(true); storm::utility::Stopwatch monotonicityWatch(true);
auto monotonicityChecker = storm::analysis::MonotonicityChecker<ValueType>(model, formulas, parSettings.isValidateAssumptionsSet(), parSettings.isSccEliminationSet());
auto monotonicityChecker = storm::analysis::MonotonicityChecker<ValueType>(model, formulas, parSettings.isValidateAssumptionsSet());
monotonicityChecker.checkMonotonicity(); monotonicityChecker.checkMonotonicity();
monotonicityWatch.stop(); monotonicityWatch.stop();
STORM_PRINT(std::endl << "Total time for monotonicity checking: " << monotonicityWatch << "." << std::endl STORM_PRINT(std::endl << "Total time for monotonicity checking: " << monotonicityWatch << "." << std::endl

2
src/storm-pars/analysis/MonotonicityChecker.cpp

@ -30,7 +30,7 @@
namespace storm { namespace storm {
namespace analysis { namespace analysis {
template <typename ValueType> template <typename ValueType>
MonotonicityChecker<ValueType>::MonotonicityChecker(std::shared_ptr<storm::models::ModelBase> model, std::vector<std::shared_ptr<storm::logic::Formula const>> formulas, bool validate, bool sccElimination) {
MonotonicityChecker<ValueType>::MonotonicityChecker(std::shared_ptr<storm::models::ModelBase> model, std::vector<std::shared_ptr<storm::logic::Formula const>> formulas, bool validate) {
outfile.open(filename, std::ios_base::app); outfile.open(filename, std::ios_base::app);
this->model = model; this->model = model;
this->formulas = formulas; this->formulas = formulas;

4
src/storm-pars/analysis/MonotonicityChecker.h

@ -26,7 +26,7 @@ namespace storm {
class MonotonicityChecker { class MonotonicityChecker {
public: public:
MonotonicityChecker(std::shared_ptr<storm::models::ModelBase> model, std::vector<std::shared_ptr<storm::logic::Formula const>> formulas, bool validate, bool sccElimination);
MonotonicityChecker(std::shared_ptr<storm::models::ModelBase> model, std::vector<std::shared_ptr<storm::logic::Formula const>> formulas, bool validate);
/*! /*!
* Checks for all lattices in the map if they are monotone increasing or monotone decreasing. * Checks for all lattices in the map if they are monotone increasing or monotone decreasing.
* *
@ -71,7 +71,7 @@ namespace storm {
std::vector<std::shared_ptr<storm::logic::Formula const>> formulas; std::vector<std::shared_ptr<storm::logic::Formula const>> formulas;
bool validate; bool validate;
bool sccElimination; bool sccElimination;
std::map<carl::Variable, std::pair<bool, bool>> resultCheckOnSamples; std::map<carl::Variable, std::pair<bool, bool>> resultCheckOnSamples;

Loading…
Cancel
Save