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

3822 commits

Author SHA1 Message Date
Nikolaj Bjorner a7e2fb31e3 updates to resource exceptions, update master possibly handle pull request issue
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 11:36:49 -08:00
Christoph M. Wintersteiger d5f79c1f17 build fix for ML API 2015-12-12 19:30:25 +00:00
Nikolaj Bjorner b31ba47271 ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:25 +00:00
Nikolaj Bjorner 17bbaa06dc ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner a134a079b1 ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner 16f1b72b7c cleanup deprecated critical sections, fix cancellation for par_or_else tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner 32be23fdaa fix index into reversed contains semantics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner 267a1e962c moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner d4a90d7ec3 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:24 +00:00
Nikolaj Bjorner a9723fb6c7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:23 +00:00
Nikolaj Bjorner 9769322690 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:23 +00:00
Nikolaj Bjorner e08bfb62f8 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:23 +00:00
Nikolaj Bjorner 589626b738 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:23 +00:00
Nikolaj Bjorner f2f9578c0a cleanup cancelation logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 19:30:22 +00:00
Nikolaj Bjorner 2ecbe26be1 ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 10:24:19 -08:00
Nikolaj Bjorner 54ac71cada ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 10:23:56 -08:00
Nikolaj Bjorner 4132fc2d91 ensure limit children are safe for race conditions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 10:18:51 -08:00
Nikolaj Bjorner 2a051719d8 cleanup deprecated critical sections, fix cancellation for par_or_else tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-12 09:43:00 -08:00
Nikolaj Bjorner c97db1722d fix index into reversed contains semantics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 22:00:01 -08:00
Nikolaj Bjorner 9c597e9eea Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-11 17:47:03 -08:00
Nikolaj Bjorner 521271e559 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 17:46:22 -08:00
Nikolaj Bjorner 1aea9722cb moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:56:23 -08:00
Nikolaj Bjorner 96d1066c6a reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:43:48 -08:00
Nikolaj Bjorner baee4225a7 reworking cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 16:21:24 -08:00
Nikolaj Bjorner 981f8226fe moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:36:47 -08:00
Nikolaj Bjorner 32b6b2da44 moving to resource managed cancellation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 13:13:11 -08:00
Nikolaj Bjorner 61dbb6168e cleanup cancelation logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 12:35:35 -08:00
Nuno Lopes 39ca5480d7 ensure that formula is skolemized in the smt solver when using MBQI
Reviewed by Nikolaj

Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-12-11 18:18:09 +00:00
Nuno Lopes ef06da8c2c fix build with gcc 2015-12-11 18:14:14 +00:00
Christoph M. Wintersteiger 8fef9e57c5 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-11 17:52:12 +00:00
Nikolaj Bjorner 4e155887b2 consolidate cancellation to context check_cancel_flag instead of calling in set_cancel()
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 09:51:43 -08:00
Christoph M. Wintersteiger ea353d77e9 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-11 17:48:50 +00:00
Christoph M. Wintersteiger 12ee1d342c Improved argument validation in FP API.
Fixes #372
2015-12-11 17:48:40 +00:00
Nikolaj Bjorner ee4ed1749a add cancel checks in model finder, patch by Sarah Winkler
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 09:09:25 -08:00
Nikolaj Bjorner aa415f3d58 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-11 08:37:55 -08:00
Nikolaj Bjorner 85b9bb3cc6 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-11 08:37:47 -08:00
Christoph M. Wintersteiger b25f517a89 Bugfix for C++ API.
Fixes #371.
2015-12-11 14:03:41 +00:00
Christoph M. Wintersteiger cc8e685f45 whitespace 2015-12-11 14:03:24 +00:00
Nikolaj Bjorner 58411f64e8 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 20:25:12 -08:00
Nikolaj Bjorner 5eb23e1e7a seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 19:20:16 -08:00
Christoph M. Wintersteiger 383d06b225 Bugfix for Expr.isInt in .NET, Java, ML.
Fixes #370
2015-12-10 15:13:55 +00:00
Nikolaj Bjorner 30580a012a seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 02:38:56 -08:00
Nikolaj Bjorner d81186eaca seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-10 01:36:17 -08:00
Nikolaj Bjorner f9ca66d90b seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 23:19:16 -08:00
Nikolaj Bjorner d58c219b54 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 22:18:02 -08:00
Nikolaj Bjorner c5a9d81d93 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 20:17:00 -08:00
Nikolaj Bjorner fe1039d12f seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 14:48:50 -08:00
Nikolaj Bjorner 0e701138e1 disable restart code in seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 09:53:18 -08:00
Nikolaj Bjorner 035f2bb0da disable unsound simplification of root objects, and incorrect evaluation of negative even roots
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 08:41:59 -08:00
Nikolaj Bjorner d11022cf2d Merge pull request #362 from NikolajBjorner/master
Combined updates to seq, add openbsd cases to build script.
2015-12-09 07:30:51 -08:00
Nikolaj Bjorner b1a1aa5007 remove unused field
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 07:09:23 -08:00
Nuno Lopes d9cd01f3f7 remove a few leftovers from min aggregation cleanup
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-12-09 09:28:17 +00:00
Nikolaj Bjorner aebdc8950a Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-09 00:40:36 -08:00
Nikolaj Bjorner b9302e6caf seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-09 00:38:03 -08:00
Nikolaj Bjorner 94bd2fdbe4 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 21:03:28 -08:00
Nikolaj Bjorner 24de0a9b90 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 16:37:08 -08:00
Nikolaj Bjorner 6c2e7e7675 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 16:03:24 -08:00
Nikolaj Bjorner 932a3a8387 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 13:27:17 -08:00
Nikolaj Bjorner 895d032996 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 10:33:09 -08:00
Nuno Lopes 4b0f2cae0d fix compiler warning in scoped_timer.cpp on linux
2 secs in nanosec representation still fit in 31 bits, so no need for ULL

Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-12-08 17:03:18 +00:00
Nikolaj Bjorner 5aabc64312 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 08:11:00 -08:00
Nikolaj Bjorner 2b190039d5 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-08 03:35:03 -08:00
Nikolaj Bjorner e7687132ed seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-08 03:34:58 -08:00
Nikolaj Bjorner ca96fea2c0 add seq methods
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-07 16:28:20 -08:00
Nikolaj Bjorner d9fee9af1e Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-07 15:01:56 -08:00
Nikolaj Bjorner a9f5c2f864 seq
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-07 15:01:46 -08:00
Christoph M. Wintersteiger 3626d9f69f Bugfix for floating-point API.
Fixes #358.
2015-12-07 19:24:09 +00:00
Nikolaj Bjorner 34a0d7dfed remove python_install target from all
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-07 09:59:46 -08:00
Christoph M. Wintersteiger 2a0bbad524 Bugfix for ML API 2015-12-07 14:42:40 +00:00
Christoph M. Wintersteiger cfc25b5094 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-07 13:14:00 +00:00
Nikolaj Bjorner 03d1391ded merge seq and string operators
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 23:37:37 -08:00
Nikolaj Bjorner 8bb73c8eae merge seq and string operators
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 23:34:28 -08:00
Nikolaj Bjorner 4944035c0a Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-06 22:16:50 -08:00
Nikolaj Bjorner 08bfd08412 merging seq and string
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 22:15:56 -08:00
Nikolaj Bjorner 4550b7ed91 Merge branch 'master' of https://github.com/NikolajBjorner/z3 2015-12-07 03:27:04 +00:00
Nikolaj Bjorner aead45a252 make dotnet optional and recover from python installation mismatch. Pull requests #338, #340
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 19:14:31 -08:00
Andres Notzli ced9ba17e9 Fix misc issues in Python API docstrings 2015-12-06 19:00:17 -08:00
Nikolaj Bjorner b5fcbd7099 Merge branch 'mono_dotnet_bindings' of https://github.com/delcypher/z3-1 2015-12-06 13:51:43 -08:00
Nikolaj Bjorner 89fe24342d fix size_t mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 11:06:58 -08:00
Nikolaj Bjorner 40e9e4c7f8 more rewrites
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-06 10:44:19 -08:00
Nikolaj Bjorner 4fe0e07080 indexof
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 16:36:11 -08:00
Nikolaj Bjorner 5296009f46 ground string rewriting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 15:38:54 -08:00
Nikolaj Bjorner 75359c580e add basic rewriting to strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 12:02:33 -08:00
Nikolaj Bjorner c04f75cdbb fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-05 10:30:08 -08:00
Dan Liew c8a2b6645a Teach the build system to generate and install a pkg-config file for the
".NET" bindings. This file is required for Monodevelop to find the
bindings because Monodevelop uses pkg-config to find packages
(it doesn't use the GAC).

For lack of a better name the GAC (and pkg-config) package name is now
``Microsoft.Z3.Sharp``. I don't want to call it ``Microsoft.Z3`` because
someone may want to create a ``Microsoft.Z3.pc`` file in the future for
the native Z3 library (i.e. C++ or C bindings).

In addition there is a new utility function ``configure_file()``
which reads a template file, applies some substitutions and writes
the result to another file. This very similar to what CMake does.

There is a new environment variable ``Z3_INSTALL_PKGCONFIG_DIR``
which allows pkgconfig directory to be controlled for the install.
2015-12-05 07:52:31 +00:00
Dan Liew 61d1cd524e Teach the build system to build and install the ".NET bindings"
under non Windows systems (i.e. Using mono).

Building these bindings is unfortunately on by default because
I didn't want to change the command line interface (i.e. ``--nodotnet``)
which people might be relying on. This should really be changed to
match the other binding flags (e.g. ``--java``) but I will leave
this for now.

To perform the build a C# compiler and the GAC utility are required.
The script will try to automatically detect them but the user can
override this by setting the ``CSC`` and ``GACUTIL`` environment
variables.

In order for the ".NET bindings" to be installed the assembly
(``Microsoft.Z3.dll``) needs to have a strong name which means
we need a Strong name key file which is what the
``Microsoft.Z3.mono.snk`` is for. This is the public and private
key so this key **must never** be used for checking integrity. Instead its
only purpose is to avoid any name clashes in the GAC.

It is also worth noting that slightly different flags needs to
be passed to the C# compiler on non Windows platforms. I don't
understand why some of the flags are being used on Windows but I left
a comment there that hopefully someone can fix...
2015-12-05 07:52:31 +00:00
Nikolaj Bjorner b77e387265 value
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 15:26:53 -08:00
Nikolaj Bjorner a8e366aa24 add basic string factory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 15:24:29 -08:00
Nikolaj Bjorner 75c935a4cb add tokens to parse strings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 12:09:15 -08:00
Christoph M. Wintersteiger 4c22a66094 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-04 17:52:59 +00:00
Nikolaj Bjorner 4bbe1d4674 remove unused min-aggregate
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-04 09:23:36 -08:00
Nikolaj Bjorner 3f02beb820 reset-assertions resets everything (also declarations, and we take scopes) when global-declarations is false. v2.5
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-03 10:18:40 -08:00
Nikolaj Bjorner 8e5dec882b Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-03 10:01:41 -08:00
Christoph M. Wintersteiger 36a4828526 Whitespace 2015-12-03 17:55:31 +00:00
Nikolaj Bjorner a4d9642cf2 parsing of SMT 2.5 style string literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-03 09:46:18 -08:00
Christoph M. Wintersteiger 00271e5531 C API cleanup. Mainly removal of ML-specific macros that are not used anymore and inline documentation fixes. 2015-12-03 17:33:25 +00:00
Nikolaj Bjorner 5d61c871b0 add some of the SMT2.5 features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 19:14:47 -08:00
Nikolaj Bjorner e9a2b7f9f0 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-02 18:41:22 -08:00
Nikolaj Bjorner e2565d8d82 add some of the SMT2.5 features
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 18:41:10 -08:00
Christoph M. Wintersteiger d23dce4f7b Bugfix for finite domains in Python API. 2015-12-02 22:34:09 +00:00
Christoph M. Wintersteiger b77f20fb0c Merge branch 'master' of https://github.com/Z3Prover/z3 2015-12-02 17:06:42 +00:00
Christoph M. Wintersteiger 2f86ab98a8 Added finite-domain expressions to the Python pretty printer 2015-12-02 17:04:06 +00:00
Christoph M. Wintersteiger 5510e0ddef Added finite-domain constant to Z3_decl_kind 2015-12-02 17:03:37 +00:00
Christoph M. Wintersteiger 5a43d8a469 Whitespace 2015-12-02 17:02:39 +00:00
Christoph M. Wintersteiger cbda38ee80 Added finite domain expressions and numerals to the .NET, Java, and Python APIs.
Relates to #318
2015-12-02 17:01:52 +00:00
Nikolaj Bjorner 6580f1daf3 expose main interpolation routines in C++ API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-02 07:40:06 -08:00
Christoph M. Wintersteiger 9e756fb6db Warning fix for Comparable<T> in Java API 2015-12-02 14:42:36 +00:00
Christoph M. Wintersteiger 00ce124db3 Bugfix for Z3_is_numeral for finite-domain numerals.
Relates to #318
2015-12-02 14:41:46 +00:00
Christoph M. Wintersteiger 52bbd67cd3 Whitespace 2015-12-02 14:40:47 +00:00
Nikolaj Bjorner 485ac9c39d add macro for converting std::vectors to pointers (leaking abstraction)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-01 16:35:03 -08:00
Nikolaj Bjorner b3e8020c88 bind variables in queries generated from Horn tactic to enforce that rule formulas don't contain free variables. Issue #328
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-01 14:47:33 -08:00
Nikolaj Bjorner aa777bd5c6 Fix for #343. Optimizations introduced on 8-10-2015 were too agressive. Remove unreferened variable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-01 13:43:47 -08:00
Nikolaj Bjorner 9fa4bf2f8f Fix for #343. Optimizations introduced on 8-10-2015 were too agressive
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-12-01 13:41:57 -08:00
Dan Liew b0bc50a75c Fixed stray UTF-8 Byte order mark in `InterpolationContext.cs`.
Old versions of the mono compiler don't like it.
2015-11-30 15:02:02 +00:00
Nuno Lopes 5d289a8da5 fix leak in asserted_formulas::propagate_values() for proof generation mode
continuation of issue #342

Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-29 10:49:52 +00:00
Nuno Lopes d175c99542 fix ast leak in asserted_formulas::propagate_values()
Fixes issue #342

Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-27 20:09:17 +00:00
Christoph M. Wintersteiger db2f973e3e Fixed initialization order in bvarray2uf_tactic 2015-11-27 15:34:06 +00:00
Nuno Lopes 2739930900 fix build with clang
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-27 12:13:44 +00:00
Christoph M. Wintersteiger 8eea6fd775 Bugfix for FPA float to float conversion.
Fixes #337
2015-11-24 17:21:40 +00:00
Christoph M. Wintersteiger 5e37cf9bbf Removed potentially unnecessary string decoding in Python API. 2015-11-23 18:41:31 +00:00
Christoph M. Wintersteiger 6aa5ec9f77 Eliminated unused variables 2015-11-23 13:12:05 +00:00
Christoph M. Wintersteiger 59c1944f92 Bugfix for FP casts (float to float conversion).
Fixes #331.
2015-11-22 14:49:04 +00:00
Nuno Lopes d9bafc3fba rewrite scoped_timer for linux
The previous version was racy and could lead to crashes.
The timer could be deleted before the callback was called, making it execute on already freed memory

This new version is similar to Mac's. It spawns its own thread and uses pthread_cond_wait.
Care is taken for small timeouts to avoid races in the thread creation and timer destruction.

Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-22 11:40:52 +00:00
Nuno Lopes b26735a887 fix build with gcc
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-22 11:24:30 +00:00
Nikolaj Bjorner c1a6163bda disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-20 14:34:31 -08:00
Nikolaj Bjorner 665af3d8b9 remove deprecated user-theory plugins and other unused functionality from API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-20 08:43:27 -08:00
Nikolaj Bjorner fd8fd40669 fix tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-20 08:00:01 -08:00
Nikolaj Bjorner 0592e76574 Enhancement for Valentin #332
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-19 10:26:01 -08:00
Nikolaj Bjorner 9eb051593d Merge pull request #329 from NikolajBjorner/master
Remove deprecated API functionality.
2015-11-19 08:25:22 -08:00
Nikolaj Bjorner 5948013b1b clear label buffer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 18:56:54 -08:00
Nikolaj Bjorner 1d4b996765 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 16:39:51 -08:00
Nikolaj Bjorner c58e640563 extract labels for optimal model. Fix to #325
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 14:53:08 -08:00
Nikolaj Bjorner 9cba63c31f remove deprecated iz3 example. Remove deprecated process control
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 12:32:15 -08:00
Nikolaj Bjorner 1575dd06a7 expose labels from optimization. Move printing of objectives to after sat/unsat. Cahnge format to something that is somewhat related to how other output is created. Issue #325.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 09:42:12 -08:00
Nikolaj Bjorner 04b0e3c2f7 add checks for cancellation inside mam to agilely not ignore Rustan's soft requests for a timeout #326
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-17 18:48:52 -08:00
Nikolaj Bjorner d6d301c5eb fix for mising handling of quantifiers in tactic. Bug #324
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-17 18:38:37 -08:00
Nikolaj Bjorner 66fc873613 Fix for #322: PDR engine cannot falls back on fixed size arithmetic for difference logic. It would eventually overflow and cause incorrect model construction. Enable only fixed-size arithmetic when configuration allows it
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-17 09:00:16 -08:00
Nikolaj Bjorner 3b7dfda0df Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-16 22:59:17 -08:00
Nikolaj Bjorner c8f09fa955 fix for unsound results reported in #313
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-16 22:59:07 -08:00
Yan 4e9b76365d pass the correct context into And() when doing Tactic.as_expr() 2015-11-16 15:41:12 -08:00
Christoph M. Wintersteiger e8d37dba9c Added comments for quantifier constructors. Fixes #319. 2015-11-16 21:58:17 +01:00
Christoph M. Wintersteiger 5e6fa5ee6f Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-16 16:01:05 +01:00
Christoph M. Wintersteiger 706a037bf4 Python 3.x string decoding fix 2015-11-16 15:16:50 +01:00
Nikolaj Bjorner 7712c9f9bb Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-15 12:53:57 -08:00
Nikolaj Bjorner b8e4871d9e disable bottom-up coi filtering when relations contain facts. bug reported by SeanMcL
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-15 10:53:00 -08:00
Nikolaj Bjorner 6ac95048e0 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 18:48:39 -08:00
Nikolaj Bjorner ab4033133f remove solver_old
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 18:46:49 -08:00
Nikolaj Bjorner 3a3e1796e2 Fix bug #311. update tabs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 18:42:11 -08:00
Nikolaj Bjorner f537167080 Fix bug #311
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 18:41:16 -08:00
Nikolaj Bjorner cb85b60160 Fix issue #311
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 18:13:14 -08:00
Nikolaj Bjorner bea68cd194 remove deprecated API functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 17:05:15 -08:00
Nikolaj Bjorner 0f602d652a remove deprecated API functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 13:47:41 -08:00
Nikolaj Bjorner c2108f74f1 fix uninitialized variable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-14 10:35:06 -08:00
Christoph M. Wintersteiger 6b5e49c4a1 Added checks for uint parameter values in context_params 2015-11-14 17:25:18 +00:00
Bernhard F. Brodowsky f880433a69 Fixed typo in warning message. 2015-11-14 15:47:47 +01:00
Nikolaj Bjorner 54bb33615e Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-13 15:13:09 -05:00
Nikolaj Bjorner 0a26bcf14c ensure unique symbols when MaxSAT problems are extracted from linear objectives such that multiple objectives can be supported. Fixes issue #308
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-13 15:12:08 -05:00
Christoph M. Wintersteiger 15c48eeaf9 Fix for timeout/rlimit in deprecated solver API.
Partially fixes #307.
2015-11-13 16:42:46 +00:00
Christoph M. Wintersteiger 954400cfa2 whitespace 2015-11-13 16:35:08 +00:00
Christoph M. Wintersteiger 4cb96bfe76 Fixed assertion failure in fpa2bv_converter.
Partially addresses #307
2015-11-13 15:55:01 +00:00
Christoph M. Wintersteiger 806016c315 build fix 2015-11-13 14:11:39 +00:00
Christoph M. Wintersteiger 643dbb874b Added tactic that translates BV arrays into BV UFs. 2015-11-12 15:27:33 +00:00
Christoph M. Wintersteiger 5f8f0b1280 Added bool rewriter case. 2015-11-12 14:49:21 +00:00
Christoph M. Wintersteiger 5cf2caa7e9 Added check for QF_BV in QF_UFBV tactic. 2015-11-12 14:48:55 +00:00
Christoph M. Wintersteiger 87ae5888ee whitespace 2015-11-12 14:48:29 +00:00
Nikolaj Bjorner 2865f60f8c deal with case of unsatisfiable context and bit-vector objectives that are not normalized to maxsmt. Issue #304
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-11 11:39:34 -05:00
Nikolaj Bjorner 315dc80eb0 toggle default for bv2int decision procedure support to avoid confusing users. Issue #301
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-10 15:09:52 -05:00
Christoph M. Wintersteiger 746689904d Added elim_small_bv_tactic. 2015-11-10 16:23:05 +00:00
Christoph M. Wintersteiger faace0e6a3 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-09 19:44:40 +00:00
Christoph M. Wintersteiger 1807acdf26 tabs, whitespace 2015-11-09 17:50:50 +00:00
Nikolaj Bjorner 84f935ae85 initialize solver prior to translate. fixes build break
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-09 06:38:06 -08:00
Christoph M. Wintersteiger 5995c753d3 Bugfix for theory_fpa construction and destruction. 2015-11-09 13:54:28 +00:00
Christoph M. Wintersteiger 689ed9fa12 Added Z3_mk_array_ext to ML API.
Relates to #292
2015-11-09 13:49:37 +00:00
Christoph M. Wintersteiger cffff18373 -whitespace 2015-11-09 13:22:33 +00:00
Christoph M. Wintersteiger 6625f7a749 Added Z3_solver_translate to ML API. 2015-11-09 13:19:10 +00:00
Christoph M. Wintersteiger 4e05e93ecb Bugfix for FPA model generation/conversion.
Addresses #300
2015-11-09 11:52:44 +00:00
Nikolaj Bjorner e9315af0d9 remove tabs from z3.py to fix build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-08 04:22:44 -08:00
Nikolaj Bjorner 4685a5f8ba add array-ext to externally exposed functions to enable interpolants with arrays to be usable in feedback loops with Z3. Addresses one issue raised in #292
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-07 16:42:13 -08:00
Nikolaj Bjorner 8d1fa3ae50 move mk_fresh to inside files that include smt_context.h directly to address build problem reported in #297
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-07 11:50:06 -08:00
Nikolaj Bjorner 13b19eb351 add translate facility to Java/C# APIs, request #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-07 10:10:21 -08:00
Nikolaj Bjorner c1adffb6ab Merge branch 'master' of https://github.com/Z3Prover/z3 into nsb/master 2015-11-07 10:00:43 -08:00
Nikolaj Bjorner 1758799ef4 add translate facility to inc_sat_solver. Limit lemma copying to unit lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-07 10:00:14 -08:00
Nikolaj Bjorner 396875bedf fix compilation problem, issue #297
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 22:56:53 -08:00
Nikolaj Bjorner 3d993a4ee1 Merge branch 'master' of https://github.com/Z3Prover/z3 into nsb/master 2015-11-06 17:29:53 -08:00
Nikolaj Bjorner b4cb51cdb3 working on Forking/Serializing a z3 Solver #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 17:29:24 -08:00
Nikolaj Bjorner 5ea2c22153 fix build break - by renaming tout to out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 10:21:02 -08:00
Nikolaj Bjorner aeedb931f3 fix build break
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-06 10:20:21 -08:00
Christoph M. Wintersteiger a6b3fba038 Build fix, hide debug code in release mode. 2015-11-06 18:06:23 +00:00
Christoph M. Wintersteiger 05e7aca388 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-06 16:24:48 +00:00
Christoph M. Wintersteiger c2aee86e4e Added new SMT logic names 2015-11-06 16:24:44 +00:00
Nikolaj Bjorner deec11f24a Merge pull request #296 from NikolajBjorner/master
fix for #291. The root issue is that the set of antecedents is recycl…
2015-11-06 07:16:44 -08:00
Nikolaj Bjorner 7b72486644 Merge branch 'master' of https://github.com/Z3Prover/z3 into nsb/master 2015-11-05 17:32:35 -08:00
Nikolaj Bjorner 63ea2c4d8f Merge pull request #295 from pazz/AstRef-hash
add __hash__ to AstRef
2015-11-05 16:20:10 -08:00
Nikolaj Bjorner fc592fc856 fix for #291. The root issue is that the set of antecedents is recycled as a fixed object between routines. Antecedents that were already allocated for a Gomory cut got reset by the internalizer. This causes unsound bounds axioms to be created
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-05 15:08:42 -08:00
Patrick Totzke d4242e16c5 add __hash__ to AstRef
AstRef objects needs to be hashable in order
to be used as keys in python dictionaries
2015-11-05 16:28:02 +00:00
Christoph M. Wintersteiger ebbed7a92e Added tactic comments for QF_AUFLIA, QF_AUFBV, QF_UF, and QF_UFBV default tactics. 2015-11-04 15:44:29 +00:00
Christoph M. Wintersteiger 7037739453 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-04 13:35:00 +00:00
Christoph M. Wintersteiger 715050da0b Java API comments fix. 2015-11-04 13:34:50 +00:00
Nikolaj Bjorner d6cb778365 fix rewriter for model validation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-03 07:45:42 -08:00
Christoph M. Wintersteiger bd94b59a92 Bugfix for arith rewriter to avoid rewriting loops. 2015-11-03 13:00:10 +00:00
Christoph M. Wintersteiger 27140c527c trailing whitespace 2015-11-03 12:56:29 +00:00
Christoph M. Wintersteiger 20715bbf3b Fixed initialization of interpolation context so it is properly disabled when solving SMT v1 benchmarks. 2015-11-03 12:29:02 +00:00
Christoph M. Wintersteiger 949ad4d2fc Trailing whitespace removed. 2015-11-03 12:28:10 +00:00
Nikolaj Bjorner 2efd5bf9d1 Fix bug exposed in #281
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 14:18:49 -08:00
Nikolaj Bjorner f78c769b3b Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-02 13:49:48 -08:00
Christoph M. Wintersteiger 7ac64f1f96 Bugfix for FP model converter (fp.min/fp.max models) 2015-11-02 19:55:25 +00:00
Nikolaj Bjorner ec12368b54 Enable model construction and evaluation for theory functions that may be uninterpreted. To fix issue #237
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 11:36:50 -08:00
Christoph M. Wintersteiger 92152b16ca Bugfixes for model verification of unspecified values of fp.min/fp.max 2015-11-02 19:25:44 +00:00
Christoph M. Wintersteiger 14d2356a32 Code simplification 2015-11-02 19:25:11 +00:00
Christoph M. Wintersteiger ba70ab9ad2 Bugfix for theory_fpa 2015-11-02 19:08:52 +00:00
Nikolaj Bjorner 77fec049a5 Enable model construction and evaluation for theory functions that may be uninterpreted. To fix issue #237
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 10:27:44 -08:00
Nikolaj Bjorner feba64b739 Enable model construction and evaluation for theory functions that may be uninterpreted. To fix issue #237
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 10:18:25 -08:00
Nikolaj Bjorner 7169fc469e Merge branch 'master' of https://github.com/NikolajBjorner/z3 2015-11-02 08:19:35 -08:00
Nikolaj Bjorner 728df41966 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-11-02 08:19:11 -08:00
Nikolaj Bjorner 653416153d use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-02 08:18:51 -08:00
Nikolaj Bjorner 32f3bd17fb adding translation routine to context to address enhancement request #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-31 14:30:54 -07:00
Nikolaj Bjorner 9acaa49a05 adding translation routine to context to address enhancement request #209
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-31 14:28:21 -07:00
Nikolaj Bjorner 4b1a730f46 API method for translating context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-31 12:47:16 -07:00
Nikolaj Bjorner fb624780d5 add checks in internalizer for issues of the form #227
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-31 12:41:57 -07:00
Christoph M. Wintersteiger 88064fc172 minor theory_fpa refactoring 2015-10-31 19:16:09 +00:00
Christoph M. Wintersteiger 1d7aa9ba2f Fixed rewriter bug in theory_fpa. 2015-10-31 18:53:40 +00:00
Christoph M. Wintersteiger 8491b3bebe Revert "Fixed use of mk_th_axiom in theory_fpa."
This reverts commit 89e99c7b4b.
2015-10-31 18:51:32 +00:00
Nikolaj Bjorner 4fd1f4a65c add handler for abuse of OP_IMPLIES
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-31 11:34:55 -07:00
Christoph M. Wintersteiger 89e99c7b4b Fixed use of mk_th_axiom in theory_fpa.
Relates to #227
2015-10-31 13:57:17 +00:00
Nikolaj Bjorner ac3edbbaaa add line/position information to unsupported command reports per zeph pull request
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 19:23:31 -07:00
Nikolaj Bjorner b19fbe4429 make sure to bring constraints into clausal form before using the th_axiom assertion. Old version should not have been used as a template for copying, as in issue #227
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 15:55:18 -07:00
Nikolaj Bjorner 7838213675 eliminate to_real coersions to make mixed integer problems easier to digest. Issue #277
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 15:12:21 -07:00
Nikolaj Bjorner f2c0a82726 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-10-30 14:14:23 -07:00
Christoph M. Wintersteiger 8fffa9f188 Removed trailing whitespace. 2015-10-30 12:20:41 +00:00
Nikolaj Bjorner d83f8d08f3 Merge pull request #276 from kenmcmil/issue260
issue #260 -- support timeout in Z3_compute_interpolant
2015-10-28 20:30:15 -07:00
Ken McMillan d4dff70f39 issue #260 -- support timeout in Z3_compute_interpolant 2015-10-28 18:02:14 -07:00
Nikolaj Bjorner 559f373588 adding PB operators to Python API. remove tabs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 17:13:24 -07:00
Nikolaj Bjorner 7f5495b134 adding PB operators to Python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 17:09:42 -07:00
Christoph M. Wintersteiger 6a5da9e9c4 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-10-28 23:32:42 +00:00
Christoph M. Wintersteiger 118d597c22 removed byte order mark 2015-10-28 23:31:08 +00:00
Nikolaj Bjorner aab63dc126 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-10-28 16:10:34 -07:00
Nikolaj Bjorner 4f7fdb5c14 fix merge conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 16:09:46 -07:00
Ken McMillan 8550de41a6 issue #204 -- throw better exception for non-linear arithmetic 2015-10-28 14:41:27 -07:00
Nikolaj Bjorner 3bc94e08b3 move friend definitions to inlined functions. Issue #241
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 13:24:13 -07:00
Nikolaj Bjorner ced04bc15c Merge pull request #272 from NikolajBjorner/master
Remove old_simplify.bv.hi_div0 option, reconciling it with rewriter.b…
2015-10-28 12:54:55 -07:00
Nikolaj Bjorner 4d6977eaea Remove old_simplify.bv.hi_div0 option, reconciling it with rewriter.bv.hi_div0. To address issue #237
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 12:53:53 -07:00
Christoph M. Wintersteiger cab42d2c66 Clarified documentation of par-or tactic.
Relates to #269.
2015-10-28 18:50:22 +00:00
Christoph M. Wintersteiger ab337de101 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-10-28 18:44:34 +00:00
Christoph M. Wintersteiger c537084056 Revert "Fixed bug in par-or tactic."
This reverts commit 89b6589a37.
2015-10-28 18:42:16 +00:00
Nikolaj Bjorner 6b82b949cf Make Groebner basis computation interruptable. Exponsed in issue #269
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 11:39:59 -07:00
Nikolaj Bjorner 2a95a77706 fix issues #240, #250
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-28 09:47:17 -07:00
Christoph M. Wintersteiger 89b6589a37 Fixed bug in par-or tactic.
Fixes #269.
2015-10-28 15:34:30 +00:00
Christoph M. Wintersteiger 2218f86f03 Merge branch 'master' of https://github.com/Z3Prover/z3 2015-10-28 14:46:23 +00:00
Christoph M. Wintersteiger 15be8d424c Fixed Python 3.x issues. 2015-10-28 14:19:23 +00:00
Nikolaj Bjorner b197e590a4 fix coercion regression. Issue #263
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-27 19:25:38 -07:00