3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Commit graph

7059 commits

Author SHA1 Message Date
Nikolaj Bjorner
77aac8d96f fix handling of global parameters, exceptions when optimization call gets cancelled
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 17:04:10 -08:00
Murphy Berzish
179b0f7630 clean up todos theory_str 2017-02-21 19:52:27 -05:00
Murphy Berzish
15e3d3ec3c octal escape theory_str 2017-02-21 15:51:08 -05:00
Nikolaj Bjorner
122a12c980 fix build on downlevel compilers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-21 09:12:10 -08:00
Nikolaj Bjorner
98c5a779b4 add xor parity solver feature
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-20 16:55:00 -08:00
Murphy Berzish
a081d81941 remove local dev files from gitignore 2017-02-20 13:27:36 -05:00
Nikolaj Bjorner
cb050998e5 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:35:46 -08:00
Nikolaj Bjorner
2885ca7714 tune cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:35:31 -08:00
Nikolaj Bjorner
0cf5af121a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-19 11:32:18 -08:00
Nikolaj Bjorner
dc588b54f7 add sorting-based pb encoding in the style of minisat+
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-19 11:31:34 -08:00
Murphy Berzish
fe1a976c21 fix merge remnant 2017-02-18 15:25:04 -05:00
Murphy Berzish
235ea79043 Merge branch 'upstream-master' into release-1.0
Conflicts:
	src/cmd_context/check_logic.cpp
	src/cmd_context/cmd_context.cpp
	src/cmd_context/cmd_context.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_context.cpp
2017-02-18 15:04:44 -05:00
Murphy Berzish
90705cfd5f remove todo from str api 2017-02-17 13:28:52 -05:00
Nikolaj Bjorner
b0dd3f3238 add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 13:58:12 -08:00
Nikolaj Bjorner
7e391a8a57 add option to disable cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 08:38:38 -08:00
Nikolaj Bjorner
2bcb875559 add option to disable cardinality solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-16 08:36:16 -08:00
Murphy Berzish
2e27e1cd36 fix obj_map insertions theory_str 2017-02-15 16:08:54 -05:00
Murphy Berzish
d67f732c7c theory_str data structure refactoring 2017-02-15 13:39:55 -05:00
Nikolaj Bjorner
c67cf1653c use non _ method from z3printer module so to be resilient against how _ is handled as indicator of private functions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-15 08:46:58 -08:00
Murphy Berzish
f9b3c47bf5 remove commented-out old worklists 2017-02-14 18:45:09 -05:00
Murphy Berzish
d5b1e4b015 refactor theory_str: all library-aware/high-level terms are in one worklist 2017-02-14 18:44:40 -05:00
Murphy Berzish
3e714075c4 theory_str refactor: check_contain_by_substr uses contain_pair_idx_map 2017-02-14 16:09:45 -05:00
Murphy Berzish
52eaae9da0 theory_str refactor: check_contain_by_eqc_val uses contain_pair_idx_map 2017-02-14 15:19:03 -05:00
Murphy Berzish
5ca4f2a1c8 theory_str cleanup 2017-02-13 17:15:13 -05:00
Murphy Berzish
e699f25889 theory_str cleanup 2017-02-13 16:24:32 -05:00
Nikolaj Bjorner
216e17e5e2 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-02-13 08:16:43 -08:00
Nikolaj Bjorner
e7a21dfac2 add par_and_then
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-13 08:16:39 -08:00
Nikolaj Bjorner
c347018cb8 testing lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-12 11:49:30 -08:00
Nikolaj Bjorner
42deeb3498 testing lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-12 11:49:07 -08:00
Nikolaj Bjorner
6fcba26ea6 make parameters accessible from expressions. Issue #896
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-12 09:56:49 -08:00
Murphy Berzish
3670fa64e6 add hex escape support theory_str 2017-02-11 16:59:06 -05:00
Nikolaj Bjorner
b3dabc7ccf add missing mod/rem/is_int functionality to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 16:28:15 -05:00
Nikolaj Bjorner
4c6efbbc8b expose numerator/denominators for Martin and Giles
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 16:02:51 -05: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
b42973152f fix model generation for non-linear expressions, reported by Martin Suda and Giles Reger
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 12:02:32 -05:00
Nikolaj Bjorner
4220432ac3 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-11 11:57:47 -05:00
Nikolaj Bjorner
8f7c804e86 fix non-linear model bug found Giles Reger and Martin Suda
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 11:57:27 -05:00
Nikolaj Bjorner
3a0e9e8f53 add itos/stoi conversion to API. Issue #895
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 11:31:13 -05:00
Nikolaj Bjorner
8b4f3ac6f0 fix drat checker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-10 18:04:54 -05:00
Nikolaj Bjorner
6b4aec9b74 fixing bugs in dealing with non-0 based cardinality constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 20:59:28 -08:00
Nikolaj Bjorner
eaf845c2f4 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 18:04:24 -08:00
Nikolaj Bjorner
b6b6035cfb tuning and fixing drat checker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-07 16:50:39 -08:00
Murphy Berzish
c456795acd temporarily remove finite model finding from theory_str 2017-02-07 17:14:11 -05:00
Murphy Berzish
55cb440aae add cut var info for theory_str processtype2 2017-02-07 14:41:16 -05:00
Nikolaj Bjorner
54f2063c81 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-02-06 21:20:01 -08:00
Nikolaj Bjorner
61ade5e6cb tune cardinality solver for cache misses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 20:57:08 -08:00
Nikolaj Bjorner
66089a7aef fix compiler errors and memory issue with drat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 16:09:46 -08:00
Nikolaj Bjorner
4831c45ad8 fix issues in par
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 13:38:07 -08: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
7aeaf11ee4 adding clause sharing to par mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-05 22:24:20 -08:00