diff options
author | Alex Ozdemir <aozdemir@hmc.edu> | 2018-12-03 11:56:47 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-03 11:56:47 -0800 |
commit | aa0a875dfd40bd9dfa810238327db51498b74677 (patch) | |
tree | 5606b1214ef8388b86e964213ed3b9c67254317f /src/prop/bvminisat | |
parent | 2a19474cdb6761fd4c9aeb0165e661c531ba3e38 (diff) |
Bit vector proof superclass (#2599)
* Split BitvectorProof into a sub/superclass
The superclass contains general printing knowledge.
The subclass contains CNF or Resolution-specific knowledge.
* Renames & code moves
* Nits cleaned in prep for PR
* Moved CNF-proof from ResolutionBitVectorProof to BitVectorProof
Since DRAT BV proofs will also contain a CNF-proof, the CNF proof should
be stored in `BitVectorProof`.
* Unique pointers, comments, and code movement.
Adjusted the distribution of code between BVP and RBVP.
Notably, put the CNF proof in BVP because it isn't
resolution-specific.
Added comments to the headers of both files -- mostly BVP.
Changed two owned pointers into unique_ptr.
BVP's pointer to a CNF proof
RBVP's pointer to a resolution proof
BVP: `BitVectorProof`
RBVP: `ResolutionBitVectorProof`
* clang-format
* Undo manual copyright modification
* s/superclass/base class/
Co-Authored-By: alex-ozdemir <aozdemir@hmc.edu>
* make LFSCBitVectorProof::printOwnedSort public
* Andres's Comments
Mostly cleaning up (or trying to clean up) includes.
* Cleaned up one header cycle
However, this only allowed me to move the forward-decl, not eliminate
it, because there were actually two underlying include cycles that the
forward-decl solved.
* Added single _s to header gaurds
* Fix Class name in debug output
Credits to Andres
Co-Authored-By: alex-ozdemir <aozdemir@hmc.edu>
* Reordered methods in BitVectorProof per original ordering
Diffstat (limited to 'src/prop/bvminisat')
-rw-r--r-- | src/prop/bvminisat/bvminisat.cpp | 5 | ||||
-rw-r--r-- | src/prop/bvminisat/bvminisat.h | 10 | ||||
-rw-r--r-- | src/prop/bvminisat/core/Solver.cc | 5 | ||||
-rw-r--r-- | src/prop/bvminisat/core/Solver.h | 13 |
4 files changed, 20 insertions, 13 deletions
diff --git a/src/prop/bvminisat/bvminisat.cpp b/src/prop/bvminisat/bvminisat.cpp index 1eb4bce96..55710092b 100644 --- a/src/prop/bvminisat/bvminisat.cpp +++ b/src/prop/bvminisat/bvminisat.cpp @@ -51,7 +51,7 @@ void BVMinisatSatSolver::MinisatNotify::notify( d_notify->notify(satClause); } -void BVMinisatSatSolver::setNotify(Notify* notify) { +void BVMinisatSatSolver::setNotify(BVSatSolverNotify* notify) { d_minisatNotify.reset(new MinisatNotify(notify)); d_minisat->setNotify(d_minisatNotify.get()); } @@ -104,7 +104,8 @@ void BVMinisatSatSolver::popAssumption() { d_minisat->popAssumption(); } -void BVMinisatSatSolver::setProofLog( BitVectorProof * bvp ) { +void BVMinisatSatSolver::setProofLog(proof::ResolutionBitVectorProof* bvp) +{ d_minisat->setProofLog( bvp ); } diff --git a/src/prop/bvminisat/bvminisat.h b/src/prop/bvminisat/bvminisat.h index 728d26bd4..16489b172 100644 --- a/src/prop/bvminisat/bvminisat.h +++ b/src/prop/bvminisat/bvminisat.h @@ -22,8 +22,10 @@ #include "context/cdo.h" #include "proof/clause_id.h" +#include "proof/resolution_bitvector_proof.h" #include "prop/bvminisat/simp/SimpSolver.h" #include "prop/sat_solver.h" +#include "prop/bv_sat_solver_notify.h" #include "util/statistics_registry.h" namespace CVC4 { @@ -35,10 +37,10 @@ class BVMinisatSatSolver : public BVSatSolverInterface, private: class MinisatNotify : public BVMinisat::Notify { - BVSatSolverInterface::Notify* d_notify; + BVSatSolverNotify* d_notify; public: - MinisatNotify(BVSatSolverInterface::Notify* notify) : d_notify(notify) {} + MinisatNotify(BVSatSolverNotify* notify) : d_notify(notify) {} bool notify(BVMinisat::Lit lit) override { return d_notify->notify(toSatLiteral(lit)); @@ -66,7 +68,7 @@ public: BVMinisatSatSolver(StatisticsRegistry* registry, context::Context* mainSatContext, const std::string& name = ""); virtual ~BVMinisatSatSolver(); - void setNotify(Notify* notify) override; + void setNotify(BVSatSolverNotify* notify) override; ClauseId addClause(SatClause& clause, bool removable) override; @@ -117,7 +119,7 @@ public: void popAssumption() override; - void setProofLog(BitVectorProof* bvp) override; + void setProofLog(proof::ResolutionBitVectorProof* bvp) override; private: /* Disable the default constructor. */ diff --git a/src/prop/bvminisat/core/Solver.cc b/src/prop/bvminisat/core/Solver.cc index a4b0248e0..a877f20c3 100644 --- a/src/prop/bvminisat/core/Solver.cc +++ b/src/prop/bvminisat/core/Solver.cc @@ -29,9 +29,9 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA #include "base/output.h" #include "options/bv_options.h" #include "options/smt_options.h" -#include "proof/bitvector_proof.h" #include "proof/clause_id.h" #include "proof/proof_manager.h" +#include "proof/resolution_bitvector_proof.h" #include "proof/sat_proof.h" #include "proof/sat_proof_implementation.h" #include "prop/bvminisat/mtl/Sort.h" @@ -1318,7 +1318,8 @@ void Solver::explain(Lit p, std::vector<Lit>& explanation) { } } -void Solver::setProofLog( BitVectorProof * bvp ) { +void Solver::setProofLog(proof::ResolutionBitVectorProof* bvp) +{ d_bvp = bvp; d_bvp->initSatProof(this); d_bvp->getSatProof()->registerTrueLit(mkLit(varTrue, false)); diff --git a/src/prop/bvminisat/core/Solver.h b/src/prop/bvminisat/core/Solver.h index da4fb4c16..eef1c4e4c 100644 --- a/src/prop/bvminisat/core/Solver.h +++ b/src/prop/bvminisat/core/Solver.h @@ -39,7 +39,10 @@ namespace BVMinisat { class Solver; } -class BitVectorProof; +// TODO (aozdemir) replace this forward declaration with an include +namespace proof { +class ResolutionBitVectorProof; +} namespace BVMinisat { @@ -212,10 +215,10 @@ public: bool only_bcp; // solving mode in which only boolean constraint propagation is done void setOnlyBCP (bool val) { only_bcp = val;} void explain(Lit l, std::vector<Lit>& explanation); - - void setProofLog( CVC4::BitVectorProof * bvp ); -protected: + void setProofLog(CVC4::proof::ResolutionBitVectorProof* bvp); + + protected: // has a clause been added bool clause_added; @@ -292,7 +295,7 @@ protected: bool asynch_interrupt; //proof log - CVC4::BitVectorProof * d_bvp; + CVC4::proof::ResolutionBitVectorProof* d_bvp; // Main internal methods: // |