mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Code Activity
14533 commits 23 branches 48 tags 157 MiB
Commit graph

364 commits

Author SHA1 Message Date
Arie Gurfinkel 4abab8aaf5 Fix bug in qe_term_graph 
In merge, parents of A instead of parents of B were traversed.
Among other things, it created stale marks that caused an
infinite loop in to_lits()
 2018-06-27 22:54:55 -04:00
Nikolaj Bjorner 7844476a7d fixes to term-graph, add proof-checker routines for PR_BIND, remove orphaned file 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-27 17:04:47 -07:00
Nikolaj Bjorner 91ef84b8c9 Merge branch 'master' of https://github.com/z3prover/z3 2018-06-27 11:25:04 -07:00
Nikolaj Bjorner 20fc573d5b add laxer check for oeq_quant_intro 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-27 11:24:56 -07:00
Nuno Lopes 2b31024dab add obj_ref::operator=(obj_ref &&) + a few explicit uses 2018-06-26 17:00:56 +01:00
Nikolaj Bjorner 520ce9a5ee integrate lambda expressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-26 07:23:04 -07:00
Nikolaj Bjorner 915983821b add rewrite to each branch of mbp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-24 17:06:49 -07:00
Nikolaj Bjorner 8969a7035c
Merge pull request #1693 from NikolajBjorner/master 
fix #1675
 2018-06-20 17:36:24 -07:00
Nikolaj Bjorner 19e2f8c9d5 fix #1694 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-20 17:35:41 -07:00
Nikolaj Bjorner 335d672bf1 fix #1675, regression in core processing in maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-19 23:23:19 -07:00
Nikolaj Bjorner 8040eddf65 fix #1658 fix #1689 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-18 16:41:04 -07:00
Arie Gurfinkel f936c92efc Improve distinct constraint generation 
still many more optimizations possible
 2018-06-14 22:27:57 -07:00
Nikolaj Bjorner baa96909cc mb-skolem for arithmetic with model repair 
The contract is that users of mb-skolem ensure that
interface equalities are preserved (by adding a
sufficient set of disequalities, such as a chain
x1 < x2 < x3 .., to force that solutions for
x_i does not clash).

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 17:26:04 -07:00
Nikolaj Bjorner a0af3383db fixes to bdd 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 17:25:18 -07:00
Arie Gurfinkel 05abf19009 comment 2018-06-14 16:38:27 -07:00
Arie Gurfinkel a3de478c93 typo 2018-06-14 16:13:53 -07:00
Arie Gurfinkel 83cee9e81f Comments 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 87715620d9 Fix mk_distict in term_graph 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner bc8ddedc54 fix a few build regressions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel e355123e37 Change declaration of projector 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 49279d7047 debugging mbi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 732a8149d8 vurtego update 2018-06-14 16:08:52 -07:00
Arie Gurfinkel a56c9faedb A sketch of vurtego 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner f0e105612c adding dbg 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 9ba76a1332 fixing eufi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner b62d73f209 first round for combined mbi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 81575fae7c Remove unused function 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 535b8893ae Complete euf project with eq and diseq on pure representatives 2018-06-14 16:08:52 -07:00
Arie Gurfinkel b246389267 Don't reset m_is_var in project 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 5e198f4119 Fix clang compilation issues 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner ec8e3f2aee consolidate use of plugin by moving declarations up front (separate from constructor at this point) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 0ae246ad2b add defs to arith solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 5fce4a1d1a Wire qe_solve_plugin into qe_term_graph 
Compiles. Not tested.
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner d5081a48b0 merge while skyping 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 8da84ec69e merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 5dc2b7172d merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 74621e0b7d first eufi example running 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 2288931b46 fix mk_unpure_equalities 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 0f799eb2ae formatting. no change to code 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 6d79b19170 fix a few bugs, debugging eufi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner ba504e4243 debugging mbi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel e0aaf4452b wip: term_graph::project and term_graph::solve 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 144d8df5d5 Rewrite term_graph::project and term_graph::solve 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 771d3b1349 wip: term_graph::project and term_graph::solve 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 7714d05c1a fill out qe_solve_plugin functionality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel e226b39914 Remove pragma once from cpp 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 2e616c482b plugin work 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 5566b5689c Silence clang warning 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 5ab6d6ca16 term_le -> term_lt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner f963fc06f4 sketch out euf-solver based on complete projection 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 44a32bc076 updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 6e61a7c1b2 minor 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 73486be590 fix typo in mk_pure 2018-06-14 16:08:52 -07:00
Arie Gurfinkel 9c7d9818d3 get_app --> get_expr + fix term_lt() 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 9a0406d181 replace app by expr 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 0d71d85069 redo representative algorithm 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner ad153592a2 fix parent list 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner a6848c79b7 redo representative generator to respect stratification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner c4188fc4be initial working version 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 1f634efe04 initial working version 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner 008f003aa0 initial working version 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:52 -07:00
Nikolaj Bjorner da18f0e0b7 prepare term-graph unit testing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 362d9258a4 prepare term-graph for cc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner d26609ebdd prepare term-graph for cc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 14696f03f7 add some review comments 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 2e44850df9 move term graph closer to qe 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 0784074b67 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 688cf79619 working on mbi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner e6468726f5 more code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Nikolaj Bjorner 5fc0f56281 sketch mbi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:51 -07:00
Arie Gurfinkel aa77a918cd Optimizing qe_lite 2018-06-14 16:08:50 -07:00
Arie Gurfinkel 1e54237880 mbp_array: Fix set_model_completion bug 2018-06-14 16:08:50 -07:00
Arie Gurfinkel b50da20531 array_mbp: turn on model completion 2018-06-14 16:08:50 -07:00
Arie Gurfinkel 0452bc3d43 qe_lite: simplify definitions before deciding on elimination order 2018-06-14 16:08:50 -07:00
Arie Gurfinkel b120923dd5 qe_lite: bug fix in der::der_sort_vars() 
The case of

