mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 11:42:28 +00:00
Code Activity

build warnings, updates to reduce-invertible, change is_algebraic tester to use int return type

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-07-01 12:34:55 -07:00
parent b8b70c53fa
commit fad1e611aa
8 changed files with 41 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/api/api_arith.cpp
View file

@ -119,10 +119,10 @@ extern "C" {
Z3_CATCH_RETURN(nullptr);
}
Z3_bool Z3_API Z3_is_algebraic_number(Z3_context c, Z3_ast a) {
int Z3_API Z3_is_algebraic_number(Z3_context c, Z3_ast a) {
LOG_Z3_is_algebraic_number(c, a);
Z3_bool r = mk_c(c)->autil().is_irrational_algebraic_numeral(to_expr(a)) ? Z3_TRUE : Z3_FALSE;
IF_VERBOSE(10, verbose_stream() << r << "\n");
int r = mk_c(c)->autil().is_irrational_algebraic_numeral(to_expr(a)) ? 1 : 0;
//IF_VERBOSE(10, verbose_stream() << r << "\n");
return r;
}

4
src/api/dotnet/Expr.cs
View file

@ -239,7 +239,7 @@ namespace Microsoft.Z3
/// </summary>
public bool IsAlgebraicNumber
{
get { return Native.Z3_is_algebraic_number(Context.nCtx, NativeObject); }
get { return 0 != Native.Z3_is_algebraic_number(Context.nCtx, NativeObject); }
}
#endregion
@ -1823,7 +1823,7 @@ namespace Microsoft.Z3
Z3_sort_kind sk = (Z3_sort_kind)Native.Z3_get_sort_kind(ctx.nCtx, s);
if ( // Z3_sort_kind.Z3_REAL_SORT == sk &&
Native.Z3_is_algebraic_number(ctx.nCtx, obj)) // is this a numeral ast?
0 != Native.Z3_is_algebraic_number(ctx.nCtx, obj)) // is this a numeral ast?
return new AlgebraicNum(ctx, obj);
if (Native.Z3_is_numeral_ast(ctx.nCtx, obj))

4
src/api/java/Expr.java
View file

@ -275,7 +275,7 @@ public class Expr extends AST
**/
public boolean isAlgebraicNumber()
{
return Native.isAlgebraicNumber(getContext().nCtx(), getNativeObject());
return 0 != Native.isAlgebraicNumber(getContext().nCtx(), getNativeObject());
}
/**
@ -2108,7 +2108,7 @@ public class Expr extends AST
Z3_sort_kind sk = Z3_sort_kind
.fromInt(Native.getSortKind(ctx.nCtx(), s));
if (Native.isAlgebraicNumber(ctx.nCtx(), obj)) // is this a numeral ast?
if (Native.isAlgebraicNumber(ctx.nCtx(), obj) != 0) // is this a numeral ast?
return new AlgebraicNum(ctx, obj);
if (Native.isNumeralAst(ctx.nCtx(), obj))

4
src/api/z3_api.h
View file

@ -4397,9 +4397,9 @@ extern "C" {
/**
\brief Return true if the given AST is a real algebraic number.
def_API('Z3_is_algebraic_number', BOOL, (_in(CONTEXT), _in(AST)))
def_API('Z3_is_algebraic_number', INT, (_in(CONTEXT), _in(AST)))
*/
Z3_bool Z3_API Z3_is_algebraic_number(Z3_context c, Z3_ast a);
int Z3_API Z3_is_algebraic_number(Z3_context c, Z3_ast a);
/**
\brief Convert an \c ast into an \c APP_AST. This is just type casting.

6
src/smt/theory_seq.cpp
View file

@ -199,6 +199,9 @@ theory_seq::theory_seq(ast_manager& m, theory_seq_params const & params):
m_reset_cache(false),
m_eq_id(0),
m_find(*this),
m_overlap(m),
m_overlap2(m),
m_len_prop_lvl(-1),
m_factory(nullptr),
m_exclude(m),
m_axioms(m),
@ -216,9 +219,6 @@ theory_seq::theory_seq(ast_manager& m, theory_seq_params const & params):
m_atoms_qhead(0),
m_new_solution(false),
m_new_propagation(false),
m_len_prop_lvl(-1),
m_overlap(m),
m_overlap2(m),
m_mk_aut(m) {
m_prefix = "seq.p.suffix";
m_suffix = "seq.s.prefix";

2
src/smt/theory_seq.h
View file

@ -50,7 +50,6 @@ namespace smt {
class seq_value_proc;
theory_seq_params const & m_params;
// cache to track evaluations under equalities
class eval_cache {
@ -295,6 +294,7 @@ namespace smt {
typedef hashtable<rational, rational::hash_proc, rational::eq_proc> rational_set;
ast_manager& m;
theory_seq_params const& m_params;
dependency_manager m_dm;
solution_map m_rep; // unification representative.
bool m_reset_cache; // invalidate cache.

27
src/tactic/core/reduce_invertible_tactic.cpp
View file

@ -258,7 +258,7 @@ private:
rest = arg;
}
if (!rest) return false;
expr_ref zero(m_arith.mk_numeral(rational::zero(), false), m);
expr_ref zero(m_arith.mk_real(0), m);
new_v = m.mk_ite(m.mk_eq(zero, rest), zero, v);
if (mc) {
ensure_mc(mc);
@ -268,7 +268,27 @@ private:
return true;
}
expr* e1 = nullptr, *e2 = nullptr;
// t / v -> if t = 0 then 0 else v
// inverse: t = 0 then 1 else v / t
if (m_arith.is_div(p, e1, e2) && e2 == v) {
expr_ref zero(m_arith.mk_real(0), m);
new_v = m.mk_ite(m.mk_eq(zero, e1), zero, v);
if (mc) {
ensure_mc(mc);
expr_ref def(m.mk_ite(m.mk_eq(zero, e1), m_arith.mk_real(1), m_arith.mk_div(e1, v)), m);
(*mc)->add(v, def);
}
return true;
}
// v / t unless t != 0
if (m_arith.is_div(p, e1, e2) && e1 == v) {
return false;
}
if (m.is_eq(p, e1, e2)) {
if (mc && has_diagonal(e1)) {
ensure_mc(mc);
@ -294,12 +314,15 @@ private:
bool has_diagonal(expr* e) {
return
m_bv.is_bv(e) ||
m.is_bool(e);
m.is_bool(e) ||
m_arith.is_int_real(e);
}
expr * mk_diagonal(expr* e) {
if (m_bv.is_bv(e)) return m_bv.mk_bv_neg(e);
if (m.is_bool(e)) return m.mk_not(e);
if (m_arith.is_int(e)) return m_arith.mk_add(m_arith.mk_int(1), e);
if (m_arith.is_real(e)) return m_arith.mk_add(m_arith.mk_real(1), e);
UNREACHABLE();
return e;
}

4
src/test/bdd.cpp
View file

@ -30,8 +30,8 @@ namespace sat {
SASSERT(m.mk_ite(v1,v0,v0) == v0);
SASSERT(m.mk_ite(v0,!v0,v1) == (!v0 && v1));
SASSERT(m.mk_ite(v0,v1,!v0) == (!v0 || v1));
SASSERT(!(v0 && v1) == (!v0 || !v1));
SASSERT(!(v0 || v1) == (!v0 && !v1));
SASSERT((!(v0 && v1)) == (!v0 || !v1));
SASSERT((!(v0 || v1)) == (!v0 && !v1));
}
static void test3() {