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

5531 commits

Author SHA1 Message Date
Murphy Berzish 41a242fab1 Merge branch 'upstream-master' into develop 
Conflicts:
	src/smt/params/smt_params.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_case_split_queue.cpp
	src/smt/smt_context.h
	src/smt/smt_setup.cpp
	src/smt/smt_setup.h
 2017-05-03 17:03:13 -04:00
Murphy Berzish ede6d7bb2b add iterator accessors to obj_pair_set 2017-05-03 14:55:22 -04:00
Nikolaj Bjorner 1177be6391 add common utility to set up seq 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 20:52:39 -07:00
Nikolaj Bjorner 52dfdedb9b Merge pull request #1000 from mtrberzi/theory_str-smt-setup 
smt_setup for strings/sequences
 2017-05-02 20:44:23 -07:00
Nikolaj Bjorner cc7a176c89 update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:32:03 -07:00
Nikolaj Bjorner eeb79e1c3c update to retain original behavior 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 19:30:54 -07:00
Nikolaj Bjorner 561a4331a8 add back use of all variables for tracking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 16:36:05 -07:00
Nikolaj Bjorner cec6ced457 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-05-02 15:57:41 -07:00
Nikolaj Bjorner 21cda27f5e fix quadratic behavior of extract_assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 15:57:31 -07:00
Nikolaj Bjorner 5b0286001b Merge pull request #999 from mtrberzi/theory-aware-branching 
Theory-aware branching heuristic
 2017-05-02 15:32:37 -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 ed0b2be618 fix bug in tracking levels of variables: levels are not cleared, only truth assignment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 14:10:07 -07:00
Murphy Berzish a418f0c30b fix spacing 2017-05-02 15:52:35 -04:00
Murphy Berzish e6d527c5d5 remove trace code from theory_arith 2017-05-02 15:39:15 -04:00
Murphy Berzish 15cb2d7dba cleanup 2017-05-02 14:08:48 -04:00
Murphy Berzish a8d069ba46 refactor: add asserts, use case split strategy param 2017-05-02 13:06:08 -04:00
Murphy Berzish 5b4792955d theory-aware branching heuristic 2017-05-02 10:43:40 -04:00
Murphy Berzish 6cd1f877b8 params for theory aware branching 2017-05-02 10:39:32 -04:00
Murphy Berzish 0862949e66 Merge branch 'upstream-master' into develop 
Conflicts:
	src/smt/params/smt_params.cpp
	src/smt/params/smt_params.h
	src/smt/smt_context.cpp
	src/smt/smt_context.h
 2017-05-01 21:33:23 -04:00
Nikolaj Bjorner 48e37b0e16 pass qhead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:54:22 -07:00
Nikolaj Bjorner 8ba78081ec fix build break 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:41:17 -07:00
Nikolaj Bjorner 61e0fc9099 Merge pull request #995 from mtrberzi/theory-case-split 
Theory case split heuristic (for theory_str)
 2017-05-01 15:27:45 -07:00
Murphy Berzish 16a5e944d7 use reference for case split sets 2017-05-01 18:25:54 -04:00
Nikolaj Bjorner f9105edb14 revert to native chunker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:52 -07:00
Murphy Berzish b86d472eaf simplify theory case split handling 2017-05-01 18:22:49 -04:00
Nikolaj Bjorner d14f2af5ae deal with subtraction that manages to sneak in. Issue #996 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:06 -07:00
Murphy Berzish 3bce61e0d4 fix warning 2017-05-01 10:43:33 -04:00
Murphy Berzish 2f56d128b0 add theory case split support to smt_context 2017-05-01 10:34:43 -04:00
Murphy Berzish f655e1976e add params for theory case split 2017-05-01 10:18:38 -04:00
Nikolaj Bjorner aceee3fac8 renmae to opt_stream_buffer to avoid clash with dimacs stream buffer. #994 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 12:54:29 -07:00
Nikolaj Bjorner 0693a413b6 augment #955 to handle hyphen 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 12:50:56 -07:00
Nikolaj Bjorner 86f3526110 update get-value to also respect parameter model_index, #955 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 11:48:06 -07:00
Nikolaj Bjorner d6e2e1f28f Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 11:28:26 -07:00
Nikolaj Bjorner aff02ca905 include 'stopwatch.h' to avoid ODR warnings, #994 2017-04-30 11:28:11 -07:00
Nikolaj Bjorner bd1b930d7a swap argument order of chunk with file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 11:00:03 -07:00
Nikolaj Bjorner 5fcbf55216 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 10:23:05 -07:00
Nikolaj Bjorner 2c208e1d10 Sat update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-30 10:23:00 -07:00
Nikolaj Bjorner 4468816d32 fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 19:00:15 -07:00
Nikolaj Bjorner b3f720c2bf fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 18:58:34 -07:00
Nikolaj Bjorner 3152833893 fix unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 18:55:47 -07:00
Nikolaj Bjorner 944dfbc6ef Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-29 17:39:20 -07:00
Nikolaj Bjorner fa868e058e fix bound bug #991 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 17:39:02 -07:00
Murphy Berzish 88147f7047 theory_str static features and cmd_context 2017-04-28 14:14:28 -04:00
Murphy Berzish d51ebac10a remove references to str_fid 2017-04-28 14:01:44 -04:00
Murphy Berzish f1cee803e8 fixup 2017-04-28 13:44:48 -04:00
Murphy Berzish d2ae94935e Merge branch 'upstream-master' into develop 
Conflicts:
	src/ast/rewriter/seq_rewriter.cpp
	src/ast/seq_decl_plugin.h
 2017-04-28 13:43:14 -04:00
