3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-11 03:33:35 +00:00
Commit graph

45 commits

Author SHA1 Message Date
Bruce Mitchener 373b691709 Use 'override' where possible. 2018-10-02 10:26:38 +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
Nikolaj Bjorner 9635a74e52 add clausification features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-12 08:23:22 -08: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 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 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 d5f646929e print success #1068
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:16:36 -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 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 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 5b31f54501 max/min
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-05-05 14:11:13 -07:00
Nikolaj Bjorner fe4f3e7772 fix regressions exposed in QF_LIA: manager got initialized early and Euclidean solver is not safe even with some throttle
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-23 20:38:18 -07:00
Nikolaj Bjorner 45fdb95f53 fix performance for model construction, recognize concats of values as a value for pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-03-23 17:23:57 -07:00
Nikolaj Bjorner baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Nikolaj Bjorner 655b44c07b make :weight understand both decimal and integral values, remove dweight, remove deprecated commands for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-15 00:48:22 +02:00
Nikolaj Bjorner ed7e0e11a8 n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-28 20:55:13 -07:00
Nikolaj Bjorner 4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner 03979fd580 fix up pareto callback mechanism
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 12:48:17 -07:00
Nikolaj Bjorner fdaeb9bb73 integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:15:50 -07:00
Nikolaj Bjorner 5adb4a22d1 enable partial results
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:23:37 -08:00
Nikolaj Bjorner 8c85ee6b7c fixing lex optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-13 23:36:42 +01:00
Nikolaj Bjorner f41d23bc0f debugging model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-12 12:18:34 -06:00
Nikolaj Bjorner 838a32206c adjust parsing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 14:10:07 -08:00
Nikolaj Bjorner 18815e3e53 reorganizing input
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 13:36:25 -08:00
Nikolaj Bjorner c14c778735 debugging multi-objective interface and pb revisions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 14:30:17 -08:00
Nikolaj Bjorner faa59ba7f9 debugging multi-objective interface and pb revisions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 14:14:44 -08:00
Nikolaj Bjorner 191efbb72f use expression structure for objectives instead of custom s-expression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 13:00:51 -08:00
Nikolaj Bjorner a016caa5d8 add expression conversion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 09:47:59 -08:00
Anh-Dung Phan 5ed8a48ac2 Add push/pop to box optimization 2013-11-26 14:16:59 -08:00
Anh-Dung Phan 4aa9c742ab Revise optimize commands 2013-11-26 12:54:18 -08:00
Nikolaj Bjorner 6e1c186017 enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:55:01 -08:00
Nikolaj Bjorner 9f53a4aa18 working on supporting multiple max-sat objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 16:54:34 -08:00
Nikolaj Bjorner c0de1e34ac working on upper bound optimziation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-03 14:54:42 -08:00
Nikolaj Bjorner 86151b4d52 dealing with cancel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:38:47 -07:00
Nikolaj Bjorner 946b888b32 adding timeout, parameters, statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:24:21 -07:00
Nikolaj Bjorner 9fc84f1389 adding timeout, parameters, statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:23:04 -07:00
Nikolaj Bjorner 3dd72f8f16 more updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-19 17:43:59 -07:00
Nikolaj Bjorner 3996f58a8e tidy & todo notes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-19 12:22:56 -07:00
Anh-Dung Phan a44044fb15 A rudimentary version of MathSAT optimization
Remarks:
(1) The core procedure accepts maximization only
(2) Add lazy initialization to min_maximize_cmd
(3) The procedure isn't working with composite objective yet.
2013-10-18 18:00:24 -07:00
Anh-Dung Phan f4e2b23238 Create placeholders to optimization methods 2013-10-16 17:56:35 -07:00
Nikolaj Bjorner 8ae0b06912 fill in details on max sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-16 02:07:30 -07:00
Anh-Dung Phan ac97a12bb8 Create callbacks for min_maximize_cmd
Enable VS_PROJ = true for temporary use
2013-10-15 11:52:27 -07:00
Nikolaj Bjorner 726f66a77c initial opt commands
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-14 17:08:24 -07:00