mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Code Activity
16461 commits 23 branches 48 tags 157 MiB
Commit graph

767 commits

Author SHA1 Message Date
Nikolaj Bjorner b33f5f879e fix another bug reported by Mark Dunlop 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-15 17:57:11 -08:00
Nikolaj Bjorner 0b84c60886 fix another bug uncovered by Dunlop, prepare grounds for equality solving within NNFs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-14 01:25:25 -08:00
Nikolaj Bjorner 4159b987ce purge unused code from theory_pb, fix bug reported by Mark Dunlop 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-13 03:23:57 -08:00
Nikolaj Bjorner 4b35ef29c9 fix #2081 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-13 01:18:03 -08:00
Nikolaj Bjorner 63d480fd92 fix cnf check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-11 21:17:39 -08:00
Nikolaj Bjorner 2dcf36e96c fix #2044 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-16 15:32:38 -08:00
Nikolaj Bjorner 2aa7ccc4a9 hide bit-vector dependencies under seq_util 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-12-03 08:45:17 -08:00
Bruce Mitchener e570940662 Prefer using empty rather than size comparisons. 2018-11-27 21:42:04 +07:00
Nikolaj Bjorner 141cd687ff disable validation in builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-17 15:37:36 -08:00
Nikolaj Bjorner d45b8a3ac8 fix debug build, add access to numerics from model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-17 15:24:54 -08:00
Nikolaj Bjorner 9ec59fdb93 fix #1934 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-11-17 15:04:25 -08:00
Nikolaj Bjorner 28a5a515a8 fix #1889 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-18 09:20:12 -07:00
Michał Janiszewski cfd0486582 Catch exceptions by const-reference 
Exceptions caught by value incur needless cost in C++, most of them can
be caught by const-reference, especially as nearly none are actually
used. This could allow compiler generate a slightly more efficient code.
 2018-10-16 19:16:07 +02:00
Nikolaj Bjorner c4829dfa22 fix #1577 again 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-06 09:01:01 -07:00
Nikolaj Bjorner 44a0dbbc61 fix #1864 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-06 08:06:51 -07:00
Nikolaj Bjorner b540868cd7 Merge branch 'master' of https://github.com/z3prover/z3 2018-10-04 13:43:04 -07:00
Nikolaj Bjorner a549e73b86 na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-04 13:43:01 -07:00
Nikolaj Bjorner 3bc2213d54 fix #1577 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-10-03 17:43:42 -07:00
Bruce Mitchener 373b691709 Use 'override' where possible. 2018-10-02 10:26:38 +07:00
Bruce Mitchener cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Nikolaj Bjorner 18bec88a8a purify non-constant terms by default to enforce theory #1820 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-10 15:52:02 -07:00
Nikolaj Bjorner 85e7b18451 fix name to divisible, guard under smtlib2_compliant as sugguested in #1757 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-09-01 18:22:10 -07:00
Nikolaj Bjorner d74978c277 fix #1762, #1764, #1768 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-26 20:29:26 +01:00
Nikolaj Bjorner 8744c62fca fix #1755 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-16 10:55:25 +01:00
Nikolaj Bjorner 3ae0ea8246 add circuit and unate encoding besides sorting option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-07-06 21:09:13 -07:00
Nikolaj Bjorner 520ce9a5ee integrate lambda expressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-26 07:23:04 -07:00
Nikolaj Bjorner e187023304 fix #1699 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-23 21:57:10 -07:00
Nikolaj Bjorner 0c32989144 change to const qualifier on constructor 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-20 15:07:21 -07:00
Nikolaj Bjorner 792bf6c10b fix tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-20 08:22:15 -07:00
Nikolaj Bjorner 335d672bf1 fix #1675, regression in core processing in maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-19 23:23:19 -07:00
Nikolaj Bjorner 66e6dc78a3 Merge branch 'master' of https://github.com/z3prover/z3 2018-06-16 11:23:03 -07:00
Nikolaj Bjorner c64321c2e4 debugging maxres bug report 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-16 11:22:58 -07:00
Nikolaj Bjorner d5081a48b0 merge while skyping 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 74621e0b7d first eufi example running 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel ebf6b18821 maxsat standalone mode 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner da0239d200 fix #1655 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-25 21:21:27 -07:00
Nikolaj Bjorner 727ba13566 fix #1653 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-25 12:55:04 -07:00
Nikolaj Bjorner 434ff31629
Merge pull request #1646 from NikolajBjorner/master 
Remove depedencies on interp
 2018-05-25 10:25:31 -07:00
