mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-17 22:35:35 +00:00
Code Activity
6950 commits 23 branches 48 tags 157 MiB
Commit graph

239 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 3f89c1418b fix test build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 12:51:14 -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
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 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
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
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
Christoph M. Wintersteiger c7fddf80c2 fixed unhandled case warning in test/qe_arith.cpp 2016-10-25 14:34:00 +01:00
Christoph M. Wintersteiger 79f1d7b4d4 fixed GCC build issue in tests 2016-10-24 15:27:47 +01:00
Nikolaj Bjorner 3778048eb4 add bounded-int and pb2bv solvers to fd_solver, use sorting networks for pb2bv rewriter when applicable, hoist to pb2bv_rewriter module and remove it from the pb2bv_tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-23 20:31:59 -07:00
Nikolaj Bjorner 23b9d3ef55 fix at-most-1 constraint compiler bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-22 18:50:16 -07:00
Nikolaj Bjorner 881e82e3fa remove legacy interface to dt2bv tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-18 23:04:17 -04:00
Nikolaj Bjorner d060359f01 add fd solver for finite domain queries 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-18 22:34:34 -04:00
Nikolaj Bjorner 9e4450228e adding unit test for enumeration types 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-17 14:52:37 -04:00
Nikolaj Bjorner 4cae91b096 spacing, unit test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-17 08:07:23 -04:00
Nikolaj Bjorner fe14a22baa adding enumeration tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-16 22:19:59 -04:00
Nikolaj Bjorner aec59e4ff7 add consequence finding to inc-sat-solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-16 15:43:28 -04:00
Nikolaj Bjorner 8d2b70a5e2 better encodings for at-most-1, #755 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-10 23:46:03 -07:00
Nikolaj Bjorner 9fa7cd48e9 Merge pull request #747 from LocutusOfBorg/patch-2 
fix build with new gcc and clang compilers
 2016-09-27 18:07:57 -07:00
Gianfranco Costamagna 4817b87b7d fix build with new gcc and clang compilers 2016-09-26 08:06:38 +02:00
Gianfranco Costamagna 9c48fbba2e Update mpff.cpp to fix build with clang and new gcc 2016-09-26 08:05:15 +02:00
Nikolaj Bjorner 0997eba700 adding hash/eq to uint_set 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-27 13:41:41 -07:00
Nikolaj Bjorner 7fc294d329 move arithmetical mbp functionality to model_based_opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-26 14:30:35 -07:00
Christoph M. Wintersteiger 89b1d7d8da Fixed test case 2016-06-22 18:52:40 +01:00
Murphy Berzish d79837eed0 Merge branch 'develop' into upstream-master 
Conflicts:
	.gitignore
	README
	src/ast/ast_smt2_pp.h
	src/ast/ast_smt_pp.cpp
	src/ast/reg_decl_plugins.cpp
	src/cmd_context/cmd_context.cpp
	src/parsers/smt2/smt2parser.cpp
 2016-06-01 17:40:52 -04:00
Nikolaj Bjorner 339cd6e537 mbo 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-20 13:45:50 -07:00
Nikolaj Bjorner 044e08a114 adding unit tests for qe_arith/mbo 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-04 11:17:09 -07:00
Nikolaj Bjorner 67e49b4adc fixing model-based-opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-01 17:15:20 -07:00
Nikolaj Bjorner 22507281cf fix model generation in opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-30 12:23:46 -07:00
Nikolaj Bjorner 4b940bde11 fix compilation of unit tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-30 11:46:25 -07:00
Nikolaj Bjorner 932ef442ae model based opt dev 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-28 09:47:55 -07:00
Nikolaj Bjorner 6aa6102891 factor out model-based-opt code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-27 15:08:10 -07:00