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

Easier fix for bound computation using SMT encoding

tempestpy_adaptions
Alexander Bork 6 years ago
parent
b89f8f8de4
commit
aff9d21811
3 changed files with 55 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
  2. 19
      src/storm-dft/modelchecker/dft/DFTASFChecker.h
  3. 25
      src/storm-dft/modelchecker/dft/SmtConstraint.cpp

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

@ -241,14 +241,6 @@ namespace storm {
STORM_LOG_ASSERT(children.size() >= 2, "Spare has only one child");
for (uint64_t currChild = 0; currChild < children.size() - 1; ++currChild) {
uint64_t timeCurrChild = childVarIndices.at(currChild); // Moment when current child fails
// If trying to claim (i+1)-th child, either child claimed before or never claimed by other spare
// (additional constraint)
std::shared_ptr<SmtConstraint> claimEarlyC = generateClaimEarlyConstraint(spare, currChild);
constraints.push_back(std::make_shared<Implies>(
std::make_shared<IsLess>(getClaimVariableIndex(spare->id(), children.at(currChild)->id()),
timeCurrChild), claimEarlyC));
constraints.back()->setDescription("Ensure earliest possible claiming");
// If i-th child fails after being claimed, then try to claim next child (constraint 6)
std::shared_ptr<SmtConstraint> tryClaimC = generateTryToClaimConstraint(spare, currChild + 1,
timeCurrChild);
@ -259,28 +251,6 @@ namespace storm {
}
}
std::shared_ptr<SmtConstraint>
DFTASFChecker::generateClaimEarlyConstraint(std::shared_ptr<storm::storage::DFTSpare<ValueType> const> spare,
uint64_t childIndex) const {
auto child = spare->children().at(childIndex + 1);
std::vector<std::shared_ptr<SmtConstraint>> constraintAggregator;
for (auto const &otherSpare : child->parents()) {
if (otherSpare->id() == spare->id()) {
// not a different spare.
continue;
}
std::vector<std::shared_ptr<SmtConstraint>> OrAggregator;
// Other spare has claimed before
OrAggregator.push_back(std::make_shared<IsLessConstant>(
getClaimVariableIndex(otherSpare->id(), child->id()), timePointVariables.at(childIndex)));
// Other spare will never claim
OrAggregator.push_back(std::make_shared<IsConstantValue>(
getClaimVariableIndex(otherSpare->id(), child->id()), notFailed));
constraintAggregator.push_back(std::make_shared<Or>(OrAggregator));
}
return std::make_shared<And>(constraintAggregator);
}
std::shared_ptr<SmtConstraint>
DFTASFChecker::generateTryToClaimConstraint(std::shared_ptr<storm::storage::DFTSpare<ValueType> const> spare,
uint64_t childIndex, uint64_t timepoint) const {
@ -309,7 +279,9 @@ namespace storm {
// not a different spare.
continue;
}
claimingPossibleC.push_back(std::make_shared<IsConstantValue>(getClaimVariableIndex(otherSpare->id(), child->id()), notFailed));
claimingPossibleC.push_back(std::make_shared<IsLess>(timepoint,
getClaimVariableIndex(otherSpare->id(),
child->id())));
}
// Claim child if available
@ -532,40 +504,51 @@ namespace storm {
return checkTleFailsWithEq(notFailed);
}
uint64_t DFTASFChecker::getLeastFailureBound() {
uint64_t DFTASFChecker::getLeastFailureBound(uint_fast64_t timeout) {
STORM_LOG_ASSERT(solver, "SMT Solver was not initialized, call toSolver() before checking queries");
if (checkTleNeverFailed() == storm::solver::SmtSolver::CheckResult::Sat) {
return notFailed;
}
uint64_t bound = 0;
while (bound < notFailed) {
setSolverTimeout(10000);
setSolverTimeout(timeout * 1000);
storm::solver::SmtSolver::CheckResult tmp_res = checkTleFailsWithLeq(bound);
unsetSolverTimeout();
if (tmp_res == storm::solver::SmtSolver::CheckResult::Sat ||
tmp_res == storm::solver::SmtSolver::CheckResult::Unknown) {
return bound;
switch (tmp_res) {
case storm::solver::SmtSolver::CheckResult::Sat:
return bound;
case storm::solver::SmtSolver::CheckResult::Unknown:
STORM_LOG_DEBUG("Solver returned 'Unknown'");
return bound;
default:
++bound;
break;
}
++bound;
}
return bound;
}
uint64_t DFTASFChecker::getAlwaysFailedBound() {
uint64_t DFTASFChecker::getAlwaysFailedBound(uint_fast64_t timeout) {
STORM_LOG_ASSERT(solver, "SMT Solver was not initialized, call toSolver() before checking queries");
if (checkTleNeverFailed() == storm::solver::SmtSolver::CheckResult::Sat) {
return notFailed;
}
uint64_t bound = notFailed - 1;
while (bound >= 0) {
setSolverTimeout(10000);
setSolverTimeout(timeout * 1000);
storm::solver::SmtSolver::CheckResult tmp_res = checkTleFailsWithEq(bound);
unsetSolverTimeout();
if (tmp_res == storm::solver::SmtSolver::CheckResult::Sat ||
tmp_res == storm::solver::SmtSolver::CheckResult::Unknown) {
return bound;
switch (tmp_res) {
case storm::solver::SmtSolver::CheckResult::Sat:
return bound;
case storm::solver::SmtSolver::CheckResult::Unknown:
STORM_LOG_DEBUG("Solver returned 'Unknown'");
return bound;
default:
--bound;
break;
}
--bound;
}
return bound;
}

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

@ -68,16 +68,18 @@ namespace storm {
/**
* Get the minimal number of BEs necessary for the TLE to fail (lower bound for number of failures to check)
*
* @param timeout timeout for each query in seconds, defaults to 10 seconds
* @return the minimal number
*/
uint64_t getLeastFailureBound();
uint64_t getLeastFailureBound(uint_fast64_t timeout = 10);
/**
* Get the number of BE failures for which the TLE always fails (upper bound for number of failures to check)
*
* @param timeout timeout for each query in seconds, defaults to 10 seconds
* @return the number
*/
uint64_t getAlwaysFailedBound();
uint64_t getAlwaysFailedBound(uint_fast64_t timeout = 10);
/**
* Set the timeout of the solver
@ -94,19 +96,6 @@ namespace storm {
private:
uint64_t getClaimVariableIndex(uint64_t spareIndex, uint64_t childIndex) const;
/**
* Generate constraint for spares such that when trying to claim child (i+1), other spares either claimed it
* before or will never claim it
*
* @param spare Spare.
* @param childIndex Index of child to consider in spare children
* @param timepoint Timepoint to try to claim
* @return
*/
std::shared_ptr<SmtConstraint>
generateClaimEarlyConstraint(std::shared_ptr<storm::storage::DFTSpare<ValueType> const> spare,
uint64_t childIndex) const;
/**
* Generate constraint for 'spare (s) tries to claim the child (i) at the given timepoint (t)'.
* This corresponds to the function \phi^s_i(t) in constraint 7.

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

@ -370,6 +370,31 @@ namespace storm {
uint64_t value;
};
class IsGreaterConstant : public SmtConstraint {
public:
IsGreaterConstant(uint64_t varIndex, uint64_t val) : varIndex(varIndex), value(val) {
}
virtual ~IsGreaterConstant() {
}
std::string toSmtlib2(std::vector<std::string> const &varNames) const override {
std::stringstream sstr;
assert(varIndex < varNames.size());
sstr << "(< " << value << " " << varNames.at(varIndex) << ")";
return sstr.str();
}
storm::expressions::Expression toExpression(std::vector<std::string> const &varNames,
std::shared_ptr<storm::expressions::ExpressionManager> manager) const override {
return manager->getVariableExpression(varNames.at(varIndex)) > value;
}
private:
uint64_t varIndex;
uint64_t value;
};
class IsLessEqualConstant : public SmtConstraint {
public:
IsLessEqualConstant(uint64_t varIndex, uint64_t val) : varIndex(varIndex), value(val) {

Write Preview
Loading…
Cancel
Save