mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05: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/opt/maxsmt.h
View file

@ -78,7 +78,7 @@ namespace opt {
svector<symbol> m_labels;
//const expr_ref_vector m_soft;
//vector<rational> m_weights;
//svector<bool> m_assignment; // truth assignment to soft constraints
//bool_vector m_assignment; // truth assignment to soft constraints
params_ref m_params; // config
public:

2
src/opt/opt_solver.h
View file

@ -78,7 +78,7 @@ namespace opt {
vector<inf_eps> m_objective_values;
sref_vector<model> m_models;
expr_ref_vector m_objective_terms;
svector<bool> m_valid_objectives;
bool_vector m_valid_objectives;
bool m_dump_benchmarks;
static unsigned m_dump_count;
statistics m_stats;

6
src/opt/pb_sls.cpp
View file

@ -108,8 +108,8 @@ namespace smt {
rational m_penalty; // current penalty of soft constraints
rational m_best_penalty;
vector<unsigned_vector> m_hard_occ, m_soft_occ; // variable occurrence
svector<bool> m_assignment; // current assignment.
svector<bool> m_best_assignment;
bool_vector m_assignment; // current assignment.
bool_vector m_best_assignment;
expr_ref_vector m_trail;
obj_map<expr, unsigned> m_decl2var; // map declarations to Boolean variables.
ptr_vector<expr> m_var2decl; // reverse map
@ -188,7 +188,7 @@ namespace smt {
IF_VERBOSE(1, verbose_stream() << "(pb.sls initial penalty: " << m_best_penalty << ")\n";
verbose_stream() << "(pb.sls violated: " << m_hard_false.num_elems()
<< " penalty: " << m_penalty << ")\n";);
svector<bool> assignment(m_assignment);
bool_vector assignment(m_assignment);
for (unsigned round = 0; round < 40; ++round) {
init_max_flips();
while (m_max_flips > 0) {