VAR 1 = (+ (:var 2) 10)
VAR 2 = (+ 0 foo)

was not properly handled whenever VAR2 has only one reference.
In that case, VAR2 is not marked as done when VAR1 is processed,
causing VAR2 to be duplicated in elimination order
 2018-06-14 16:08:50 -07:00
Nikolaj Bjorner ebfb2a4a1e Fix mbp to respect reduce_all_selects option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:50 -07:00
Nikolaj Bjorner aa8dac2583 fix uninitialized variable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner e6401908a5 fix crash 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 7e9f7d2cfe remove removed paramter from comment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 92bac11778 update to make variables work with other theories 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 5eacb8122d add tuple features, remove dead code from mbp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 560a26127e bind nested variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 692a701516 updates to mbp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 7642106e73 add way to unit test mbp from command line 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 20300bbf94 updates to mbqi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Arie Gurfinkel bf4c35982f Debug print 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner efb1f50d00 bind nested variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner d95e167d61 updates to mbqi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner e281f85586 add way to unit test mbp from command line 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 402234757e updates to mbqi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 23272f0d2f array support for mbp 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:49 -07:00
Arie Gurfinkel 988466705c port array projection to qe_arrays 
ensure it works with multi-dimensional arrays

commit on behalf of Nikolaj
 2018-06-14 16:08:49 -07:00
Nikolaj Bjorner 7931bd1dfc updates to mbqi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner ff0f257102 remove iff 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-06-14 16:08:48 -07:00
Nikolaj Bjorner b9637924c4 fix #1662 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-05-30 16:47:17 -07:00
Nikolaj Bjorner f525f43e43 merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-04-30 09:30:43 -07:00
Bruce Mitchener 2fa304d8de Remove int64, uint64 typedefs in favor of int64_t / uint64_t. 2018-03-31 14:45:04 +07:00
Nikolaj Bjorner c513f3ca09 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-25 14:57:01 -07:00
Nikolaj Bjorner 8e09a78c26 fix #1510 by reintroducing automatic declaration of recognizers 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-03-02 23:02:20 +09:00
Bruce Mitchener 76eb7b9ede Use nullptr. 2018-02-12 14:05:55 +07:00
Bruce Mitchener 7167fda1dc Use override rather than virtual. 2018-02-10 09:56:33 +07:00
Bruce Mitchener 50f3e9c3c0 Fix typos. 2018-02-09 16:35:26 +07:00
Bruce Mitchener 5911f810ed Fix inconsistent missing override warnings. 2018-02-06 11:23:08 +07:00
Nikolaj Bjorner a1d4e485a4 fix #1469 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-02-05 18:33:31 -08:00
Nikolaj Bjorner e4f29a7b8a debugging mc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2018-01-19 21:09:52 -08:00
Bruce Mitchener 73b3da37d8 Typo fixes. 2018-01-02 22:48:06 +07:00
Nikolaj Bjorner 79a9dfd8fd adding pre-processing to nlsat for equations 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-30 20:35:33 -08:00
Nikolaj Bjorner faebbc5384 add shortcuts for concatenation and equality propagation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-12-08 16:17:04 +05:30
Nikolaj Bjorner 103ce78c29 save model from level 0, fix #1380 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-28 08:53:06 -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 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 07031798ec fix occurs function used in qe_lite #1241 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-11-16 01:43:35 -08:00
Nuno Lopes 9b54b4e784 fix vector<> to support non-POD types 
adjust code to std::move and avoid unnecessary/illegal
 2017-10-16 00:54:29 +01:00
