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
Lev Nachmanson
cc5a12c5c7
port grobner basis
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
490672a5ba
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
36380463d7
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
35efdc9852
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
7386b7d68d
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
248e3e092a
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
26b4294bce
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
06dbc623c7
start porting grobner basis functionality
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
bfcfc517fe
add stubs to the nla_grobner
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
f4e7002ea3
forgotten changes after a rebase
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
bf79d93d51
limit the row length in horner's scheme
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
5435942228
add statistics on horner's heuristic
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
dfe0e85629
toward fetching existing terms intervals from lar_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
4ef7bf2bf6
fixes in the interval multiplication
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
8eaa2bfb02
sort nla_expr
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
97ef190f4f
full recursion on horner, not finished
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
73e63e1ad9
fix a bug in nla_intervals
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
8258e2a8fd
generate lemmas from nla_intervals
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
6a6cb3822c
before getting explanations for monomials upper and low bounds
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
9c18ede687
hook up nla_solver it lp bound propagation
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
33cbd29ed0
mv util/lp to math/lp
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
b6513b8e2d
fix the merge
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
df5f3f9722
debug tangent lemmas
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
e49dbbe465
fix ordered lemma
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
54ba889b7b
debug order lemma, introduce sign for factors
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
218e155603
fix feasibility tracking in lar_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
e234bede4c
fixes ( #96 )
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
b32f2703d4
fix in emonomials
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
8cdf754990
debug emons
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
be5170fc3b
hook up more lp_params
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
c9f2f6f110
Forgotten file
2020-01-28 10:04:21 -08:00
Lev Nachmanson
a323eaf1c8
add some nla statistics generate not more than one pl lemma an a rm monomial
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
09152013b3
var_eqs compiles but broken
2020-01-28 10:04:21 -08:00
Lev Nachmanson
0dcebde060
replace s() to lp() it theory_lra
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
1abb109faf
move the indices housekeeping from theory_lra to lar_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
76e1aeb2bb
move the indices housekeeping from theory_lra to lar_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
63e62ec1bb
stronger lemmas to avoid branching
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
b2943c34f1
create class lemma
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
34137cfa0a
a bug fix in internalize_atom, by NB
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
9aca3bc239
change the signature of nla_solver::check() to accept lemma and explanation as vectors
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
0d5ca4edfe
more efficient sign lemma
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
3192db64a1
Nikolaj's changes is mk_eq
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
f3f9372eac
fixes after the rebase
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
54f447d118
change the signature of int_solver::check by adding explanation* parameter
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
23a7e5e302
a bug fix for handling infeasibilities created in add_var_bound()
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
2993453798
remove explanation.reset() and fixes in add_var_bound()
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
1d51c5689e
roll back add_var api
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
4fa38b5aa2
process conflicts immediately aftep add_var_bound()
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
c9be7b89c1
change the add_var_bound() signature
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
1c8f28c2e9
check m.canceled() more often
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
efeeabe127
check the lar_solver status more often
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
c95f2a5bc6
Nikolaj's fix for constants
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
ca5666cabd
add diagnostics for registering vars in lar_solver
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
025e4b90ca
add a constant to the context trail
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
fde1cd23d5
small changes
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
c1e0c79a69
integrating Nikolaj's changes
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
1ed9639898
Nikolaj's changes
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
ee2aed38e8
switch pos ( sign) when creating literals for EQ and NE
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
545bfff827
take coefficient into account ( #87 )
...
* take coefficient into account
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* take coefficient into account
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev
a82316a172
rebase with z3prover
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
d301a9c403
rebase with z3prover
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
96aaa8638e
rename niil to nla
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
56ae577c97
rename the files
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
c09c944922
rebase with upstream
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
0be5fc5693
revert to a previous state: avoid adding branches for free vars when creating a gomory cut
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
2b18627fa1
fix assertions ( #83 )
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
d913a55dfb
reset m_explanation ( #82 )
...
* reset m_explanation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* streamline handling of m_explanation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
064cf9e983
allow gomory cut for a row with free non-basic vars
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
de4a2b3ea7
compiles and runs, need to restore niil_solver.cpp later
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
0d9aff9834
added bounds ( #81 )
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
64ecefdf07
tinker with bound atom ( #80 )
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
a9a45b7b47
change conflict to th_axiom ( #78 )
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
10871ad76e
towards basic newtral check
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
08d891891e
handle unsorted monomials
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
88ea90fbb9
handle output from niil_solver ( #77 )
...
* handle output from niil_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
* add proper equality handling
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
49ae42cebd
produce the first lemma in niil_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
0911fc2bda
use explanation.h for conflict explanations everywhere
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
31d44471a1
remove some warnings
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
92b5a9b134
work on niil
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
a86601f7d2
work on niil_solver::check()
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
b6f07e2a23
roll back changes in get_model
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev Nachmanson
0dbe8982ce
simplify lar_solver::get_model
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
fa5d10b6dd
work on switcher
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
253facff46
work on switcher
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
032a4efdb6
work on switcher
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
a5c62bfcc4
preparing niil files
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Lev
c979c694f6
remove an unused method
...
Signed-off-by: Lev <levnach@hotmail.com>
2020-01-28 10:04:21 -08:00
Nikolaj Bjorner
ee62f83131
fix #2892
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-27 20:59:02 -08:00
Nikolaj Bjorner
d12523e4c0
fix #2883
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-27 08:57:16 -08:00
Nikolaj Bjorner
3774d6d405
fix #2890
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-26 17:59:52 -08:00
Nikolaj Bjorner
5497022f5c
fix #2877
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-24 17:56:23 -06:00
Nikolaj Bjorner
ce0ccc2e9e
fix #2860
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-24 16:33:57 -06:00
Lev Nachmanson
4ba4d41346
track rounded columns in lar_solver
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2020-01-23 17:21:55 -06:00
Nikolaj Bjorner
f9917edf6c
fix #2879 . relax benign restriction on eq propagation justification
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-23 14:00:14 -06:00
Nikolaj Bjorner
794aafa6f8
fix warnings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-23 12:14:34 -06:00
Nikolaj Bjorner
6321dabe93
fix #2869 fix #2878
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-23 10:59:33 -06:00
Nikolaj Bjorner
55f62fcaed
fix #2865
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-22 16:16:44 -06:00
Nikolaj Bjorner
0ab107dcb5
revert fix for #2865
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-22 15:06:20 -06:00
Nikolaj Bjorner
da2f5cc362
remove spurious out
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-21 14:18:49 -06:00
Nikolaj Bjorner
d3b105f9f8
move out sign
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-20 16:22:38 -06:00
Christoph M. Wintersteiger
321bad2c84
Fix for implicit consts in FPA models. Fixes #2865 .
2020-01-20 17:06:35 +00:00
Murphy Berzish
509cad9c9a
z3str3: refactoring, move legacy model construction code into theory_str_mc
2020-01-14 16:13:25 -08:00
Christoph M. Wintersteiger
77689ed002
Fix term-ite models in theory_fpa. Fixes #2857 .
2020-01-13 19:24:48 +00:00
Nikolaj Bjorner
ba292346ae
some more string perf profiling
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-12 22:11:00 -08:00
Nikolaj Bjorner
ab5905cf7f
some adjustments for stack use on large strings
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-12 22:08:24 -08:00
Nikolaj Bjorner
e8cfbb41d3
missing length constraint for at fixes #2852
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-12 17:22:59 -08:00
Nikolaj Bjorner
78a1736bd2
prepare symbols to be more abstract, update mbi, delay initialize some modules
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-10 12:02:08 -08:00
Nuno Lopes
0b14f1b6f6
fix crash when propagating equalities over arrays with lambdas
2020-01-10 16:04:58 +00:00
Lev Nachmanson
1fff7bb51d
use u_map in lar_term
...
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2019-12-30 20:31:36 -08:00
Nikolaj Bjorner
3b16f129bb
fix #2803
2019-12-29 21:30:59 -08:00
Nikolaj Bjorner
991e587950
User performs some parameter sweep for Christmas, ho ho ho
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-25 21:23:21 -08:00
Nikolaj Bjorner
78feac4465
different kind of loop
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-23 19:36:13 -08:00
Nikolaj Bjorner
38f74297a9
seq
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-23 15:30:06 -08:00
Nikolaj Bjorner
918846a97e
fix #2814
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-20 16:35:38 -08:00
Nikolaj Bjorner
d2108ad043
na
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-20 15:42:30 -08:00
Nikolaj Bjorner
cb21f70cc3
fix #2813
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-20 15:42:03 -08:00
Nikolaj Bjorner
c560ee54e8
fix #2802
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-13 13:02:58 -08:00
Nikolaj Bjorner
a069b65669
fix #2797
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-11 01:42:28 -08:00
Nikolaj Bjorner
ec39d84f57
remove empty clause feature
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-10 20:19:59 -08:00
Nikolaj Bjorner
c839f58276
fix #2796
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-10 15:37:40 -08:00
Nikolaj Bjorner
4b22ff2d3b
empty clause handling
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-10 02:45:40 -08:00
Nikolaj Bjorner
04df77e89d
revert empty clause handling
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-10 02:40:38 -08:00
Nikolaj Bjorner
5cecd986e2
track empty clause during pop
...
If a theory solver creates the empty clause it gets dropped during pop.
By maintaining a variable m_empty_clause, the solver ensures that it retains the information that the search state is inconsistent.
2019-12-09 11:10:37 +03:00
Nikolaj Bjorner
a2aab76c22
fix build
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-07 11:02:25 +03:00
Nikolaj Bjorner
3fa3c8bf76
fix #2788
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-07 09:46:33 +03:00
Nikolaj Bjorner
8eb2356b68
fix #2787
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-12-07 09:03:36 +03:00
Murphy Berzish
e5ca451a02
z3str3: remove unused str_eq_todo worklist
2019-12-05 01:51:16 +03:00
Murphy Berzish
32e5c6ffd1
z3str3: missed instance of rewrite-then-assert
2019-12-05 01:51:16 +03:00
Nikolaj Bjorner
7e415c1b69
update to logging
2019-12-04 23:08:41 +03:00
Nikolaj Bjorner
20754bc72d
fix #2768
2019-12-04 23:08:03 +03:00
Nikolaj Bjorner
f646c9ac11
fix #2780
2019-12-04 10:45:17 +03:00