mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-20 12:53:38 +00:00
Code Activity

Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable

Browse source
This commit is contained in:
Nuno Lopes 2015-05-19 13:48:59 +01:00
commit 227c8870d6
5 changed files with 68 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/dotnet/Microsoft.Z3.csproj
View file

@ -365,6 +365,7 @@
<Compile Include="IntSymbol.cs" />
<Compile Include="ListSort.cs" />
<Compile Include="Model.cs" />
<Compile Include="Optimize.cs" />
<Compile Include="Params.cs" />
<Compile Include="ParamDescrs.cs" />
<Compile Include="Pattern.cs" />

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

@ -137,14 +137,14 @@ namespace Microsoft.Z3
}
///
/// <summary>
/// Check satisfiability of asserted constraints.
/// Produce a model that (when the objectives are bounded and
/// don't use strict inequalities) meets the objectives.
/// </summary>
///
public Status Check() {
public Status Check()
{
Z3_lbool r = (Z3_lbool)Native.Z3_optimize_check(Context.nCtx, NativeObject);
switch (r)
{

20
src/cmd_context/cmd_context.cpp
View file

@ -500,6 +500,7 @@ bool cmd_context::logic_has_arith_core(symbol const & s) const {
s == "QF_RDL" ||
s == "QF_IDL" ||
s == "QF_AUFLIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
@ -550,9 +551,7 @@ bool cmd_context::logic_has_bv_core(symbol const & s) const {
}
bool cmd_context::logic_has_horn(symbol const& s) const {
return
s == "HORN";
return s == "HORN";
}
bool cmd_context::logic_has_bv() const {
@ -560,24 +559,26 @@ bool cmd_context::logic_has_bv() const {
}
bool cmd_context::logic_has_seq_core(symbol const& s) const {
return
s == "QF_BVRE";
return s == "QF_BVRE";
}
bool cmd_context::logic_has_seq() const {
return !has_logic() || logic_has_seq_core(m_logic);
}
bool cmd_context::logic_has_fpa() const {
return !has_logic() || m_logic == "QF_FP" || m_logic == "QF_FPBV";
bool cmd_context::logic_has_fpa_core(symbol const& s) const {
return s == "QF_FP" || s == "QF_FPBV" || s == "QF_BVFP";
}
bool cmd_context::logic_has_fpa() const {
return !has_logic() || logic_has_fpa_core(m_logic);
}
bool cmd_context::logic_has_array_core(symbol const & s) const {
return
s == "QF_AX" ||
s == "QF_AUFLIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
@ -682,8 +683,7 @@ bool cmd_context::supported_logic(symbol const & s) const {
return s == "QF_UF" || s == "UF" ||
logic_has_arith_core(s) || logic_has_bv_core(s) ||
logic_has_array_core(s) || logic_has_seq_core(s) ||
logic_has_horn(s) ||
s == "QF_FP" || s == "QF_FPBV";
logic_has_horn(s) || logic_has_fpa_core(s);
}
bool cmd_context::set_logic(symbol const & s) {

1
src/cmd_context/cmd_context.h
View file

@ -250,6 +250,7 @@ protected:
bool logic_has_bv_core(symbol const & s) const;
bool logic_has_array_core(symbol const & s) const;
bool logic_has_seq_core(symbol const & s) const;
bool logic_has_fpa_core(symbol const & s) const;
bool logic_has_horn(symbol const& s) const;
bool logic_has_arith() const;
bool logic_has_bv() const;