mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-01 17:03:18 +00:00
Code Activity

Merge branch 'master' into nlsat-solver-stack

Browse source
This commit is contained in:
Nikolaj Bjorner 2024-08-26 10:02:27 -07:00 • committed by GitHub
commit d263714df8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sat/sat_ddfw.cpp
View file

@ -613,7 +613,7 @@ namespace sat {
out << ci.m_num_trues << " " << ci.m_weight << "\n"; out << ci.m_num_trues << " " << ci.m_weight << "\n";
} }
for (unsigned v = 0; v < num_vars(); ++v) { for (unsigned v = 0; v < num_vars(); ++v) {
out << v << ": " << reward(v) << "\n"; out << v << ": rw " << reward(v) << "\n";
} }
out << "unsat vars: "; out << "unsat vars: ";
for (bool_var v : m_unsat_vars) { for (bool_var v : m_unsat_vars) {

6
src/tactic/arith/fix_dl_var_tactic.cpp
View file

@ -214,10 +214,8 @@ class fix_dl_var_tactic : public tactic {
app * operator()(goal const & g) { app * operator()(goal const & g) {
try { try {
if (m_visited != nullptr) { expr_fast_mark1 visited;
dealloc(m_visited); flet<expr_fast_mark1*> _visited(m_visited, &visited);
}
m_visited = alloc(expr_fast_mark1);
unsigned sz = g.size(); unsigned sz = g.size();
for (unsigned i = 0; i < sz; i++) { for (unsigned i = 0; i < sz; i++) {
process(g.form(i)); process(g.form(i));