mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-12 02:04:43 +00:00
Code Activity
19303 commits 25 branches 49 tags 159 MiB
Commit graph

417 commits

Author SHA1 Message Date
Christoph M. Wintersteiger
a7d5bb7b36 Tabs 2017-05-31 12:18:00 +01:00
Nikolaj Bjorner
b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Nikolaj Bjorner
3ae722025f relaxing condition for assumptions, add theory-assumption to skolem functions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 14:54:47 -07:00
Murphy Berzish
75ba4d5a4d remove unneeded include 2017-05-05 14:54:36 -04:00
Murphy Berzish
ab4fbe40b6 cleanup 2017-05-03 17:45:56 -04: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
48e37b0e16 pass qhead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:54:22 -07:00
Nikolaj Bjorner
8ba78081ec fix build break 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 16:41:17 -07:00
Murphy Berzish
16a5e944d7 use reference for case split sets 2017-05-01 18:25:54 -04:00
Murphy Berzish
b86d472eaf simplify theory case split handling 2017-05-01 18:22:49 -04:00
Murphy Berzish
3bce61e0d4 fix warning 2017-05-01 10:43:33 -04:00
Murphy Berzish
2f56d128b0 add theory case split support to smt_context 2017-05-01 10:34:43 -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
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
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
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
a8935e99bc Merge branch 'upstream-master' into develop 2017-04-04 16:47:30 -04:00
Nikolaj Bjorner
e05cee757b properly handle recursive function definitions #898 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-24 10:10:42 -07:00
Nikolaj Bjorner
1ab7ab9d74 fix double ownership of enode marking causing crash during tracing. Issue #952 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-23 11:09:36 -07:00
Murphy Berzish
94d5f242b8 Merge branch 'str-at-semantics' into develop 2017-03-13 14:40:40 -04: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
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
05c5b3b07b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-03-09 22:45:52 +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
Murphy Berzish
5107e5cafc refactor: remove t_str_refcount_hack traces 2017-02-23 15:01:55 -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
Nikolaj Bjorner
b0dd3f3238 add recursive function graphs to model, adapt rewriter to bypass branches whose evaluation is redundant 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-16 13:58:12 -08:00
Nikolaj Bjorner
a412a554eb merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-30 09:39:23 -08:00
Nikolaj Bjorner
49d7fd4f9c updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-26 09:27:57 -08:00
Nikolaj Bjorner
777091e653 fix part 1 of #875 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-25 18:09:27 -08:00
Nikolaj Bjorner
904f87feac working on card 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-20 21:36:52 -08:00
Nikolaj Bjorner
13099b1590 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-19 17:56:43 -08:00
Nikolaj Bjorner
0aa912371b Another fix for #847. Reset wmax theory solver state between lex calls, otherwise it uses stale constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-17 14:19:24 -08:00
Murphy Berzish
1363f50e4f demonstration of theory-aware branching in theory_str, WIP 2017-01-10 19:50:46 -05:00
Christoph M. Wintersteiger
8047f0d91a GCC compilation/keyword fix. Relates to #864 2017-01-10 14:06:56 +00:00
Nikolaj Bjorner
8d09b6e4a8 add at-least and pbge to API, fix for issue #864 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-09 21:23:00 -08:00
Nikolaj Bjorner
cb6c6332b3 update conflict resolution for cardinality case 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-28 12:44:30 -08:00
Nikolaj Bjorner
e36eba1168 added cardinality solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-27 09:58:23 -08:00
Murphy Berzish
df63b62763 fix vector manip bug in theory case split 2016-12-20 17:32:51 -05:00
Murphy Berzish
ab0fcc42f9 theory case split heuristic 2016-12-20 16:21:07 -05:00
Murphy Berzish
a04bc9974b theory case split WIP 2016-12-20 11:14:42 -05:00
Murphy Berzish
e85f9d33c4 add "legacy" support for theory case splits 
this replicates what was done in theory_str to add axioms excluding each
pair of literals from being assigned True at the same time;
no new heuristics are being used in smt_context (yet)
 2016-12-16 15:50:03 -05:00
Murphy Berzish
dd8cd8199b theory_str refcount debug messages and beginning theory case split 2016-12-16 14:37:34 -05:00
Nikolaj Bjorner
024082a45f adding preferred sat, currently disabled, to wmax. Fixing issue #815 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-30 09:52:05 -08:00