mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-01 03:57:51 +00:00
Code Activity
10662 commits 49 branches 53 tags 182 MiB
Commit graph

259 commits

Author SHA1 Message Date
Lev
257ba6218f remove gomory.h 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 11:54:10 -07:00
Lev
22213a9e73 rebase 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 11:53:54 -07:00
Lev
5dee39721a rebase 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 11:52:14 -07:00
Lev
e705e5a309 branch on inf basic in gomory 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 11:49:39 -07:00
Nikolaj Bjorner
6ea4aff622 add validation code for cuts, fix missing unit propagation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-13 10:47:50 -07:00
Lev Nachmanson
f810a5d8c3 remove an assert 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-10 15:22:48 -07:00
Lev Nachmanson
8068c64cab avoid using not initialized variables in theory_lra 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-10 11:02:38 -07:00
Lev Nachmanson
075cf106aa fix the build 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-08-01 08:46:03 -07:00
Lev Nachmanson
7370396c30 fix the build 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-08-01 08:06:56 -07:00
Lev Nachmanson
0a51417804 unroll static_matrix to avoid dead cells 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-31 22:57:10 -07:00
Lev
3d274c2e6f use CASSERT for hnf 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-30 15:55:06 -07:00
Lev Nachmanson
0ee68220e1 use CASSERT instead of lp_assert for static_matrix 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-30 14:34:03 -07:00
Lev
181bb60e36 remove some lp_asserts 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-30 12:54:53 -07:00
Lev Nachmanson
9cb713879e fix the build 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-30 09:56:39 -07:00
Lev Nachmanson
2de27ae3af uniform choice of a beneficial column 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-29 22:33:19 -07:00
Lev
e9595eb283 merge with z3prover 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-29 21:15:42 -07:00
Lev Nachmanson
16b71fe911 work on static_matrix's cells 
Signed-off-by: Lev <levnach@hotmail.com>

trying the new scheme in static_matrix : in progress

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

in the middle of changes in static_matrix

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

more fixes in static_matrix.h

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

debug

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

fixes in static_matrix

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

fixes in static_matrix, column_strip

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

fixes in static_matrix

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

fixes for static_matrix

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

work on static_matrix

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

work on static_matrix

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

progress in static_matrix

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

fix a bug in swap_with_head_cell

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

progress in static_matrix

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

compress rows and columns if needed

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

fix in compression of cells

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-29 20:45:13 -07:00
Nikolaj Bjorner
1cb3f7c792 fixing #1520 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-28 18:03:13 -07:00
Lev
ef2cdc226a a fix in maximize_term 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-26 22:46:28 -07:00
Nikolaj Bjorner
d74978c277 fix #1762, #1764, #1768 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-26 20:29:26 +01:00
Lev Nachmanson
b71fe0b3b7 speed up find_cube 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-16 16:17:49 -07:00
Lev Nachmanson
35f7f1f62e fix in cube heuristic 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-16 12:29:42 -07:00
Nikolaj Bjorner
30330c79a1 Merge branch 'master' of https://github.com/z3prover/z3 2018-07-15 22:36:02 -07:00
Nikolaj Bjorner
d00ffdda82 strengthen filter for specialized tactic conditions, add flag to disable hnf to lp_params 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-15 22:35:47 -07:00
Lev Nachmanson
f7ac096696 avoid a vector copy 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-15 15:29:13 -07:00
Nikolaj Bjorner
1d408c1955 Merge branch 'master' of https://github.com/z3prover/z3 2018-07-13 07:52:40 -07:00
Nikolaj Bjorner
167969d6c2 remove debug/non-debug difference 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-13 07:52:36 -07:00
Lev Nachmanson
e0e893b791 fix in hnf for the lower bounds 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-11 12:29:09 -07:00
Lev Nachmanson
2dfb8f53b6 do not add term to hnf if one of the vars has v.y value 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-11 10:59:55 -07:00
Nikolaj Bjorner
5e5f46f0f8 handle cancelation from nra_solver gracefully 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-10 17:34:45 -07:00
Lev
a4a468660d remove an assert 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-10 12:05:23 -07:00
Lev
c4c52ad104 enable printing in Release 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-07-09 20:49:16 -07:00
Lev Nachmanson
5c712d471f create hnf cuts too, when gomory_cut_period is 2 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-09 20:49:16 -07:00
Lev Nachmanson
852df6f7d9 reshufle var_register to faster access 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-07-05 16:35:05 -07:00
Nikolaj Bjorner
e8e786ae64 remove stale files from lp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-03 20:57:52 -07:00
Nikolaj Bjorner
7e0a7d73f2 remove unused files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-03 20:53:11 -07:00
Nikolaj Bjorner
c06ed77ff1 fix merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 15:37:33 -07:00
Nikolaj Bjorner
03ed33ac02 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-02 15:31:26 -07:00
Nuno Lopes
cef17c22a1 remove some allocs from exceptions 2018-07-02 17:08:02 +01: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
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
Lev Nachmanson
f2e878047d avoid a crash in maximize_term when the term var has not been used 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-29 13:33:31 -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
fd8f972cac grammar 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-28 13:53:38 -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
efa149bed1 always apply cube 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-06-27 12:19:10 -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