Nikolaj Bjorner d338fab4f6 fix #1305 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-10-12 13:58:14 -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 2ede4b2c80 fixes based on regression tests 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-27 09:31:16 -07:00
Nikolaj Bjorner 2955b0c2ef removing more dependencies 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-26 03:05:34 -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 7b47b0380e update Ackerman reduction for division to make Andre and Nathan happy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-08-10 23:43:21 +02:00
Nikolaj Bjorner 063b6e9ea5 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-07-31 13:24:57 -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
Arie Gurfinkel 331eec8a05 option to control array_der in qe_lite 2017-07-31 14:19:16 -04:00
Nikolaj Bjorner 6558999cef fixes #1171 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-07-27 08:46:20 -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
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
Arie Gurfinkel ef62621f50 make qe_lite prefer simpler definitions 2017-06-20 21:51:08 -04:00
Arie Gurfinkel 9f73359a86 improve comments 2017-06-20 21:50:35 -04:00
Arie Gurfinkel ac6ca4d334 factored out is_variable_proc to a header file 2017-06-20 21:34:49 -04:00
Nikolaj Bjorner 894c60bdf9 fix bug in qe-lite reported in #1086: bookkeeping of unconstrained variables only works for quantifier-free formulas 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 18:22:30 -05: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
Christoph M. Wintersteiger 27a1758857 Added rewriter.ignore_patterns_on_ground_qbody option to disable simplification of quantifiers that have their universals appear only in patterns, but otherwise have a ground body. 2017-04-07 21:19:20 +01:00
Nikolaj Bjorner 70bb92d016 remove nested booleans during pre-processing. issue #837 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-11 05:16:31 +01:00
Nikolaj Bjorner ff46a925a2 bail out on failure to properly project. issue #837 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-11 04:25:05 +01:00
Nikolaj Bjorner 20790c46ee bail out on failure to properly project 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-11 04:23:07 +01:00
Nikolaj Bjorner fe10f2d244 address #835 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-10 07:51:16 +01:00
Nikolaj Bjorner b66d457b19 move arithmetical mbp functionality to model_based_opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-26 16:12:14 -07:00
Nikolaj Bjorner 7fc294d329 move arithmetical mbp functionality to model_based_opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-26 14:30:35 -07:00
Nikolaj Bjorner 017165c474 fix bug with model completion and remove spurious std::cout 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-24 09:02:12 -07:00
Nikolaj Bjorner c72ed3e6b4 update core minimization code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-23 21:39:28 -07:00
Nikolaj Bjorner 5b497b6249 reduce set of mainly verbose warnings raised by -Wmaybe-uninitialized and unused variable warnings from release mode builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-22 20:25:47 -07:00
Nikolaj Bjorner 9c099d6b1b fix mb maximization logic, so far not accessible 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-20 16:39:03 -07:00
Nikolaj Bjorner c7ff05cc78 enable core minimization with qsat in case it turns out to be useful 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-12 15:58:12 -07:00
Nikolaj Bjorner 9f5a117443 move mus to solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-10 16:24:14 -07:00
Nikolaj Bjorner c20b391cf7 reduce warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-23 14:32:51 -07:00
Nikolaj Bjorner c725fe7698 tune lra optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-22 17:03:29 -07:00
Nikolaj Bjorner 339cd6e537 mbo 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-20 13:45:50 -07:00
Nikolaj Bjorner 1aa3fdab8a remove min/max, use qmax; disable cancellation during model evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-19 13:04:20 -07:00
Nikolaj Bjorner 40f8e16273 removing warnings for unused variables, #579 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 14:00:30 -07:00
Nikolaj Bjorner 96e157e201 fix warnings for unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 13:54:22 -07:00
Nikolaj Bjorner a8fca8f77e remove unused private fields 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-15 20:28:46 -07:00
Nikolaj Bjorner 42726171b5 add limit checks in Grobner. Issue #599 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-15 11:34:48 -07:00
Nikolaj Bjorner 5b31f54501 max/min 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-05 14:11:13 -07:00
Nikolaj Bjorner 044e08a114 adding unit tests for qe_arith/mbo 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-04 11:17:09 -07:00
Nikolaj Bjorner e29adbf304 fix issues #581: nested timeouts canceled each-other 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-30 11:18:34 -07:00
Nikolaj Bjorner 2428bf18f1 add model correction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-29 19:08:10 -07:00
Nikolaj Bjorner c75fd02c95 qsat-opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-28 21:31:16 -07:00
Nikolaj Bjorner 68c7d64d00 adding model-based opt facility 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-27 11:18:20 -07:00
Nikolaj Bjorner a1aa166ef5 adding local optimization to qsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-26 17:15:24 -07:00
Nikolaj Bjorner c3f4124a9f trace down recent exposed regression in goal2sat, incorporate Scott's suggestion on making vector<std::string inaccessible 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-18 14:50:10 -07:00
Nikolaj Bjorner cc6f72aba7 fix handing of ite conditions that have to be included in projection, thanks to bug report by Zak 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-10 01:48:35 +02:00
Arie Gurfinkel 4e7b6b6586 proposed fix to compare 2016-03-23 19:20:57 -04:00
Arie Gurfinkel ee125b4fe3 extend model with the value of a fresh variable 2016-03-23 19:07:50 -04:00
Nikolaj Bjorner ec681d7565 some of Arie's fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-23 10:19:16 -07:00
Nikolaj Bjorner fd6fe87c5d enable qe-lite for UFNIA benchmarks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-22 15:41:21 -07:00
Nikolaj Bjorner 72ec6dc8e1 remove debug code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-21 16:58:48 -07:00
Nikolaj Bjorner 5e737641b7 remove qe-lite pass in quant_tatics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-21 16:57:30 -07:00
Nikolaj Bjorner 3dc2028925 adding min/max 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-21 09:20:57 -07:00
Nikolaj Bjorner 1a5449c3d4 enable new NRA solver for nra benchmarks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-20 12:35:29 -07:00
Nikolaj Bjorner 73e29c6ee6 fix regression warning on invalid case split strategy 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-20 10:20:43 -07:00
Nikolaj Bjorner 92b5aac12a adjusting new tactics 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-20 10:13:23 -07:00
Nikolaj Bjorner 20bbdfe31a moving remaining qsat functionality over 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-19 15:35:26 -07:00
Nikolaj Bjorner d614fedde2 more merges with qsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-19 12:41:41 -07:00
Nikolaj Bjorner c4472ce717 include more qsat features 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-19 12:29:23 -07:00
Nikolaj Bjorner 8c538fd3f0 setting partial equivalence priority lower so that it doesn't intefere with inlining (partial fix to the fact that inlining will remove such implicit relations). Using short-circuit negation in qe to avoid redundant double negations in intermediary results 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-02-21 10:31:13 -08:00
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
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 32b6b2da44 moving to resource managed cancellation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 13:13:11 -08:00
Nikolaj Bjorner d121d031e9 fix unintialized memory read exposed by nightly build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-09-06 14:15:08 -07:00
Nikolaj Bjorner 4be3926daa use signed character type declarations for cross platform compilation. Fixes issue #210 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-09-05 16:30:58 -07:00
Nikolaj Bjorner 1257d1d990 fix issue #196 related to resetting qe-sat tactic state over multiple calls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-09-01 12:36:45 -07:00
Nikolaj Bjorner 4bc044c982 update header guards to be C++ style. Fixes issue #9 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-07-08 23:18:40 -07:00
Nikolaj Bjorner bf5419d44a move functionality from qe_util to ast_util 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-06-23 14:33:45 +02:00
Nikolaj Bjorner b08ccc7816 added missing Copyright forms 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-06-10 11:54:02 -07:00
Nikolaj Bjorner ffff006945 remove old files 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-06-02 09:15:08 -07:00
Nikolaj Bjorner ed7e0e11a8 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-28 20:55:13 -07:00
Nikolaj Bjorner e47eea2c61 n/a 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-05-28 17:22:34 -07:00
Nikolaj Bjorner ac732a500c add first file 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-05-28 15:20:25 -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
Nikolaj Bjorner e28701a64c add assertions to simplifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-14 22:09:48 +05:30
Nikolaj Bjorner ce18421a7a fix box 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-15 14:29:39 -07:00
Nikolaj Bjorner 4ea3ed7e27 ensure parameters are updated and ensure that global use of auto-config is not obscured by smt.auto-config scoping 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-07 11:00:45 -07:00
Nikolaj Bjorner 19e291f479 qe fix 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-06 08:43:35 -07:00
Nikolaj Bjorner 6d8daacdec fix check for satisfiability before calling final_check 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-06 08:35:05 -07:00
Nikolaj Bjorner 18e77bd539 fix qe for undef scenarios, codeplex issue 130 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-05 18:36:15 -07:00
Nikolaj Bjorner 0ccd56b847 fix qe on undef 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-05 18:33:20 -07:00
Nikolaj Bjorner c09903288f have free variable utility use a class for more efficient re-use 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-15 16:14:22 -07:00
Nikolaj Bjorner 19050d1c4c merge Fixedpoint.cs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-28 12:20:48 -07:00