3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-18 14:49:01 +00:00
Commit graph

3113 commits

Author SHA1 Message Date
Christoph M. Wintersteiger d5c39798ea Bugfix for hwf 2015-05-23 12:02:53 +01:00
Nuno Lopes c577ab361b fix assorted undefined behaviors caught by clang
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-23 11:45:12 +01:00
Christoph M. Wintersteiger 25a29bf5b0 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-22 20:30:26 +01:00
Christoph M. Wintersteiger 6f6cd61817 Bugfix for float-to-float conversion.
Fixes #77
2015-05-22 20:30:12 +01:00
Ken McMillan e438143abc fix for github issue #105 2015-05-22 11:02:26 -07:00
Ken McMillan 4546c3e7bb merge 2015-05-22 11:01:55 -07:00
Ken McMillan 13a3bdd7a3 fix proof for extended GCD rule 2015-05-22 10:28:19 -07:00
Nikolaj Bjorner 279ef05713 expose BoolExpr[] for ASTVector and merge common functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-22 08:57:05 -07:00
Nikolaj Bjorner b4f72c8145 Revert "Change ASTVector to Expr[] in interpolation result" 2015-05-22 08:24:45 -07:00
Marcus Völker a229416a2b Change ASTVector to Expr[] in interpolation result 2015-05-22 15:55:09 +02:00
Christoph M. Wintersteiger 8fc0ba0ab5 Moved auxiliary fp.isNaN lemma injection to the right place.
Fixes #102
2015-05-22 12:33:53 +01:00
Christoph M. Wintersteiger 891073d3fe typo 2015-05-22 12:01:10 +01:00
Christoph M. Wintersteiger ffbbf08d20 Fixed warning message about unused lock when OpenMP is not available. 2015-05-22 11:59:31 +01:00
Christoph M. Wintersteiger 54cde7cabb Bugfix for hwf::round_to_integral 2015-05-22 11:39:58 +01:00
Christoph M. Wintersteiger 759d9f2dda bugfix for hwf::fma 2015-05-22 11:39:28 +01:00
Christoph M. Wintersteiger 705ace6f0a Naming consistency 2015-05-22 11:39:08 +01:00
Nikolaj Bjorner 8a34bd2bf1 fixes issue #88
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-21 15:08:39 -07:00
Nikolaj Bjorner a3c5207f91 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-21 15:07:24 -07:00
Nikolaj Bjorner c969d78042 throw exception instead of debug mode assertion in ast_manager on malformed input
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-21 15:07:01 -07:00
Nikolaj Bjorner f100d4feda hoist out basic union find
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-21 11:10:42 -07:00
Christoph M. Wintersteiger 6f575689b1 Added injection of auxiliary lemmas for fp.isNaN, so that the value propagation can pick up these values and propagate them.
Fixes #96.
2015-05-21 19:02:09 +01:00
Christoph M. Wintersteiger eee076b9f8 Bugfixes for fp.min, fp.max.
Fixes the fix for #68
2015-05-21 18:16:02 +01:00
Christoph M. Wintersteiger 8c18bdcca9 Bugfix for fp.roundToIntegral.
Fixes #69
2015-05-21 18:12:14 +01:00
Christoph M. Wintersteiger c422b48bf4 Bugfix for hwf_manager::round_to_integral 2015-05-21 15:06:47 +01:00
Ken McMillan caa616f11b fix for github issue 83 2015-05-20 15:37:51 -07:00
Nikolaj Bjorner cd8f82ebc2 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-20 10:41:50 -07:00
Nikolaj Bjorner 9d0e3abd24 use static features to set hidden configuration parameters on small integers and int vs. real
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-20 10:41:41 -07:00
Christoph M. Wintersteiger 51040d3e19 Bugfix for fp.isNormal 2015-05-20 18:32:40 +01:00
Christoph M. Wintersteiger 1e3952406c disabled debug output 2015-05-20 18:14:38 +01:00
Christoph M. Wintersteiger f8145c8b9f Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-20 17:57:34 +01:00
Christoph M. Wintersteiger c377fec7a4 Made fp.* comparison chainable. 2015-05-20 17:57:27 +01:00
Nikolaj Bjorner e915d0f67d Merge pull request #97 from hguenther/unstable
Expose insert_if_not_there_core method in map class
2015-05-20 09:25:53 -07:00
Nikolaj Bjorner c876194a43 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-20 09:22:01 -07:00
Nikolaj Bjorner 28f6adf79e disable hybrid relations pending overhaul/deletion of product relations
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-20 09:21:55 -07:00
Henning Günther 33ddf0bcdf Expose insert_if_not_there_core method in map class
Signed-off-by: Henning Günther <t-hennig@microsoft.com>
2015-05-20 14:33:46 +01:00
Ken McMillan ccc1f02216 fix for github issue 54 2015-05-19 18:47:13 -07:00
Nuno Lopes 69a3590490 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-19 16:52:57 +01:00
Nuno Lopes 66e6e67395 fix build on CentOS
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-19 16:52:47 +01:00
Christoph M. Wintersteiger 8f3b133882 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-19 16:52:16 +01:00
Christoph M. Wintersteiger 0197f6e010 Bugfix for fp.rem when the result is zero.
Fixes #91
2015-05-19 16:51:56 +01:00
Nikolaj Bjorner 15e1c84592 update docuemntation for codeplex question 29927489/z3-proofs-are-hypothesis-and-lemma-rules-always-cleanly-nested
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-19 08:38:07 -07:00
Nikolaj Bjorner 92cfc242d2 cast variables to avoid compiler warning on signed/unsigned comparison
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-19 08:15:59 -07:00
Nuno Lopes 227c8870d6 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-19 13:48:59 +01:00
Nuno Lopes 4c7fea7e55 fix 'make test' for newer gcc versions
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-19 13:48:14 +01:00
Nuno Lopes 8ff7735a20 python 3 fixes
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-19 13:47:43 +01:00
Christoph M. Wintersteiger 8f86542f26 Added QF_ALIA to supported logics.
Fixes #90
2015-05-19 13:38:26 +01:00
Christoph M. Wintersteiger db411eef25 Improved supported logics checks for FPA logics. 2015-05-19 13:35:19 +01:00
Christoph M. Wintersteiger a41a9c94dd Formatting 2015-05-19 12:43:25 +01:00
Christoph M. Wintersteiger f0b699f03a Added Optimize.cs to to Microsoft.Z3.csproj 2015-05-19 12:41:51 +01:00
Christoph M. Wintersteiger 7232877d92 tabs, indentation 2015-05-19 11:01:27 +01:00
Christoph M. Wintersteiger 32fb679066 tabs 2015-05-19 11:01:15 +01:00
Christoph M. Wintersteiger 25f37c8a0c Resolved mpf merge conflicts. 2015-05-19 11:00:34 +01:00
Nikolaj Bjorner 203c5015c8 fix debian amd64 warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-18 15:17:21 -07:00
Nikolaj Bjorner c17fd2d516 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-18 14:51:27 -07:00
Nikolaj Bjorner c36df1c34a fix openmp nested critical section
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-18 12:43:55 -07:00
Nikolaj Bjorner 014fb7f6b7 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-18 08:40:21 -07:00
Nuno Lopes d8dc86f558 Merge branch 'unstable' of https://github.com/mschlaipfer/z3 into unstable 2015-05-18 16:38:19 +01:00
Nikolaj Bjorner 552bba2c8c decongest critical section in lia2card-tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-17 22:59:11 +01:00
Nikolaj Bjorner afea50e631 remove assertion from integer constructor, rely on exceptions for API abuse
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-17 22:49:59 +01:00
Nikolaj Bjorner e8811748d3 fix regressions in nl/smt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-16 19:08:37 +01:00
Nikolaj Bjorner 5632900f35 fix gcc compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-16 12:04:10 +01:00
Nikolaj Bjorner 64bd62b17e fix gcc compiler warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-16 11:56:04 +01:00
Nuno Lopes 6c22edc988 fix assorted compiler warnings
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-16 11:44:58 +01:00
Nikolaj Bjorner e6b8af402f fix build warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-15 15:56:21 +01:00
Christoph M. Wintersteiger 1702a55018 Introduced return value classes for interpolation functions.
Fixes #82.
2015-05-15 13:50:55 +01:00
Nuno Lopes 1dc17db56a Fix concat() in c++ api
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-15 09:01:56 +01:00
Matthias Schlaipfer c82319b358 Refactor count_vars and count_rule_vars
ast_manager m was not used
2015-05-14 17:04:38 +01:00
Nikolaj Bjorner 09afb31d4c Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-14 13:51:58 +01:00
Christoph M. Wintersteiger 2d1a0b010d Bugfix for AIG tactic. 2015-05-14 13:44:39 +01:00
Nikolaj Bjorner ab5022888c Merge branch 'opt' of https://github.com/Z3Prover/z3 into unstable 2015-05-14 12:11:17 +01:00
Nikolaj Bjorner 193191e003 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-14 11:57:06 +01:00
Alex Horn e576ca50bf Fix typo in documentation
Signed-off-by: Alex Horn <t-alexh@microsoft.com>
2015-05-12 14:24:59 +01:00
Alex Horn efaba8eb40 Fix negation in documentation
Signed-off-by: Alex Horn <t-alexh@microsoft.com>
2015-05-12 14:22:32 +01:00
Alex Horn 0f78238b7e Fix typo in documentation
Signed-off-by: Alex Horn <t-alexh@microsoft.com>
2015-05-12 13:18:51 +01:00
Nuno Lopes c2ef566ddc Merge pull request #81 from ahorn/opt
Fix g++ compile-time error
2015-05-12 10:44:28 +01:00
Christoph M. Wintersteiger a6bb7d2d0f Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-12 10:24:31 +01:00
U-EUROPE\t-alexh b882a94f6a Fix g++ compile-time error
Signed-off-by: U-EUROPE\t-alexh <t-alexh@microsoft.com>
2015-05-12 10:23:25 +01:00
Nikolaj Bjorner 4d3d9f7602 include compression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-11 20:32:39 -07:00
Nikolaj Bjorner c96c4c7af7 Merge branch 'opt' of https://github.com/Z3Prover/z3 into opt 2015-05-11 17:12:04 -07:00
Nikolaj Bjorner bf6ab3fc03 local state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-11 17:11:52 -07:00
Nikolaj Bjorner e53462c1c1 update ddnf experiment code
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-11 17:11:21 -07:00
Nuno Lopes 379ce66391 fix a few undefined behaviors exposed by the unit tests
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-11 06:30:24 +01:00
Nuno Lopes 091ae37c06 Fix bug in my previous patch in bit_vector::operator=()
Signed-off-by: Nuno Lopes <nuno@linux.Home>
2015-05-11 04:44:11 +01:00
Nuno Lopes 6645358fed fix issue #57: undefined behavior in bit_vector.h 2015-05-10 22:30:07 +00:00
Nikolaj Bjorner 2e627e78bc filter tactic on proofs and cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-10 14:55:28 -07:00
Nikolaj Bjorner 1a4e8f89bd fix release build failure
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-10 14:53:05 -07:00
Nikolaj Bjorner 5063a2cdb6 add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-10 11:53:36 -07:00
Nikolaj Bjorner 6163085ff8 add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-10 10:02:44 -07:00
Nikolaj Bjorner f5c048775b add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-10 09:42:11 -07:00
Nikolaj Bjorner c807ad0927 add ddnf tests, add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-09 21:28:26 -07:00
Nikolaj Bjorner e5716501e8 add ddnf tests, add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-09 19:47:00 -07:00
Nikolaj Bjorner 839e3fbb7c add ddnf tests, add facility to solve QF_NRA + QF_UF(and other theories) in joint solver to allow broader use of QF_NRA core
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-09 19:40:34 -07:00
Nikolaj Bjorner 4080cddb68 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-08 21:30:01 -07:00
Nikolaj Bjorner 4a9d97bd02 add concat to z3++, codeplex request
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-08 21:29:48 -07:00
Christoph M. Wintersteiger 31e78cd178 Bugfix for fp.rem(0, 0).
Fixes #70.
2015-05-08 22:49:14 +01:00
Christoph M. Wintersteiger 8d7b76f2b2 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-08 22:46:38 +01:00
Nikolaj Bjorner 901d8a9f5b change exception test to take into account new coercion operation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-08 00:38:26 -07:00
Nikolaj Bjorner ad39811dc0 allow coercion from Boolean to Int/Real, fixes #78
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-07 21:36:37 -07:00
Nikolaj Bjorner dc52ebd312 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-07 21:33:51 -07:00
Nikolaj Bjorner 45eda4bee7 allow coercion from Boolean to Int/Real, fixes #78
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-07 21:33:36 -07:00
Nikolaj Bjorner 99861ffc32 allow coercion from Boolean to Integers and reals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-07 21:32:02 -07:00
Christoph M. Wintersteiger a63481de85 New implementations of fp.roundToIntegral in mpf and fpa2bv.
Partially fixes #69
2015-05-06 19:19:03 +01:00
Christoph M. Wintersteiger 53b479e1c3 Bugfix for fp.rem(0, 0).
Fixes #70.
2015-05-06 12:24:18 +01:00
Christoph M. Wintersteiger 73eb7cbf5c Bugfix for mpf roundToIntegral.
Partially fixes #69
2015-05-05 23:53:33 +01:00
Christoph M. Wintersteiger 57af3a4c6e FPA min/max refactoring and fixes.
Fixes #68

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-05-04 13:47:04 +01:00
Nikolaj Bjorner 9377779e58 merge with unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-30 10:40:03 -07:00
Nikolaj Bjorner a0f0b53686 fixes to #52, #53
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-28 14:48:59 -07:00
Nikolaj Bjorner 620c11932b type check distinct operator. fixes #62
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-27 11:10:37 -07:00
Nuno Lopes f7d9438e7b add failing test for issue #62 (mk_distinct doesnt type check)
Signed-off-by: Nuno Lopes <nlopes@MSRC-3617536.europe.corp.microsoft.com>
2015-04-27 17:44:38 +01:00
Christoph M. Wintersteiger abe73db702 FP: bugfix for get_some_value which couldn't produce rounding-mode values. 2015-04-25 15:19:48 +01:00
Christoph M. Wintersteiger 4768a360f8 FP: Fix for conversion functions from non-FP 0 to +0.0 even when the rounding mode is ToNegative. 2015-04-25 15:01:20 +01:00
Christoph M. Wintersteiger b58d3f4335 Bugfix for MPF unpacking 2015-04-25 14:26:18 +01:00
Christoph M. Wintersteiger 8c3fc574d1 comments fix 2015-04-24 15:37:45 +01:00
Nikolaj Bjorner ffc3a36dcb checked ite-expressions as shared for bounds detection
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-23 19:59:33 +02:00
Ken McMillan 9bff93279f merging into unstable 2015-04-20 12:31:16 -07:00
Ken McMillan 5f37b1d32f fixed interp api bug (github issue #47) 2015-04-20 12:30:15 -07:00
Nikolaj Bjorner 6c1a5390ef fix big-int bug for shift amounts, github issue 44, reported by Dejan
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-20 10:20:06 +02:00
Nikolaj Bjorner 7d88d04514 fix crash reported by Jojanovich, github issue 45'
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-20 00:55:30 +02:00
Christoph M. Wintersteiger 7e6ab736c0 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-04-17 16:10:13 +01:00
Christoph M. Wintersteiger f1a1267d4c Added missing notes on fpToIEEEBV in Python. 2015-04-17 16:08:53 +01:00
Ken McMillan af444beb2e re-indenting interp and duality 2015-04-15 12:22:50 -07:00
Christoph M. Wintersteiger e1303e1eab Python API: Fixed expression types for floating point conversion functions.
Partially fixes #39
2015-04-15 12:07:53 +01:00
Nikolaj Bjorner 80a13977fc fix race condition from cancellation exposed by build regression tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-15 05:44:10 +01:00
Christoph M. Wintersteiger 2948e47240 Java API doc fix 2015-04-13 17:43:29 +01:00
Nikolaj Bjorner 3ba2e712b2 merge with unstable branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-12 15:54:52 -07:00
Christoph M. Wintersteiger b7bb53406f Turned Z3Exception into a RuntimeException such that throws declarations are not needed anymore. Thanks to codeplex user steimann for this suggestion. 2015-04-08 13:16:32 +01:00
Christoph M. Wintersteiger 2f4c923216 Bugfix; InterpolationContext deleted Z3_config objects (inconsistent with non-Interpolation mk_context).
Fixes #25
2015-04-08 13:09:27 +01:00
Nikolaj Bjorner 841c1c2290 scope precedence of ||, github issue 24
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-03 12:06:31 -07:00
Nikolaj Bjorner 0e8a0822f1 fix used_vars reported by Daniel J. H, issue #24
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-03 11:59:27 -07:00
Ken McMillan d797b0c285 merge 2015-04-03 11:25:43 -07:00
Nikolaj Bjorner bd162588b2 enable SAT solver by default for MaxSAT constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-02 17:09:01 -07:00
Nikolaj Bjorner 26c53d055a Merge branch 'opt' of https://github.com/Z3Prover/z3 into opt 2015-04-02 15:22:41 -07:00
Nikolaj Bjorner dca0fb77c2 use same defaults as unstable branch for difference logic configuration
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-02 15:22:32 -07:00
Ken McMillan b6787fe5a9 merge 2015-04-02 13:13:10 -07:00
Ken McMillan d42e3ce651 possible header problem for std::less 2015-04-02 13:10:23 -07:00
Nikolaj Bjorner d01c3491a6 simplify with caching, but without expanding number of asserted formulas. Bug reported by Heizmann, codeplex issue 197
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-02 10:28:30 -07:00
Christoph M. Wintersteiger b47851d7da Made GetInterpolant and ComputeInterpolant public in Java and .NET.
Fixes Codeplex discussion #616450
2015-04-02 16:51:30 +01:00
Nikolaj Bjorner 6b995c4077 disable wrong fix for simplification
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-02 02:56:40 -07:00
Nikolaj Bjorner e944f89505 fix bug introduced when clearing state between calls to Pareto/Box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-02 02:36:01 -07:00
Nikolaj Bjorner fc36d861a7 update default to maxres for MaxSAT, reset pareto and box state on every constraint update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-01 19:32:50 -07:00
Nikolaj Bjorner 9978cba5a8 Codeplex issue 191: inconsistent results from PDR engine. The report exposed bugs in the implementation of the priority queue leaving unexplored leaves durin search. The priority queue has now been revised to address the exposed bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:27:15 -07:00
Nikolaj Bjorner f8d04118d8 switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:21:56 -07:00
Nikolaj Bjorner 52619b9dbb pull unstable
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 14:57:11 -07:00
Nikolaj Bjorner 9c55be14fb change print parameters to use hyphen instead of namespace dots
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 10:56:40 -07:00
Christoph M. Wintersteiger 1d9c9bcf7a Made the InterpolationContext public.
Fixes #20
2015-03-31 19:51:42 +02:00
Christoph M. Wintersteiger 99ea0a8c19 Bugfix for mpf is_normal.
Fixes #17
2015-03-30 08:02:57 +01:00
Christoph M. Wintersteiger 5911f788c3 Improved translation from reals to floats (fp.to_real).
Fixes #14
2015-03-29 14:39:47 +01:00
Christoph M. Wintersteiger 0ed16c09f9 Bugfix for fp.isNegative.
Fixes #13
2015-03-29 13:57:11 +01:00
Christoph M. Wintersteiger 690eb8eaca Bugfix for fp.isSubnormal.
Fixes #10
2015-03-29 13:31:44 +01:00
Christoph M. Wintersteiger fc84461e31 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-26 14:49:45 +00:00
Christoph M. Wintersteiger 9cbf45f689 Added int to float conversion. 2015-03-26 14:48:55 +00:00
Nikolaj Bjorner 10cdbb881f enable canceling simplex on interrupt, investigating PDR inconsistency
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-25 12:13:57 -07:00
Nikolaj Bjorner 39892aae10 cache datatype util in context to avoid performance bug, codeplex issue 195
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-03-25 11:46:17 -07:00
Nikolaj Bjorner 3c5897eea0 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-25 11:25:12 -07:00
Nikolaj Bjorner 2aa91eee70 cache datatype util in context to avoid performance bug, codeplex issue 195
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-03-25 11:24:47 -07:00
Christoph M. Wintersteiger a792790882 Fixed performance problems with enumeration sorts (Codeplex #190). 2015-03-25 18:08:56 +00:00
Christoph M. Wintersteiger 1c77ad00c3 Added accessors to enumeration sorts. Thanks to codeplex user steimann for suggesting this.
(http://z3.codeplex.com/workitem/195)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-24 21:42:05 +00:00
Christoph M. Wintersteiger b76d588c28 Renamed the soft_timeout option to just timeout.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-21 16:10:30 +00:00
Ken McMillan be709802cd merging interpolation fix (issue 182) 2015-03-20 17:46:01 -07:00
Ken McMillan 47d33452c6 interpolation fix (issue 182) 2015-03-20 17:39:45 -07:00
Christoph M. Wintersteiger ed81e3b9d8 Bugfix for BV-SLS initialization
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-20 17:07:32 +00:00
Nikolaj Bjorner 4145b92136 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:52:07 -07:00
Nikolaj Bjorner f47cc70236 use of regions for AUX lemmas from pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 11:48:52 -07:00
Nuno Lopes 4ed062d54a fix missing memset in my previous commit
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-11 11:04:33 +00:00
Nikolaj Bjorner 695ce643f5 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-03-11 00:45:09 -07:00
Nikolaj Bjorner 755a259ea0 fix codeplex issue 188
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 00:44:56 -07:00
Nikolaj Bjorner 51267f3aba take into account that bound from optimization may create atom that clashes with inequality bound from term
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-11 00:26:49 -07:00
nikolajbjorner fe6af38d97 debugging assertion violation
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-03-10 20:57:01 -07:00
Nuno Lopes 44e647e72b add reallocate() function and use it in bit_vector and vector containers
give a speedup of 1-4%

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-10 16:53:47 +00:00
Christoph M. Wintersteiger 55ca6ce44b Resurrected the dack* options.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-04 19:15:22 +00:00
Christoph M. Wintersteiger 858ce1158d Bugfix in model translation (ast_manager mismatch after par-or). Thanks to stackoverflow user user297886 for reporting this issue.
http://stackoverflow.com/questions/28852722/segmentation-fault-while-using-par-or-tactic
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-03-04 18:30:06 +00:00
Nuno Lopes 89c43676d5 save memory in the sat solver to tentatively speed things up.
I get a slight speedup on my benchmarks. There's still one extra sign extend, which will be removed in a follow-up patch

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-02 09:50:35 +00:00
Nuno Lopes e64760abbd fix the build with VS
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-03-02 09:18:15 +00:00
Nikolaj Bjorner 8bcd6edd08 temporary build fix
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-03-01 15:19:57 -08:00
Nuno Lopes 8029e31ddd add compiler attributes to allocation functions
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-02-28 17:31:50 +00:00
nikolajbjorner 3bf22964dd Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-27 11:09:05 -08:00
nikolajbjorner 3ca3c948cf add bit-vector extract shortcuts to C++ API
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-27 11:08:49 -08:00
Nuno Lopes 71d31c1267 minor optimization to reset() methods in smt::ketnel and smt::quantifier_manager
Signed-off-by: Nuno Lopes <a-nlopes@MSRC-4051274.europe.corp.microsoft.com>
2015-02-27 11:48:14 +00:00
Nikolaj Bjorner 696a1a453a Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-24 17:34:52 -08:00
Nikolaj Bjorner 64e2011d42 fix crash in explanation generation. Codeplex issue 181
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-24 17:34:38 -08:00
Nikolaj Bjorner dffb0ff844 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2015-02-24 17:04:01 -08:00
Nikolaj Bjorner b8fbc32689 fix crash in explanation generation. Codeplex issue 181
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-24 17:03:34 -08:00
nikolajbjorner fbf8289394 probe also hard constraints before enabling SAT solver. Bug reported by Zvonimir Pavlinovic
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-24 14:02:23 -08:00
Christoph M. Wintersteiger a51aed0133 Fixed bug in constant propagation
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-02-24 21:26:25 +00:00
nikolajbjorner fcb4962016 add patch suggested by Arie Gurfinkel
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-23 11:18:24 -08:00
nikolajbjorner f0967c0572 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-23 10:29:10 -08:00
nikolajbjorner 0d9f949ab2 Fix memory smash on double free of clauses
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-23 10:28:32 -08:00
Nikolaj Bjorner 8ea7a1905f reset scope on reset, codeplex issue 183
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-22 10:16:38 -08:00
Nikolaj Bjorner c3232693f0 use PB solver instead of full arithmetic for bouding Pareto fronts so that difference logic theory isn't broken. Codeplex issue 175
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-22 09:46:21 -08:00
Nuno Lopes a106b4125a move definition of Z3_API to the right file
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-02-22 11:57:40 +00:00
Nuno Lopes 1e30fd2c65 Hide non-exported symbols when compiling with gcc/clang.
I get a 17% reduction in the size of libz3.so on linux 32 bits, plus a 0.5-1% speedup when using the API.

Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-02-22 11:38:46 +00:00
Nuno Lopes 5676fbbc9e compiler love: make a few symbols static and avoid unneeded relocations
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
2015-02-22 11:13:51 +00:00
Nikolaj Bjorner 49483fdc28 take conflicts during restart into account. reported by Arie Gurfinkel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-21 02:08:00 -08:00
nikolajbjorner a96a9a076d Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2015-02-19 19:10:21 -08:00
nikolajbjorner aa40316268 rewrite terminology for policheck
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-19 19:09:12 -08:00
Ken McMillan ece838bc80 merge interpolation fix 2015-02-19 12:38:23 -08:00
Ken McMillan 185f9325a6 fixed interpolation bug 2015-02-19 12:25:06 -08:00
nikolajbjorner 7735a40752 fix bug in array simplification. Codeplex issue 173
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-19 07:01:55 -08:00
Christoph M. Wintersteiger 9b137d54d3 Bugfix and new examples for implicit assumptions in Z3_solver_assert_and_track. Thanks to Amir Ebrahimi for reporting this issue!
(See http://stackoverflow.com/questions/28558683/modeling-constraints-in-z3-and-unsat-core-cases)

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
2015-02-18 16:25:27 +00:00
Nikolaj Bjorner 911ffc370a separate MaxSMT functionality to enable using this independently (and incrementally) of overall context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-16 09:11:28 +01:00