mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-08 00:41:56 +00:00
Code Activity
14901 commits 29 branches 52 tags 172 MiB
Commit graph

1281 commits

Author SHA1 Message Date
Nikolaj Bjorner
94416bea52 fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-27 09:07:55 -07:00
Nikolaj Bjorner
66f0de6785 added in-processing features to card/pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-25 16:26:47 -07:00
Nikolaj Bjorner
c3d29e75ef adding in-processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-24 18:27:32 -07:00
Nikolaj Bjorner
fb84ba8c34 updates and fixes to copying and cardinalities 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-23 14:00:33 -07:00
Nikolaj Bjorner
5752830f71 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 15:01:12 -07:00
Nikolaj Bjorner
9ebe980b44 cleaning up lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-22 07:42:44 -07:00
Nikolaj Bjorner
5e2f7f7177 fixes top lookahead simplification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 20:22:31 -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
5f93b9a081 add N-ary clause reward heuristic based on discussions with Heule 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-21 10:30:30 -07:00
Nikolaj Bjorner
c6fbe38f78 disable anti-exploration by default 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-19 23:56:50 -05: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
bc54197fb3 64 bit clause offset fix 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 10:46:51 -07:00
Nikolaj Bjorner
8acb37e734 revert change to 1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:45:18 -07:00
Nikolaj Bjorner
b8e8e090ad filter assumptions by membership in initial list #1065 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-10 09:30:01 -07:00
Nikolaj Bjorner
a55416351f lookahead 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-09 09:17:20 -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
964102726d lookahead on cardinality extension 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-07 18:24:58 -07:00
Nikolaj Bjorner
f3b0ede6e8 update lookahead to include extensions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-07 16:35:35 -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
71b6f97fb1 fix lookahead code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-04 11:55:53 -07:00
Nikolaj Bjorner
19d4b0a97a resolve conflicts 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:38:37 -07:00
Nikolaj Bjorner
3ce82ea8ce merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:37:22 -07:00
Nikolaj Bjorner
efd5727676 add shorthand for enumerating constants in a model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-02 10:35:09 -07:00
Nikolaj Bjorner
e37a6dd809 add tracking for reason unknown 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-06-01 17:04:37 -07:00
Nikolaj Bjorner
55ba1e9178 Merge branch 'opt' of https://github.com/nikolajbjorner/z3 into opt 2017-06-01 14:50:37 -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
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
e0a86ccc1a add lrb/chb and experiment with them 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-28 10:48:31 -07:00
Nikolaj Bjorner
c28f26c17d merge and update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-25 14:17:19 -07:00
Nikolaj Bjorner
49faaaa8f1 allowing non-literal assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 15:01:00 -07:00
Nikolaj Bjorner
db4bbecb27 Merge branch 'opt' of https://github.com/NikolajBjorner/z3 into opt 2017-05-23 10:52:27 -07:00
Nikolaj Bjorner
9633c16d75 local updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-23 10:52:14 -07:00
Nikolaj Bjorner
f9f0b2221d bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-22 14:27:34 -07:00
Nikolaj Bjorner
d1fec7c029 bug fixes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-21 15:39:05 -07:00
Nikolaj Bjorner
2d0ab6a615 pb propagation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-19 22:45:17 -07:00
Nikolaj Bjorner
1507ab5d4b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09:34:41 -07:00
Nikolaj Bjorner
f253b20820 local changes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09:34:11 -07:00
Nikolaj Bjorner
2033e649b5 fix bugs related to use of lookahead equivalences and encoding of pb constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-15 09: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
b915f78281 merge with master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 17:05:57 -07:00
Nikolaj Bjorner
0ba7c9c39b adding pb 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-07 16:53:25 -07:00
Nikolaj Bjorner
21cda27f5e fix quadratic behavior of extract_assumptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 15:57:31 -07:00
Nikolaj Bjorner
ed0b2be618 fix bug in tracking levels of variables: levels are not cleared, only truth assignment 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-02 14:10:07 -07:00
Nikolaj Bjorner
f9105edb14 revert to native chunker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:52 -07:00
Nikolaj Bjorner
d14f2af5ae deal with subtraction that manages to sneak in. Issue #996 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-05-01 15:22:06 -07:00
Nikolaj Bjorner
d6e2e1f28f Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 11:28:26 -07:00
Nikolaj Bjorner
aff02ca905 include 'stopwatch.h' to avoid ODR warnings, #994 2017-04-30 11:28:11 -07:00
Nikolaj Bjorner
5fcbf55216 Merge branch 'master' of https://github.com/Z3Prover/z3 2017-04-30 10:23:05 -07:00