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

112 commits

Author SHA1 Message Date
Nikolaj Bjorner df6b1a707e remove proof_converter from tactic application, removing nlsat_tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 23:32:29 -08:00
Nikolaj Bjorner dc0b2a8acf remove extension model converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 17:25:35 -08:00
Nikolaj Bjorner 0d15b6abb7 add stubs for converting assertions, consolidate filter_model_converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 14:51:13 -08:00
Nikolaj Bjorner 454e12fc49 update to vector format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-10 15:28:16 -08:00
Nikolaj Bjorner ee3ed3a27a Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-09 09:55:41 -08:00
Nikolaj Bjorner 700f413e26 updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-09 09:55:37 -08:00
Nikolaj Bjorner 75b8d10f48 add backtrack level to cuber interface
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-08 21:44:21 -08:00
Nikolaj Bjorner 2746528aab fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-07 17:16:36 -08:00
Nikolaj Bjorner 303157d3b7 allow incremental mode override
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-06 15:00:52 -08:00
Nikolaj Bjorner 5813e22032 fix race condition, exception handling/throwing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-05 18:24:15 -08:00
Nikolaj Bjorner 9a4fb4ff76 remove ad-hoc parameters, deprecating dimacs cube mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-05 14:08:55 -08:00
Nikolaj Bjorner 70ee030228 updates to parallel tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-05 10:53:25 -08:00
Nikolaj Bjorner e46e9cf86d work on parallel-tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-04 15:56:05 -05:00
Nikolaj Bjorner 59ea11b1a3 cube and conquer parallel tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-04 13:40:31 -05:00
Nikolaj Bjorner fd49a0c89c added facility to persist model transformations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-02 00:05:52 -05:00
Nikolaj Bjorner caaf0ba33c model-add/del
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-01 22:32:22 -05:00
Nikolaj Bjorner 3de8c193ea implementing model updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-30 16:11:51 -05:00
Nikolaj Bjorner 92b5301b7f adding Cube method to .NET API, removing lookahead and get-lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-29 08:57:24 -07:00
Nikolaj Bjorner e4b595d490 add solver pool abstraction for Spacer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-28 16:10:20 -07:00
Nikolaj Bjorner b72225d7d0 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-24 15:16:59 -07:00
Nikolaj Bjorner 4d48811efd updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-13 11:22:47 -07:00
Nikolaj Bjorner 81ad69214c fixing lookahead/ba + parallel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-11 17:06:28 -07:00
Nikolaj Bjorner 79ceaa1d13 fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-11 13:17:57 -07:00
Nikolaj Bjorner 97f37613c2 parallel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-11 07:50:04 -07:00
Nikolaj Bjorner 1a6f8c2fad working on parallel solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-10 16:35:05 -07:00
Nikolaj Bjorner 8b32c15ac9 use clause structure for nary
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-10 11:49:31 -07:00
Nikolaj Bjorner a0cd6e0fca adding outline for parallel tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-09 16:47:23 -07:00
Nikolaj Bjorner a625301a41 expose incremental cubing over API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-28 15:05:10 -07:00
Nikolaj Bjorner e507a6ccd1 adding incremental cubing from API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-28 09:06:17 -07:00
Nikolaj Bjorner ced2029ae9 local changes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-25 16:37:15 -07:00
Nikolaj Bjorner cab4e4b461 add feature to display benchmark in format seen by SAT solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-21 18:32:46 -05:00
Nikolaj Bjorner 651587ce01 merge with master branch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-19 09:39:22 -07:00
Nikolaj Bjorner 5d17e28667 support for smtlib2.6 datatype parsing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-04 21:12:43 -07:00
Nikolaj Bjorner a3dba5b2f9 hide new datatype plugin
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-03 20:01:59 -07:00
Nikolaj Bjorner 5db349f6fa raise an exception if trying proof generation for the SAT solver. Stackoverflow question https://stackoverflow.com/questions/45885321/check-function-while-qf-fd-logic-is-set-throws-accessviolationexception
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-27 23:52:27 -07:00
Nikolaj Bjorner 97e263299d add logic 'SAT' as an alternative name to QF_FD some solverFor(SAT) works too. #1152
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-15 01:35:28 -07:00
Nikolaj Bjorner f99048f3e7 rewrite to address some cases like #1203, updates to division handling in NRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-08-12 13:24:54 -07:00
Nikolaj Bjorner b19f94ae5b make include paths uniformly use path relative to src. #534
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-31 13:24:11 -07:00
Nikolaj Bjorner b482dbd589 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-27 17:02:27 -07:00
Nikolaj Bjorner 08524a2d90 cleanup for warning message
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-07-01 11:47:17 -07:00
Nikolaj Bjorner 6f4c873b29 debugging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-27 13:18:20 -07:00
Nikolaj Bjorner 6caef86738 translate
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-22 21:05:54 -07:00
Dan Liew 229fd3dc3e [CMake] Fix dependencies for generating install_tactic.cpp.
Previously CMake was not aware of which headers files the generation
of `install_tactic.cpp` depended on. Consequently this could result
in broken incremental builds if

* Existing headers that declared tactics/probes changed.
* New tactics/probes were added to new header files.

Now the `z3_add_component()` CMake function has been modifed to take an
optional `TACTIC_HEADERS` argument which allows the headers that declare
tactics/probes to be explicitly listed. The necessary component
declarations have been modified to declare their tactic/probe header
files.

With this information CMake will now regenerate `install_tactic.cpp`
correctly.

This required the `mk_install_tactic_cpp_internal()` function to be
changed to take a list of header files rather than a list of component
source directories. The two consumers (CMake and Python/Makefile build
systems) of this function have been modified to work with this change.

This partially fixes #1030.
2017-06-21 23:03:48 +01:00
Nikolaj Bjorner ce592d7716 add facility to add lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-12 19:44:02 -07:00
Dan Liew 4b517b96df [CMake] Move CMake files into their intended location so the
`contrib/cmake/bootstrap.py` script no longer needs to be executed.

The previous location of the CMake files was a compromise proposed
by @agurfinkel in #461. While this has served us well (allowing progress
to be made) over time limitations of this approach have appeared.

The main problem is that doing many git operations (e.g. pull, rebase)
means the CMake files don't get updated unless the user remembers to
run the script. This can lead to broken and confusing build system
behaviour.

This commit only does the file moving and necessary changes to
`.gitignore`. Other changes will be done in subsequent commits.
2017-06-12 11:59:00 +01:00
Nikolaj Bjorner af6ebbcd92 init search before returning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-11 13:08:05 -07:00
Nikolaj Bjorner c870b77366 fixes to lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-08 17:25:06 -07:00
Nikolaj Bjorner c33dce1161 extract lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 14:12:55 -07:00
Nikolaj Bjorner 538411c67f remove dependencies on fd_tactic.h
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 15:03:34 -07:00
Nikolaj Bjorner 4e65c13726 adding lookahead and lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-01 14:49:54 -07:00