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

4785 commits

Author SHA1 Message Date
Christoph M. Wintersteiger 5ef7d38d72 Whitespace 2016-11-05 14:39:23 +00:00
Christoph M. Wintersteiger 50c323dc74 Whitespace 2016-11-05 14:35:56 +00:00
Nikolaj Bjorner 69853ba6fc Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-05 08:18:59 +00:00
Nikolaj Bjorner caf0a1e80d fix breaking change to theory-seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-05 07:22:27 +00:00
Christoph M. Wintersteiger b1f7c6ac97 eliminated unnecessary variable 2016-11-04 22:08:49 +00:00
Christoph M. Wintersteiger 696bbc7708 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-04 21:27:16 +00:00
Christoph M. Wintersteiger ac7e1b145c Whitespace, typo 2016-11-04 21:27:10 +00:00
Christoph M. Wintersteiger 81fce55d78 Updated optimization ML API. Addresses #776. 2016-11-04 21:22:01 +00:00
Nikolaj Bjorner 152321bce6 fix crash in poly normalizer exposed by qe. Issue #775
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-04 20:29:12 +00:00
Nikolaj Bjorner 856cf7d4f9 fix generation of fresh constants for uninterpreted sort in EPR, Issue #649
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-04 15:51:35 +00:00
Nikolaj Bjorner e700460645 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-04 15:19:19 +00:00
Nikolaj Bjorner 51a4085910 check for logic in solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-04 15:19:11 +00:00
Christoph M. Wintersteiger 824ba14977 Disabled some ITE rewrite rules that were applied by default, but too expensive. Added re-computation of subterm occurrences in ctx_simplify_tactic. (Performance fixes for QF_LIA benchmarks). 2016-11-04 13:39:53 +00:00
Christoph M. Wintersteiger a3e915fbea Whitespace 2016-11-04 13:37:14 +00:00
Nikolaj Bjorner c0fb2eafe5 remove recursive expansion of else-case
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-02 23:08:10 +00:00
Nikolaj Bjorner be9d5c7088 fix evaluator for array store expressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-02 21:33:24 +00:00
Nikolaj Bjorner 46a4bc6030 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-02 14:15:05 +00:00
Nikolaj Bjorner f61600d1d8 fixing unsat core extraction for tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-02 14:14:55 +00:00
Christoph M. Wintersteiger c8689ed796 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-02 13:36:38 +00:00
Christoph M. Wintersteiger c81ee05098 Fixes for .NET Core build 2016-11-02 13:36:29 +00:00
Nikolaj Bjorner 46c4fdaae5 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-01 18:39:00 +01:00
Nikolaj Bjorner 305e080239 enable unsat core extraction in nlsat_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-01 17:57:28 +01:00
Christoph M. Wintersteiger 026309a325 bugfix for disequality propagation in smt_context 2016-11-01 14:21:06 +00:00
Christoph M. Wintersteiger ed5137ffd2 build fix 2016-11-01 11:23:42 +00:00
Nikolaj Bjorner 84172302a2 fix bug in mutex extraction, reported by Patrick Trentin
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-01 00:16:16 +01:00
Nikolaj Bjorner ba942af5a8 disable sat solver when proofs are turned on. Fixes issue #768
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-31 23:27:39 +01:00
Nikolaj Bjorner fa1a0aa7ba remove buggy and unused equivalence relation plugin. Github issue #770
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-31 22:59:56 +01:00
Nikolaj Bjorner ff75f88c4f fix memory abuse in internalization in inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-31 22:25:58 +01:00
Nikolaj Bjorner 596f07e548 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-28 08:27:21 -07:00
Nikolaj Bjorner 3714e520be fix performance bottlnecks: gc of literals walk through potentially huge watch-lists, avoid user-push/pop around calls to solver2tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-28 08:27:11 -07:00
Nikolaj Bjorner 7764148dd3 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-28 07:42:27 -07:00
Nikolaj Bjorner 2475f3bff5 ensure that variables passed to consequence finding have bound constraints, if applicable. Even if those variables do not occur in the constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-28 07:41:27 -07:00
Nikolaj Bjorner 4d078dc0a9 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-28 07:17:49 -07:00
Christoph M. Wintersteiger f1412d3f32 Bugfix for bouned_int2bv_solver 2016-10-28 14:23:01 +01:00
Christoph M. Wintersteiger 02e1bae9cb whitespace 2016-10-28 14:22:27 +01:00
Christoph M. Wintersteiger 9c16d16bc8 removed debug output 2016-10-28 12:22:28 +01:00
Nikolaj Bjorner ca309341c3 fixing cancellation code paths for inc_sat_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 22:07:46 -07:00
Nikolaj Bjorner b1d673e3eb catch cancellation exceptions, return undef
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 16:34:26 -07:00
Nikolaj Bjorner 7d7e03e377 rewind qhead to ensure re-propagation after cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 16:23:33 -07:00
Nikolaj Bjorner 41deae52c6 fix enum2bv to handle singleton enumeration types, differentiate disequality conflicts for theories that handle disequalities vs. theories that don't
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 13:35:53 -07:00
Nikolaj Bjorner 24fc19ed58 speed up consequence finding by avoiding local search whenver assumption level is reached during the initial phase
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-27 08:15:39 -07:00
Christoph M. Wintersteiger 253cfeb0af Added FPA numeral accessors/predicates to Python API 2016-10-27 15:07:34 +01:00
Christoph M. Wintersteiger 95d7b33ebb Added is_numeral_negative to .NET and Java APIs 2016-10-27 15:07:10 +01:00
Christoph M. Wintersteiger e4f7ff9881 Added Z3_fpa_is_numeral_negative to FPA API 2016-10-27 15:06:24 +01:00
Nikolaj Bjorner 485372ec2a Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-26 19:15:11 -07:00
Nikolaj Bjorner 4bd83724dd remove conflict on false disequality, introduced regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-26 19:15:05 -07:00
Christoph M. Wintersteiger 23c58a1ef6 Added FPA numeral predicates to ML API 2016-10-26 18:53:20 +01:00
Christoph M. Wintersteiger 903d962a3c Merge branch 'fpa_numeral_accessors' of https://github.com/wintersteiger/z3 into fpa_numeral_accessors 2016-10-26 18:44:49 +01:00
Christoph M. Wintersteiger 935c523ef8 Added FPA numeral predicates to Java API 2016-10-26 18:44:35 +01:00
Christoph M. Wintersteiger c573a7446b Added FPA numeral predicates to .NET API 2016-10-26 18:44:25 +01:00
Christoph M. Wintersteiger bea7bc5e30 Bugfix for bv2fpa_converter. Fixes #767. 2016-10-26 16:32:44 +01:00
Christoph M. Wintersteiger cf93e39666 Fixed FPA unbiased exponent accessors 2016-10-26 15:54:33 +01:00
Christoph M. Wintersteiger e381cef92c Marked .NET Z3Exception as serializable 2016-10-26 15:12:10 +01:00
Christoph M. Wintersteiger ead970b477 Bugfix for Python API.
Thanks to John D. Ramsdell for reporting this issue (http://stackoverflow.com/questions/39584779/why-is-the-sort-of-a-bound-variable-forced-not-to-be-a-finite-domain-sort).
2016-10-26 14:08:33 +01:00
Nikolaj Bjorner da4289fadc fix unit tests for pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-25 20:47:48 -07:00
Nikolaj Bjorner d0c5b86a2a Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-25 20:32:20 -07:00
Nikolaj Bjorner 461e88e34c additional robustness check for incremental sat solver core when it recieves interpreted constants, added PB equality to interface and special handling of equalities to adddress performance gap documented in #755
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-25 20:32:13 -07: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 8c5c564d6c fixed initialization order warning in pb2bv_rewriter 2016-10-25 14:31:29 +01:00
Christoph M. Wintersteiger 963dfad10e fix for biased flag on get_numeral_exponent_string 2016-10-25 14:17:23 +01:00
Christoph M. Wintersteiger dc78a04135 removed debug output 2016-10-25 12:20:45 +01:00
Nikolaj Bjorner fefd00aa49 fix sign of constant in pb constraint
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 20:28:56 -07:00
Nikolaj Bjorner b82b53dc34 add handling of pseudo-boolean inequalities that use if-expressions over Booleans and arihmetic instead of built-in PB predicates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 17:41:52 -07:00
Nikolaj Bjorner e4d2c5867a remove dead (and incorrect) code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 15:52:47 -07:00
Nikolaj Bjorner a880e5f49b fix incorrection assertion when checking signs of literals, exposed by miTLS regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 13:12:36 -07:00
Nikolaj Bjorner c68c56b0e7 fix incorrect assertion when checking signs of literals, exposed by mitls regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 13:09:27 -07:00
Nikolaj Bjorner 33e7dccd42 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 09:11:02 -07:00
Nikolaj Bjorner 0439b795b4 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-24 09:10:40 -07:00
Nikolaj Bjorner 99002aeffb Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-24 08:25:19 -07:00
Nikolaj Bjorner 6cf54a226e a more efficient encoding for pseudo-Boolean inequality constraints into bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-24 08:25:02 -07:00
Christoph M. Wintersteiger 79f1d7b4d4 fixed GCC build issue in tests 2016-10-24 15:27:47 +01:00
Christoph M. Wintersteiger 5fee1ea3c0 removed unused variables 2016-10-24 14:08:33 +01:00
Christoph M. Wintersteiger 7517cf485e ML API bugfixes for FPA numeral accessors 2016-10-24 13:32:37 +01:00
Christoph M. Wintersteiger df2a569d25 Replaced antiquated header with modern equivalent. 2016-10-24 13:29:17 +01:00
Christoph M. Wintersteiger abcb6040d4 Refactored FPA numeral accessors. 2016-10-24 12:53:57 +01:00
Christoph M. Wintersteiger 0a11e8f3c0 Resolved rebase conflicts 2016-10-24 12:53:57 +01:00
Christoph M. Wintersteiger 8926b3311d Fixed FP numeral special value sig/exp extraction functions. 2016-10-24 12:52:07 +01:00
Christoph M. Wintersteiger 89d38385db Added functions to test FP numerals for special values. 2016-10-24 12:50:05 +01:00
Christoph M. Wintersteiger 6b474adc8a Added accessors to extract sign/exponent/significand BV numerals from FP numerals. 2016-10-24 12:50:05 +01:00
Christoph M. Wintersteiger 5716eaafed whitespace 2016-10-24 12:50:05 +01:00
Nikolaj Bjorner 4f3f21bff1 disable local optimization in presence of non-linear constraints, addresses issue #758
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 21:45:35 -07:00
Nikolaj Bjorner a1b7e41d7f Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-23 20:53:14 -07:00
Nikolaj Bjorner b92bd89a45 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 20:53:10 -07:00
Nikolaj Bjorner b476784f23 add missing file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-23 20:52:44 -07: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 6d3430c689 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-22 21:51:11 -07:00
Nikolaj Bjorner e32e0d460d fix at-most-1 constraint compiler bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-22 21:50:45 -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
Christoph M. Wintersteiger 5bd00d3f83 Bugfixes for the FPA API 2016-10-21 15:39:02 +01:00
Nikolaj Bjorner bb6d826908 use index j to avoid superficial, but typically flagged, name clash with internal index i
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-20 22:17:11 -07:00
Nikolaj Bjorner 9cd7b9b4f6 fix mutex finding for smt-core: it was returning mutexes for negations of literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-20 22:13:23 -07:00
Nikolaj Bjorner ef9486913b Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-19 08:57:16 -07:00
Nikolaj Bjorner 527980e440 local
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-19 08:57:10 -07:00
Christoph M. Wintersteiger f97ffce479 Silenced GCC warning about empty loop body. 2016-10-19 12:31:35 +01:00
Christoph M. Wintersteiger f9bd8f674d whitespace 2016-10-19 12:31:06 +01:00
Christoph M. Wintersteiger 948bf9540f Fix for previous commit. 2016-10-19 12:07:33 +01:00
Christoph M. Wintersteiger 11997afb5d Fixed potential problems with invalidated iterators. 2016-10-19 12:00:34 +01: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 3aa7eab3e2 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-18 22:37:08 -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