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

3142 commits

Author SHA1 Message Date
Lev Nachmanson 8dcec5c4ad add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson dcb81f0ad2 introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 5556b82989 introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson fc62ecb8d1 relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 1b92400801 remove debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 3b10318183 add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 981aafa59c introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 5dbe4a6c8b introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson a80b48a597 relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 252eb5e856 remove debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson db94109827 add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson f9f1960c73 introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson d39d64176e introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 84933c4435 relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner f1f974638d track variables used by nla_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 79fefe5fb3 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner f43f1629cf fix #3273
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner b67d136849 hide flag on registering variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 3e84d04719 fix internalize for multiplication #3119
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 0207878f5f fix #3183 - change relevancy propagation to ensure that div/mod axioms are picked up
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson a0251ac745 do not register equality terms created in lar_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner f00c026272 fix #3173
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 0f779c9c0d fix #3185 - move handling of to_real within def conversion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson fad08454c1 remove debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 2b4de6ebbc add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 59a82a4482 introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson bf885bf9b3 introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 28c057fd7b relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 6396857ee2 remove debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 87f80ce022 add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 8e55a77ee7 introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 406bd98a39 introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 3e4720abbd relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 0229ab2811 remove debug code
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson ab92c20106 add option branch_flip to lp_settings
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson b9bfa950f6 introduce a bug int theory_array.cpp - look for a counter example
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 37c72b71f5 introduce a bug into theory_array - looking for a counterexample
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson c0b49e95c4 use lar_solver directly to compare variable values in assume_eqs()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson c469ea2717 do not call get_model() from assume_eqs()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 697fd37d26 relax the literal check in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 762f265616 merge with master
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner cf86e6ef73 disable dubious eq adapter code causing perf hit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 16:41:01 -07:00
Nikolaj Bjorner 477fd3fba0 remove model initialization all-together because assumption literals are not connected with model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 04:00:21 -07:00
Nikolaj Bjorner b8c25ac20b fix #2909
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 01:43:20 -07:00
Nikolaj Bjorner 41c68d64d4 avoid deref on null
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-24 17:06:06 -07:00
Nikolaj Bjorner af51d98a32 avoid unintialized value build warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-24 15:02:31 -07:00
Nikolaj Bjorner a4f668eef0 add unit test for #2867
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-24 11:52:41 -07:00
Nikolaj Bjorner 33b644adad fix #3500
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-24 10:25:42 -07:00
Nikolaj Bjorner 601b3998f3 fix #3430
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-23 18:59:07 -07:00
Nikolaj Bjorner 2494709e98 fix #3421
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-23 17:33:23 -07:00
Nikolaj Bjorner 84090aaf24 fix #3423
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-23 10:27:42 -07:00
Nikolaj Bjorner c0a1a24069 fix #3427 check cancel flag
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 16:37:14 -07:00
Nikolaj Bjorner d945227904 fix ? #3423
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 15:08:19 -07:00
Nikolaj Bjorner 70a1786061 scoping th solver to avoid memory leak during cancellation exposed by #3431
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 14:14:45 -07:00
Nikolaj Bjorner d6a2e7ac15 fix #3433
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 13:21:48 -07:00
Nikolaj Bjorner 00520041fe fix #3436
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 13:02:08 -07:00
Nikolaj Bjorner 94234aef97 fix #3437
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 12:24:30 -07:00
Nikolaj Bjorner b6618892d8 fix #3469
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-22 11:02:24 -07:00
Nikolaj Bjorner fcd1f2b3cd fix #3459
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-21 18:11:40 -07:00
Nikolaj Bjorner cd434d8bd5 fix #3420
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-19 17:49:48 -07:00
Nikolaj Bjorner 5cbcd9a88a fix #3410
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-19 11:24:00 -07:00
Nikolaj Bjorner 1380a98a17 fix #3411
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-19 09:46:46 -07:00
Nikolaj Bjorner 31ff658f5e fix #3416
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-19 08:54:08 -07:00
Nikolaj Bjorner e075f38152 fixing #2956
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-18 19:58:13 -07:00
Nikolaj Bjorner 19cdf08818 fix #3396
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-18 12:45:37 -07:00
Nikolaj Bjorner b590751e92 fix #3389
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-18 10:36:34 -07:00
Nikolaj Bjorner 89ff533dcd port fix #3376 from Debug branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-17 11:08:30 -07:00
Nikolaj Bjorner 7996472923 fix ? #3370
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-17 10:38:26 -07:00
Nikolaj Bjorner 019acdb1ef fix #3350
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-16 19:56:18 -07:00
Nikolaj Bjorner f86205b0e8 fix #3343
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-16 12:24:22 -07:00
Nikolaj Bjorner 3209d4ff6c fix #3351
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-16 12:05:35 -07:00
Nikolaj Bjorner bb1fe358c1 fix #3356
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-16 11:54:01 -07:00
Nikolaj Bjorner 1bddfd40c3 fix #3364
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-16 11:38:25 -07:00
Nikolaj Bjorner 6ad261e24c fix #3330
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-15 09:49:44 -07:00
Nikolaj Bjorner 6c67654e64 fix #3335
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-15 09:12:43 -07:00
Nikolaj Bjorner f323da8f37 fix #3304
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 22:41:13 -07:00
Nikolaj Bjorner 894702d600 fix #3301
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 14:42:24 -07:00
Nikolaj Bjorner 42dbee9165 fix #3302
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 14:39:03 -07:00
Nikolaj Bjorner ec0349819f fix #3298
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 12:15:05 -07:00
Nikolaj Bjorner 47bd06338e fix #3283
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 11:54:24 -07:00
Nikolaj Bjorner 6b319f9ac3 fix #3297
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 11:49:05 -07:00
Nikolaj Bjorner 9f6a0a0a48 fix #3289, recent regression introduced when dealing with push on inconsistent state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 10:50:41 -07:00
Nikolaj Bjorner 51e459d02b fix #3294
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-14 10:46:03 -07:00
Nikolaj Bjorner 59755dd72e fix #3260
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-13 11:42:25 -07:00
Nikolaj Bjorner a6fcdecfd7 Add accessor for lower/upper bounds of algebraic numerals #3245
The pretty printer for algebraic numerals prints a polynomial root expression, however, polynomial root expressions are not exposed over the API. The C API contains methods for approximating root objects from above and below with arbitrary precision. These functions are now exposed over the C++ API.
Note that algebraic numbers are also disjoint from rcf (real closed field) objects.
Thus, z3 doesn't support adding "pi" as an extension field to algebraic numbers that are used by the nlsat solver. It operats on algebraic numbers formed by roots over polynomial with rational coefficients
2020-03-12 14:23:45 -07:00
Nikolaj Bjorner 7a80fe20ca fix #3242 2020-03-12 10:41:08 -07:00
Nikolaj Bjorner 1796fc32f5 breaking change to fix #3062 #3147 #2896 #2937 #3105
This moves handling of contains into an axiomatization that unfolds on demand.
The previous handling, based on rewriting, proved too brittle. While it simplifies how contains is handled, it is likely to introduce regressions in terms of what constraints can now be handled.
2020-03-12 10:16:48 -07:00
Nikolaj Bjorner 67d19cba4a fix #3105 fix #2937
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 14:13:12 -07:00
Nikolaj Bjorner d9c09dcdf9 disable extra model validation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 11:46:54 -07:00
Nikolaj Bjorner 36cddd0c46 fix #3235 - return early during lookaehad, avoid checking invariant when context is inconsistent
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 10:55:56 -07:00
Nikolaj Bjorner 59acd1093d fix #3236 - fix also max conflict overwrite for incremental mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 10:13:20 -07:00
Nikolaj Bjorner c49d0c5033 fix #3236 relax restriction on nnf-cnf pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 10:04:15 -07:00
Nikolaj Bjorner e45871d7c5 fix #3239
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 09:35:28 -07:00
Nikolaj Bjorner e32020ba10 fix #3228
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-11 08:32:25 -07:00
Nikolaj Bjorner 7bcd3452b8 reduce invertible update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-10 21:02:54 -07:00
Nikolaj Bjorner 427358d0a1 fix #3233
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-10 15:59:20 -07:00
Nikolaj Bjorner c4c235e9d7 fix #3224
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-10 12:52:49 -07:00
Nikolaj Bjorner bed2097fc4 fix #3076 - need to apply relevancy propagation in mk_bits. Assume bv v is already relevant but did not have bits associated with it, the bits need to then be marked as relevant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-10 10:36:00 -07:00
Nikolaj Bjorner d229efabfc na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-09 17:12:34 +01:00
Nikolaj Bjorner bbcfd79bf6 fix #3129
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-09 08:13:05 +01:00
Nikolaj Bjorner 611c14844d fix #3194, remove euclidean solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-08 16:05:13 +01:00
Nikolaj Bjorner 9b3c844c2a fix #3209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-08 15:23:20 +01:00
Nikolaj Bjorner 44104a5cce fix #3198
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-08 14:03:46 +01:00
Nikolaj Bjorner 7452e55698 fix #3190 fix #3168
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-08 12:54:03 +01:00
Nikolaj Bjorner bdd66e1fa0 fix #3180 fix #3181 #3184
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-07 12:13:43 +01:00
Nikolaj Bjorner f501380e89 fix #3169 - set cancellation timeout and limit during push. Also expose internalization outside of scope that disables cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-06 23:36:04 +01:00
Nikolaj Bjorner ca4a78f2ab fix #3150
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-05 10:13:04 +01:00
Nikolaj Bjorner 153d0661fe fix #3141
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-05 07:57:21 +01:00
Nikolaj Bjorner b8f076a072 fix #3121
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-03 12:59:14 -08:00
Nikolaj Bjorner 794c09425e check also for offset #3099
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 20:58:04 -08:00
Nikolaj Bjorner 2edab50f53 fix #3099
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 20:54:20 -08:00
Lev Nachmanson e56a5787dc remove a too strict debug check and fix a bug in intervals on terms
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-02 19:47:17 -08:00
Murphy Berzish 6ec9f9112c z3str3: fix value cex in int.to.str model construction 2020-03-02 18:16:36 -08:00
Murphy Berzish 069a5fba16 z3str3: improve implementation of int.to.str reduction 2020-03-02 18:16:36 -08:00
Murphy Berzish 8881084449 z3str3: reduce int-to-string in bitvector model construction 2020-03-02 18:16:36 -08:00
Nikolaj Bjorner ad6062cd9e disable unsound code to fix #3100
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-01 12:50:00 -08:00
Murphy Berzish 01299dacbf z3str3: check relevancy of subformulas for negated non-relevant formulas in bitvector model construction 2020-02-27 20:27:33 -08:00
Murphy Berzish f18bd7bf08 z3str3: refactoring to str.indexof axioms 2020-02-27 20:27:33 -08:00
Nikolaj Bjorner 11199619a5 prepare for throttling gcd test and patching based on cost/success ratio
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-26 19:02:56 -08:00
Nikolaj Bjorner 833b54a12c fix dotnet build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-26 09:44:21 -08:00
Nikolaj Bjorner 915ff38f97 fix #3089
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-26 09:28:45 -08:00
Nikolaj Bjorner afa34a1c12 fix #3087
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-25 12:58:45 -08:00
Nikolaj Bjorner 198622b61a fix #3081 fix #3075
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-25 02:18:01 -08:00
Nikolaj Bjorner e1ece7e968 CTRACE
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-24 20:24:42 -08:00
Nikolaj Bjorner b68efe44af fix fix
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-23 12:28:15 -08:00
Murphy Berzish f604fad779 z3str3: fix negated str.contains, add reduction for str.at 2020-02-20 11:46:29 -10:00
Nikolaj Bjorner 8b97e26fd7 cut fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-20 09:55:17 -08:00
Nikolaj Bjorner 44a79d05c8 debugging cuts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-19 06:45:23 -08:00
Nikolaj Bjorner 006caea5ba fix #3042
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-18 23:11:45 -08:00
Nikolaj Bjorner 953ea7c880 fix #3044
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-18 23:08:59 -08:00
Nikolaj Bjorner 2882a6708e fix #2957 - arrays are treated as values
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-18 16:35:13 -08:00
Nikolaj Bjorner 559c3ca012 fix #3035
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-18 10:46:25 -10:00
Murphy Berzish 698e2ffb0b z3str3: small refactoring to previous commit 2020-02-18 08:57:06 -10:00
Murphy Berzish b4acd44d5e z3str3: fix crash in model construction when a variable has an impossible length assignment 2020-02-18 08:57:06 -10:00
Murphy Berzish da8182419b z3str3: fix indexof out-of-bounds axiom terms 2020-02-18 08:57:06 -10:00
Murphy Berzish 85fd139c7f z3str3: assert precondition for regex linearity axiom 2020-02-13 18:19:24 -08:00
Murphy Berzish 0146259ea4 z3str3: fix control flow and return paths in regex model construction 2020-02-12 12:03:34 -08:00
Nikolaj Bjorner bbce6bfa07 fix #2980
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-11 22:43:00 -08:00
Nikolaj Bjorner 4f33c123c9 add placeholder
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-11 20:31:05 -08:00
Nikolaj Bjorner d02d90dab2 add assert to catch bad lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-11 20:00:48 -08:00
Nikolaj Bjorner ba2f587c26 rm eq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-11 18:39:32 -08:00
Murphy Berzish 8d3ed19981 z3str3: loop and trace cleanup 2020-02-11 12:37:42 -08:00
Nikolaj Bjorner 1371526062 fix build break
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-10 16:15:21 -08:00
Lev Nachmanson ad55f61580 roll back the defaults of invoking the nla_solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-10 13:35:33 -08:00
Nikolaj Bjorner f1abc71c35 fix #2962
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-10 11:44:10 -08:00
Lev Nachmanson 26eb23c05b move lp_params to smt_params_helper
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-10 11:25:54 -08:00
Lev Nachmanson 514c3d7a3b move the content of nla_params.pyg to smt_params_helper.pyg
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-10 11:08:35 -08:00
Lev Nachmanson e2514a2b19 make nla_solver the default
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-10 10:22:05 -08:00
Nikolaj Bjorner d770b5135d fix build warnings for theory_str_mc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-10 09:02:14 -08:00
Murphy Berzish 524434cfbb z3str3: pass correct subterm to negative regex model construction 2020-02-09 20:40:43 -08:00
Nikolaj Bjorner bc75e08a52 fix #2943
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-09 15:48:53 -08:00
Nikolaj Bjorner 1ef83351cb fix #2963
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-09 12:32:11 -08:00
Nikolaj Bjorner 3f1f4e0f67 remove pragma once from cpp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 15:41:13 -08:00
Nikolaj Bjorner f29b455611 fix #2949 fix #2955 experiment with cut selection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-08 10:34:14 -08:00
Nikolaj Bjorner 140926e7c0 move assume eqs until __after__ other checks, big perf regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 20:23:27 -08:00
Nikolaj Bjorner d22ad5e819 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 19:43:58 -08:00
Nikolaj Bjorner d5dfe07203 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 19:42:44 -08:00
Nikolaj Bjorner b2c265496e dbg
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 19:41:50 -08:00
Nikolaj Bjorner 02b074e28b compile constraints during internalization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 19:28:17 -08:00
Lev Nachmanson bbfcd00627 experiment with branching
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 15:40:33 -08:00
Lev Nachmanson 6027224e34 do not throttle lp bound propagation
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-07 14:21:11 -08:00
Nikolaj Bjorner 8c016abb12 build issues
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 11:16:57 -08:00
Nikolaj Bjorner 88374a15d0 build errors/warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 10:09:10 -08:00
Nikolaj Bjorner a59745c2f2 isolate constraints in a constraint_set
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 09:13:40 -08:00
Murphy Berzish 4535228fe2 z3str3: mk_value searches equivalence class of terms for candidate model variables 2020-02-06 21:43:23 -08:00
Murphy Berzish 69cab61de3 z3str3: fix str.contains bitvector reduction 2020-02-06 21:43:23 -08:00
Murphy Berzish 883c5df109 z3str3: regex automata in bitvector model construction 2020-02-06 21:43:23 -08:00
Murphy Berzish 237adbf40c z3str3: ensure top-level free variables always participate in model construction 2020-02-06 21:43:23 -08:00
Murphy Berzish 812049ca4a z3str3: ignore non-relevant formulas in bitvector model construction 2020-02-06 21:43:23 -08:00
Murphy Berzish cf3f271f5b z3str3: add smt.str.fixed_length_naive_cex option for naive length-based counterexamples 2020-02-06 21:43:23 -08:00
Murphy Berzish c1e7d7788e z3str3: refactor bv-mc to separate file 2020-02-06 21:43:23 -08:00
Murphy Berzish 5a9a173c5f z3str3: move bitvector model construction to theory_str_mc 2020-02-06 21:43:23 -08:00
Murphy Berzish faf3934749 z3str3: add bitvector model construction algorithm 2020-02-06 21:43:23 -08:00
Nikolaj Bjorner ff6b3304f8 remove incorrect assertions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-06 17:40:30 -08:00
Nikolaj Bjorner 200f47369d some micro tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-06 16:58:25 -08:00
Nikolaj Bjorner 8b23a1701a move flatten functionality to asserted_formulas, sort variables in lut_finder
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-06 09:16:23 -08:00
Nikolaj Bjorner b2a6c30100 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-06 01:43:49 -08:00
Nikolaj Bjorner 459df32211 supress more assumptions on reference counts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 20:55:44 -08:00
Nikolaj Bjorner 58cc69ca61 change assert to conditional code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 20:53:19 -08:00
Nikolaj Bjorner 7714bff6b2 simplify condition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 19:49:12 -08:00
Nikolaj Bjorner 3ef05ced2f tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 19:36:07 -08:00
Nikolaj Bjorner f1c8754527 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 12:46:08 -08:00
Nikolaj Bjorner 2d59b81353 delay evaluation of model, throttle propagation, introduce LUT results into cutset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 12:33:42 -08:00
Nikolaj Bjorner 7b2f6791bc bp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 07:10:23 -08:00
Nikolaj Bjorner 566d3070fa enable parallel under scopes, preview in sequential mode before incurrring copy overhead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 20:26:42 -08:00
Nikolaj Bjorner 3da3b41786 ensure parallel mode works under push/pop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 19:22:28 -08:00
Nikolaj Bjorner 69ca840ceb na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 16:13:32 -08:00
Lev Nachmanson c562a1f883 remove debug code and improve printing
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-04 16:08:24 -08:00
Lev Nachmanson 0d95c780d1 remove an unnecessary check
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-04 14:51:15 -08:00
Nikolaj Bjorner 876bd80bea fix model generation for underspecified operators in theory_lra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 14:07:24 -08:00
Nikolaj Bjorner cc5971ceaf fix #2936
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 13:50:10 -08:00
Lev Nachmanson 06173aa4d7 do not use nl variables in random_update()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-02-04 11:51:37 -08:00
Nikolaj Bjorner 3ab7477663 fix #2920
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-04 10:20:44 -08:00
Nuno Lopes 506fbf9672 fix #2933: soundness issue in dom-simplify with (or foo true) 2020-02-04 14:05:12 +00:00
Nikolaj Bjorner 32968fa41c fix #2935
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-03 19:57:20 -08:00
Nikolaj Bjorner 7a946fd9d0 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-03 18:56:20 -08:00
Nikolaj Bjorner 47cdb5f46e fix #2913
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-03 09:14:23 -08:00
Nikolaj Bjorner 18280a9737 fix #2928 - test case is actually abuse of qe2. It is reasonable for qe2 to assume that simplify was applied first
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-03 08:43:45 -08:00
Nikolaj Bjorner 18df6ce1fe remove stdout print
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-03 08:19:34 -08:00
Nikolaj Bjorner 28c827fb69 fix #2919
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-02 14:49:35 -08:00
Nikolaj Bjorner b0a28160f7 fix #2921
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-02 10:35:06 -08:00
Nikolaj Bjorner 805ac745e9 fix #2902
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 18:51:17 -08:00
Nikolaj Bjorner be95ea121b fix #2912
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 17:32:19 -08:00
Nikolaj Bjorner 321329d77c fix #2910
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 14:31:13 -08:00
Nikolaj Bjorner 7df8d17639 move in assumptions to loop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 10:59:48 -08:00
Nikolaj Bjorner 75fb25a06c add randomization to lookahead selection'
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 10:48:43 -08:00
Nikolaj Bjorner 615da0e3fb move remove thread unsafe increment to num_iterations, use num_rounds
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 10:38:24 -08:00
Nikolaj Bjorner ece041baf8 randomize branch direction (outside of int_solver for now)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 10:32:49 -08:00
Nikolaj Bjorner 1e92165690 branch selection updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 10:19:27 -08:00
Nikolaj Bjorner 74fc8cfde7 combine PS_THEORY with cache on/off mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-01 09:50:00 -08:00
Nuno Lopes 3ec7146ec8 attempt to fix build 2020-02-01 10:52:16 +00:00
Nikolaj Bjorner 9fab72b3ef fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 22:20:25 -08:00
Nikolaj Bjorner 5f89ead54b adding t-smt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 17:08:53 -08:00
Nikolaj Bjorner 5f2720562b adding threads to smt core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 17:08:53 -08:00
Nikolaj Bjorner d4a24aff1e local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 17:08:52 -08:00
Nuno Lopes d2fc88d675 fix debug build 2020-01-31 17:30:13 +00:00
Nuno Lopes d79692b185 remove unused file & hide a few symbols 2020-01-31 17:13:28 +00:00
Lev Nachmanson 35aa98436f fix term columns after rounding in cube()
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-30 14:29:36 -08:00
Nuno Lopes eece2f4d49 remove unused vars 2020-01-30 15:30:14 +00:00
Nikolaj Bjorner ff5bdd6f1f speed up freedom interval computation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 15:21:39 -08:00
Lev Nachmanson 75d1e8e929 return l_undef in get_phase() if lpvar is not available
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 12:06:56 -08:00
Nikolaj Bjorner f161bdaf8f fix #2898
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:30:57 -08:00
Lev Nachmanson d3a4b7c44b correct handling of int terms in theory_lra
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 052814d165 NB fix in theory_lra mk_bound
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson fd1e0e4d80 fixes for mixed case
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 0e86c567cc prepare the mixed case
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson b577544830 make grobner quota a parameter
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 00e1049ff2 move some grobner settings to pdd_solver.m_config
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson bb6511b425 add parameters to control grobner's explosure
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson d1e9998332 add a config parameter to grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson a83425bec6 clean up a trace statement
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 11995e58f4 clean up a trace statement
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 20af3dd675 add options to substitute vars in Horner and Grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 496a8c17aa remove nex grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 2334ed5b66 disable nex grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson aafdab65bd fix the build and extend options to run grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 7eb1affc7b after rebasing with Z3Prover
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 48f7e69d0e only run grobner when horner fails, introduce concat instead copy
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner 0535e24dd1 consolidate parameters, add comment (#102)
* updates

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

* code review of nla_intervals: combine functionality

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

* tidy

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

* formatting

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

* add comments

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

* merge issue

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

* tired of looking at compiler warning

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 882b8ee63b NB's review
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 9ecae4abad revert changes in smt directory
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 21d9875239 integrating changes of Nikolaj with m_empty_clause etc.
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson f939a26c86 integrating changes of Nikolaj with m_empty_clause etc.
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 87d7ce69e3 add trace statement and a fix change in pick_next() - choosing a smaller monomial
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 69c89426da port Grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 4a87ca8b92 remove m_lc field from equation
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson f5c8ead995 port Grobner
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson 3e0cf4b96d port Grobner: fixes in nex simplifications
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson e8b6b870ac port grobner basis functionality
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson a0bdb8135d rename monomial to monic
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00