mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 09:05:31 +00:00
Code Activity
9792 commits 23 branches 48 tags 157 MiB
Commit graph

875 commits

Author SHA1 Message Date
Nikolaj Bjorner
be8a9c611e incorporate #1854 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-01 19:49:18 -07:00
Bruce Mitchener
cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Christoph M. Wintersteiger
35bf63d563 Fixed filename in CMakeLists.txt 2018-10-01 12:29:14 +01:00
Christoph M. Wintersteiger
f0e74b7f2a Fix for module name clash (and thus linking error) in the Visual Studio solution. 2018-10-01 12:11:42 +01:00
Lev
5d586c8fd1 set lar_solver.m_status = UNKNOWN in the constructor 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-30 15:12:50 -07:00
Lev Nachmanson
e68deab443 Merge branch 'master' of https://github.com/Z3Prover/z3 2018-09-25 13:34:23 -07:00
Lev Nachmanson
0b2b6b1306 assert all_constraints_hold() rarely 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-25 13:33:30 -07:00
Lev Nachmanson
066b5334ad refactor some parameters into fields in Gomory cuts 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-22 20:57:59 -07:00
Lev Nachmanson
43f89dc2cc changes in column_info of lar_solver 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-22 12:01:24 -07:00
Nikolaj Bjorner
0c4754d94b rename version.h to z3_version.h to differentiate name in install include directory. Add support for z3_version.h in python build system. #1833 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-21 20:13:58 -07:00
Nikolaj Bjorner
39ed27101e include version.h in install include directory for cmake build #1833 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-20 19:56:55 -07:00
Nikolaj Bjorner
d75b6fd9c1 remove offsets from terms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-20 11:06:05 -07:00
Nikolaj Bjorner
dcda39e76e merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-19 17:12:32 -07:00
Nikolaj Bjorner
3c553c17e8 fix dump utility for cuts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-19 14:32:56 -07:00
Lev Nachmanson
a99ebed907 keep the coefficients of 'at lower' variables positive, and the rest negative for Gomory cuts 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-19 10:17:27 -07:00
Nikolaj Bjorner
ed19af4c4e merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-19 09:02:37 -07:00
Lev Nachmanson
b90d571d9a fixing the build 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2018-09-18 15:36:01 -07:00
Lev
041458f97a fixes the +- bug in gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-18 14:42:32 -07:00
Lev
b940b7873b work on Gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-18 13:47:18 -07:00
Lev
ca3ce964ce work on Gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-18 13:34:05 -07:00
Lev
106b677201 fixes in gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-15 17:47:54 -07:00
Lev
34bdea750c fixes in gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-15 17:46:16 -07:00
Lev
8c122ba9bd fixes in gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-15 17:33:35 -07:00
Lev
03d55426bb fixes in gomory cut 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-15 17:15:46 -07:00
Lev
324396e403 separate the gomory cut functionality in a separate file 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 17:12:49 -07:00
Lev
26764b076f adjust cuts and branch (m_t and m_k) for terms 
Signed-off-by: Lev <levnach@hotmail.com>
 2018-09-14 12:39:46 -07:00
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
Nikolaj Bjorner
e8a78ec696 remove std::max for #1752 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-03 10:24:01 -07:00
Simon Cruanes
5141f05e6d fix(union-find): keep values and representative in consistent order 
the merge handlers should be called with r1,r2,v1,v2 or r2,r1,v2,v1
but not a mix
 2018-08-17 14:58:44 -05:00
Nikolaj Bjorner
12f9336fec disable unused macros 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-15 22:44:07 -07:00
Nikolaj Bjorner
2b2f193f2b remove dependency on ARRAYSIZE for issue #1616 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-15 22:26:14 -07:00
Nikolaj Bjorner
8b4e1c1209 fix #1793 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-06 18:13:26 -07:00
Nikolaj Bjorner
f306f75e36 harness internalization and API for #1776 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-08-02 20:18:27 -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
879e217fe6 limits -> climits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-28 20:28:53 -07:00