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

215 commits

Author SHA1 Message Date
Nuno Lopes cef17c22a1 remove some allocs from exceptions 2018-07-02 17:08:02 +01:00
Nuno Lopes 8791f61aa7 reduce mem allocation in tactic API 2018-07-02 13:41:44 +01:00
Arie Gurfinkel 176c0a97f7 Gracefully handle absence of a proof 2018-06-27 22:49:35 -04: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 74621e0b7d first eufi example running 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 6d79b19170 fix a few bugs, debugging eufi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner c3fb863ad1 formatting/reviewing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner bfeb15b876 move to list of clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:50 -07:00
Arie Gurfinkel bebfac047e Dump benchmarks in pool_solver 2018-06-14 16:08:50 -07:00
Arie Gurfinkel 26339119e4 solver::check_sat_cc : check_sat assuming cube and clause 
Extends check_sat with an ability to assume a single clause in
addition to assuming a cube of assumptions
 2018-06-14 16:08:50 -07:00
Arie Gurfinkel ef58753ae7 Silence clang warning 2018-06-14 16:08:50 -07:00
Nikolaj Bjorner 005a6d93bb cube and clause 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:50 -07:00
Nikolaj Bjorner b73aa3642a check with cube and clause 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Arie Gurfinkel 80c39eb037 Fix solver_pool::updt_params 2018-06-14 16:08:49 -07:00
Arie Gurfinkel 180d38378a Add additional API to solver_pool 2018-06-14 16:08:49 -07:00
Arie Gurfinkel d06f4bd337 Fix reset of params_ref in solver 
params_ref is not a ref, and params_ref::reset is not ref::reset.

params_ref::reset resets the params object being pointed to by
params_ref.

A proper way to reset a params_ref as a reference is to assign an
empty params_ref object to it.
 2018-06-14 16:08:49 -07:00
Arie Gurfinkel 1da002d7b1 scoped params on solver 
solver::push_params() saves current parameters
solver::pop_params() restores previously saved parameters
 2018-06-14 16:08:49 -07:00
Arie Gurfinkel 49821e7c91 Revised solver_pool 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner b649cd93cb change pool solver to enable external control of pool allocation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner f5775f265a fix python build script dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-23 09:21: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 f2bee7f16a fix build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-12 10:03:20 -07:00
Nikolaj Bjorner 9e2625e629 add support for core extraction in parallel mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-12 07:49:11 +02:00
Nikolaj Bjorner c151ae98f8 fix osx build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-09 18:20:37 +01: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 202d497be8
Merge branch 'master' into opt 2018-05-02 12:32:14 -07:00
Nikolaj Bjorner 6bff15e12e fix #1609 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-02 10:38:46 -07:00
Nikolaj Bjorner 454d20d23e fix build errors 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-01 10:06:54 -07:00
Nikolaj Bjorner f525f43e43 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 09:30:43 -07:00
Nikolaj Bjorner 859c68c2ac merge with opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 08:27:54 -07:00
Nikolaj Bjorner 2f025f52c0 fix local search initialization of units, encode offset in clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-28 22:26:01 +02:00
Christoph M. Wintersteiger a1d870f19f Added tactic for QF_FPLRA 2018-04-24 12:43:11 +01:00
Nikolaj Bjorner 8ccec28cb9 remove extra file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-16 10:08:55 -07:00
Nikolaj Bjorner 0150a4bf3f add params 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-16 10:08:10 -07:00
Nikolaj Bjorner a37303a045 move parallel-tactic to solver level 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-16 08:21:21 -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 718e5a9b6c add unit extraction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-06 01:08:17 -08:00
Nikolaj Bjorner 00c3f4fdcd fix bugs found while running sample from #1112 in debug mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-28 22:35:41 +09:00
Bruce Mitchener 76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07:00
Bruce Mitchener b7d1753843 Use override rather than virtual. 2018-02-09 21:19:27 +07:00
Nikolaj Bjorner fa0c75e76e rename to core2 to avoid overloaded virtual 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 15:13:13 -08:00
Nikolaj Bjorner 5a8154c156 fix errors 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-07 14:47:16 -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 ae728374c8 disable buggy clausification in ba_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-15 17:20:19 -08:00
Nikolaj Bjorner 6b258578f9 fix uninitialized variable m_gc_burst in config, have cuber accept and receive optional vector of variables indicating splits and global autarky as output 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-14 02:38:45 -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 7afbf8165e snapshot 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-12 01:36:44 -08:00
Nikolaj Bjorner 427b5ef002 set eliminated to false on literals used in clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-30 11:20:19 -08:00
Nikolaj Bjorner 7e56d05dcf translation? 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-28 15:17:00 -08:00
Nikolaj Bjorner fbae881ece add option to bypass model converter during constraint addition. Simplify model definitions that come from blocked clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-27 16:24:14 -08:00
Nikolaj Bjorner 8230cbef4c fix mc efficiency issues 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-22 08:55:21 -08:00
Nikolaj Bjorner 107bfb1438 print model-add in display method 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-21 21:26:07 -08:00
Nikolaj Bjorner 2313b14210 include mc0 for display method 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-21 20:40:43 -08:00
Nikolaj Bjorner 33e8113c9e adding instrumentation to debug #1233 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-20 16:51:17 -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 b3bd9b89b5 prepare for inverse model conversion for formulas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-17 19:55:23 -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 ee3ed3a27a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-09 09:55:41 -08:00
Nikolaj Bjorner 700f413e26 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-09 09:55:37 -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 59ea11b1a3 cube and conquer parallel tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-04 13:40:31 -05:00
Nikolaj Bjorner 6df3e47b07 disable symbol fixing in pretty printer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-02 09:53:47 -05: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 caaf0ba33c model-add/del 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-01 22:32:22 -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 2227db215e fix build break with virtual method override 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-28 16:58:16 -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 32711790e8 bug fixes reported by Miguel 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-25 13:36:48 -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 ae9a6664d4 add cube mode 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-24 10:53:57 -07:00
Nikolaj Bjorner 651587ce01 merge with master branch 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-19 09:39:22 -07:00
Nikolaj Bjorner 8ff1e070be add QF_DT 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-09-17 01:39:39 +02:00
Nikolaj Bjorner 7a977f0106 ensure that timeouts are distinguished from other cancel events #848 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-18 14:54:54 -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 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 c870b77366 fixes to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-08 17:25:06 -07:00
Nikolaj Bjorner 19d4b0a97a resolve conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:38:37 -07:00
Nikolaj Bjorner 4e65c13726 adding lookahead and lemmas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 14:49:54 -07:00
Nikolaj Bjorner 7d245be4e1 enable exposing internal solver state on interrupted solvers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-30 17:33:27 -07:00
Nikolaj Bjorner 2de80b5ce9 add pb built in ops for logic ALL #1045 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-29 10:08:50 -07:00
Murphy Berzish 92755b0185 smt_setup framework, all hooks to theory_str are redirected to theory_seq 2017-05-02 17:16:35 -04:00
Nikolaj Bjorner 854bb2197f include recursive functions to models. Issue #898 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-08 21:41:24 -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
Christoph M. Wintersteiger 5682c43604 Merge pull request #881 from dwoos/tactic-labels 
Thread labels through tactic system
 2017-02-04 20:37:11 +00:00
Nikolaj Bjorner f015e3e4cc fix bug in propagation of parameters to combined solvers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-31 17:17:58 -08:00
Doug Woos 8196173e29 Introduce and use labels_vec 2017-01-30 15:50:34 -08:00
Doug Woos 5796e15088 Thread labels through tactic system 2017-01-27 11:07:13 -08:00
Nikolaj Bjorner 5cb21924ad ensure that FD logic understands pb from command context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-17 16:02:54 -08: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 51a4085910 check for logic in solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-04 15:19:11 +00:00
Nikolaj Bjorner f61600d1d8 fixing unsat core extraction for tactics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-02 14:14:55 +00:00