3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 04:03:39 +00:00
Commit graph

371 commits

Author SHA1 Message Date
Lev Nachmanson 01279582ff move nla stats to nla_core
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-15 12:58:34 -07:00
Lev Nachmanson 82fd2a062d make calling nra from nla optional
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-15 12:16:40 -07:00
Lev Nachmanson 6b28973799
nla review (#4321)
* simplify the nla_solver interface

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

* more simplifications

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

* init m_use_nra_model

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

* work on NSB comments

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

* work on NSB comments

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

Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-13 13:52:42 -07:00
Lev Nachmanson b2dc21b107
simplify the nla_solver interface (#4312)
* simplify the nla_solver interface

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

* more simplifications

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

* init m_use_nra_model

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

Co-authored-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 19:34:03 -07:00
Nikolaj Bjorner 7a6c66a085 add stubs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 17:38:16 -07:00
Nikolaj Bjorner be1a1dd7c2 add stubs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 17:36:46 -07:00
Nikolaj Bjorner 32055a31db pass resource limits by reference
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 10:49:16 -07:00
Lev Nachmanson 3e4a4c6df2 rebase with master branch
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Lev Nachmanson 4b68d98b2a work on nra to nla
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Lev Nachmanson 279d55a2c7 nra to nla
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Lev Nachmanson e32a6714a5 call nlsat
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Lev Nachmanson 151397a067 nra to nla
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Lev Nachmanson 7a79397769 nra to nla
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Nikolaj Bjorner 16478b415b disable order and tangent lemmas on reals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-11 13:46:25 -07:00
Nikolaj Bjorner 9c972521c4 priority code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-10 21:09:14 -07:00
Nikolaj Bjorner e74faf42ad code review 2020-05-10 12:58:05 -07:00
Nikolaj Bjorner fdc87f286f
na (#4254)
* remove level of indirection for context and ast_manager in smt_theory

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

* add request by #4252

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

* move to def

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

* int

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

* fix #4251

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

* fix #4255

* fix #4257

* add code to debug #4246

* restore new solver as default

* na

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

* fix #4246

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-09 17:40:02 -07:00
Nikolaj Bjorner becf423c77
remove level of indirection for context and ast_manager in smt_theory (#4253)
* remove level of indirection for context and ast_manager in smt_theory

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

* add request by #4252

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

* move to def

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

* int

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-08 16:46:03 -07:00
Lev Nachmanson 530f77281c fixes in branching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-26 16:13:47 -07:00
Lev Nachmanson 5208b64a6b expose only necessary methods of lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-16 12:58:39 -07:00
Nikolaj Bjorner 206c3e2c38 fix #3979
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-16 10:54:19 -07:00
Nikolaj Bjorner 75a460cc15 fix #3932
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-12 17:49:50 -07:00
Nikolaj Bjorner 9b609af8fc fix #3924
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-12 16:19:54 -07:00
Nikolaj Bjorner 76c2fb5732 remove ref
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-11 11:36:19 -07:00
Nikolaj Bjorner 03e411c22d fix #3868
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-11 02:28:38 -07:00
Nikolaj Bjorner 21a31fcd26 add missing fixed propagations on negated integer inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-11 02:28:38 -07:00
Nikolaj Bjorner d14ce97b76 multiple regressions from previous commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-10 12:18:30 -07:00
Nikolaj Bjorner 33677b9803 fix #3898
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-10 11:56:35 -07:00
Lev Nachmanson bd3946677c resize m_var_set in random_update
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-09 14:45:32 -07:00
Nikolaj Bjorner cd98a21984 decouple random update with assume eqs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-09 14:01:34 -07:00
Nikolaj Bjorner 5ced73afb5 decouple random update with assume eqs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-09 14:00:31 -07:00
Lev Nachmanson 5c9fd90031 work on random_updates
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-07 19:50:50 -07:00
Lev Nachmanson ae8c6acc1a fill columns to fill in random update as in theory_arith_aux.h
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-07 19:50:50 -07:00
Nikolaj Bjorner c2e5cd78c8 change lar_terms to use column indices
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-06 12:13:59 -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 296a97d0d3 build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 01:03:38 -07:00
Nikolaj Bjorner 7838e99f47 fix #3749
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 14:45:29 -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 df1c6c8a21 fix #3742
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 11:27:37 -07:00
Nikolaj Bjorner 41e11857e5 fix #3744
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-04 10:57:49 -07:00
Nikolaj Bjorner 426e4cc75c fix #3557
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-03 16:37:59 -07:00
Nikolaj Bjorner bab879c832 fix #3685
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-02 15:04:56 -07:00
Nikolaj Bjorner cc394f0fe9 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-01 03:42:13 -07:00
Nikolaj Bjorner d8e00bc02e fix #3644 regression introduced in #3641
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-01 00:26:02 -07:00
Nikolaj Bjorner c20b321e57 fix #3641
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 23:29:08 -07:00
Nikolaj Bjorner 43e7242e35 fix #3511
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 11:14:01 -07:00
Nikolaj Bjorner 696a178c08 s
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 11:14:01 -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
Nikolaj Bjorner ba4765f16f debugging #3511
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-30 11:00:02 -07:00
Lev Nachmanson 3237bd9243 better tracing
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-29 15:03:46 -07:00