3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 06:39:02 +00:00
Commit graph

1883 commits

Author SHA1 Message Date
Nikolaj Bjorner 46048d5150 change lemma display utility to use updated pretty printer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-14 12:15:13 -07:00
Murphy Berzish b5471e7fe0 refactor: use c++11 for (part 1) 2018-03-12 20:04:04 -04:00
Murphy Berzish 73f7e301c3 preliminary refactoring to use obj_map 2018-03-12 17:09:55 -04:00
Nikolaj Bjorner 5651d00751 fix #1534
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-12 13:21:31 -07:00
Murphy Berzish 11a339c490 fix include path 2018-03-11 23:26:30 -04:00
Murphy Berzish 49b810e00f Merge branch 'master' into regex-develop 2018-03-11 23:18:55 -04:00
Nikolaj Bjorner 6e87622c8a remove references to deprecated uses of PROOF_MODE #1531
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-10 13:55:01 -05:00
Nikolaj Bjorner 4f9d198c51
Merge pull request #1517 from mtrberzi/issue1379
Handle third argument of str.indexof in Z3str3
2018-03-08 14:19:01 -08:00
Murphy Berzish bf6975122b integrate contains and indexof in theory_str 2018-03-08 12:37:44 -05:00
Nikolaj Bjorner 02a9696701 fix #1521
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-08 11:19:00 -05:00
Murphy Berzish d1407e843d Merge branch 'issue1379' of github.com:mtrberzi/z3 into issue1379 2018-03-07 18:16:17 -05:00
Murphy Berzish a7caa2fd2a remove useless get_assignments in theory_str final check 2018-03-07 18:16:11 -05:00
Murphy Berzish fd6d9a9489 Merge branch 'issue1379' of github.com:/mtrberzi/z3 into issue1379 2018-03-07 13:54:45 -05:00
Murphy Berzish f43a027447 Merge branch 'develop' into issue1379 2018-03-06 22:14:18 -05:00
Nikolaj Bjorner eb1122c5cb delay updating parameters to ensure rewriting in asserted_formulas is applied using configuration overrides. Fixes build regression for tree_interpolation documentation test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 21:57:08 -08:00
Nikolaj Bjorner 534a31f74e inherit solver parameters in asserted formulas rewriter. #1511
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-04 05:06:36 -08: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
Nikolaj Bjorner 8e09a78c26 fix #1510 by reintroducing automatic declaration of recognizers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-03-02 23:02:20 +09:00
Nikolaj Bjorner 00c3f4fdcd fix bugs found while running sample from #1112 in debug mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-28 22:35:41 +09:00
Murphy Berzish ac9b03528a add re.allchar support in z3str3 2018-02-26 17:19:45 -05:00
Nikolaj Bjorner ce1b135ec3 address accessor inconsistencies between - and from #1506
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-26 14:57:17 +09:00
Nikolaj Bjorner 7b68be75c9 fixes to #1500 and #1457
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-25 13:11:20 +09:00
Nikolaj Bjorner a2f907c7d1 fix #1492
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-18 13:20:15 -08:00
Bruce Mitchener 7bf80c66d0 Remove redundant void arg.
While this was needed in ANSI C, it isn't in C++ and triggers a warning
in clang-tidy when `modernize-redundant-void-arg` is enabled.
2018-02-13 18:51:52 +07:00
Murphy Berzish 762129d4c7 fixups to theory_str for regex 2018-02-12 17:45:07 -05:00
Murphy Berzish 54206e3674 Merge branch 'develop' into regex-develop
Conflicts:
	src/smt/theory_str.h
