mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

bool_vector, some spacer tidy

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-04-05 12:59:04 -07:00
parent 2ed26e8e73
commit b889b110ee
106 changed files with 239 additions and 266 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nlsat/nlsat_assignment.h
View file

@ -30,7 +30,7 @@ namespace nlsat {
*/
class assignment : public polynomial::var2anum {
scoped_anum_vector m_values;
svector<bool> m_assigned;
bool_vector m_assigned;
public:
assignment(anum_manager & _m):m_values(_m) {}
virtual ~assignment() {}

2
src/nlsat/nlsat_explain.cpp
View file

@ -258,7 +258,7 @@ namespace nlsat {
\brief Add literal p != 0 into m_result.
*/
ptr_vector<poly> m_zero_fs;
svector<bool> m_is_even;
bool_vector m_is_even;
void add_zero_assumption(polynomial_ref & p) {
// If p is of the form p1^n1 * ... * pk^nk,
// then only the factors that are zero in the current interpretation needed to be considered.

12
src/nlsat/nlsat_solver.cpp
View file

@ -114,10 +114,10 @@ namespace nlsat {
unsigned_vector m_levels; // bool_var -> level
svector<justification> m_justifications;
vector<clause_vector> m_bwatches; // bool_var (that are not attached to atoms) -> clauses where it is maximal
svector<bool> m_dead; // mark dead boolean variables
bool_vector m_dead; // mark dead boolean variables
id_gen m_bid_gen;
svector<bool> m_is_int; // m_is_int[x] is true if variable is integer
bool_vector m_is_int; // m_is_int[x] is true if variable is integer
vector<clause_vector> m_watches; // var -> clauses where variable is maximal
interval_set_vector m_infeasible; // var -> to a set of interval where the variable cannot be assigned to.
atom_vector m_var2eq; // var -> to asserted equality
@ -497,7 +497,7 @@ namespace nlsat {
SASSERT(m_is_int.size() == m_inv_perm.size());
}
svector<bool> m_found_vars;
bool_vector m_found_vars;
void vars(literal l, var_vector& vs) {
vs.reset();
atom * a = m_atoms[l.var()];
@ -835,7 +835,7 @@ namespace nlsat {
ineq_atom& ia = *to_ineq_atom(a);
unsigned sz = ia.size();
ptr_vector<poly> ps;
svector<bool> is_even;
bool_vector is_even;
for (unsigned i = 0; i < sz; ++i) {
ps.push_back(ia.p(i));
is_even.push_back(ia.is_even(i));
@ -2400,7 +2400,7 @@ namespace nlsat {
new_inv_perm[ext_x] = p[m_inv_perm[ext_x]];
m_perm.set(new_inv_perm[ext_x], ext_x);
}
svector<bool> is_int;
bool_vector is_int;
is_int.swap(m_is_int);
for (var x = 0; x < sz; x++) {
m_is_int.setx(p[x], is_int[x], false);
@ -2698,7 +2698,7 @@ namespace nlsat {
u_map<literal> b2l;
scoped_literal_vector lits(m_solver);
svector<bool> even;
bool_vector even;
unsigned num_atoms = m_atoms.size();
for (unsigned j = 0; j < num_atoms; ++j) {
atom* a = m_atoms[j];