Nikolaj Bjorner
|
e98acf4ece
|
working on adding basic cores to efficient SAT solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-29 07:22:59 -07:00 |
|
Nikolaj Bjorner
|
96dc933c99
|
merging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-28 08:33:16 -07:00 |
|
Nikolaj Bjorner
|
4ab27eff78
|
refactor weighted-maxsat into separate files
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-28 08:31:57 -07:00 |
|
Nikolaj Bjorner
|
ff64adf292
|
rename hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-26 12:45:21 -07:00 |
|
Nikolaj Bjorner
|
9f1b2ccfc4
|
restructure maxsmt solvers, flatten weighted/non-weighted versions, fix bugs and simplify mus/max-res
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-23 23:53:03 +02:00 |
|
Nikolaj Bjorner
|
5e9bf2ef53
|
maxres revised to handle weighted constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-22 15:42:08 +02:00 |
|
Nikolaj Bjorner
|
bf35a62da7
|
adding mus extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-21 23:28:19 +02:00 |
|
Nikolaj Bjorner
|
582dbe509c
|
first implementation of maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-21 22:24:34 +02:00 |
|
Nikolaj Bjorner
|
465eafbf45
|
fix assertion for integrality, lax noprogress bail out code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-09 05:04:00 +02:00 |
|
Nikolaj Bjorner
|
53f82e3239
|
update model during Lex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-07-06 17:33:54 +02:00 |
|
Nikolaj Bjorner
|
519c9dba25
|
update hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-23 11:28:38 -07:00 |
|
Nikolaj Bjorner
|
04407938be
|
custom HS solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-18 17:31:00 -07:00 |
|
Nikolaj Bjorner
|
d7d85aa18a
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 22:32:32 -07:00 |
|
Nikolaj Bjorner
|
84d971b69a
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 17:05:05 -07:00 |
|
Nikolaj Bjorner
|
b64b12cae3
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-17 12:54:50 -07:00 |
|
Nikolaj Bjorner
|
bad03822b4
|
working on HS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-16 16:55:48 -07:00 |
|
Nikolaj Bjorner
|
63550d8a1a
|
bug fixes in hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-15 05:44:03 -07:00 |
|
Nikolaj Bjorner
|
ef62a52fff
|
cleanup
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 18:45:16 -07:00 |
|
Nikolaj Bjorner
|
7fbe7124f9
|
bugfixes to hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 17:29:53 -07:00 |
|
Nikolaj Bjorner
|
5427964c54
|
use approximate hitting set implementation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-14 14:08:55 -07:00 |
|
Nikolaj Bjorner
|
960e8ea1d5
|
working on hitting sets
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-08 14:12:54 +01:00 |
|
Nikolaj Bjorner
|
88bd01bc4f
|
patching non-termination bug in datatype factory, reported by Tiago
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-03 23:03:34 +05:30 |
|
Nikolaj Bjorner
|
4415df3fcf
|
various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-06-02 19:10:20 +05:30 |
|
Nikolaj Bjorner
|
a10c318e15
|
Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
|
2014-05-31 12:04:28 +05:30 |
|
Nikolaj Bjorner
|
f76b343bfa
|
expose parameter settings for controlling injectivity axiom. rquested by Jasmin Blanchette
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-31 11:25:54 +05:30 |
|
Christoph M. Wintersteiger
|
7288353575
|
Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
|
2014-05-30 18:14:46 +01:00 |
|
Christoph M. Wintersteiger
|
bc25ea404f
|
Fixed potential bug (warning on OSX).
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-05-30 18:14:33 +01:00 |
|
Nikolaj Bjorner
|
49f9f4b3b5
|
fix crash in model construction from finite domain theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-30 20:52:39 +05:30 |
|
Christoph M. Wintersteiger
|
1e774064bc
|
assertion bug fix in z3py
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-05-30 12:26:55 +01:00 |
|
Christoph M. Wintersteiger
|
756645326b
|
Bugfix for And/Or operators in Python.
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-05-29 17:33:03 +01:00 |
|
Christoph M. Wintersteiger
|
4da56aa4df
|
added debug assertion
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
|
2014-05-29 12:41:07 +01:00 |
|
Nikolaj Bjorner
|
57fc0f3f55
|
bug fixes to min-max, and experiments with hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-28 15:44:39 -07:00 |
|
Nikolaj Bjorner
|
2071029bb3
|
hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-27 15:45:33 -07:00 |
|
Nikolaj Bjorner
|
e370fbb7ed
|
updated maxhs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-27 11:38:43 -07:00 |
|
Nikolaj Bjorner
|
aba79802cf
|
fix warning about unused variable
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-25 21:01:10 -07:00 |
|
Nikolaj Bjorner
|
698705b7fa
|
initial version of HS maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-24 18:39:43 -07:00 |
|
Ken McMillan
|
aa35149700
|
merging duality/interp changes
|
2014-05-22 11:52:16 -07:00 |
|
Ken McMillan
|
97c5d09de1
|
turn off a windows warning
|
2014-05-21 16:56:18 -07:00 |
|
Ken McMillan
|
06b79cd9ea
|
trying to prevent quantifier in interp (leq2eq rule)
|
2014-05-21 13:30:54 -07:00 |
|
Nikolaj Bjorner
|
a1ee1ec4cc
|
add virtal destructor to qe_sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-21 12:28:07 -07:00 |
|
Nikolaj Bjorner
|
2ee416fc8f
|
deal with infinite loop in diagonalization attempt in datatype factory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-21 10:23:31 -07:00 |
|
Ken McMillan
|
01c6fe39ab
|
fix markers aliasing bug in Duality::CheckerForEdgeClone
|
2014-05-20 15:10:31 -07:00 |
|
Ken McMillan
|
b91cca8db9
|
fix unbound variables bug in duality_dl_interface
|
2014-05-20 15:10:16 -07:00 |
|
Nikolaj Bjorner
|
e3098b0ec5
|
add documentation comment to bind_variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-20 11:20:15 -07:00 |
|
Nikolaj Bjorner
|
6f0155ce94
|
avoid compiler warning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-20 10:14:40 -07:00 |
|
Nikolaj Bjorner
|
2ca14b49fe
|
fix AV in debug assertion, address warnings
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-16 09:45:32 -07:00 |
|
Nikolaj Bjorner
|
8b5eb08e2d
|
Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable
|
2014-05-15 21:12:41 -07:00 |
|
Nikolaj Bjorner
|
3d1ca5ecc9
|
make eval cache sensitive to model completion. Bug 110 reported by cipher1024
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-15 21:12:16 -07:00 |
|
Nikolaj Bjorner
|
3e1b9876db
|
fix bug in model generation for COI filter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-15 17:54:54 -07:00 |
|
Nikolaj Bjorner
|
61dcdcb9d1
|
separate inc sat solver for now
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2014-05-15 11:25:05 -07:00 |
|