mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-23 06:13:40 +00:00
Code Activity

compile

Browse source
This commit is contained in:
Jakob Rath 2022-03-10 10:57:49 +01:00
parent 22411f8b43
commit 9b20f17f9c
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/math/polysat/smul_ovfl_constraint.cpp → src/math/polysat/smul_fl_constraint.cpp
View file

@ -10,13 +10,13 @@ Author:
Jakob Rath, Nikolaj Bjorner (nbjorner) 2021-12-09 Jakob Rath, Nikolaj Bjorner (nbjorner) 2021-12-09
--*/ --*/
#include "math/polysat/smul_ovfl_constraint.h" #include "math/polysat/smul_fl_constraint.h"
#include "math/polysat/solver.h" #include "math/polysat/solver.h"
namespace polysat { namespace polysat {
smul_ovfl_constraint::smul_ovfl_constraint(constraint_manager& m, pdd const& p, pdd const& q, bool is_overflow): smul_fl_constraint::smul_fl_constraint(constraint_manager& m, pdd const& p, pdd const& q, bool is_overflow):
constraint(m, ckind_t::smul_ovfl_t), m_is_overflow(is_overflow), m_p(p), m_q(q) { constraint(m, ckind_t::smul_fl_t), m_is_overflow(is_overflow), m_p(p), m_q(q) {
simplify(); simplify();
m_vars.append(m_p.free_vars()); m_vars.append(m_p.free_vars());
for (auto v : m_q.free_vars()) for (auto v : m_q.free_vars())
@ -24,7 +24,7 @@ namespace polysat {
m_vars.push_back(v); m_vars.push_back(v);
} }
void smul_ovfl_constraint::simplify() { void smul_fl_constraint::simplify() {
if (m_p.is_zero() || m_q.is_zero() || if (m_p.is_zero() || m_q.is_zero() ||
m_p.is_one() || m_q.is_one()) { m_p.is_one() || m_q.is_one()) {
m_q = 0; m_q = 0;
@ -35,7 +35,7 @@ namespace polysat {
std::swap(m_p, m_q); std::swap(m_p, m_q);
} }
std::ostream& smul_ovfl_constraint::display(std::ostream& out, lbool status) const { std::ostream& smul_fl_constraint::display(std::ostream& out, lbool status) const {
switch (status) { switch (status) {
case l_true: return display(out); case l_true: return display(out);
case l_false: return display(out << "~"); case l_false: return display(out << "~");
@ -44,7 +44,7 @@ namespace polysat {
return out; return out;
} }
std::ostream& smul_ovfl_constraint::display(std::ostream& out) const { std::ostream& smul_fl_constraint::display(std::ostream& out) const {
if (m_is_overflow) if (m_is_overflow)
return out << "sovfl*(" << m_p << ", " << m_q << ")"; return out << "sovfl*(" << m_p << ", " << m_q << ")";
else else
@ -70,7 +70,7 @@ namespace polysat {
* ~sudfl(p, q) & p >s 0 & q <s 0 => ~ovfl(p, -q) & p*q <s 0 * ~sudfl(p, q) & p >s 0 & q <s 0 => ~ovfl(p, -q) & p*q <s 0
* ~sudfl(p, q) & p <s 0 & q >s 0 => ~ovfl(-p, q) & p*q <s 0 * ~sudfl(p, q) & p <s 0 & q >s 0 => ~ovfl(-p, q) & p*q <s 0
*/ */
void smul_ovfl_constraint::narrow(solver& s, bool is_positive, bool first) { void smul_fl_constraint::narrow(solver& s, bool is_positive, bool first) {
if (!first) if (!first)
return; return;
signed_constraint sc(this, is_positive); signed_constraint sc(this, is_positive);
@ -108,11 +108,14 @@ namespace polysat {
} }
} }
unsigned smul_ovfl_constraint::hash() const { unsigned smul_fl_constraint::hash() const {
return mk_mix(p().hash(), q().hash(), kind()); return mk_mix(p().hash(), q().hash(), mk_mix(kind(), is_overflow(), 0));
} }
bool smul_ovfl_constraint::operator==(constraint const& other) const { bool smul_fl_constraint::operator==(constraint const& other) const {
return other.is_smul_ovfl() && p() == other.to_smul_ovfl().p() && q() == other.to_smul_ovfl().q(); return other.is_smul_fl()
&& is_overflow() == other.to_smul_fl().is_overflow()
&& p() == other.to_smul_fl().p()
&& q() == other.to_smul_fl().q();
} }
} }

7
src/math/polysat/smul_ovfl_constraint.h → src/math/polysat/smul_fl_constraint.h
View file

@ -17,7 +17,7 @@ namespace polysat {
class solver; class solver;
class smul_ovfl_constraint final : public constraint { class smul_fl_constraint final : public constraint {
friend class constraint_manager; friend class constraint_manager;
bool m_is_overflow; bool m_is_overflow;
@ -25,10 +25,11 @@ namespace polysat {
pdd m_q; pdd m_q;
void simplify(); void simplify();
smul_ovfl_constraint(constraint_manager& m, pdd const& p, pdd const& q, bool is_overflow); smul_fl_constraint(constraint_manager& m, pdd const& p, pdd const& q, bool is_overflow);
public: public:
~smul_ovfl_constraint() override {} ~smul_fl_constraint() override {}
bool is_overflow() const { return m_is_overflow; }
pdd const& p() const { return m_p; } pdd const& p() const { return m_p; }
pdd const& q() const { return m_q; } pdd const& q() const { return m_q; }
std::ostream& display(std::ostream& out, lbool status) const override; std::ostream& display(std::ostream& out, lbool status) const override;