mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-29 07:27:57 +00:00
Code Activity

Merge branch 'master' of https://github.com/z3prover/z3

Browse source
This commit is contained in:
Nikolaj Bjorner 2019-02-25 18:14:47 -08:00
commit 15d5be66b6
55 changed files with 1426 additions and 1462 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/smt/smt_context.cpp
View file

@ -3496,7 +3496,6 @@ namespace smt {
m_case_split_queue ->init_search_eh();
m_next_progress_sample = 0;
TRACE("literal_occ", display_literal_num_occs(tout););
m_timer.start();
}
void context::end_search() {

8
src/smt/smt_kernel.cpp
View file

@ -156,6 +156,14 @@ namespace smt {
}
void set_activity(expr* lit, double act) {
SASSERT(m().is_bool(lit));
m().is_not(lit, lit);
if (!m_kernel.b_internalized(lit)) {
m_kernel.internalize(lit, false);
}
if (!m_kernel.b_internalized(lit)) {
return;
}
auto v = m_kernel.get_bool_var(lit);
double old_act = m_kernel.get_activity(v);
m_kernel.set_activity(v, act);

10
src/smt/theory_jobscheduler.cpp
View file

@ -499,7 +499,10 @@ namespace smt {
std::ostream& theory_jobscheduler::display(std::ostream & out, job_resource const& jr) const {
return out << "r:" << jr.m_resource_id << " cap:" << jr.m_capacity << " load:" << jr.m_loadpct << " end:" << jr.m_finite_capacity_end;
for (auto const& s : jr.m_properties) out << " " << s; out << "\n";
for (auto const& s : jr.m_properties) {
out << " " << s;
}
out << "\n";
}
std::ostream& theory_jobscheduler::display(std::ostream & out, job_info const& j) const {
@ -511,7 +514,10 @@ namespace smt {
std::ostream& theory_jobscheduler::display(std::ostream & out, res_available const& r) const {
return out << "[" << r.m_start << ":" << r.m_end << "] @ " << r.m_loadpct << "%";
for (auto const& s : r.m_properties) out << " " << s; out << "\n";
for (auto const& s : r.m_properties) {
out << " " << s;
}
out << "\n";
}
std::ostream& theory_jobscheduler::display(std::ostream & out, res_info const& r) const {