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

84 commits

Author SHA1 Message Date
Nikolaj Bjorner
e4f29a7b8a debugging mc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-19 21:09:52 -08:00
Nikolaj Bjorner
c7ee532173 fix static
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-18 10:44:40 -08:00
Nikolaj Bjorner
7b8101c502 fix bugs related to model-converter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-17 12:25:24 -08:00
Nikolaj Bjorner
3047d930e1 fix xor processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 19:53:50 -08:00
Nikolaj Bjorner
d79c33fb21 fix model bugs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-13 16:12:38 -08:00
Nikolaj Bjorner
1c2966f8e9 updates to model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-01-11 11:20:23 -08:00
Nikolaj Bjorner
b1724b2f62 fix update to variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-28 14:39:16 -08:00
Nikolaj Bjorner
0b424942ab bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-23 14:42:21 -08:00
Nikolaj Bjorner
8198a8ce7b bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-23 14:41:16 -08:00
Nikolaj Bjorner
c199344bbf fix sat model converter to work with incrementality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-12-18 11:12:27 -08:00
Nikolaj Bjorner
427b5ef002 set eliminated to false on literals used in clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-30 11:20:19 -08:00
Miguel Angelo Da Terra Neves
cba0599046 model converter fixes
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-29 17:14:49 -08:00
Nikolaj Bjorner
a57628fbcc fix missing conversions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-28 14:12:05 -08:00
Nikolaj Bjorner
5f0a02b5f7 remove output
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 09:05:17 -08:00
Nikolaj Bjorner
8230cbef4c fix mc efficiency issues
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-22 08:55:21 -08:00
Nikolaj Bjorner
87a1e2b30e Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-11-21 13:32:44 -08:00
Nikolaj Bjorner
ef30868ad7 change lookahead equivalence filter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-21 13:32:40 -08:00
Miguel Angelo Da Terra Neves
773d938925 re-adding simplified constraints based on model converter
Signed-off-by: Miguel Angelo Da Terra Neves <t-mineve@microsoft.com>
2017-11-21 13:24:14 -08:00
Nikolaj Bjorner
2f218b0bdc remove also cores as arguments to tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-19 12:18:50 -08:00
Nikolaj Bjorner
4bbece6616 re-organize proof and model converters to be associated with goals instead of external
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-18 16:33:54 -08:00
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
b3bd9b89b5 prepare for inverse model conversion for formulas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-17 19:55:23 -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
2746528aab fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-07 17:16:36 -08:00
Nikolaj Bjorner
7c743b3d16 add direct FromFile method to solvers so that model transformations are loaded along with assertions.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-11-02 09:25:18 -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
829c140087 ensure that bca takes also lemmas into account
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-27 15:40:25 -07:00
Nikolaj Bjorner
ac0202630e fix non-termination bug with retained clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-25 15:40:11 -07:00
Nikolaj Bjorner
32711790e8 bug fixes reported by Miguel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-10-25 13:36:48 -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
6c4cadd223 tidy
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-28 00:33:56 -07:00
Nikolaj Bjorner
ae9a6664d4 add cube mode
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-24 10:53:57 -07:00
Nikolaj Bjorner
2751cbc270 n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-09-23 22:36:36 -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
394d54fa8b fix missin clause generation for ad-hoc handling of conjunction #1245 2017-09-05 09:54:52 -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
e176c4ba9a rename to ba_solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-28 17:54:16 -07:00
Nikolaj Bjorner
6fad478a18 reorg
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-28 17:46:29 -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
c33dce1161 extract lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-04 14:12:55 -07:00
Nikolaj Bjorner
7d245be4e1 enable exposing internal solver state on interrupted solvers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-30 17:33:27 -07:00
Nikolaj Bjorner
c49550ff2d enable pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-07 18:03:38 -07:00
Nikolaj Bjorner
59baaea219 integrating local search, supporting top-level inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-01 19:49:59 -08:00