3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-27 18:35:50 +00:00
Commit graph

142 commits

Author SHA1 Message Date
Nikolaj Bjorner
c513f3ca09 merge with master
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-25 14:57:01 -07:00
Nikolaj Bjorner
a64fd7145c remove buggy legacy code, rely on pull_cheap_ite option in rewriter, #1511
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 03:36:03 -08:00
Simon Cruanes
d5e134dd94 wip: add recursive functions 2017-12-25 22:51:39 +01:00
Thai Trinh
b181d9d5fa fix set-up 2017-12-08 18:45:56 +08:00
trinhmt
034e72572f
Merge pull request #1 from Z3Prover/master 2017-12-08 14:42:34 +08:00
Thai Trinh
2c48ffe7a7 Fixed setup_QF_S(): using configuration to choose the corresponding string solver 2017-12-08 13:41:18 +08:00
Nikolaj Bjorner
a5d5dfdf86 fix setup for non-linear real arithmetic per QF_UFNRA regresssions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 09:23:57 +05:30
Thai Trinh
b6806eb1c2 Add more splitting rules for string equations (including rules based on length constraints) 2017-12-08 04:34:50 +08:00
Nikolaj Bjorner
c1b243a8e3 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-07 19:24:30 +01:00
Nikolaj Bjorner
e0e2397566 missing setup datatypes for QF_DT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-01 19:40:30 -07:00
Nikolaj Bjorner
ae9a6664d4 add cube mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-24 10:53:57 -07:00
Nikolaj Bjorner
651587ce01 merge with master branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-19 09:39:22 -07:00
Nikolaj Bjorner
8ff1e070be add QF_DT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-17 01:39:39 +02:00
Nikolaj Bjorner
5492d0e135 re-introduce eq2ineq name for rewriting parameter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-04 11:03:57 -07:00
Nikolaj Bjorner
2897b98ed2 remove simplify dependencies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-26 00:37:22 -07:00
Nikolaj Bjorner
25752dc169 enable QF_UF mode use same parameters whether with or without static featues, #1141, revert some breaking changes that should not have been part of commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-15 01:20:30 -07:00
Nikolaj Bjorner
1690febffd enable QF_UF mode use same parameters whether with or without static featues, #1141
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-15 00:26:05 -07:00
Nikolaj Bjorner
49cf899207 remove local change
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 16:33:48 -07:00
Nikolaj Bjorner
5cda9504f1 remove relative include from API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 16:32:26 -07:00
Nikolaj Bjorner
b19f94ae5b make include paths uniformly use path relative to src. #534
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 13:24:11 -07:00
Nikolaj Bjorner
b18dc7d052 adding nra
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-24 17:24:36 -07:00
Nikolaj Bjorner
eb8da3fb9d fixing setup for LRA, re-enable LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:34:07 -07:00
Nikolaj Bjorner
7e004fe331 fix build warnings part 7, disable LRA for regression t201.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:28:59 -07:00
Nikolaj Bjorner
9b3e2a9afe re-enable LRA after fixing dispatch for LRA in smt-setup
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 09:16:07 -07:00
Nikolaj Bjorner
f176e1e5e5 disable LRA until unit tests are fixed
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 08:40:20 -07:00
Nikolaj Bjorner
e9a085a0e2 enable LRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-11 08:23:43 -07:00
Lev Nachmanson
1d5fafd558 disable lev's solver
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-10 21:18:20 -07:00
Lev Nachmanson
cf695ab876 taking changes from the fork
Signed-off-by: Lev Nachmanson <levnach@hotmail.com>
2017-05-10 10:43:01 -07:00
Nikolaj Bjorner
2a63c56ae0 A faster and more scalable LRA solver by Lev Nachmanson. It is disabled in the initial merge pending a few bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-09 14:03:30 -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
1177be6391 add common utility to set up seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-02 20:52:39 -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
Murphy Berzish
6fececaad9 fix str/seq parameter config 2017-04-24 21:47:31 -04: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
Murphy Berzish
bef64961ae add pre-init assumptions for smt theories 2017-04-18 13:12:03 -04:00
Murphy Berzish
7207cabc97 experimental new unsat core based overlap detection 2017-04-12 17:09:35 -04:00
Murphy Berzish
9f79015ee6 patches to theory_str for theory_seq compat 2017-03-01 22:18:18 -05: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
Murphy Berzish
f5bc17b864 theory_str params module, WIP 2016-12-13 16:12:57 -05:00
Nuno Lopes
42b26c63e5 make a few functions static 2016-12-01 14:01:20 +00:00
Murphy Berzish
62aeff90c5 fix string theory setup so that string-integer integration actually works 2016-06-07 17:38:57 -04: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
Murphy Berzish
f8f7014a18 use LRA instead of LIA in strings setup, so that the theory_seq integer value code works 2016-06-01 16:34:48 -04:00
Nikolaj Bjorner
6529d43fb1 fix bugs exposed by unit tests from Pierre
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-01-26 09:50:14 -08:00
Nikolaj Bjorner
284fcc2c04 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-20 09:43:56 +02:00
Nikolaj Bjorner
72883df134 fix build, add seq features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-13 16:02:17 -08:00
Nikolaj Bjorner
3c50508762 use ADT for strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 20:46:28 -08:00
Nikolaj Bjorner
85b9bb3cc6 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 08:37:47 -08:00