Nikolaj Bjorner 7145a9ac41 fix #1647 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-25 07:38:30 -07:00
Nikolaj Bjorner 8eeaa27cf3 remove interp from documentation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-25 07:33:43 -07:00
Nikolaj Bjorner 6ecae2b986 fix #1645 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-24 09:21:20 -07:00
Nikolaj Bjorner 0708ecb543 dealing with compilers that don't take typename in non-template classes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-23 09:11:33 -07:00
Nikolaj Bjorner c963f6f2df merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-23 08:02:16 -07:00
Nikolaj Bjorner 96914d8578 update model conversion 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-03 11:46:26 -07:00
Nikolaj Bjorner f525f43e43 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 09:30:43 -07:00
Nikolaj Bjorner c64d044e60 Merge branch 'master' of https://github.com/z3prover/z3 2018-04-27 17:49:51 +02:00
Nikolaj Bjorner 5dbba8bd53 fix #1599. fix #1600 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-27 17:48:04 +02:00
Nikolaj Bjorner a9568d1b12
Merge pull request #1597 from TheRealNebus/master 
WMax Bug Fix
 2018-04-27 09:53:29 +02:00
TheRealNebus 24b35fb925 WMax conflict budget bug fix 2018-04-26 22:42:55 +01:00
TheRealNebus e1d7f5deba Revert "MSS based MaxSMT solver" 
This reverts commit 3bbc09c1d2.
 2018-04-26 22:40:00 +01:00
TheRealNebus 7e8ed0762d Revert "implemented CLD" 
This reverts commit 3a7efb91ae.
 2018-04-26 22:39:58 +01:00
TheRealNebus bf2a031f7b Revert "disjoint cores" 
This reverts commit e5aa79ba6a.
 2018-04-26 22:39:55 +01:00
TheRealNebus 37852807b0 Revert "WMax conflict budget bug fix" 
This reverts commit ab8d3cdc44.
 2018-04-26 22:39:45 +01:00
