sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added basis for SMT solver integration

tempestpy_adaptions
Alexander Bork 6 years ago
parent
33b6ba6d8f
commit
7cab3985c0
4 changed files with 119 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
  2. 4
      src/storm-dft/modelchecker/dft/DFTASFChecker.h
  3. 85
      src/storm-dft/modelchecker/dft/SmtConstraint.cpp
  4. 4
      src/storm-dft/modelchecker/dft/SmtConstraint.h

29
src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
View File

@ -1,8 +1,12 @@
#include "DFTASFChecker.h" #include "DFTASFChecker.h"
#include "SmtConstraint.cpp" #include "SmtConstraint.cpp"
#include <string> #include <string>
#include "storm/utility/file.h" #include "storm/utility/file.h"
#include "storm/utility/bitoperations.h" #include "storm/utility/bitoperations.h"
#include "storm/solver/SmtSolver.h"
#include "storm/storage/expressions/ExpressionManager.h"
#include "storm/storage/expressions/Type.h"
#include "storm/exceptions/NotImplementedException.h" #include "storm/exceptions/NotImplementedException.h"
#include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/NotSupportedException.h"
@ -429,5 +433,30 @@ namespace storm {
stream << "(check-sat)" << std::endl; stream << "(check-sat)" << std::endl;
storm::utility::closeFile(stream); storm::utility::closeFile(stream);
} }
void DFTASFChecker::toSolver() {
std::shared_ptr<storm::expressions::ExpressionManager> manager(new storm::expressions::ExpressionManager());
std::unique_ptr<storm::solver::SmtSolver> solver = storm::utility::solver::SmtSolverFactory().create(
*manager);
for (auto const &timeVarEntry : timePointVariables) {
manager->declareIntegerVariable(varNames[timeVarEntry.second]);
}
for (auto const &claimVarEntry : claimVariables) {
manager->declareIntegerVariable(varNames[claimVarEntry.second]);
}
for (auto const &markovianVarEntry : markovianVariables) {
manager->declareBooleanVariable(varNames[markovianVarEntry.second]);
}
if (!tmpTimePointVariables.empty()) {
for (auto const &tmpVar : tmpTimePointVariables) {
manager->declareIntegerVariable(varNames[tmpVar]);
}
}
for (auto const &constraint : constraints) {
solver->add(constraint->toExpression(varNames, manager));
}
//TODO Add porperties to check
}
} }
} }

4
src/storm-dft/modelchecker/dft/DFTASFChecker.h
View File

@ -6,7 +6,7 @@
#include "SmtConstraint.h" #include "SmtConstraint.h"
#include "storm-dft/storage/dft/DFT.h" #include "storm-dft/storage/dft/DFT.h"
#include "storm/utility/solver.h"
namespace storm { namespace storm {
namespace modelchecker { namespace modelchecker {
@ -29,14 +29,12 @@ namespace storm {
using ValueType = double; using ValueType = double;
public: public:
DFTASFChecker(storm::storage::DFT<ValueType> const&); DFTASFChecker(storm::storage::DFT<ValueType> const&);
/** /**
* Generate general variables and constraints for the DFT and store them in the corresponding maps and vectors * Generate general variables and constraints for the DFT and store them in the corresponding maps and vectors
* *
*/ */
void convert(); void convert();
void toFile(std::string const&); void toFile(std::string const&);
void toSolver(); void toSolver();
private: private:

85
src/storm-dft/modelchecker/dft/SmtConstraint.cpp
View File

@ -34,6 +34,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
std::vector<uint64_t> varIndices; std::vector<uint64_t> varIndices;
@ -69,6 +74,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
std::vector<uint64_t> varIndices; std::vector<uint64_t> varIndices;
@ -93,6 +103,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
uint64_t upperBound; uint64_t upperBound;
@ -122,6 +137,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::vector<std::shared_ptr<SmtConstraint>> constraints; std::vector<std::shared_ptr<SmtConstraint>> constraints;
@ -150,6 +170,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::vector<std::shared_ptr<SmtConstraint>> constraints; std::vector<std::shared_ptr<SmtConstraint>> constraints;
@ -167,6 +192,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::shared_ptr<SmtConstraint> lhs; std::shared_ptr<SmtConstraint> lhs;
std::shared_ptr<SmtConstraint> rhs; std::shared_ptr<SmtConstraint> rhs;
@ -184,6 +214,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::shared_ptr<SmtConstraint> lhs; std::shared_ptr<SmtConstraint> lhs;
std::shared_ptr<SmtConstraint> rhs; std::shared_ptr<SmtConstraint> rhs;
@ -204,6 +239,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
bool value; bool value;
}; };
@ -228,6 +268,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
bool value; bool value;
@ -249,6 +294,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
uint64_t value; uint64_t value;
@ -270,6 +320,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
uint64_t value; uint64_t value;
@ -290,6 +345,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t varIndex; uint64_t varIndex;
uint64_t value; uint64_t value;
@ -308,6 +368,11 @@ namespace storm {
return "(= " + varNames.at(var1Index) + " " + varNames.at(var2Index) + ")"; return "(= " + varNames.at(var1Index) + " " + varNames.at(var2Index) + ")";
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t var1Index; uint64_t var1Index;
uint64_t var2Index; uint64_t var2Index;
@ -326,6 +391,11 @@ namespace storm {
return "(< " + varNames.at(var1Index) + " " + varNames.at(var2Index) + ")"; return "(< " + varNames.at(var1Index) + " " + varNames.at(var2Index) + ")";
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
uint64_t var1Index; uint64_t var1Index;
uint64_t var2Index; uint64_t var2Index;
@ -355,6 +425,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::vector<uint64_t> varIndices; std::vector<uint64_t> varIndices;
}; };
@ -378,6 +453,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::vector<uint64_t> varIndices; std::vector<uint64_t> varIndices;
}; };
@ -397,6 +477,11 @@ namespace storm {
return sstr.str(); return sstr.str();
} }
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
//TODO
}
private: private:
std::shared_ptr<SmtConstraint> ifConstraint; std::shared_ptr<SmtConstraint> ifConstraint;
std::shared_ptr<SmtConstraint> thenConstraint; std::shared_ptr<SmtConstraint> thenConstraint;

4
src/storm-dft/modelchecker/dft/SmtConstraint.h
View File

@ -1,4 +1,5 @@
#include <string> #include <string>
#include <storm/storage/expressions/Expression.h>
namespace storm { namespace storm {
namespace modelchecker { namespace modelchecker {
@ -9,6 +10,9 @@ namespace storm {
virtual std::string toSmtlib2(std::vector<std::string> const &varNames) const = 0; virtual std::string toSmtlib2(std::vector<std::string> const &varNames) const = 0;
virtual storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const = 0;
virtual std::string description() const { virtual std::string description() const {
return descript; return descript;
} }

Write Preview
Loading…
Cancel
Save