mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-02 09:20:22 +00:00
Code Activity
19367 commits 44 branches 51 tags 170 MiB
Commit graph

103 commits

Author SHA1 Message Date
Nikolaj Bjorner
d8156aeff3 weird latent bug in wmax: init() succeeds and it returns undef 2023-04-24 21:14:42 -07:00
Nikolaj Bjorner
fdd5c923ed use only maxres if there is a lexicographic objective, fix #6697 
- maxlex.enable heuristic does not work if it is chained among multiple objectives. Only maxres is set up to commit the proper constraints.
 2023-04-24 20:20:26 -07:00
Nikolaj Bjorner
94a2477fa0 totalizer 2022-06-30 19:49:19 -07:00
Nikolaj Bjorner
c3d2120bdd add totalizer version of rc2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2022-06-29 23:10:42 -07:00
Nikolaj Bjorner
911134b3c7 add new heuristic rc2bin (to be tested) to maxsat 
The rc2bin heuristic is a hybrid of rc2 and binary maxres.
It follows the suggestion by Nina to use rc2 on large cores after a single maxres relaxation step; otherwise maxres (binary) on smaller cores. In the design space of possible hybrids, this variant chooses to always apply a single layer of maxres and then rc2 for large cores.
 2022-06-20 11:50:25 -07:00
Nikolaj Bjorner
386c511f54 core opt 2022-05-21 10:27:37 -04:00
Nikolaj Bjorner
0dd0fd26d4 remove buggy prototype 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2022-04-21 10:44:49 +01:00
Nikolaj Bjorner
c727e2d048 add rc2 option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2022-04-18 10:31:56 +02:00
Nikolaj Bjorner
c131eb4db1 build fix 2022-04-16 16:42:45 +02:00
Nikolaj Bjorner
3f5eb7fcf2 re-enable pre-process 2022-04-13 11:24:24 +02:00
Nikolaj Bjorner
ac55e29a56 disable propagation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2022-04-11 22:23:42 +02:00
Nikolaj Bjorner
c996a66da0 separate pre-processing, add callback parameter to push/pop in python API 2022-04-11 17:05:59 +02:00
Nikolaj Bjorner
405a26c585 allow adding constraints during on_model 2022-04-09 09:55:02 +02:00
Nikolaj Bjorner
4a6083836a call it data instead of c_ptr for approaching C++11 std::vector convention. 2021-04-13 18:17:35 -07:00
Nuno Lopes
23e6adcad3 fix a couple hundred deref-after-free bugs due to .c_str() on a temporary string 2020-07-11 20:24:45 +01:00
Nikolaj Bjorner
becf423c77
remove level of indirection for context and ast_manager in smt_theory (#4253) 
* remove level of indirection for context and ast_manager in smt_theory

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add request by #4252

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* move to def

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* int

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2020-05-08 16:46:03 -07:00
Nikolaj Bjorner
c2264c73f2 debug mutex 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-07-23 19:01:49 -07:00
Nikolaj Bjorner
1ed68906fa fix debug assertion code, make maxlex optional 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-25 08:23:41 -08:00
Nikolaj Bjorner
ad81fee118 adding maxlex, throttle use of asymmetric literal addition 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2019-01-24 19:26:44 -08: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
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
Arie Gurfinkel
ebf6b18821 maxsat standalone mode 2018-06-14 16:08:48 -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
e7d43ed516 fix pb rewriter 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-12 11:22:05 -07:00
Bruce Mitchener
76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07: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
9635a74e52 add clausification features 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-12 08:23:22 -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
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
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
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
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
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
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
5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-07 16:42:29 -08:00
Nikolaj Bjorner
32b6b2da44 moving to resource managed cancellation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 13:13:11 -08:00
Nikolaj Bjorner
c58e640563 extract labels for optimal model. Fix to #325 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-18 14:53:08 -08:00
Nikolaj Bjorner
c2108f74f1 fix uninitialized variable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-14 10:35:06 -08:00
Nikolaj Bjorner
653416153d use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-02 08:18:51 -08:00
Nikolaj Bjorner
0ed38ed59b add option for using corr set and use partial cores 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-30 14:48:24 -07:00
Nikolaj Bjorner
a9807878ea reworking pd-maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-20 12:20:30 -07:00
Nikolaj Bjorner
e3cb0e2d8b reworking pd-maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-20 12:06:27 -07:00
Nikolaj Bjorner
911ffc370a separate MaxSMT functionality to enable using this independently (and incrementally) of overall context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-02-16 09:11:28 +01:00