mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-14 19:50:19 +00:00
Code Activity
15218 commits 34 branches 52 tags 174 MiB
Commit graph

564 commits

Author SHA1 Message Date
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
181911463e Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-02 10:40:19 -07:00
Nikolaj Bjorner
3ce82ea8ce merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:37:22 -07:00
Nikolaj Bjorner
0ac80fc042 have parser produce ast-vector instead of single ast 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 21:21:05 -07:00
Nikolaj Bjorner
e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner
3f89c1418b fix test build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 12:51:14 -07:00
Nikolaj Bjorner
f698efa403 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-05-22 12:59:36 -07:00
Nikolaj Bjorner
f90ae40480 Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt 2017-05-22 12:53:19 -07:00
Lev Nachmanson
b92f0acae3 fix add_constraint and substitute_terms_in_linear_expression 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-18 10:56:50 -07:00
Lev Nachmanson
d28b8b33b4 add file 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-17 11:04:35 -07:00
Lev Nachmanson
9a58eb63cb resurrect lp_tst in its own director lp 
Signed-off-by: Lev Nachmanson <levnach@microsoft.com>
 2017-05-17 11:01:04 -07:00
Nikolaj Bjorner
64f3b3e316 remove lp_main from test branch to ensure test build only builds a single entry point 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-12 07:59:16 -07:00
Nikolaj Bjorner
29a49f4427 convert static random fields to non-static 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 16:46:07 -07:00
Nikolaj Bjorner
6e021781cd fix build issues part 3 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 07:49:41 -07:00
Nikolaj Bjorner
2a905e02c8 fix build issues part 1 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-11 07:38:52 -07:00
Lev Nachmanson
b08f094620 merging with the lp fork 
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
 2017-05-10 16:53:25 -07:00
Nikolaj Bjorner
c5f1f8ba59 missing files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 14:14:58 -07:00
Nikolaj Bjorner
911b24784a merge LRA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-09 10:46:11 -07:00
Nikolaj Bjorner
b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
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
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
21cda27f5e fix quadratic behavior of extract_assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 15:57:31 -07: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
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
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
fa868e058e fix bound bug #991 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-29 17:39:02 -07: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
8205b45839 initial integration of opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-04-27 19:13:00 -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
d16b20d62b Merge branch 'upstream-master' into develop 2017-04-26 17:21:10 -04: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
Nikolaj Bjorner
b70096a97f testing double lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-31 17:22:44 -07:00
Nikolaj Bjorner
6571aad440 debugging double lookahead and autarkies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-31 07:21:59 -07:00
Nikolaj Bjorner
2afd45b3c2 working on lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-27 04:53:27 +02:00
Nikolaj Bjorner
5c6cef4735 fix local search 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-14 13:47:01 -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
Nikolaj Bjorner
31c68b6e23 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-27 23:19:58 -08:00
Nikolaj Bjorner
c22359820d latest updates from Cliff 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-27 16:37:31 -08:00
Nikolaj Bjorner
e407b81f70 update for layout 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-24 15:56:04 -08:00
Nikolaj Bjorner
54f145b364 initialize 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-22 15:11:18 -08:00
Nikolaj Bjorner
43ddad0ecd initial pass 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-22 14:57:25 -08:00
Nikolaj Bjorner
748ada2acc adding unit test entry point 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-22 11:46:47 -08:00
Murphy Berzish
235ea79043 Merge branch 'upstream-master' into release-1.0 
Conflicts:
	src/cmd_context/check_logic.cpp
	src/cmd_context/cmd_context.cpp
	src/cmd_context/cmd_context.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_context.cpp
 2017-02-18 15:04:44 -05:00
Nikolaj Bjorner
c347018cb8 testing lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-12 11:49:30 -08:00
Nikolaj Bjorner
42deeb3498 testing lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-12 11:49:07 -08:00
Nikolaj Bjorner
61ade5e6cb tune cardinality solver for cache misses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-06 20:57:08 -08:00
Christoph M. Wintersteiger
8f95ee01e1 Removed polynomial factorization test cases. Relates to #852 and fixes #865. 2017-01-10 14:02:59 +00:00
Nikolaj Bjorner
8d18fd075e remove sources for unused variable warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-21 09:54:45 -08:00
Christoph M. Wintersteiger
ed5137ffd2 build fix 2016-11-01 11:23:42 +00:00