3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 22:59:02 +00:00
Commit graph

574 commits

Author SHA1 Message Date
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