3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 03:15:50 +00:00

merge with unstable branch

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-04-12 15:54:52 -07:00
commit 3ba2e712b2
72 changed files with 925 additions and 930 deletions

View file

@ -28,7 +28,7 @@ public class Fixedpoint extends Z3Object
/**
* A string that describes all available fixedpoint solver parameters.
**/
public String getHelp() throws Z3Exception
public String getHelp()
{
return Native.fixedpointGetHelp(getContext().nCtx(), getNativeObject());
}
@ -38,7 +38,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void setParameters(Params value) throws Z3Exception
public void setParameters(Params value)
{
getContext().checkContextMatch(value);
@ -51,7 +51,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public ParamDescrs getParameterDescriptions() throws Z3Exception
public ParamDescrs getParameterDescriptions()
{
return new ParamDescrs(getContext(), Native.fixedpointGetParamDescrs(
getContext().nCtx(), getNativeObject()));
@ -62,7 +62,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void add(BoolExpr ... constraints) throws Z3Exception
public void add(BoolExpr ... constraints)
{
getContext().checkContextMatch(constraints);
for (BoolExpr a : constraints)
@ -77,7 +77,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void registerRelation(FuncDecl f) throws Z3Exception
public void registerRelation(FuncDecl f)
{
getContext().checkContextMatch(f);
@ -90,7 +90,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void addRule(BoolExpr rule, Symbol name) throws Z3Exception
public void addRule(BoolExpr rule, Symbol name)
{
getContext().checkContextMatch(rule);
@ -103,7 +103,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void addFact(FuncDecl pred, int ... args) throws Z3Exception
public void addFact(FuncDecl pred, int ... args)
{
getContext().checkContextMatch(pred);
Native.fixedpointAddFact(getContext().nCtx(), getNativeObject(),
@ -119,7 +119,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public Status query(BoolExpr query) throws Z3Exception
public Status query(BoolExpr query)
{
getContext().checkContextMatch(query);
@ -144,7 +144,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public Status query(FuncDecl[] relations) throws Z3Exception
public Status query(FuncDecl[] relations)
{
getContext().checkContextMatch(relations);
@ -166,7 +166,7 @@ public class Fixedpoint extends Z3Object
* Creates a backtracking point.
* @see pop
**/
public void push() throws Z3Exception
public void push()
{
Native.fixedpointPush(getContext().nCtx(), getNativeObject());
}
@ -178,7 +178,7 @@ public class Fixedpoint extends Z3Object
*
* @see push
**/
public void pop() throws Z3Exception
public void pop()
{
Native.fixedpointPop(getContext().nCtx(), getNativeObject());
}
@ -188,7 +188,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public void updateRule(BoolExpr rule, Symbol name) throws Z3Exception
public void updateRule(BoolExpr rule, Symbol name)
{
getContext().checkContextMatch(rule);
@ -202,7 +202,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public Expr getAnswer() throws Z3Exception
public Expr getAnswer()
{
long ans = Native.fixedpointGetAnswer(getContext().nCtx(), getNativeObject());
return (ans == 0) ? null : Expr.create(getContext(), ans);
@ -211,7 +211,7 @@ public class Fixedpoint extends Z3Object
/**
* Retrieve explanation why fixedpoint engine returned status Unknown.
**/
public String getReasonUnknown() throws Z3Exception
public String getReasonUnknown()
{
return Native.fixedpointGetReasonUnknown(getContext().nCtx(),
@ -221,7 +221,7 @@ public class Fixedpoint extends Z3Object
/**
* Retrieve the number of levels explored for a given predicate.
**/
public int getNumLevels(FuncDecl predicate) throws Z3Exception
public int getNumLevels(FuncDecl predicate)
{
return Native.fixedpointGetNumLevels(getContext().nCtx(), getNativeObject(),
predicate.getNativeObject());
@ -232,7 +232,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public Expr getCoverDelta(int level, FuncDecl predicate) throws Z3Exception
public Expr getCoverDelta(int level, FuncDecl predicate)
{
long res = Native.fixedpointGetCoverDelta(getContext().nCtx(),
getNativeObject(), level, predicate.getNativeObject());
@ -244,7 +244,7 @@ public class Fixedpoint extends Z3Object
* at <tt>level</tt>.
**/
public void addCover(int level, FuncDecl predicate, Expr property)
throws Z3Exception
{
Native.fixedpointAddCover(getContext().nCtx(), getNativeObject(), level,
predicate.getNativeObject(), property.getNativeObject());
@ -269,7 +269,7 @@ public class Fixedpoint extends Z3Object
* Instrument the Datalog engine on which table representation to use for
* recursive predicate.
**/
public void setPredicateRepresentation(FuncDecl f, Symbol[] kinds) throws Z3Exception
public void setPredicateRepresentation(FuncDecl f, Symbol[] kinds)
{
Native.fixedpointSetPredicateRepresentation(getContext().nCtx(),
@ -281,7 +281,7 @@ public class Fixedpoint extends Z3Object
/**
* Convert benchmark given as set of axioms, rules and queries to a string.
**/
public String toString(BoolExpr[] queries) throws Z3Exception
public String toString(BoolExpr[] queries)
{
return Native.fixedpointToString(getContext().nCtx(), getNativeObject(),
@ -293,7 +293,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public BoolExpr[] getRules() throws Z3Exception
public BoolExpr[] getRules()
{
ASTVector v = new ASTVector(getContext(), Native.fixedpointGetRules(
@ -310,7 +310,7 @@ public class Fixedpoint extends Z3Object
*
* @throws Z3Exception
**/
public BoolExpr[] getAssertions() throws Z3Exception
public BoolExpr[] getAssertions()
{
ASTVector v = new ASTVector(getContext(), Native.fixedpointGetAssertions(
@ -339,18 +339,18 @@ public class Fixedpoint extends Z3Object
super(ctx, obj);
}
Fixedpoint(Context ctx) throws Z3Exception
Fixedpoint(Context ctx)
{
super(ctx, Native.mkFixedpoint(ctx.nCtx()));
}
void incRef(long o) throws Z3Exception
void incRef(long o)
{
getContext().getFixedpointDRQ().incAndClear(getContext(), o);
super.incRef(o);
}
void decRef(long o) throws Z3Exception
void decRef(long o)
{
getContext().getFixedpointDRQ().add(o);
super.decRef(o);