2018-02-12 17:25:50 -05:00
Bruce Mitchener 76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07:00
Bruce Mitchener 7167fda1dc Use override rather than virtual. 2018-02-10 09:56:33 +07:00
Bruce Mitchener 50f3e9c3c0 Fix typos. 2018-02-09 16:35:26 +07:00
Nikolaj Bjorner 61934d8106 align semantics of re.allchar with string proposal. #1475
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 20:08:15 -08:00
Nikolaj Bjorner fa0c75e76e rename to core2 to avoid overloaded virtual
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-02-07 15:13:13 -08:00
Bruce Mitchener 177414c0ee Use const refs to reduce copying.
These are things that have been found by `clang-tidy`.
2018-01-30 21:43:56 +07:00
Murphy Berzish 1ee5ce96b8 use regex instead of head/tail split for string-integer conversion; check sort of refreshed vars; add intersection difficulty estimation 2018-01-26 14:52:18 -05:00
Murphy Berzish c01dda4e31 experimental str.to.int fix 2018-01-25 16:11:31 -05:00
Murphy Berzish 5c3f35dc44 always rewrite regex length constraints as they are sometimes malformed 2018-01-25 15:52:57 -05:00
Murphy Berzish 852e0e0892 fix regex difficulty overflow bug; fix final check on regex terms that don't get path constraints 2018-01-25 15:25:36 -05:00
Murphy Berzish 8d5065d35d fix constant eqc bug in mk_concat 2018-01-24 22:02:00 -05:00
Murphy Berzish d648f95f63 fix setup of path constraints when the path constraint is False 2018-01-24 21:25:45 -05:00
Murphy Berzish d9d3ef78d2 temporarily disable final check progress checking
it is interfering with regex automata solving
2018-01-19 16:14:56 -05:00
Murphy Berzish 2065ea88ee fix null pointer dereference 2018-01-19 14:56:06 -05:00
Murphy Berzish a9fda81d03 check polarity 2018-01-18 17:53:42 -05:00
Murphy Berzish 5727950a3c zero-length automaton solution fix 2018-01-18 17:52:55 -05:00
Murphy Berzish dbb15f65b5 correct generation of linear length constraints for regex star terms 2018-01-17 19:26:42 -05:00
Murphy Berzish c2b268c645 short path for length-0 regex terms 2018-01-17 18:26:31 -05:00
Murphy Berzish c0ed683882 disable regex length constraint generation as it currently makes unsound axioms 2018-01-17 13:32:44 -05:00
Murphy Berzish 26ab91a448 check duplicate bounds info for regex terms 2018-01-17 13:02:32 -05:00
Murphy Berzish e5585ecf4c regex fail count and automaton fallback 2018-01-16 18:15:29 -05:00
Murphy Berzish 153701eabe regex length term assertion WIP 2018-01-16 13:56:01 -05:00
Murphy Berzish 6c4c9a10e4 regex length linearity check WIP 2018-01-16 13:16:31 -05:00
Murphy Berzish 191cc30e2a intersection of regex constraints produces a conflict clause 2018-01-15 15:30:12 -05:00
Murphy Berzish 058d24fd09 reuse regex character constraints for the same string 2018-01-15 14:30:12 -05:00
Murphy Berzish 6f889ab699 intersection WIP; fix polarity of generated path constraint LHS 2018-01-15 14:08:15 -05:00
Murphy Berzish ca3784449f regex failsafe and intersect WIP 2018-01-12 13:53:02 -05:00
Murphy Berzish 6b799706b5 add path constraint generation for regex terms 2018-01-10 17:24:47 -05:00
Murphy Berzish bac5a648d9 regex path constraint generation (WIP) 2018-01-09 20:20:04 -05:00
Murphy Berzish 98691a2c49 lower bound refinement 2018-01-08 15:56:21 -05:00
Murphy Berzish 09dc5cd0f8 Merge branch 'develop' into regex-develop 2018-01-03 16:12:33 -05:00
Murphy Berzish a5180edc76 make linear search the default for theory_str 2018-01-03 16:05:34 -05:00
Murphy Berzish 0f20944aeb regex lower bound (WIP) 2018-01-03 13:54:18 -05:00
Murphy Berzish 0917af7c56 full upper bound refinement 2018-01-03 12:02:11 -05:00
Bruce Mitchener 5a0f5a778f Remove unnecessary copy of coeff in iteration. 2018-01-02 23:14:29 +07:00
Bruce Mitchener 73b3da37d8 Typo fixes. 2018-01-02 22:48:06 +07:00
Nikolaj Bjorner e8a9e1a58b set default rewriter behavior in incremental mode to distribute multiplication over addition #1373
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-01 20:04:55 -08:00
Nikolaj Bjorner c1c1b7378c removing axiom exposing unsoundness, replace by weaker axiom
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-01 19:44:16 -08:00
Nikolaj Bjorner f0a30ded7d add shorthand for translating models #1407
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-01 19:25:09 -08:00
Nikolaj Bjorner 5bc4c9809e initialize additional assumptions after setup_context is called the first time
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-25 12:50:11 -08:00
Murphy Berzish 0ac7082c80 add upper bound refinement (WIP) 2017-12-21 17:13:39 -05:00
Nikolaj Bjorner 58c6cb87c3 small improvements to QF_NIA tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-14 11:48:22 -08:00
Nikolaj Bjorner a74d18a695 prepare for variable scoping and autarkies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 20:11:16 -08:00
Nikolaj Bjorner 387e984bd3 Merge branch 'master' of https://github.com/z3prover/z3 2017-12-13 13:48:34 -08:00
Nikolaj Bjorner 5a479fca76 generalize model finder code to be independent of conjunction elimination
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-13 13:48:24 -08:00
Nikolaj Bjorner 7afbf8165e snapshot
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-12 01:36:44 -08:00
Nikolaj Bjorner 82c26509ae
Merge pull request #1396 from mtrberzi/substr-bug
Fix incorrect term in theory_str str.substr reduction
2017-12-11 12:36:07 -08:00
Murphy Berzish 9d2c86f214 fix incorrect clause in argumentsValid subterm of substr reduction 2017-12-08 20:31:22 -05:00
Nikolaj Bjorner faebbc5384 add shortcuts for concatenation and equality propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-08 16:17:04 +05:30
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
Murphy Berzish 9554723b44 use safer mk_and in extended indexof 2017-12-06 20:50:03 -05:00
Nikolaj Bjorner 39d1ad3edb fix #1390
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-07 05:15:53 +05:30
Murphy Berzish a5c828f6f2 length estimation 2017-12-06 18:32:11 -05:00
Murphy Berzish fbe8d1577e new regex automata start; add complexity estimation 2017-12-04 18:05:00 -05:00
Murphy Berzish b3ebcfe558 correctly check third argument of str.indexof in theory_str 2017-11-29 18:20:59 -05:00
Nikolaj Bjorner 2749e547cf fix c example, remove more smtlib1 printing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 18:14:24 -08:00
Nikolaj Bjorner d7042c234f fix #1371
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 09:34:44 -08:00
Nikolaj Bjorner 2b3ee995ff fix #1375
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 09:03:52 -08:00
Nikolaj Bjorner bfe6260c58 fix #1376
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-27 08:39:20 -08:00
Nikolaj Bjorner 4520fafa8c fix #1368
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-26 19:13:35 -08:00
Nikolaj Bjorner 7d693a5f9f fix different bug reported on #1366
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-25 20:01:14 -08:00
Nikolaj Bjorner 841c48e04d fix break
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-25 18:24:45 -08:00
Nikolaj Bjorner 77b74ddb88 fix #1366
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-25 17:55:20 -08:00
Nikolaj Bjorner 441c0de3c8 Merge branch 'master' of https://github.com/z3prover/z3 2017-11-23 11:17:58 -08:00
Nikolaj Bjorner 357b4b20fd fix #1365. Filter MBQI instantiations for as-array terms that lead the array theory to return unknown and therefore block further instantiations. as-array terms are at this point almost always created from internal model values so quantifier instantiations with these have little value, other than instantiations of other paraameters that may indepdendently help
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-23 11:17:41 -08:00
Nikolaj Bjorner 107bfb1438 print model-add in display method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 21:26:07 -08:00
Nikolaj Bjorner d520557ad9 fix #1233
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 11:52:15 -08:00
Nikolaj Bjorner c5f231acdf debugging #1233
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 08:16:41 -08:00
Nikolaj Bjorner 33e8113c9e adding instrumentation to debug #1233
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-20 16:51:17 -08:00
Nikolaj Bjorner 2f218b0bdc remove also cores as arguments to tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 12:18:50 -08:00
Nikolaj Bjorner 4bbece6616 re-organize proof and model converters to be associated with goals instead of external
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-18 16:33:54 -08:00
Nikolaj Bjorner df6b1a707e remove proof_converter from tactic application, removing nlsat_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 23:32:29 -08:00
Nikolaj Bjorner 0d15b6abb7 add stubs for converting assertions, consolidate filter_model_converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 14:51:13 -08:00
Nikolaj Bjorner 2e6ae8cfd2 fix crash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-15 23:06:05 -08:00