Nikolaj Bjorner
|
d68cb5aee7
|
working on conflict resolution
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-20 07:44:00 -08:00 |
|
Nikolaj Bjorner
|
1bfd09e16b
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-19 19:31:24 -08:00 |
|
Nikolaj Bjorner
|
e23509797a
|
access parameters from Python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-19 19:28:20 -08:00 |
|
Nikolaj Bjorner
|
13099b1590
|
merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-19 17:56:43 -08:00 |
|
Nikolaj Bjorner
|
e17c130422
|
updated cardinality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-19 17:55:15 -08:00 |
|
Nikolaj Bjorner
|
238e85867a
|
working on card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-18 15:40:39 -08:00 |
|
Christoph M. Wintersteiger
|
5c1ffe13d1
|
x64 build fix for .NET 3.5 API
|
2017-01-18 13:06:28 +00:00 |
|
Christoph M. Wintersteiger
|
81c3a7dabd
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-18 12:32:10 +00:00 |
|
Christoph M. Wintersteiger
|
a334020f2c
|
Added .NET 3.5 solution/project files
|
2017-01-18 12:32:02 +00:00 |
|
Nikolaj Bjorner
|
e1640fcee9
|
cardinality reduction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-17 16:08:33 -08:00 |
|
Nikolaj Bjorner
|
16552d32cb
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-17 14:19:32 -08:00 |
|
Nikolaj Bjorner
|
0aa912371b
|
Another fix for #847. Reset wmax theory solver state between lex calls, otherwise it uses stale constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-17 14:19:24 -08:00 |
|
Nikolaj Bjorner
|
735998c386
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-17 13:41:25 -08:00 |
|
Nikolaj Bjorner
|
873d975c77
|
fix bug in consequence extraction: the order of bcp is not fixed between restarts, so the order of unit literals may not be preserved. This is relatively rare, so we optimize for the case where we assume bcp preserves order (and maybe miss some consequences)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-17 13:41:15 -08:00 |
|
Christoph M. Wintersteiger
|
6d34899c46
|
Bugfix for macro finder. Fixes #832.
|
2017-01-17 15:44:03 +00:00 |
|
Christoph M. Wintersteiger
|
e472a8d4cf
|
Enabled filenames in error messages during inclusion of files.
|
2017-01-16 15:46:58 +00:00 |
|
Christoph M. Wintersteiger
|
090a331d79
|
Added filenames to error messages for when we have more than one file.
|
2017-01-16 15:43:13 +00:00 |
|
Christoph M. Wintersteiger
|
00a50eea7f
|
Added (include ...) SMT2 command.
|
2017-01-16 15:05:58 +00:00 |
|
Nikolaj Bjorner
|
dc543a7ee7
|
update macro_util logging to uniform format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-15 21:13:22 -08:00 |
|
Nikolaj Bjorner
|
c4c9de0838
|
fix memory leaks from cancellations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-15 20:09:27 -08:00 |
|
Nikolaj Bjorner
|
24eae3f6e0
|
fix crash with unary xor #870
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-15 12:06:56 -08:00 |
|
Nikolaj Bjorner
|
ee36662435
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-15 11:56:01 -08:00 |
|
Nikolaj Bjorner
|
7df803c131
|
Fix unsound handling of upper bounds in wmax, thanks to Patrick Trentin for report and careful repros #847
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-15 11:52:48 -08:00 |
|
Nikolaj Bjorner
|
bc6b3007de
|
remove unused features related to weighted check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-13 20:53:22 -08:00 |
|
Nikolaj Bjorner
|
975474f560
|
fixing bounds calculation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-13 17:05:51 -08:00 |
|
Christoph M. Wintersteiger
|
f1a4a48491
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-12 12:49:35 +00:00 |
|
Christoph M. Wintersteiger
|
2458db30cf
|
Corner-case fix for smt::solver::pop_core
|
2017-01-12 12:49:26 +00:00 |
|
Daniel Perelman
|
3370adcdff
|
Mark void DummyContracts as Conditional to avoid compiling their arguments.
|
2017-01-11 17:02:26 -08:00 |
|
Christoph M. Wintersteiger
|
650ea7b9cc
|
Bugfix for smt.core.extend_patterns
|
2017-01-11 18:40:11 +00:00 |
|
Christoph M. Wintersteiger
|
9f49905582
|
Formatting, whitespace, and Z3_API annotations.
|
2017-01-10 21:05:27 +00:00 |
|
Christoph M. Wintersteiger
|
d8d869822f
|
Cleaned up #include<iostream> in api* objects.
|
2017-01-10 21:04:44 +00:00 |
|
Christoph M. Wintersteiger
|
384468bc99
|
Added option to extend unsat cores with literals that (potentially) provide quantifier instances.
|
2017-01-10 20:22:20 +00:00 |
|
Christoph M. Wintersteiger
|
ba9d36605b
|
Formatting, whitespace
|
2017-01-10 20:22:20 +00:00 |
|
Christoph M. Wintersteiger
|
8047f0d91a
|
GCC compilation/keyword fix. Relates to #864
|
2017-01-10 14:06:56 +00:00 |
|
Christoph M. Wintersteiger
|
8f95ee01e1
|
Removed polynomial factorization test cases. Relates to #852 and fixes #865.
|
2017-01-10 14:02:59 +00:00 |
|
Nikolaj Bjorner
|
331658f208
|
remove polynomial factorization as suggested by issue #852
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-09 21:30:54 -08:00 |
|
Nikolaj Bjorner
|
8d09b6e4a8
|
add at-least and pbge to API, fix for issue #864
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-09 21:23:00 -08:00 |
|
Nikolaj Bjorner
|
c69a86e647
|
fix bug in antecedent collection for consequence finding: once an antecedent is set, it should not be cleared
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-06 19:34:50 -05:00 |
|
Nikolaj Bjorner
|
e9edcdc6e6
|
moderate exception behavior for issue #861
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-05 16:09:16 -05:00 |
|
Nikolaj Bjorner
|
f443bfed87
|
Merge branch 'master' of https://github.com/Z3Prover/z3
|
2017-01-04 19:05:52 -08:00 |
|
Nikolaj Bjorner
|
ddf4bc548f
|
allow disabling exceptions from C++. Issue #861
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-04 19:04:43 -08:00 |
|
Nikolaj Bjorner
|
ae9a3bfc24
|
add operator for issue #860
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-04 09:14:09 -08:00 |
|
Christoph M. Wintersteiger
|
cb75a55095
|
Fixed initialization order warning.
|
2017-01-03 13:41:08 +00:00 |
|
Nikolaj Bjorner
|
74d3de01b3
|
enable incremental consequence finding with restart timeout
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2017-01-02 10:07:02 -08:00 |
|
Nikolaj Bjorner
|
a4d5c4a00a
|
make get_consequence call skip check-sat if a model is already there
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-12-30 18:05:19 -08:00 |
|
Nikolaj Bjorner
|
cb6c6332b3
|
update conflict resolution for cardinality case
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-12-28 12:44:30 -08:00 |
|
Nikolaj Bjorner
|
e36eba1168
|
added cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-12-27 09:58:23 -08:00 |
|
Nikolaj Bjorner
|
cb10a618a1
|
Merge branch 'master' of https://github.com/z3prover/z3 into opt
|
2016-12-26 10:19:51 -08:00 |
|
Nikolaj Bjorner
|
7210f6e912
|
local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-12-26 10:19:48 -08:00 |
|
Nikolaj Bjorner
|
8dde60f634
|
initialize watch in assign_eh
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2016-12-26 10:18:55 -08:00 |
|