summaryrefslogtreecommitdiff
path: root/src/smt
diff options
context:
space:
mode:
authorDejan Jovanović <dejan.jovanovic@gmail.com>2012-02-24 20:29:12 +0000
committerDejan Jovanović <dejan.jovanovic@gmail.com>2012-02-24 20:29:12 +0000
commitd8da6a3644d1cdbe62d44a8eb80068da4d1d2855 (patch)
tree773ccef817d1e5cbad85b4c0a1fb44666b1e0600 /src/smt
parent5a20a19a30929ad58a9e64a9d8d1f877f3a07ae6 (diff)
Theory interface changes:
solve -> ppAsert staticLearning -> ppStaticLearn preprocess -> ppRewrite SolveStatus -> PPAssertStatus (SOLVE_* -> PP_ASSERT_*) via Eclipse refactoring magic.
Diffstat (limited to 'src/smt')
-rw-r--r--src/smt/smt_engine.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/smt/smt_engine.cpp b/src/smt/smt_engine.cpp
index 12288e40a..5a7209c40 100644
--- a/src/smt/smt_engine.cpp
+++ b/src/smt/smt_engine.cpp
@@ -622,7 +622,7 @@ void SmtEnginePrivate::staticLearning() {
NodeBuilder<> learned(kind::AND);
learned << d_assertionsToCheck[i];
- d_smt.d_theoryEngine->staticLearning(d_assertionsToCheck[i], learned);
+ d_smt.d_theoryEngine->ppStaticLearn(d_assertionsToCheck[i], learned);
if(learned.getNumChildren() == 1) {
learned.clear();
} else {
@@ -689,10 +689,10 @@ void SmtEnginePrivate::nonClausalSimplify() {
// Solve it with the corresponding theory
Trace("simplify") << "SmtEnginePrivate::nonClausalSimplify(): "
<< "solving " << learnedLiteral << endl;
- Theory::SolveStatus solveStatus =
+ Theory::PPAssertStatus solveStatus =
d_smt.d_theoryEngine->solve(learnedLiteral, d_topLevelSubstitutions);
switch (solveStatus) {
- case Theory::SOLVE_STATUS_CONFLICT:
+ case Theory::PP_ASSERT_STATUS_CONFLICT:
// If in conflict, we return false
Trace("simplify") << "SmtEnginePrivate::nonClausalSimplify(): "
<< "conflict while solving "
@@ -700,7 +700,7 @@ void SmtEnginePrivate::nonClausalSimplify() {
d_assertionsToPreprocess.clear();
d_assertionsToCheck.push_back(NodeManager::currentNM()->mkConst<bool>(false));
return;
- case Theory::SOLVE_STATUS_SOLVED:
+ case Theory::PP_ASSERT_STATUS_SOLVED:
// The literal should rewrite to true
Trace("simplify") << "SmtEnginePrivate::nonClausalSimplify(): "
<< "solved " << learnedLiteral << endl;
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback