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

150 commits

Author SHA1 Message Date
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 08940cff8f comment out the call to nra_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-15 11:26:40 -07:00
Nikolaj Bjorner 9c9fe712ad disable nra in master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-15 10:36:53 -07:00
Lev Nachmanson 6a4062809d
Nra add term (#4331)
* n

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

* do not create assumptions

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

* disable nra_solver

Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-15 10:35:42 -07:00
Nikolaj Bjorner 146fd77e0f pretty print 2020-05-15 10:12:06 -07:00
Nikolaj Bjorner 4e51633e6f adding monomial bounds
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-13 18:45:47 -07:00
Lev Nachmanson bdecbe4ed7 remove a duplicate method
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-13 15:38:20 -07:00
Nikolaj Bjorner fff1426556 remove unreferenced label
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-13 13:54:47 -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
Nikolaj Bjorner 8b546867f0 move lemma creation into nra_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 19:47:29 -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 be1a1dd7c2 add stubs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-12 17:36:46 -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 e32a6714a5 call nlsat
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-11 19:12:02 -07:00
Nikolaj Bjorner 1be22a80f6 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-11 17:20:18 -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 81b3c440ce fix mixup between constraint indices and lpvar explanations fixes various newly reported unsoundness bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-11 13:07:28 -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 99043399ce na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-10 20:28:35 -07:00
Nikolaj Bjorner 179c9c2da2 consolidate methods that add lemma specific information to under "new_lemma" 2020-05-10 18:31:57 -07:00
Nikolaj Bjorner e74faf42ad code review 2020-05-10 12:58:05 -07:00
Nikolaj Bjorner 1ecc6a21fa na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-10 11:21:15 -07:00
Nikolaj Bjorner 30de76b529 add occurs check to other nla_basic lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-09 20:50:27 -07:00
Nikolaj Bjorner 4890c3ce31 fix #4230
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-09 18:49:00 -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
Lev Nachmanson a34c5a9450 bail out on big rational numbers in nla monotone lemmas
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-05-04 14:21:48 -07:00
Lev Nachmanson 8921ed56b5 fix a bug in Horner heuristic
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-23 15:58:53 -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 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
Lev Nachmanson 29a857e258 fix the build
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-06 17:31:56 -07:00
Lev Nachmanson c846902285 simplify patch_blocker()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-06 17:31:56 -07:00
Lev Nachmanson e90ff4b992 fix the patch of real vars
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-06 17:31:56 -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
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 ec1f449d34 avoid patching vars in powers
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-04-01 12:31:32 -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 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 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 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
Nikolaj Bjorner 50db22b2b2 fix #3407
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.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 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
Nikolaj Bjorner cc74dd6373 emonics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00