TheRealNebus ab8d3cdc44 WMax conflict budget bug fix 2018-04-24 17:59:21 +01:00
Nikolaj Bjorner 480e1c4dab add warning message for optimization with quantifiers. Fix #1580 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-23 07:20:24 +02:00
Nikolaj Bjorner a81a8de975 remove lns 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-25 19:54:11 -07:00
Nikolaj Bjorner c4ff5c7ac7 remove lns code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-25 18:32:16 -07: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 af96e42724 fixing local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-15 21:11:55 -07:00
Nikolaj Bjorner 59b142f803 fixing local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-15 06:48:26 -07:00
Nikolaj Bjorner bf8ea92b99 fixing nls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-13 17:23:58 -07:00
Nikolaj Bjorner 4375f54c45 adding lns 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-13 13:31:27 -07:00
Nikolaj Bjorner e7d43ed516 fix pb rewriter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-12 11:22:05 -07:00
Nikolaj Bjorner 205d77d591 save last model to ensure it is available fixes #1514 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-03 19:26:31 -08:00
Nikolaj Bjorner 4c1379e8c9 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-19 21:49:03 -08:00
TheRealNebus e5aa79ba6a disjoint cores 2018-02-19 13:29:15 +00:00
Nikolaj Bjorner c7063631e1 remove unused code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-16 12:07:23 -08:00
TheRealNebus 3a7efb91ae implemented CLD 2018-02-16 19:48:29 +00:00
TheRealNebus 3bbc09c1d2 MSS based MaxSMT solver 2018-02-16 14:44:22 +00:00
Nikolaj Bjorner fadcac8f6d fix #1491 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-15 12:39:08 -08:00
Nikolaj Bjorner e1100af52c ensure that final model is logged by the time it is produced fix #1463 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-12 12:04:24 -08: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 4f630f2a00 fix configuration for compiling equalities, add extended binaries 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-08 09:09:53 -08:00
Nikolaj Bjorner 5e482def18 fix local search encoding bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-08 07:27:32 -08:00
Nikolaj Bjorner 615e1e0845 remove redundant tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 17:17:27 -08:00
Nikolaj Bjorner 734d48fa33 fix errors 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 14:29:28 -08:00
Nikolaj Bjorner bee4716a85 lia2card simplifications, move up before elim01 (which could be deprecated) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 12:56:30 -08:00
Nikolaj Bjorner 1ee7871bbf to fix #1476 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-06 18:48:03 -08:00
Nikolaj Bjorner 43441d0fd5 add LP parser option to front-end and opt context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-06 14:02:44 -08:00
Nikolaj Bjorner e95840b640 ate/acce 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-02 20:51:41 -08:00
Nikolaj Bjorner eca250933d disable uhle from lookahead solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-01 19:56:01 -08:00
Nikolaj Bjorner 73e9d351dc adding initial model to updated #1463 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-30 03:21:58 -08:00
Nikolaj Bjorner e4198c38e2 add solution_prefix per #1463, have parto with single objective behave similar to multipe-objectives #1439 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-28 11:45:39 -08:00
Nikolaj Bjorner e4f29a7b8a debugging mc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-19 21:09:52 -08:00
Nikolaj Bjorner 57406d6cc4 more updates for #1439 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-17 18:11:14 -08:00
Nikolaj Bjorner b5335bc34b change behavior of single-objective pareto to use Pareto GIA algorithm (so not a good idea with MaxSAT solving, but then uniform behavior #1439 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-13 20:08:23 -08:00
Nikolaj Bjorner 7e0920e362 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-13 16:15:51 -08:00
Nikolaj Bjorner 4adb24ede5 fix model bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-13 16:12:59 -08:00
Nikolaj Bjorner 9635a74e52 add clausification features 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-12 08:23:22 -08:00
Nikolaj Bjorner d86e8f02d7 fix get-objectives error #1419 message (get-objectives) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-27 10:09:22 -08:00
Nikolaj Bjorner a74d18a695 prepare for variable scoping and autarkies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-13 20:11:16 -08:00
Nikolaj Bjorner a83af22841 include special functionality in parsers for solvers and opt for additional file formats 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-03 20:00:45 +01:00
Nikolaj Bjorner 5ee30a3cd9 include special functionality in parsers for solvers and opt for additional file formats 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-03 20:00:24 +01:00
Nikolaj Bjorner 8357210d3c fix lack of warning/error for unbounded objectives in context of quantifiers #1382 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-01 01:07:41 -08:00
Nikolaj Bjorner bdbaf68f8b adding handlers for dimacs for solver_from_file, and opb, wncf for opt_from_file, #1361 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-19 15:21:09 -08:00
Nikolaj Bjorner 2f218b0bdc remove also cores as arguments to tactics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-19 12:18:50 -08:00
Nikolaj Bjorner 4bbece6616 re-organize proof and model converters to be associated with goals instead of external 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-18 16:33:54 -08:00
Nikolaj Bjorner df6b1a707e remove proof_converter from tactic application, removing nlsat_tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-17 23:32:29 -08:00
Nikolaj Bjorner 0d15b6abb7 add stubs for converting assertions, consolidate filter_model_converter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-17 14:51:13 -08:00
Nikolaj Bjorner 454e12fc49 update to vector format 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-10 15:28:16 -08:00
Nikolaj Bjorner 75b8d10f48 add backtrack level to cuber interface 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-08 21:44:21 -08: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
Nikolaj Bjorner 3de8c193ea implementing model updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-30 16:11:51 -05:00
Nikolaj Bjorner 92b5301b7f adding Cube method to .NET API, removing lookahead and get-lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-29 08:57:24 -07:00
Nikolaj Bjorner e4b595d490 add solver pool abstraction for Spacer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-28 16:10:20 -07:00
Nikolaj Bjorner e7aa6455bc fix #1326 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 19:25:25 -07:00
Nikolaj Bjorner 0589a20b46 fix #1326 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 19:24:45 -07:00
Nikolaj Bjorner e507a6ccd1 adding incremental cubing from API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-28 09:06:17 -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 ae9a6664d4 add cube mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 10:53:57 -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
Christoph M. Wintersteiger db398eca7a Tabs, formatting. 2017-09-17 17:50:05 +01:00
Nikolaj Bjorner 77008dc411 Merge pull request #1226 from NikolajBjorner/master 
removing dependencies on simplifier, support SMTLIB2 parametric algebraic datatypes.
This is a breaking change. It introduces two substantial changes:
1. The legacy simplifier is removed. It was obsoleted with the introduction of the rewriter facilities, but many dependencies made it a major change to remove the legacy simplifier. All uses of the legacy simplifier have now been replaced by corresponding calls to the rewriter. It means that some normalization may behave differently. At this point, Z3 passes regressions and passes performance tests without regressing.
2. Algebraic datatypes in the form of SMT-LIB2.6 are now supported. These generalize the datatypes supported so far as parametric datatype constructors may be applied to different arguments within a recursive definition.
 2017-09-11 00:40:51 +03:00
Nikolaj Bjorner 1d6f53c310 fix #1248, fix #1249 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-07 05:32:07 -07:00
Nikolaj Bjorner 2897b98ed2 remove simplify dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 00:37:22 -07:00
Nikolaj Bjorner 2b82fd5d0c updated include directives 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-01 10:51:47 -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 b482dbd589 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 17:02:27 -07:00
Nikolaj Bjorner 08524a2d90 cleanup for warning message 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-01 11:47:17 -07:00
Nikolaj Bjorner 9d1852343c add separate get-objectives command #1107 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 16:34:38 -07:00
Nikolaj Bjorner 7386f2e045 #1101 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 14:18:53 -07:00
Nikolaj Bjorner ce592d7716 add facility to add lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-12 19:44:02 -07:00
Dan Liew 4b517b96df [CMake] Move CMake files into their intended location so the 
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
 2017-06-12 11:59:00 +01:00
Nikolaj Bjorner af6ebbcd92 init search before returning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-11 13:08:05 -07:00
Nikolaj Bjorner d5f646929e print success #1068 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:16:36 -07:00
Nikolaj Bjorner c870b77366 fixes to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-08 17:25:06 -07:00
Nikolaj Bjorner e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner f3a0b7e0cd change command-line experience for pareto fronts. It now requires multiple check-sat calls to loop over the fronts. This allows querying each model in turn. #1008 2017-05-23 20:05:10 -07:00
Nikolaj Bjorner f90ae40480 Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt 2017-05-22 12:53:19 -07:00
Nikolaj Bjorner 911b24784a merge LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 10:46:11 -07:00
Nikolaj Bjorner b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Nikolaj Bjorner cc7a176c89 update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:32:03 -07:00
Nikolaj Bjorner eeb79e1c3c update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:30:54 -07:00
Nikolaj Bjorner ed0b2be618 fix bug in tracking levels of variables: levels are not cleared, only truth assignment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 14:10:07 -07:00
Nikolaj Bjorner 8205b45839 initial integration of opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-27 19:13:00 -07:00
Nikolaj Bjorner a048d74bae adding interval designator to output of non-optimal objectives, fix python doc test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 14:05:33 -07:00
Nikolaj Bjorner e4b9080165 include timeout/rlimit parameters in optmize 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 15:04:13 +08:00
Nikolaj Bjorner c99205fa7e return box model based on index. Issue #955 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-31 08:12:53 -07:00
Nikolaj Bjorner ec47706226 fix constant offset and handling of ite in difference logic optimizer code-path. Issue #946 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-24 02:23:50 -07:00
Nikolaj Bjorner c56c7fd649 add handlers for dense difference logic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-24 01:31:00 -07:00
Nikolaj Bjorner a0237ed2a6 fix crash reported in #946 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-16 18:56:43 -07:00
Nikolaj Bjorner 05c5b3b07b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:45:52 +01:00
Nikolaj Bjorner 5f5819f029 fix xor handling, and defaults for cardinality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:44:41 +01:00
Nikolaj Bjorner 829519b837 fix bug for bit-vector optimization. Issue #928 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-08 10:19:35 +01:00
Nikolaj Bjorner 41e6fafc58 fix bug for bit-vector optimization. Issue #919 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-08 10:07:31 +01:00
Nikolaj Bjorner e9b49644b2 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-25 16:20:33 -08:00
Nikolaj Bjorner e02160c674 expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-24 11:07:40 -08:00
Nikolaj Bjorner 690689424d fix parallel solving bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-11 15:35:13 -05:00
Nikolaj Bjorner fe105d94a0 fixes to sat-par 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 12:00:35 -08:00
Nikolaj Bjorner 0b711c5ef8 adding drat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-03 15:41:08 -08:00
Nikolaj Bjorner 6bb0b196e2 fix conflict level detection bug with plugins 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-02 11:04:15 -08:00
Nikolaj Bjorner e9e0293d1a local updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-02 10:19:51 -08:00
Nikolaj Bjorner bd0bd6052a Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-02 10:19:21 -08:00
Nikolaj Bjorner 9ca52a3361 fix bug in lexicographic handling in maxres: previous assumptions were not committed in corner cases 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-02 10:19:11 -08:00
Nikolaj Bjorner 9cfd412cd0 enable pb theory always as pb terms can be introduced during transformations. Issue #884 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-01 15:28:29 -08:00
Nikolaj Bjorner 669c018242 updates on cardinality solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-01 07:43:43 -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 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 aaf6e67ec8 add restart.max parameter to control cancellation based on restart count 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-25 17:43:47 -08:00
Nikolaj Bjorner 2bd29548da improve parser error message over API, streamline names of statistics for arithmetic solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-25 17:27:56 -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 2307a7ffa7 fix bug in handling of repeated soft constraints. #815 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-11 10:19:57 +01:00
Nikolaj Bjorner dea3b8ddf7 address warnings from #836 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-10 13:14:36 +01:00
Nikolaj Bjorner 0ab2067b69 produce error message for cores with optimization. Issue #825 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-09 13:15:40 +01:00
Nikolaj Bjorner 024082a45f adding preferred sat, currently disabled, to wmax. Fixing issue #815 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-30 09:52:05 -08:00
Nikolaj Bjorner df0e3a100c tune initialization for wmax and sortmax 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-19 08:04:06 -08:00
Nikolaj Bjorner ea601dd403 fix and coallesce clique functionality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-19 03:55:48 -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 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 84172302a2 fix bug in mutex extraction, reported by Patrick Trentin 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-01 00:16:16 +01:00
Nikolaj Bjorner ba942af5a8 disable sat solver when proofs are turned on. Fixes issue #768 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-31 23:27:39 +01: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 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 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 619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-07 12:42:08 -07:00
Nikolaj Bjorner f452895f5f add mutex pass 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-04 14:45:23 -07:00
Nikolaj Bjorner e3f0aff318 address ubuntu warning and add shortcuts for maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-03 16:22:13 -07:00
Nikolaj Bjorner b2db2f1eb6 allow negative weights for weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-02 10:21:58 -07:00
Nikolaj Bjorner 527c5191a6 Add C++ functions for set operations per stackoverflow post, set relevancy = 2 for quantified maxsmt per example from Aaron Gember, fix conversion of default weights based on bug report from Patrick Trentin on maxsat. Annotating soft constraints with weight=0 caused the weight to be adjusted to 1 and therefore produce wrong results 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-09-21 12:24:24 -07:00
Nikolaj Bjorner 491b3b34aa tune consequence finding. Factor solver pretty-printing as SMT-LIB into top-level 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-08-03 11:14:29 -07:00
Nikolaj Bjorner cb2d8d2107 add detection of non-fixed variables to consequence finding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-30 19:12:41 -07:00
Nikolaj Bjorner 56c78753f0 updating default solver selection. Add dt2bv transformation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-24 18:16:32 -07:00
Nikolaj Bjorner 3581f6de42 remove stale SLS option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-21 18:18:42 -07:00
Nikolaj Bjorner f522d995d1 apply 'to-real' coercion only on integers. bug reported by Geoff 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-20 19:03:25 -07:00
Nikolaj Bjorner 4f5b0667ef fix rounding mode for pseudo-boolean constraint creation, Issue #683 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-14 12:34:18 -07:00
Nikolaj Bjorner 5d5004193b avoid crash on box models under cancellation. Issue #654 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-29 04:54:31 -07:00
Nikolaj Bjorner 0fdf01e410 avoid crash on box models under cancellation. Issue # SASSERT(!m_box_models.empty()); 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-29 04:53:28 -07:00
Nikolaj Bjorner c72ed3e6b4 update core minimization code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-23 21:39:28 -07:00
Nikolaj Bjorner 5b497b6249 reduce set of mainly verbose warnings raised by -Wmaybe-uninitialized and unused variable warnings from release mode builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-22 20:25:47 -07:00
Nikolaj Bjorner 9c099d6b1b fix mb maximization logic, so far not accessible 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-20 16:39:03 -07:00
Nikolaj Bjorner c7ff05cc78 enable core minimization with qsat in case it turns out to be useful 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-12 15:58:12 -07:00
Nikolaj Bjorner 9f5a117443 move mus to solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-10 16:24:14 -07:00
Nikolaj Bjorner c725fe7698 tune lra optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-22 17:03:29 -07:00
Nikolaj Bjorner 1aa3fdab8a remove min/max, use qmax; disable cancellation during model evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-19 13:04:20 -07:00
Nikolaj Bjorner 96e157e201 fix warnings for unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 13:54:22 -07:00
Nikolaj Bjorner ec565ae7a0 fixes to #596 and #592: use exponential step increments on integer problems, align int.to.str with canonizer and disequality checker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 01:00:42 -07:00
Nikolaj Bjorner 5b31f54501 max/min 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-05 14:11:13 -07:00