mirror of
https://github.com/Z3Prover/z3
synced 2025-06-22 05:43:39 +00:00
merge with Z3Prover/z3/master
This commit is contained in:
commit
f7b50ef796
452 changed files with 29240 additions and 34285 deletions
|
@ -320,6 +320,7 @@ namespace smt {
|
|||
}
|
||||
#endif
|
||||
|
||||
clause_vector const& get_lemmas() const { return m_lemmas; }
|
||||
|
||||
literal get_literal(expr * n) const;
|
||||
|
||||
|
@ -622,8 +623,6 @@ namespace smt {
|
|||
|
||||
void remove_cls_occs(clause * cls);
|
||||
|
||||
void mark_as_deleted(clause * cls);
|
||||
|
||||
void del_clause(clause * cls);
|
||||
|
||||
void del_clauses(clause_vector & v, unsigned old_size);
|
||||
|
@ -648,6 +647,14 @@ namespace smt {
|
|||
|
||||
void reassert_units(unsigned units_to_reassert_lim);
|
||||
|
||||
public:
|
||||
// \brief exposed for PB solver to participate in GC
|
||||
|
||||
void remove_watch(bool_var v);
|
||||
|
||||
void mark_as_deleted(clause * cls);
|
||||
|
||||
|
||||
// -----------------------------------
|
||||
//
|
||||
// Internalization
|
||||
|
@ -890,6 +897,8 @@ namespace smt {
|
|||
unsigned m_num_conflicts;
|
||||
unsigned m_num_conflicts_since_restart;
|
||||
unsigned m_num_conflicts_since_lemma_gc;
|
||||
unsigned m_num_restarts;
|
||||
unsigned m_num_simplifications;
|
||||
unsigned m_restart_threshold;
|
||||
unsigned m_restart_outer_threshold;
|
||||
unsigned m_luby_idx;
|
||||
|
@ -1031,6 +1040,8 @@ namespace smt {
|
|||
|
||||
enode * get_enode_eq_to(func_decl * f, unsigned num_args, enode * const * args);
|
||||
|
||||
expr* next_decision();
|
||||
|
||||
protected:
|
||||
bool decide();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue