mirror of
https://github.com/Z3Prover/z3
synced 2025-04-23 17:15:31 +00:00
Polysat: use constraint_literal and begin move to core-based conflict representation (#5489)
* Rename solver_scope for fixplex tests (otherwise the wrong constructor is called for polysat's solver_scope) * Update conflict_core * simplify * Be clearer about constraint_literal lifetime * remove old comment * Remove status (positive/negative) from constraint * Use constraint_literal in the solver * Fix build (constraint -> get_constraint)
This commit is contained in:
parent
30e9f24fa3
commit
ebaea2159e
19 changed files with 933 additions and 1004 deletions
|
@ -11,11 +11,12 @@ namespace polysat {
|
|||
|
||||
typedef uint64_ext::numeral numeral;
|
||||
|
||||
struct solver_scope {
|
||||
struct fp_scope {
|
||||
params_ref p;
|
||||
reslimit lim;
|
||||
};
|
||||
struct scoped_fp : public solver_scope, public fixplex<uint64_ext> {
|
||||
|
||||
struct scoped_fp : public fp_scope, public fixplex<uint64_ext> {
|
||||
|
||||
scoped_fp(): fixplex<uint64_ext>(p, lim) {}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue