3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 09:35:32 +00:00
Commit graph

155 commits

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