Nikolaj Bjorner 62a36189d5 Merge pull request #988 from mtrberzi/theory_str-frontend 
Frontend changes for theory_str
 2017-04-28 08:21:18 -07:00
Murphy Berzish 05958193ab revert change to String sort declaration 2017-04-27 22:30:02 -04:00
Murphy Berzish 12dd6d786b remove redundant is_seq() check 2017-04-27 21:24:40 -04:00
Murphy Berzish 7811a91bad fix is_string_term() 2017-04-27 13:59:02 -04:00
Murphy Berzish 334677a7eb fix is_string_term() 2017-04-27 13:58:36 -04:00
Nikolaj Bjorner 69aa5ca877 Merge pull request #984 from delcypher/cmake_doxygen 
[CMake][Doxygen] Support building/installing API documentation and fix lots of bugs
 2017-04-27 06:58:32 -07:00
Nikolaj Bjorner d3b30968fa added chunk based backbone utility 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 16:55:56 -07:00
Murphy Berzish 46ac718790 theory_str frontend changes 2017-04-26 17:24:05 -04:00
Murphy Berzish d16b20d62b Merge branch 'upstream-master' into develop 2017-04-26 17:21:10 -04:00
Nikolaj Bjorner a048d74bae adding interval designator to output of non-optimal objectives, fix python doc test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 14:05:33 -07:00
Nikolaj Bjorner 8032217fd1 tuning and fixing consequence finding, adding dimacs evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-26 13:53:37 -07:00
Dan Liew fe702d7782 [Doxygen] Fix warning about non-existent functions. 
`Z3_push` and `Z3_pop` should be `Z3_solver_push` and `Z3_solver_pop`
respectively.
 2017-04-26 10:42:57 +01:00
