3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-04 17:17:41 +00:00
Commit graph

851 commits

Author SHA1 Message Date
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
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
Nuno Lopes
b88596283f don't use mp[zq] synchronized mode if OpenMP mode is disabled 2018-07-14 20:44:35 +01:00
Nuno Lopes
7d20fbb280 do not cooperate if OMP mode is disabled (i.e. it's single threaded only) 2018-07-14 12:21:43 +01: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
Nuno Lopes
b7ea90c12b bv_decl_plugin: remove some mem allocs of parameters 2018-07-12 18:36:09 +01: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
Nikolaj Bjorner
fc4627a24f force the new arithmetic solver for QF_LIA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-09 16:33:48 -07:00
Nikolaj Bjorner
567fbac27f add back old multiplication for comparison
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-09 14:33:32 -07:00
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
4b802fd5cd
Merge pull request #1740 from alexanderjsummers/master
Added return value to bool-typed function
2018-07-09 09:05:52 -07:00