3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Commit graph

6399 commits

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