mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-02 16:20:41 +00:00
Code Activity

fix ema

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-05-05 13:58:47 +02:00
parent 43403fafcd
commit 13b54f379c
8 changed files with 103 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/sat/sat_solver.h
View file

@ -41,6 +41,7 @@ Revision History:
#include "util/params.h"
#include "util/statistics.h"
#include "util/stopwatch.h"
#include "util/ema.h"
#include "util/trace.h"
#include "util/rlimit.h"
#include "util/scoped_ptr_vector.h"
@ -137,6 +138,8 @@ namespace sat {
unsigned m_qhead;
unsigned m_scope_lvl;
unsigned m_search_lvl;
ema m_fast_glue_avg;
ema m_slow_glue_avg;
literal_vector m_trail;
clause_wrapper_vector m_clauses_to_reinit;
std::string m_reason_unknown;
@ -416,7 +419,10 @@ namespace sat {
void mk_model();
bool check_model(model const & m) const;
void restart(bool to_base);
unsigned restart_level(bool to_base);
bool should_restart() const;
void set_next_restart();
bool reached_max_conflicts();
void sort_watch_lits();
void exchange_par();
lbool check_par(unsigned num_lits, literal const* lits);