mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-25 08:54:35 +00:00
Code Activity
10268 commits 44 branches 52 tags 176 MiB
Commit graph

2253 commits

Author SHA1 Message Date
Nikolaj Bjorner
efe440839e Merge branch 'master' of https://github.com/z3prover/z3 2018-07-09 09:19:37 -07:00
Nikolaj Bjorner
605dcc40a3 fix #1741 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-09 09:19:13 -07:00
Nikolaj Bjorner
a2d078f6f5
Merge pull request #1737 from Nils-Becker/master 
Equality Explanation Logging
 2018-07-07 15:39:08 -07:00
Nikolaj Bjorner
dfbd285dae avoid rewriting if reduces to tautology 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-06 22:02:48 -07:00
Nikolaj Bjorner
3ae0ea8246 add circuit and unate encoding besides sorting option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-06 21:09:13 -07:00
nilsbecker
820c14ed06 synchronize fork 2018-07-06 16:19:13 +02:00
nilsbecker
a405742037 Adding comments 2018-07-06 12:43:46 +02:00
Nikolaj Bjorner
0b30ddb769 fix #1733 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-06 02:09:47 -07:00
Lev Nachmanson
905282ffe4 fix in theory_lra.cpp get_value 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-05 14:47:05 -07:00
Murphy Berzish
da41949f69 Merge branch 'develop' of github.com:/mtrberzi/z3 into develop 2018-07-04 12:13:07 -04:00
Nikolaj Bjorner
c7e1d59b19 Merge branch 'master' of https://github.com/z3prover/z3 into lev 2018-07-03 13:42:50 -07:00
Lev Nachmanson
f59ffc2986 remove tracing arith from theory_lra.cpp 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-03 09:46:33 -07:00
Nikolaj Bjorner
e37954d87b simplify code fix for #1725 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-03 09:16:52 -07:00
Nikolaj Bjorner
ec6260342b fix #1725 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-03 09:13:02 -07:00
Nikolaj Bjorner
026265f9a3 fix memory leak in proof production in theory_pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-03 08:55:26 -07:00
Nikolaj Bjorner
03ed33ac02 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 15:31:26 -07:00
Nikolaj Bjorner
dc8ec50137 enable proof objects for PB 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 13:53:55 -07:00
Lev Nachmanson
fbf0d0d7b2 changed in for loops for terms 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-02 11:46:46 -07:00
Nikolaj Bjorner
e13b61eae8 work around regression with use of mk_app_core, returning BR_FAILED if nothing is rewritten 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 11:10:37 -07:00
Nuno Lopes
cef17c22a1 remove some allocs from exceptions 2018-07-02 17:08:02 +01:00
Nikolaj Bjorner
05738702d6 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 08:10:47 -07:00
Nikolaj Bjorner
4820e51c53 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 08:10:14 -07:00
Nikolaj Bjorner
61d887b36f use for pattern 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 04:35:22 -07:00
Nikolaj Bjorner
88dd9ac668 add back get_value that uses solver model, have assume_eqs only use those variables (not the impqs) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 04:29:54 -07:00
Nikolaj Bjorner
46ea054784 merge get_value and get_ivalue that produced different results 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 03:55:40 -07:00
Nikolaj Bjorner
2ab0681381 deal with unintialized variable in debug code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 19:34:27 -07:00
Nikolaj Bjorner
b38abf64d7 use expr_ref on mk_concat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 19:30:46 -07:00
Nikolaj Bjorner
8895ed7122 remove unintialized variable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 18:34:02 -07:00
Nikolaj Bjorner
b6054b8406 add has_value utility to retrieve value from solver state 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 17:03:58 -07:00
Nikolaj Bjorner
593a6e5139 update smt_setup and default parameters to only use new solver consveratively 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 12:52:50 -07:00
Nikolaj Bjorner
fad1e611aa build warnings, updates to reduce-invertible, change is_algebraic tester to use int return type 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-01 12:34:55 -07:00
Nikolaj Bjorner
5a2a8d7d5c
Merge pull request #1715 from levnach/master 
merge lar_solver/int_solver
 2018-07-01 12:20:02 -07:00
Lev Nachmanson
c554e1723b fixes in theory_lra by Nikolaj 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-30 13:53:45 -07:00
Nikolaj Bjorner
c4d893dfad fix compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-30 06:10:09 -07:00
Nikolaj Bjorner
080bf79fe6
Merge pull request #1705 from trinhmt/master 
created pull from Trinh's seq solver
 2018-06-30 04:53:14 -07:00
