3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-07 08:21:56 +00:00
Commit graph

3197 commits

Author SHA1 Message Date
Murphy Berzish
725352234d refactoring theory_str 2017-02-27 13:22:56 -05:00
Nikolaj Bjorner
e9b49644b2 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-25 16:20:33 -08:00
Nikolaj Bjorner
c7591e3c99 remove unreferenced label
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:13:08 -08:00
Nikolaj Bjorner
183ee7e37d expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:10:18 -08:00
Nikolaj Bjorner
e02160c674 expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:07:40 -08:00
Murphy Berzish
a7b21dc5d5 refactor: aligned external/internal names for str.strong_arrangements option 2017-02-23 16:00:05 -05:00
Murphy Berzish
3816779ba1 fix indent 2017-02-23 15:25:20 -05:00
Murphy Berzish
6387d59f5c refactor: remove commented-out code 2017-02-23 15:08:05 -05:00
Murphy Berzish
858c754b15 refactor: remove unused variable in smt_case_split_queue 2017-02-23 15:05:43 -05:00
Murphy Berzish
5107e5cafc refactor: remove t_str_refcount_hack traces 2017-02-23 15:01:55 -05:00
Murphy Berzish
cff7c450c3 refactor: uint_set 2017-02-23 14:57:48 -05:00
Murphy Berzish
179b0f7630 clean up todos theory_str 2017-02-21 19:52:27 -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
Murphy Berzish
2e27e1cd36 fix obj_map insertions theory_str 2017-02-15 16:08:54 -05:00
Murphy Berzish
d67f732c7c theory_str data structure refactoring 2017-02-15 13:39:55 -05:00
Murphy Berzish
f9b3c47bf5 remove commented-out old worklists 2017-02-14 18:45:09 -05:00
Murphy Berzish
d5b1e4b015 refactor theory_str: all library-aware/high-level terms are in one worklist 2017-02-14 18:44:40 -05:00
Murphy Berzish
3e714075c4 theory_str refactor: check_contain_by_substr uses contain_pair_idx_map 2017-02-14 16:09:45 -05:00
Murphy Berzish
52eaae9da0 theory_str refactor: check_contain_by_eqc_val uses contain_pair_idx_map 2017-02-14 15:19:03 -05:00
Murphy Berzish
5ca4f2a1c8 theory_str cleanup 2017-02-13 17:15:13 -05:00
Murphy Berzish
e699f25889 theory_str cleanup 2017-02-13 16:24:32 -05:00
Nikolaj Bjorner
b42973152f fix model generation for non-linear expressions, reported by Martin Suda and Giles Reger
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 12:02:32 -05:00
Nikolaj Bjorner
4220432ac3 Merge branch 'master' of https://github.com/z3prover/z3 into opt 2017-02-11 11:57:47 -05:00
Nikolaj Bjorner
8f7c804e86 fix non-linear model bug found Giles Reger and Martin Suda
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 11:57:27 -05:00
Murphy Berzish
c456795acd temporarily remove finite model finding from theory_str 2017-02-07 17:14:11 -05:00
Murphy Berzish
55cb440aae add cut var info for theory_str processtype2 2017-02-07 14:41:16 -05:00
Nikolaj Bjorner
15283e4e7c expose extension conflict resolution as plugin to sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-05 10:08:57 -08:00
Christoph M. Wintersteiger
5682c43604 Merge pull request #881 from dwoos/tactic-labels
Thread labels through tactic system
2017-02-04 20:37:11 +00:00
Nikolaj Bjorner
92e2d920fd working on card for sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 14:03:27 -08:00
Murphy Berzish
ebcfa966c7 data structure refactor in theory_str 2017-01-30 16:07:32 -05:00
Nikolaj Bjorner
a412a554eb merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 09:39:23 -08:00
Nikolaj Bjorner
dadcc6e8ff Merge branch 'master' of https://github.com/Z3Prover/z3 2017-01-30 02:09:26 -08:00
Nikolaj Bjorner
37ee4c95c3 adding parallel threads
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-30 02:09:08 -08:00
Nikolaj Bjorner
0123b63f8a experimenting with cardinalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-27 16:12:46 -08:00
Doug Woos
5796e15088 Thread labels through tactic system 2017-01-27 11:07:13 -08:00
Nikolaj Bjorner
b70f1f0319 fix overflow exposed in #880
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-27 09:47:18 -08:00
Nikolaj Bjorner
49d7fd4f9c updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-26 09:27:57 -08:00
Nikolaj Bjorner
7386e2f3e9 add warning for scearios of #876
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-25 18:29:30 -08:00
Nikolaj Bjorner
6e6c5935d7 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-01-25 18:09:37 -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
Murphy Berzish
09ac5645e4 parameterize theory-aware activity of overlap 2017-01-22 23:21:20 -05:00
Nikolaj Bjorner
127bae85bd fixing card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-22 15:33:29 -08:00
Christoph M. Wintersteiger
adf8072eaa Added option to limit the distance of unsat core extension through patterns. 2017-01-21 12:28:37 +00:00
Nikolaj Bjorner
904f87feac working on card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-20 21:36:52 -08:00
Murphy Berzish
50e2273dbd substr bugfix 2017-01-20 17:39:32 -05:00
Nikolaj Bjorner
d68cb5aee7 working on conflict resolution
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-20 07:44:00 -08:00
Nikolaj Bjorner
13099b1590 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-19 17:56:43 -08:00
Nikolaj Bjorner
e17c130422 updated cardinality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-19 17:55:15 -08:00
Nikolaj Bjorner
238e85867a working on card
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-18 15:40:39 -08:00