mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-27 10:55:50 +00:00
Code Activity
7324 commits 24 branches 48 tags 158 MiB
Commit graph

5989 commits

Author SHA1 Message Date
Nikolaj Bjorner
0668ba5f6c add pb shorthands to C++. Issue #694 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-14 07:58:39 -07:00
Nikolaj Bjorner
7634f8b93e Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-14 07:47:51 -07:00
Nikolaj Bjorner
1dd2de61ec add sum shorthand to C++. Issue #694 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-14 07:43:26 -07:00
hume
0b1d564509 added no exception support to z3++.h 2017-03-14 18:11:00 +08:00
Nikolaj Bjorner
51951a3683 add logging to lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-13 16:40:00 -07:00
Nikolaj Bjorner
0c7603e925 fix build of tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-13 14:39:12 -07:00
Murphy Berzish
24df976f95 fixup startswith/endswith to prefixof/suffixof 2017-03-13 17:03:36 -04:00
Murphy Berzish
94d5f242b8 Merge branch 'str-at-semantics' into develop 2017-03-13 14:40:40 -04:00
Murphy Berzish
5c9d7538a0 add alternate str.at semantics check in seq_rewriter 
this rewrites to empty string if the index is negative or beyond the length of the string,
which is consistent with CVC4's semantics for this term
 2017-03-13 14:39:12 -04:00
Dan Liew
2cb4223979 [CMake] Support including Git hash and description into the build. 
CMake will automatically pick up changes in git's HEAD so that
the necessary code is rebuilt when the build system is invoked.

Two new options `INCLUDE_GIT_HASH` and `INCLUDE_GIT_DESCRIBE` have been
added that enable/disable including the git hash and the output of `git
describe` respectively. By default if the source tree is a git
repository both options are on, otherwise they are false by default.

To support the `Z3GITHASH` macro a different implementation is used from
the old build system. In that build system the define is passed on the
command line. This would not work well for CMake because CMake
conservatively (and correctly) rebuilds *everything* if the flags given
to the compiler change. This would result in the entire project being
rebuilt everytime git's `HEAD` changed.  Instead in this implementation
a CMake specific version of `version.h.in` (named `version.h.cmake.in`)
is added that uses the `#cmakedefine` feature of CMake's
`configure_file()` command to define `Z3GITHASH` if it is available and
not define it otherwise. This way only object files that depend on
`version.h` get re-built rather than the whole project.

It is unfortunate that the build systems now have different `version.h`
file templates. However they are very simple and I don't want to
modify how templates are handled in the python/Makefile build system.
 2017-03-12 22:11:59 +00:00
Nikolaj Bjorner
1f4f4514bf Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-12 09:40:58 +01:00
Nikolaj Bjorner
8bec1e25a8 move restore relevancy until after literals have been replayed 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-12 08:32:06 +01:00
James Bornholt
559c5e5ae6 z3py: With tactical should not try to use context as a parameter 2017-03-11 16:09:25 -08:00
Nikolaj Bjorner
228111511c fixing build break, addressing #935 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-11 18:41:36 +01:00
Nikolaj Bjorner
509f7409ba adding fixedpoint object to C++ API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-10 23:01:43 +01:00
Nikolaj Bjorner
338193548b fixing build break, adding fixedpoint object to C++ API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-10 22:52:55 +01:00
Murphy Berzish
b459d17624 fix int-to-str terms in theory_str not being picked up 2017-03-10 13:53:55 -05:00
Murphy Berzish
c198bc5863 fix re.range rewrite for theory_str 2017-03-10 13:13:45 -05:00
Nikolaj Bjorner
05c5b3b07b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:45:52 +01:00
Nikolaj Bjorner
5f5819f029 fix xor handling, and defaults for cardinality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:44:41 +01:00
Nikolaj Bjorner
fbf81c88a2 remove print breaking build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 11:13:38 +01: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
6f68355fbc Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-08 21:33:43 -08:00
Nikolaj Bjorner
29969648ba check that formulas are in lira before invoking qsat. Issue #919 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 05:52:46 +01:00
Nikolaj Bjorner
fcda4cee9f ensure evaluation of array equalities is enabled for external facing evaluator. Issue #917 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 05:29:56 +01:00
Nikolaj Bjorner
829519b837 fix bug for bit-vector optimization. Issue #928 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-08 10:19:35 +01:00
Nikolaj Bjorner
202ac0d1ee Merge branch 'master' of https://github.com/Z3Prover/z3 
:wi
 2017-03-08 10:08:54 +01:00
Nikolaj Bjorner
41e6fafc58 fix bug for bit-vector optimization. Issue #919 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-08 10:07:31 +01:00
Christoph M. Wintersteiger
b57764800c Merge branch 'master' of https://github.com/Z3Prover/z3 2017-03-07 18:10:31 +00:00
Christoph M. Wintersteiger
8f14cfadd2 Tabs, whitespace 2017-03-07 18:10:03 +00:00
Murphy Berzish
4d5c1dcfb6 fix model gen for regex terms in theory_str 2017-03-06 17:04:07 -05:00
Nikolaj Bjorner
ac59e7b6d3 enable multiple local search threads 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-06 11:48:23 -08:00
Murphy Berzish
577cb19745 experimental rewrite of bitvector unit sequences to string constants 2017-03-06 13:58:03 -05:00
Nikolaj Bjorner
cd4a2701db adding ability to ahve multiple local search threads 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-06 10:48:58 -08:00
Nikolaj Bjorner
fda5809c89 local search updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-05 14:40:58 -08:00
Murphy Berzish
82b1a61b25 fix string operator names 2017-03-04 16:30:36 -05:00
Murphy Berzish
ad0766898c add boolean operators to zstring and fix ostream 2017-03-04 15:20:57 -05:00
Nikolaj Bjorner
a7db118ebc use iterators 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-03 19:30:44 -08:00
Nikolaj Bjorner
f16dcef7e2 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-03 18:09:41 -08:00
Nikolaj Bjorner
b5ace71bb8 current updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-03 17:37:55 -08:00
Nikolaj Bjorner
d819784500 walk/gsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-03 16:10:18 -08:00
Nikolaj Bjorner
1e32f1fbb5 parameter example 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 13:36:05 -08:00
Nikolaj Bjorner
9777f43e75 fiddle with phase 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 13:28:17 -08:00
Nikolaj Bjorner
c6f943e4d6 updates to local search integration 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 11:23:06 -08:00
Nikolaj Bjorner
40df1949f5 tweaking local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 10:18:12 -08:00
Nikolaj Bjorner
a37dfd3ab9 refine logging for local search, add handling of <= for opb front-end 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 09:25:05 -08:00
Nikolaj Bjorner
b0a47ca897 disable pb sorting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-02 08:11:38 -08:00
Nikolaj Bjorner
2c7a978c16 debugging local 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-01 20:37:07 -08:00
Nikolaj Bjorner
59baaea219 integrating local search, supporting top-level inequalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-01 19:49:59 -08:00
Murphy Berzish
9f79015ee6 patches to theory_str for theory_seq compat 2017-03-01 22:18:18 -05:00