3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Commit graph

371 commits

Author SHA1 Message Date
Lev Nachmanson 907d310600 get rid of arith.nla parameter
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-27 14:33:40 -07:00
Nikolaj Bjorner 4b7bd3a881 fix #3536
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-27 12:59:24 -07:00
Nikolaj Bjorner 12f62e73d5 fix ordering of delayed assume eqs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-26 16:24:34 -07:00
Nikolaj Bjorner 7a04e52c41 fix ordering of delayed assume eqs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-26 16:22:24 -07:00
Nikolaj Bjorner ee2e81b696 fix #3517
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-26 10:02:41 -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 ab34ef9daf fix crash exposed by #3503
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 0ec12f497c reduce use of m_core as attribute reference, instead pass as parameter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner e16c62d6e2 don't reset core after it has been populated for the cut #3451 and presumably other bugs
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 cc74dd6373 emonics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson b52150de22 cleanup
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner c88d5e6468 remove debug out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner e50082b484 add tv
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 6c5d7fbe96 fixes in max term with tableau
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 45980694b7 fetch explanations earlier than setting the bound
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 4c5c17c7d8 fixes for #3376
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner eb0f318686 fix #3361
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 562be531e9 fix #3317
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 4dfc0d6d88 fix #3334
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner b41b83cd63 fix #3314
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 31e2a9b163 add scoping for variable equivalences between new monomials
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Nikolaj Bjorner 919f687df6 expose settings, not all of core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 8af245a410 use a simpler encoding for term indices
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-03-25 19:43:55 -07:00
Lev Nachmanson 4917475f9e remove debug code
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 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 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 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 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 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
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 6ad261e24c fix #3330
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-15 09:49:44 -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 7452e55698 fix #3190 fix #3168
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-08 12:54:03 +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
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 198622b61a fix #3081 fix #3075
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-25 02:18:01 -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
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
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 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 a59745c2f2 isolate constraints in a constraint_set
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-07 09:13:40 -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 b2a6c30100 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-06 01:43:49 -08:00
Nikolaj Bjorner 3ef05ced2f tuning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-05 19:36:07 -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
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
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 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 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 d4a24aff1e local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-31 17:08:52 -08: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
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