mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-22 16:45:31 +00:00
Code Activity

fix warning

Browse source
This commit is contained in:
Jakob Rath 2024-03-14 15:08:00 +01:00
parent 1f0a6c051a
commit f6c99585f3
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/sat/smt/polysat/types.h
View file

@ -49,21 +49,21 @@ namespace polysat {
struct fixed_claim : public fixed_slice {
pvar parent;
fixed_claim() = default;
fixed_claim(pvar v, rational value, unsigned offset, unsigned length) : fixed_slice(child, std::move(value), offset, length), parent(v) {}
fixed_claim(pvar v, fixed_slice const& s) : fixed_slice(s), parent(v) {}
fixed_claim(pvar parent, pvar child, rational value, unsigned offset, unsigned length) : fixed_slice(child, std::move(value), offset, length), parent(parent) {}
fixed_claim(pvar parent, fixed_slice const& s) : fixed_slice(s), parent(parent) {}
};
struct offset_slice {
pvar child;
unsigned offset;
offset_slice() = default;
offset_slice(pvar v, unsigned offset) : child(v), offset(offset) {}
offset_slice(pvar child, unsigned offset) : child(child), offset(offset) {}
};
struct offset_claim : public offset_slice {
pvar parent;
offset_claim() = default;
offset_claim(pvar w, offset_slice const& s) : offset_slice(s), parent(w) {}
offset_claim(pvar parent, offset_slice const& s) : offset_slice(s), parent(parent) {}
};
@ -128,7 +128,7 @@ namespace polysat {
unsigned level = 0; // level when sub-slice was fixed to value
dependency dep = null_dependency;
fixed_slice_extra() = default;
fixed_slice_extra(rational value, unsigned offset, unsigned length, unsigned level, dependency dep) :
fixed_slice_extra(pvar child, rational value, unsigned offset, unsigned length, unsigned level, dependency dep) :
fixed_slice(child, std::move(value), offset, length), level(level), dep(std::move(dep)) {}
};
using fixed_slice_extra_vector = vector<fixed_slice_extra>;
@ -136,7 +136,7 @@ namespace polysat {
struct offset_slice_extra : public offset_slice {
unsigned level = 0; // level when variable was fixed to value
offset_slice_extra() = default;
offset_slice_extra(pvar v, unsigned offset, unsigned level) : offset_slice(v, offset), level(level) {}
offset_slice_extra(pvar child, unsigned offset, unsigned level) : offset_slice(child, offset), level(level) {}
};
using offset_slice_extra_vector = vector<offset_slice_extra>;

4
src/sat/smt/polysat_egraph.cpp
View file

@ -152,7 +152,9 @@ namespace polysat {
verbose_stream() << " merge-level " << level;
verbose_stream() << "\n";
#endif
fixed.push_back(fixed_slice_extra(value, offset, length, level, dep));
fixed.push_back(fixed_slice_extra(null_var, value, offset, length, level, dep));
for (euf::enode* sib : euf::enode_class(n)) {
euf::theory_var s = sib->get_th_var(get_id());
if (s == euf::null_theory_var)