Thai Trinh
cd62017afd fixed failures with regression tests 2018-06-30 15:52:20 +08:00
Lev Nachmanson
16d4e2f5d1 regression fix 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 16:10:15 -07:00
Lev Nachmanson
4d88818560 fixes in get_lower,get_upper of theory_lra 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 14:38:10 -07:00
Lev Nachmanson
342feeff03 implement get_lower, get_upper in theory_lra.cpp 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 14:17:13 -07:00
Lev Nachmanson
da44ad7e6f added stubs for get_lower/get_upper required by theory_seq 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 13:43:23 -07:00
Lev Nachmanson
d80f6e3222 regression failures fixes 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 09:57:29 -07:00
Lev Nachmanson
4641d5f32d fixes to get z3test.py back on track etc 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-28 21:30:41 -07:00
Lev Nachmanson
2087ee3fb0 restore some code that was removed during the rebase 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-28 11:59:01 -07:00
Nuno Lopes
46799cb3f0 MAM: check soft limits before calling the interpreter 2018-06-28 18:25:22 +01:00
Nuno Lopes
5de6628a5d remove spurious copies and inc_refs around ref_vector 2018-06-28 10:31:38 +01:00
Lev Nachmanson
e3a9794d98 take in changes for equalities 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-27 15:59:45 -07:00
Lev Nachmanson
7b59e2094d after rebase 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-27 15:20:25 -07:00
Lev Nachmanson
e5eea467b7 adjust hnf 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

change in settings + random in adding terms to hnf

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

add terms in hnf from the beginning

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

adjusting settings

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove non used determinant()

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-27 12:19:06 -07:00
Lev Nachmanson
eeaca949e0 cleanup in hnf.h 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fixex in maximize_term

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

prepare for LIRA (#76)

* merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* simple mixed integer example

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

Nikolaj's fixes in theory_lra.cpp

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fixes in maximize_term, disable find_cube for mixed case

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fix cube heuristic for the mixed case

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fix the build

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fix in find cube delta's calculation

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove a printout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove a blank line

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

test credentials

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

avoid double checks to add terms in hnf_cutter

Signed-off-by: Lev Nachmanson <levnach@microsoft.com>

fixes in add terms to hnf_cutter

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove a variable used for debug only

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove a field

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove a warning and hide m_A_orig under debug

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

use var_register to deal with mapping between external and local variables

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

tighten the loop in explain_implied_bound

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fixes in theory_lra and relaxing debug checks in pop(), for the case when push() has been done from not fully initialized state

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

suppress hnf cutter when the numbers become too large

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

remove some debug code

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

adjusting hnf

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-27 12:19:02 -07:00
Lev Nachmanson
9ba4026bc6 avoid going creating hnf_cuts if all involved vars have integral values 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

add explanations to hnf cuts

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

nits and virtual methods (#68)

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

cleanup from std::cout

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

handle the case when the number of terms is greater than the number of variables in hnf

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

method name's fix

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

restore hnf_cutter to work with m_row_count <= m_column_count

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

tune addition of rational numbers (#70)

* log quantifiers only if present

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge and fix some warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* set new arith as default for LIA

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* prepare for mixed integer-real

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix default tactic usage

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

give shorter explanations, call hnf only when have a not integral var

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

overhaul of mpq (#71)

* log quantifiers only if present

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge and fix some warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* set new arith as default for LIA

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* prepare for mixed integer-real

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix default tactic usage

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* overhaul of mpz/mpq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* disabled temporary setting

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove prints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

fix for 32 bit build (#72)

* log quantifiers only if present

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge and fix some warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* set new arith as default for LIA

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* prepare for mixed integer-real

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix default tactic usage

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* overhaul of mpz/mpq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* disabled temporary setting

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove prints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* customize for 64 bit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

yes (#74)

* log quantifiers only if present

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge and fix some warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* set new arith as default for LIA

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* prepare for mixed integer-real

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix default tactic usage

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* overhaul of mpz/mpq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* disabled temporary setting

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove prints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* customize for 64 bit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* customize for 64 bit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* more refactor

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

fix the merge

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fixes in maximize_term untested

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>

fix compilation (#75)

* log quantifiers only if present

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge and fix some warnings

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* set new arith as default for LIA

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* local

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* virtual method in bound propagator

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* prepare for mixed integer-real

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix default tactic usage

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* overhaul of mpz/mpq

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* disabled temporary setting

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* remove prints

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* customize for 64 bit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* customize for 64 bit

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* more refactor

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* relax check

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* change for gcc

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* merge

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-27 12:16:58 -07:00