3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-06 09:34:08 +00:00
Commit graph

131 commits

Author SHA1 Message Date
Nikolaj Bjorner fa93bc419d fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-05-01 10:53:36 -07:00
Nikolaj Bjorner f525f43e43 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-30 09:30:43 -07:00
Nikolaj Bjorner 28fbcd7687 fix #1571
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-04-12 15:59:06 +08:00
Nikolaj Bjorner c513f3ca09 merge with master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-25 14:57:01 -07:00
Nikolaj Bjorner ff2924e83b fix mac build error
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-20 17:19:40 -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
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 356835533a clean up debug output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-08 10:47:15 -07:00
Nikolaj Bjorner ced2029ae9 local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-25 16:37:15 -07:00
Nikolaj Bjorner edb3569599 updates to sorting networks
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-23 22:36:19 -05: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 480296ed96 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-02 11:27:02 -07:00
Nikolaj Bjorner 15283e4e7c expose extension conflict resolution as plugin to sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-05 10:08:57 -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 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
Nikolaj Bjorner 46df31babf Merge branch 'master' of https://github.com/Z3Prover/z3 2016-12-22 20:54:14 -08:00
Nikolaj Bjorner 1787fa8296 remove redundant disjunction in compilation of at-most-1 constraints, log mutexes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 20:54:09 -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 e9db934f1a improving perf of mutex finding, revert semantics of 0 timeout to no-timeout. Issue #791
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-17 04:26:17 +02:00
Nikolaj Bjorner 33e7dccd42 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 09:11:02 -07:00
Nikolaj Bjorner b92bd89a45 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 20:53:10 -07:00
Nikolaj Bjorner 3778048eb4 add bounded-int and pb2bv solvers to fd_solver, use sorting networks for pb2bv rewriter when applicable, hoist to pb2bv_rewriter module and remove it from the pb2bv_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 20:31:59 -07:00
Nikolaj Bjorner e32e0d460d fix at-most-1 constraint compiler bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-22 21:50:45 -07:00
Nikolaj Bjorner 23b9d3ef55 fix at-most-1 constraint compiler bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-22 18:50:16 -07:00
Nikolaj Bjorner ef9486913b Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-19 08:57:16 -07:00
Nikolaj Bjorner 527980e440 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-19 08:57:10 -07:00
Nikolaj Bjorner 58198d7cb6 add consequence finding to inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 15:45:39 -04:00
Nikolaj Bjorner 8d2b70a5e2 better encodings for at-most-1, #755
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-10 23:46:03 -07:00
Nikolaj Bjorner 339cd6e537 mbo
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-20 13:45:50 -07:00
Nikolaj Bjorner 40f8e16273 removing warnings for unused variables, #579
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-17 14:00:30 -07:00
Nikolaj Bjorner 61dbb6168e cleanup cancelation logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 12:35:35 -08:00
Nikolaj Bjorner f96c0b6963 fixes #186, remove ite-lifting from opt_context to detect weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-06 11:52:59 +02:00
Nikolaj Bjorner 4145b92136 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:52:07 -07:00
Nikolaj Bjorner f47cc70236 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:48:52 -07: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