3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 13:58:45 +00:00
Commit graph

4941 commits

Author SHA1 Message Date
Nikolaj Bjorner d9227b95ea blast distinct in incremental BV solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-29 15:45:23 -08:00
Nuno Lopes 4b4365470d mam compiler: move reset of matched_exprs cache next to code reset 2016-11-28 15:40:25 +00:00
Nuno Lopes 2babd192b8 small optimization in compilation of multi-patterns
also make the path faster for single patterns
2016-11-28 14:43:47 +00:00
Nuno Lopes 4452ac0d6d optimize pattern matching code generator for DAG patterns
generated code now uses COMPARE instructions to compare subtrees instead of diving into both subtrees. Code is thus smaller and fails faster.
2016-11-28 13:48:15 +00:00
Christoph M. Wintersteiger 1799310155 Fixed iterator invalidation bug in SAT probing. Relates to #798. 2016-11-26 14:07:05 +00:00
Nikolaj Bjorner 441dbbb94b streamline logging in arithmetic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-24 13:08:50 -08:00
Martin Nowack 762e5fd093 Do not request time stamp if not needed
If no timeout is needed for solving queries, time stamps do not
need to be acquired.
2016-11-23 16:38:21 +01:00
Nikolaj Bjorner 7a4c20698f fix handling of AC operator ++ on regular expressions. Issue #804
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-22 13:02:17 -08:00
Christoph M. Wintersteiger 71ca355257 Fixed OpenMP problems in log synchronization. Relates to #798. 2016-11-22 13:26:29 +00:00
Christoph M. Wintersteiger dee7c29b19 Added optional synchronization for multi-thread API logs. Relates to #798. 2016-11-22 11:32:25 +00:00
Nikolaj Bjorner d3fe015ff5 Merge pull request #796 from rickyz/nondependent_name
Fix GCC/Clang compilation.
2016-11-20 06:29:37 -08:00
Nikolaj Bjorner 725e79e9eb re-enable ematching on recursive function definitions, disabling ematching breaks regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-20 06:24:47 -08:00
Nikolaj Bjorner 650a719298 fix crash in new clique code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-20 06:20:22 -08:00
Ricky Zhou 9939d07827 Fix GCC/Clang compilation.
The calls to negate use a non-dependent name, so GCC and Clang do not
examine dependent base classes when looking up the name. Adds a using
declaration as suggested at
https://isocpp.org/wiki/faq/templates#nondependent-name-lookup-members.
2016-11-20 05:09:30 -08:00
Nikolaj Bjorner 6a9b5ea3af fix unsoundness reported in issue #777, disable ematching on recursive function definition axioms exposed in #793
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 15:29:43 -08:00
Nikolaj Bjorner 2ff5af7d42 fix bug incorrect clearing of goals during node creation. Issue #777
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 10:06:16 -08:00
Nikolaj Bjorner a5bae72bdf Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-19 08:09:55 -08:00
Nikolaj Bjorner df0e3a100c tune initialization for wmax and sortmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 08:04:06 -08:00
Nikolaj Bjorner ea601dd403 fix and coallesce clique functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 03:55:48 -08:00
Christoph M. Wintersteiger ad76e536b2 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-17 16:36:44 +00:00
Christoph M. Wintersteiger b138a0f6d3 Cleaned up hacky rewriter cancelation fix in theory_fpa. 2016-11-17 16:36:39 +00:00
Christoph M. Wintersteiger a97358965b Fixed interruption/cancelation issue in rewriter. 2016-11-17 16:28:49 +00:00
Nikolaj Bjorner 1600823435 fix perf bug reported in #790
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-17 05:38:52 +02:00
Nikolaj Bjorner 123b50ed3c Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-17 04:26:36 +02:00
Nikolaj Bjorner e9db934f1a improving perf of mutex finding, revert semantics of 0 timeout to no-timeout. Issue #791
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-17 04:26:17 +02:00
Christoph M. Wintersteiger 9053e6eba6 Resolved merge conflicts. Added FPA API input validity checks. 2016-11-15 20:19:40 +00:00
Christoph M. Wintersteiger dcf643f711 Merge branch 'master' of https://github.com/Z3Prover/z3 into gh570-att-2 2016-11-15 19:59:54 +00:00
Christoph M. Wintersteiger c7787feebb Assertion fix for theory_fpa. Relates to #570. 2016-11-15 19:59:22 +00:00
Christoph M. Wintersteiger ee60ba824f Bugfix for rewriter exceptions in theory_fpa. Relates to #570. 2016-11-15 19:59:08 +00:00
Nikolaj Bjorner e65d80dedd make semantics of extract/substr deterministic. Issue #781
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-15 18:29:51 +02:00
Nikolaj Bjorner fa8427258a Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-15 15:07:15 +02:00
Nikolaj Bjorner e21bd8dacc fix lexicographic combinations for wmax: pb constrsaints were not interpreted in Boolean benchmarks. #782
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-15 15:07:05 +02:00
Christoph M. Wintersteiger bfaa9ddf63 Fixed potential SAT solver cleanup problem. Renamed functions for consistency. Relates to #570. 2016-11-14 17:42:21 +00:00
Christoph M. Wintersteiger 520e868add Fixed interruption cleanup bug in sat_solver. Relates to #570. 2016-11-14 17:42:20 +00:00
Christoph M. Wintersteiger d099e26342 Fixed compiler warning 2016-11-14 17:42:20 +00:00
Christoph M. Wintersteiger 890142ef96 Fix cleanup/initialization of sat::simplifier. Relates to #570. 2016-11-14 17:42:20 +00:00
Christoph M. Wintersteiger 6204f67d38 Fixed problems with aborted rewriters in theory_fpa. Relates to #570. 2016-11-14 17:40:09 +00:00
Nikolaj Bjorner fc7a217cd0 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-12 08:58:09 -08:00
Nikolaj Bjorner e0613b6737 fix crash reported in #784
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-12 08:58:03 -08:00
Christoph M. Wintersteiger 2df5a4e3f9 typo 2016-11-12 15:01:54 +00:00
Christoph M. Wintersteiger ca81e803cb Bugfix for Z3_fpa_get_numeral_sign. Relates to #570. 2016-11-10 21:33:42 +00:00
Christoph M. Wintersteiger b47c67dee3 Bugfix for Z3_fpa_get_numeral_*_uint64. Relates to #570. 2016-11-10 21:16:05 +00:00
Christoph M. Wintersteiger 1188e6df47 Typo 2016-11-08 15:28:20 +00:00
Christoph M. Wintersteiger e22a67c12c Whitespace 2016-11-08 15:27:46 +00:00
Christoph M. Wintersteiger e0066df6a9 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-11-08 15:12:08 +00:00
Christoph M. Wintersteiger a3e4629996 fixed hard-coded version number in setup.py 2016-11-08 15:12:04 +00:00
Christoph M. Wintersteiger 7c308ca8c6 Merge pull request #779 from ddcc/master
Standardize on __uint64 instead of unsigned __int64
2016-11-08 12:21:34 +00:00
Christoph M. Wintersteiger 889e5e9388 Bumped version number. 2016-11-07 23:19:59 +00:00
Dominic Chen 00ada5305f Standardize on __uint64 instead of unsigned __int64 2016-11-07 17:42:44 -05:00
Christoph M. Wintersteiger d57a2a6dce Bumped version to 4.5.0 2016-11-07 22:02:30 +00:00
Nikolaj Bjorner ef9230d8f8 detect quantifiers in model expressions to quiet down failing model validation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-07 06:56:36 -08:00
Christoph M. Wintersteiger 75cfd14e5a bugfix for macro finder 2016-11-07 14:14:45 +00:00
Christoph M. Wintersteiger 80e136f090 build fix 2016-11-07 13:51:09 +00:00
Christoph M. Wintersteiger 4e7077db70 Bugfix for denormal numeral exponents 2016-11-07 12:38:12 +00:00
Christoph M. Wintersteiger 758a6d98fb FPA API clarification 2016-11-07 12:35:48 +00:00
Christoph M. Wintersteiger 9ebea09d05 added is_numeral_negative to ML API. 2016-11-07 10:28:39 +00:00
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
Christoph M. Wintersteiger 4546915238 Fixed iterator invalidation bug in theory_arith_nl.
Indirectly relates to #740
2016-10-18 17:17:19 +01:00
Christoph M. Wintersteiger 9fef51553c Whitespace 2016-10-18 17:15:43 +01:00
Nikolaj Bjorner 948a1e600e undo breaking commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-18 10:27:47 -04:00
Christoph M. Wintersteiger 5ac3bb04ee Tabs 2016-10-18 13:18:59 +01:00
Nikolaj Bjorner edaec81aa2 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-17 14:53:13 -04:00
Nikolaj Bjorner 9e4450228e adding unit test for enumeration types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-17 14:52:37 -04:00
Christoph M. Wintersteiger 2f6ef0f3be Removed unnecessary variables. 2016-10-17 16:33:09 +01:00
Christoph M. Wintersteiger 707dbd4173 Bugfix for bv2fpa (model) conversion.
Relates to #740
2016-10-17 16:19:27 +01:00
Nikolaj Bjorner 4cae91b096 spacing, unit test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-17 08:07:23 -04:00
Nikolaj Bjorner fe14a22baa adding enumeration tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 22:19:59 -04:00
Nikolaj Bjorner 4fda2adec8 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-16 15:46:50 -04:00
Nikolaj Bjorner 58198d7cb6 add consequence finding to inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 15:45:39 -04:00
Nikolaj Bjorner aec59e4ff7 add consequence finding to inc-sat-solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-16 15:43:28 -04:00
Christoph M. Wintersteiger 009af4455d Refactored and fixed model conversion for fpa2bv conversion of unspecified values via theory_fpa. 2016-10-15 18:35:39 +02:00
Christoph M. Wintersteiger ab4bb8194e Added unregister_decl to model_core 2016-10-15 18:35:39 +02:00
Christoph M. Wintersteiger 58af4cae14 More consistent fp.* operators. 2016-10-15 18:35:39 +02:00
Christoph M. Wintersteiger 7e705a2d32 Bug fixes for underspecified FP operations. 2016-10-15 18:35:39 +02:00
Christoph M. Wintersteiger bc257211d6 Whitespace 2016-10-15 18:35:39 +02:00
Nikolaj Bjorner d8ea3023fc Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-10 23:49:59 -07:00
Nikolaj Bjorner 487f15f90a better encodings for at-most-1, #755
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-10 23:49:45 -07:00
Nikolaj Bjorner 8d2b70a5e2 better encodings for at-most-1, #755
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-10 23:46:03 -07:00
Andrew Dutcher bd80f7b4d5 fix some issues with the windows build 2016-10-10 15:38:08 -07:00
Andrew Dutcher 67a7889188 Update metadata for new distribution 2016-10-10 15:38:02 -07:00
Nikolaj Bjorner 5d9820f3e2 add example of parsing with external declarations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-07 12:57:07 -07:00
Nikolaj Bjorner 37f7c30e23 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-07 12:42:13 -07:00
Nikolaj Bjorner 619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-07 12:42:08 -07:00
Christoph M. Wintersteiger 9548b88e71 Added dummy code contracts for .NET Core/CoreCLR builds. 2016-10-06 16:24:49 +01:00
Christoph M. Wintersteiger 4956f6ef5b Test fix for python3 2016-10-05 16:11:07 +01:00
Christoph M. Wintersteiger 56e874e991 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-05 15:34:07 +01:00
Christoph M. Wintersteiger d495b08639 Build/test fix for python3 2016-10-05 15:34:02 +01:00
Nikolaj Bjorner f452895f5f add mutex pass
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-04 14:45:23 -07:00
Dionna Amalie Glaze f4fd721741 Z3_query_constructor documentation clarification
Hit a segfault when I assumed the API would allocate these _out parameters for me.
2016-10-04 13:02:31 -05:00
Christoph M. Wintersteiger acdaeca826 Bugfix for ITEs over FP rounding modes.
Fixes #751.
2016-10-04 18:04:56 +01:00
Christoph M. Wintersteiger 0bd06930ae whitespace 2016-10-04 18:04:00 +01:00
Nikolaj Bjorner e3f0aff318 address ubuntu warning and add shortcuts for maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-03 16:22:13 -07:00
Nikolaj Bjorner 186afe7d10 Merge branch 'master' of https://github.com/Z3Prover/z3 2016-10-02 10:22:23 -07:00
Nikolaj Bjorner b2db2f1eb6 allow negative weights for weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-02 10:21:58 -07:00
Nikolaj Bjorner 57ebf7bd38 accepting floats
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-10-02 10:08:23 -07:00
Nikolaj Bjorner 136f724445 update python API with facilities for Pseudo-Booleans and += shorthand for adding constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-30 14:18:34 -07:00
Nikolaj Bjorner 279621c1d7 duplicating private member from z3 to avoid build regressions under some environments
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-30 07:21:39 -07:00
Nikolaj Bjorner ab3b36269e Merge branch 'master' of https://github.com/Z3Prover/z3 2016-09-28 16:42:14 -07:00
Nikolaj Bjorner 476b06fa14 fix compiler warnings, gcc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-09-28 16:42:07 -07:00
Nikolaj Bjorner 9fa7cd48e9 Merge pull request #747 from LocutusOfBorg/patch-2
fix build with new gcc and clang compilers
2016-09-27 18:07:57 -07:00
Gianfranco Costamagna 4817b87b7d fix build with new gcc and clang compilers 2016-09-26 08:06:38 +02:00