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
Nikolaj Bjorner
2c208e1d10
Sat update
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-30 10:23:00 -07:00
Nikolaj Bjorner
fa868e058e
fix bound bug #991
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-29 17:39:02 -07:00
Nikolaj Bjorner
8205b45839
initial integration of opt
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-27 19:13:00 -07:00
Nikolaj Bjorner
8032217fd1
tuning and fixing consequence finding, adding dimacs evaluation
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-26 13:53:37 -07:00
Nikolaj Bjorner
4575b2820d
parallelizing lh
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-26 00:22:59 -07:00
Nikolaj Bjorner
c637240c40
parallel verison of ccc
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-25 16:56:39 -07:00
Nikolaj Bjorner
dedc130e98
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-04-25 10:30:16 -07:00
Nikolaj Bjorner
34acaa8f56
update license for space/quotes per #982
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-24 13:34:10 -07:00
Nikolaj Bjorner
07ef79d664
parallelizing ccc
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-24 08:36:33 -07:00
Nikolaj Bjorner
3aaea6b920
parallelizing ccc
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-23 23:10:23 -07:00