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
9d1852343c
add separate get-objectives command #1107
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-23 16:34:38 -07:00
Nikolaj Bjorner
7386f2e045
#1101
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-22 14:18:53 -07: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
d5f646929e
print success #1068
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-06-10 09:16:36 -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
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
f3a0b7e0cd
change command-line experience for pareto fronts. It now requires multiple check-sat calls to loop over the fronts. This allows querying each model in turn. #1008
2017-05-23 20:05:10 -07:00
Nikolaj Bjorner
f90ae40480
Merge branch 'master' of https://github.com/NikolajBjorner/z3 into opt
2017-05-22 12:53:19 -07:00
Nikolaj Bjorner
911b24784a
merge LRA
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-09 10:46:11 -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
cc7a176c89
update to retain original behavior
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-02 19:32:03 -07:00
Nikolaj Bjorner
eeb79e1c3c
update to retain original behavior
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-05-02 19:30:54 -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
8205b45839
initial integration of opt
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-27 19:13:00 -07:00
Nikolaj Bjorner
a048d74bae
adding interval designator to output of non-optimal objectives, fix python doc test
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-26 14:05:33 -07:00
Nikolaj Bjorner
e4b9080165
include timeout/rlimit parameters in optmize
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-04-15 15:04:13 +08:00
Nikolaj Bjorner
c99205fa7e
return box model based on index. Issue #955
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-31 08:12:53 -07:00
Nikolaj Bjorner
ec47706226
fix constant offset and handling of ite in difference logic optimizer code-path. Issue #946
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 02:23:50 -07:00
Nikolaj Bjorner
c56c7fd649
add handlers for dense difference logic
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-24 01:31:00 -07:00
Nikolaj Bjorner
a0237ed2a6
fix crash reported in #946
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-16 18:56:43 -07:00
Nikolaj Bjorner
05c5b3b07b
merge
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 22:45:52 +01:00
Nikolaj Bjorner
5f5819f029
fix xor handling, and defaults for cardinality
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-09 22:44:41 +01:00
Nikolaj Bjorner
829519b837
fix bug for bit-vector optimization. Issue #928
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:19:35 +01:00
Nikolaj Bjorner
41e6fafc58
fix bug for bit-vector optimization. Issue #919
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-03-08 10:07:31 +01:00
Nikolaj Bjorner
e9b49644b2
Merge branch 'master' of https://github.com/z3prover/z3 into opt
2017-02-25 16:20:33 -08:00
Nikolaj Bjorner
e02160c674
expose bounds as vector expressions instead of containing ad-hoc expressions. Issue #911
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-24 11:07:40 -08:00
Nikolaj Bjorner
690689424d
fix parallel solving bugs
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-11 15:35:13 -05:00
Nikolaj Bjorner
fe105d94a0
fixes to sat-par
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-06 12:00:35 -08:00
Nikolaj Bjorner
0b711c5ef8
adding drat
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-03 15:41:08 -08:00
Nikolaj Bjorner
6bb0b196e2
fix conflict level detection bug with plugins
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 11:04:15 -08:00
Nikolaj Bjorner
e9e0293d1a
local updates
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 10:19:51 -08:00
Nikolaj Bjorner
bd0bd6052a
Merge branch 'master' of https://github.com/Z3Prover/z3
2017-02-02 10:19:21 -08:00
Nikolaj Bjorner
9ca52a3361
fix bug in lexicographic handling in maxres: previous assumptions were not committed in corner cases
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-02 10:19:11 -08:00
Nikolaj Bjorner
9cfd412cd0
enable pb theory always as pb terms can be introduced during transformations. Issue #884
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 15:28:29 -08:00
Nikolaj Bjorner
669c018242
updates on cardinality solver
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-02-01 07:43:43 -08:00
Nikolaj Bjorner
0aa912371b
Another fix for #847 . Reset wmax theory solver state between lex calls, otherwise it uses stale constraints
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-17 14:19:24 -08:00
Nikolaj Bjorner
7df803c131
Fix unsound handling of upper bounds in wmax, thanks to Patrick Trentin for report and careful repros #847
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-15 11:52:48 -08:00
Nikolaj Bjorner
bc6b3007de
remove unused features related to weighted check-sat
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2017-01-13 20:53:22 -08:00
Nikolaj Bjorner
aaf6e67ec8
add restart.max parameter to control cancellation based on restart count
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-25 17:43:47 -08:00
Nikolaj Bjorner
2bd29548da
improve parser error message over API, streamline names of statistics for arithmetic solver
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-25 17:27:56 -08:00
Nikolaj Bjorner
1787fa8296
remove redundant disjunction in compilation of at-most-1 constraints, log mutexes
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-22 20:54:09 -08:00
Nikolaj Bjorner
2307a7ffa7
fix bug in handling of repeated soft constraints. #815
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-11 10:19:57 +01:00
Nikolaj Bjorner
dea3b8ddf7
address warnings from #836
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-10 13:14:36 +01:00
Nikolaj Bjorner
0ab2067b69
produce error message for cores with optimization. Issue #825
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-12-09 13:15:40 +01:00
Nikolaj Bjorner
024082a45f
adding preferred sat, currently disabled, to wmax. Fixing issue #815
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-30 09:52:05 -08:00
Nikolaj Bjorner
df0e3a100c
tune initialization for wmax and sortmax
...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2016-11-19 08:04:06 -08:00