3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-10 21:20:52 +00:00
Commit graph

66 commits

Author SHA1 Message Date
Bruce Mitchener
cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Nikolaj Bjorner
c513f3ca09 merge with master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-25 14:57:01 -07:00
Bruce Mitchener
76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07:00
Bruce Mitchener
7167fda1dc Use override rather than virtual. 2018-02-10 09:56:33 +07:00
Nikolaj Bjorner
fd49a0c89c added facility to persist model transformations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-02 00:05:52 -05:00
Nuno Lopes
9b54b4e784 fix vector<> to support non-POD types
adjust code to std::move and avoid unnecessary/illegal
2017-10-16 00:54:29 +01:00
Nikolaj Bjorner
651587ce01 merge with master branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-19 09:39:22 -07:00
Nikolaj Bjorner
b19f94ae5b make include paths uniformly use path relative to src. #534
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 13:24:11 -07:00
Nikolaj Bjorner
92e2d920fd working on card for sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 14:03:27 -08:00
Nikolaj Bjorner
0123b63f8a experimenting with cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-27 16:12:46 -08:00
Nikolaj Bjorner
49d7fd4f9c updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-26 09:27:57 -08:00
Nikolaj Bjorner
127bae85bd fixing card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-22 15:33:29 -08:00
Nikolaj Bjorner
904f87feac working on card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-20 21:36:52 -08:00
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
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
Nikolaj Bjorner
e1640fcee9 cardinality reduction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 16:08:33 -08:00
Nikolaj Bjorner
975474f560 fixing bounds calculation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-13 17:05:51 -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
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
Nikolaj Bjorner
a444a33c30 updated encodings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 17:45:21 -08:00
Nikolaj Bjorner
e21bd8dacc fix lexicographic combinations for wmax: pb constrsaints were not interpreted in Boolean benchmarks. #782
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-15 15:07:05 +02:00
Nikolaj Bjorner
c54a19b084 generate proof justifications in theory_pb: codeplex issue 157
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-29 12:57:02 -08:00
Nikolaj Bjorner
05a39cb2cf fix wrong simplex backtracking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 08:51:07 -07:00
Nikolaj Bjorner
76b11f2d12 improved SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-21 15:06:31 -07:00
Nikolaj Bjorner
3b3498c4b5 initial sls experiment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-19 15:39:11 -07:00
Nikolaj Bjorner
54e3b5ee0d further tuning pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-25 23:30:14 -08:00
Nikolaj Bjorner
478b3160ac optimize theory pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-25 18:06:54 -08:00
Nikolaj Bjorner
e180cfe256 optimizing pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-25 12:24:48 -08:00
Nikolaj Bjorner
e2db1418f9 debugging simplex/pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-21 14:39:54 -08:00
Nikolaj Bjorner
51cb63b6c0 adding simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-12 20:20:52 -08:00
Nikolaj Bjorner
a594597906 improve equality solving in qe-lite
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-12 10:54:00 -08:00
Nikolaj Bjorner
8b5390c56f adding simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-11 17:15:09 -08:00
Nikolaj Bjorner
3afa409abb snapshot adding simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-11 15:44:47 -08:00
Nikolaj Bjorner
236b2d2ff3 working on incremtal PB theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 10:12:45 -08:00
Nikolaj Bjorner
c5b82796ca moving parameters to theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 20:00:10 -08:00
Nikolaj Bjorner
4027de42f6 add optimized sorting network
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-30 13:06:58 -08:00
Nikolaj Bjorner
eb4def108f reinit logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-27 17:45:14 -08:00
Nikolaj Bjorner
0deb951873 different strategies for weighted
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 12:04:17 +01:00
Nikolaj Bjorner
26237a3727 debug benchmarks, theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-19 07:40:18 +02:00
Nikolaj Bjorner
1ca44ed316 handle proof-wrapper justifications
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 11:25:50 +02:00
Nikolaj Bjorner
e38729a1c6 redo marking mechanism as marked literals can disappear from lemma
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-16 07:50:24 +02:00
Nikolaj Bjorner
fe5c42c90f fixes to bugs exposed by regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 05:23:47 +02:00
Nikolaj Bjorner
2c577a304d bug fixes to pb; working on model extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-10 15:16:58 -08:00
Nikolaj Bjorner
d1e86f1d42 adding validation code for assignment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-09 15:48:15 -08:00
Nikolaj Bjorner
a016caa5d8 add expression conversion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 09:47:59 -08:00
Nikolaj Bjorner
2ff51e9a60 move model_evaluator from pdr to model, call it model_implicant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-23 21:33:35 +01:00
Nikolaj Bjorner
97dfb6d521 moving to rational coefficients
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-21 15:55:08 -08:00