diff options
| author | Morgan Deters <mdeters@gmail.com> | 2011-04-10 00:44:20 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2011-04-10 00:44:20 +0000 |
| commit | 969b144a5f9630d646afdf0ff0a053df38d0ed1a (patch) | |
| tree | 92eb38ad161abfe3af979a86285549168d118c5e /src/prop/sat.h | |
| parent | 8495ee8e7de4a7e472d72cfb20290940c59794e3 (diff) | |
merge from replay branch
Diffstat (limited to 'src/prop/sat.h')
| -rw-r--r-- | src/prop/sat.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/prop/sat.h b/src/prop/sat.h index b80b0f705..c00115cd8 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -5,7 +5,7 @@ ** Major contributors: taking, cconway, dejan ** Minor contributors (to current version): barrett ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) + ** Copyright (c) 2009, 2010, 2011 The Analysis of Computer Systems Group (ACSys) ** Courant Institute of Mathematical Sciences ** New York University ** See the file COPYING in the top-level source directory for licensing @@ -250,14 +250,19 @@ public: void notifyRestart(); + SatLiteral getNextReplayDecision(); + + void logDecision(SatLiteral lit); + };/* class SatSolver */ /* Functions that delegate to the concrete SAT solver. */ #ifdef __CVC4_USE_MINISAT -inline SatSolver::SatSolver(PropEngine* propEngine, TheoryEngine* theoryEngine, - context::Context* context) : +inline SatSolver::SatSolver(PropEngine* propEngine, + TheoryEngine* theoryEngine, + context::Context* context) : d_propEngine(propEngine), d_cnfStream(NULL), d_theoryEngine(theoryEngine), |