mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Code Activity

adding Cube method to .NET API, removing lookahead and get-lemmas

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-10-29 08:57:24 -07:00
parent 2774d6896b
commit 92b5301b7f
13 changed files with 38 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/solver/combined_solver.cpp
View file

@ -280,10 +280,6 @@ public:
return m_solver1->get_num_assumptions() + m_solver2->get_num_assumptions();
}
virtual expr_ref lookahead(expr_ref_vector const& assumptions, expr_ref_vector const& candidates) {
return m_solver1->lookahead(assumptions, candidates);
}
virtual expr_ref cube() {
return m_solver1->cube();
}

9
src/solver/solver.h
View file

@ -182,18 +182,21 @@ public:
\brief extract a lookahead candidates for branching.
*/
virtual expr_ref lookahead(expr_ref_vector const& assumptions, expr_ref_vector const& candidates) = 0;
virtual expr_ref cube() = 0;
#if 0
/**
\brief extract a lookahead candidates for branching.
*/
virtual expr_ref cube() = 0;
virtual expr_ref lookahead(expr_ref_vector const& assumptions, expr_ref_vector const& candidates) = 0;
/**
\brief extract learned lemmas.
*/
virtual void get_lemmas(expr_ref_vector& lemmas) {}
#endif
/**
\brief Display the content of this solver.
@ -217,4 +220,6 @@ protected:
};
typedef ref<solver> solver_ref;
#endif

4
src/solver/tactic2solver.cpp
View file

@ -77,10 +77,6 @@ public:
virtual ast_manager& get_manager() const;
virtual expr_ref lookahead(expr_ref_vector const& assumptions, expr_ref_vector const& candidates) {
ast_manager& m = get_manager();
return expr_ref(m.mk_true(), m);
}
virtual expr_ref cube() {
ast_manager& m = get_manager();
return expr_ref(m.mk_true(), m);