mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-26 13:06:05 +00:00
Code Activity

roll in new-viable

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2021-11-22 06:17:20 +01:00
parent d86570ce75
commit 8ec5ccbb9a
4 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/math/polysat/solver.h
View file

@ -36,7 +36,7 @@ Author:
#include "math/polysat/log.h"
#define NEW_VIABLE 0
#define NEW_VIABLE 1
namespace polysat {
@ -75,12 +75,13 @@ namespace polysat {
reslimit& m_lim;
params_ref m_params;
scoped_ptr_vector<dd::pdd_manager> m_pdd;
#if NEW_VIABLE
viable2 m_viable;
#else
viable m_viable; // viable sets per variable
#endif
scoped_ptr_vector<dd::pdd_manager> m_pdd;
linear_solver m_linear_solver;
conflict m_conflict;
forbidden_intervals m_forbidden_intervals;
@ -224,7 +225,6 @@ namespace polysat {
void restart();
signed_constraint lit2cnstr(sat::literal lit) const { return m_constraints.lookup(lit); }
void assert_constraint(signed_constraint c, unsigned dep);
static void insert_constraint(signed_constraints& cs, signed_constraint c);
bool inc() { return m_lim.inc(); }
@ -348,8 +348,6 @@ namespace polysat {
void updt_params(params_ref const& p);
void get_param_descrs(param_descrs& pd);
};
class assignments_pp {