Dan Liew 7242a77a3f [Doxygen] Fix typo found with Doxygen warning 
```
warning: Found unknown command `\s'
```
 2017-04-26 10:42:57 +01:00
Dan Liew eb1c985a94 [Doxygen] Fixed malformed code blocks in z3_api.h. 
These malformed `\code` blocks caused broken documentation to
be generated.
 2017-04-26 10:42:57 +01:00
Nikolaj Bjorner dedc130e98 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-25 10:30:16 -07:00
Nikolaj Bjorner bd8b0186d6 make SMT consequence finding work with compound terms and formulas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-25 10:30:10 -07:00
Murphy Berzish 6fececaad9 fix str/seq parameter config 2017-04-24 21:47:31 -04:00
Nikolaj Bjorner 48b62d34b7 make sure consequence generation works with interpreted atoms/terms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-24 18:08:52 -07:00
Murphy Berzish 54e28a4fe7 string/sequence static features test 2017-04-24 21:02:22 -04:00
Murphy Berzish 3fe49137d0 fix trace typos 2017-04-24 19:25:35 -04:00
Nikolaj Bjorner 34acaa8f56 update license for space/quotes per #982 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-24 13:34:10 -07:00
Murphy Berzish 8ce93b4ee5 unify tracing in theory_str to 'str' tag 2017-04-24 15:39:25 -04:00
Murphy Berzish c46f95a629 remove unused parameter from smt_context 2017-04-24 12:39:55 -04:00
Murphy Berzish 9e8a4e2a01 Merge branch 'upstream-master' into develop 
Conflicts:
	src/smt/smt_context.cpp
 2017-04-24 12:28:16 -04:00
Bruce Collie ce67c8277c Return check result in fixedpoint object 
This is a small change to fix a missing return statement.
 2017-04-24 12:59:44 +00:00
Nikolaj Bjorner 5068d2083d tidy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-22 11:36:03 -07:00
Murphy Berzish 367cc4b77f check result of unsat core validation 2017-04-22 13:36:09 -04:00
Murphy Berzish 06cd07e3c2 Merge branch 'theory-assumptions' into develop 
Conflicts:
	src/smt/smt_context.cpp
	src/smt/smt_context.h
	src/smt/smt_theory.h
 2017-04-22 13:31:43 -04:00
Murphy Berzish a1bb1f2a13 pre-init assumptions and unsat core validation for smt theories 2017-04-22 13:15:00 -04:00
Murphy Berzish 5cfe5e15ac unsat core validation for smt theories 2017-04-21 17:51:14 -04:00
Christoph M. Wintersteiger 0a0b17540f Added rlimit.inc() for expensive interval exponentiation in the non-linear arithmetic theory. 2017-04-19 13:07:04 +01:00
Christoph M. Wintersteiger a02a7f4443 Whitespace 2017-04-19 13:04:04 +01:00
Murphy Berzish bef64961ae add pre-init assumptions for smt theories 2017-04-18 13:12:03 -04:00
Christoph M. Wintersteiger 71da36f85c Added core.extend_nonlocal_patterns parameter to improve unsat cores. 2017-04-18 15:13:11 +01:00
Nikolaj Bjorner 66e61b8a31 issues #963 #912 2017-04-17 03:06:38 -07:00
Nikolaj Bjorner 8b5627e361 additional API per #977 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-16 12:13:30 +09:00
Nikolaj Bjorner 9933c36050 replace long by int 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 17:06:03 +08:00
Nikolaj Bjorner ab6abe901f replace long by int 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 15:57:30 +08:00
Nikolaj Bjorner 87c3b5ee51 replace uint by long 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 15:29:02 +08:00
Nikolaj Bjorner e4b9080165 include timeout/rlimit parameters in optmize 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 15:04:13 +08:00
Nikolaj Bjorner 48638c6f1e fix for #975, add mask to ensure character encoding is unique within range of bits used for encoding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 09:34:13 +07:00
Nikolaj Bjorner 7bb5e72e07 add missing string/re operations #977 and adding Pseudo-Boolean operations to Java API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-15 09:09:30 +07:00
Murphy Berzish a7f72bf4ef add overlap assumption to other cases in theory_str 2017-04-13 13:46:23 -04:00
Murphy Berzish 7207cabc97 experimental new unsat core based overlap detection 2017-04-12 17:09:35 -04:00
Nikolaj Bjorner 4140afa4cb add regular expression membership for range of int.to.str functions. Issue #957 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-11 10:49:42 +08:00
Nikolaj Bjorner be3cc91323 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-11 07:40:30 +08:00
Nikolaj Bjorner 67513a2cf5 fix detection of bounds under conjunctions. Issue #971 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-11 07:40:09 +08:00
Christoph M. Wintersteiger b67c1c5501 Fixed valgrind warning. Fixes #972 2017-04-10 16:28:41 +01:00
Nikolaj Bjorner 80c10d5833 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-07 21:22:48 -07:00
Nikolaj Bjorner ec29a03c8f add facility to dispense with cancellation (not activated at this point). Address #961 by expanding recurisve function definitions that are not tautologies if the current model does not validate 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-07 21:22:38 -07:00
Christoph M. Wintersteiger 27a1758857 Added rewriter.ignore_patterns_on_ground_qbody option to disable simplification of quantifiers that have their universals appear only in patterns, but otherwise have a ground body. 2017-04-07 21:19:20 +01:00
Christoph M. Wintersteiger 7d35fcb17e Avoid null pointer warnings in justifications. 2017-04-05 19:42:02 +01:00
Murphy Berzish eef2bbadad remove obsolete PARAM_STRING from ast 2017-04-04 20:29:48 -04:00
Murphy Berzish f881e85470 remove old theory_str enums from api 2017-04-04 17:54:18 -04:00