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

880 commits

Author SHA1 Message Date
Nikolaj Bjorner
b889b110ee bool_vector, some spacer tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 12:59:04 -07:00
Nikolaj Bjorner
080dbb13b0 tv alignment, code review comments
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 03:35:19 -07:00
Nikolaj Bjorner
fddbac0f52 use tv for interfacing on get_term
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 02:42:00 -07:00
Nikolaj Bjorner
0fc8ebc8cc fix #3683
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 18:56:10 -07:00
Nikolaj Bjorner
8d59355b88 fix #3750
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 14:37:51 -07:00
Nikolaj Bjorner
0735491557 path fix #3747, this patches incoherent behavior of terms / ival from lar_solver. The variables occurring in terms are mapped to columns and not as original variables/terms. theory_lra has to interact with the column_corresponds_to_term test instead of relying on the terms themselves carrying the relevant information
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 14:27:56 -07:00
Nikolaj Bjorner
031b3a55ef fix #3733 persist uninterpreted atoms across calls to incremental sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 13:11:39 -07:00
Nikolaj Bjorner
426e4cc75c fix #3557
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-03 16:37:59 -07:00
Lev Nachmanson
9d58fccd41 fix in random_update()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-03 12:43:20 -07:00
Lev Nachmanson
7890555455 fix in random_update()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-03 12:37:57 -07:00
Lev Nachmanson
7fe46de266 trace random update
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-03 12:00:19 -07:00
Lev Nachmanson
afce09efe4 assert that the sdi is infinite by default
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-02 15:58:46 -07:00
Lev Nachmanson
b45311cc7c use only scoped intervals
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-02 15:58:46 -07:00
Lev Nachmanson
cf3f06ee26 use scoped interval
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-02 15:58:46 -07:00
Lev Nachmanson
55329ea935 more fixes in patching of monomials
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-02 14:47:06 -07:00
Lev Nachmanson
0dc5bad6e4 fix in patching of monics
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-01 12:58:34 -07:00
Lev Nachmanson
5e2927aa96 Merge branch 'master' of https://github.com/z3prover/z3 2020-04-01 12:31:49 -07:00
Lev Nachmanson
ec1f449d34 avoid patching vars in powers
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-01 12:31:32 -07:00
Nikolaj Bjorner
c6b4641050 fix #3649
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-01 10:56:27 -07:00
Lev Nachmanson
c4416f822e add an assert
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-01 10:44:15 -07:00
Nikolaj Bjorner
65b2037ba2 add code review comments, add assertions (disabled for now)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-01 04:07:59 -07:00
Nikolaj Bjorner
cc394f0fe9 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-01 03:42:13 -07:00
Lev Nachmanson
c76adfaf19 exit on success of patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-31 17:17:54 -07:00
Lev Nachmanson
086149f3f8 patch real columns when they are factors
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-31 16:50:02 -07:00
Lev Nachmanson
cf0952c232 roll back in maximize_term if the integrality is broken
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-30 17:59:45 -07:00
Lev Nachmanson
3e845010dd replace v by j in lp printouts
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-30 15:59:03 -07:00
Lev Nachmanson
7936df8e0b pass std::function as const aliases
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-30 12:20:47 -07:00
Lev Nachmanson
9be7bda69a fix a bug in column patching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-29 15:03:46 -07:00
Lev Nachmanson
7a950dd667 patch reals
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-29 15:03:46 -07:00
Lev Nachmanson
3237bd9243 better tracing
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-29 15:03:46 -07:00
Lev Nachmanson
352f4b5b37 use u_set in random_update()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-26 18:11:32 -07:00
Lev Nachmanson
f5b62015fc change the return type of ival.var() to tv
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
96cc58f67c instrument the tableau
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
09467ba677 restore some class names by replacing u_set to int_set
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
ea964e5c3b rename int_set to u_set
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
bc5b68b16e convert term indices to columns in lar_solver::add_equality()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
e2538afd32 better diagnostics in lar_solver and more efficient int_set::resize()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
50db22b2b2 fix #3407
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
98dfb1ba86 get rid of m_resize_buffer
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
2975873b91 ensure encapsulation boundaries
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
eac5070a2e remove stdout
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
c16d90307b more careful resize in int_set
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
6b9e1e936d correcting invariant, fix #3482
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
e0b95979e6 detect the status change in lar_solver::add_equality()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
38eca3b66a fixes in order lemmas and printing terms
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
4b8a063996 convert seg fault to assertion violation #3456
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
b964976b3f remove debug code from theory_lra.cpp and restore gomory.cpp
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
8a665e25ed reverting signed mon_eq, try to rely on canonization state during add/pop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson
6877840342 port from master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner
cc74dd6373 emonics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00