Nikolaj Bjorner
|
f6c5088cc9
|
pb theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-16 21:05:33 -08:00 |
|
Nikolaj Bjorner
|
77cdb2bcde
|
working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-16 17:01:43 -08:00 |
|
Nikolaj Bjorner
|
06073db413
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-16 10:14:52 -08:00 |
|
Nikolaj Bjorner
|
41efa8a75d
|
Merge branch 'opt' of https://git00.codeplex.com/z3 into opt
Conflicts:
src/smt/theory_card.cpp
|
2013-11-16 10:14:29 -08:00 |
|
Anh-Dung Phan
|
aadfe007c1
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-15 18:34:12 -08:00 |
|
Anh-Dung Phan
|
6ddc838628
|
Add a basic spanning tree
|
2013-11-15 18:34:05 -08:00 |
|
Nikolaj Bjorner
|
6da4bae840
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-15 17:31:39 -08:00 |
|
Nikolaj Bjorner
|
13c97d12a8
|
snapshot
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-15 17:31:31 -08:00 |
|
Anh-Dung Phan
|
af8da013b5
|
Fix a few issues related to thread spanning tree
|
2013-11-15 17:17:20 -08:00 |
|
Anh-Dung Phan
|
761c95129b
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-15 16:59:01 -08:00 |
|
Anh-Dung Phan
|
c837f62863
|
Use quick explain for unsat core in Fu Malik algorithm by default
|
2013-11-15 16:58:42 -08:00 |
|
Nikolaj Bjorner
|
314f03c12c
|
started new PB solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-15 16:44:08 -08:00 |
|
Anh-Dung Phan
|
074e851d49
|
Display Fu Malik statistics
|
2013-11-15 12:58:11 -08:00 |
|
Nikolaj Bjorner
|
f9164f4cb1
|
local updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-14 20:21:33 -08:00 |
|
Anh-Dung Phan
|
0acf331ed1
|
Merge conflicts
|
2013-11-14 19:07:23 -08:00 |
|
Anh-Dung Phan
|
4be11f24e1
|
Instrument fu_malik to use the new SAT solver (WIP)
|
2013-11-14 19:02:15 -08:00 |
|
Nikolaj Bjorner
|
e034331f2e
|
working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-14 18:04:55 -08:00 |
|
Nikolaj Bjorner
|
06ae0db116
|
working on pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-14 18:04:05 -08:00 |
|
Anh-Dung Phan
|
d729e89a7b
|
Fix a minor bug on cardinality solver
|
2013-11-14 12:36:39 -08:00 |
|
Nikolaj Bjorner
|
d8d77d943c
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-14 08:51:13 -08:00 |
|
Nikolaj Bjorner
|
34af198816
|
missing file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-14 08:51:01 -08:00 |
|
Anh-Dung Phan
|
5921628f53
|
Dump opt_solver checksat calls for profiling
|
2013-11-13 18:46:18 -08:00 |
|
Nikolaj Bjorner
|
2d3f6ca71d
|
add pb constraints to API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-13 17:15:41 -08:00 |
|
Nikolaj Bjorner
|
d1937b2032
|
add PB operators to C-based API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-13 17:09:10 -08:00 |
|
Nikolaj Bjorner
|
133ba2d02a
|
fixes to pb solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-13 13:41:14 -05:00 |
|
Anh-Dung Phan
|
64daa2977d
|
Fix termination conditions on core_maxsat
|
2013-11-12 16:14:21 -08:00 |
|
Anh-Dung Phan
|
66eda866ca
|
Fix bugs on candidate list pivot rule
|
2013-11-11 18:23:21 -08:00 |
|
Anh-Dung Phan
|
0d6ffe6b31
|
Implement three pivot rules
|
2013-11-11 08:51:52 +01:00 |
|
Nikolaj Bjorner
|
e412d6175d
|
add pb capabilities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-09 16:19:49 -08:00 |
|
Nikolaj Bjorner
|
3e8c7d85aa
|
add vocabulary for arbitrary PB inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-09 16:13:26 -08:00 |
|
Nikolaj Bjorner
|
293a97bdfc
|
working on core-maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-09 15:54:38 -08:00 |
|
Nikolaj Bjorner
|
2349a0fcdd
|
adding core-based max-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-09 12:35:20 -08:00 |
|
Nikolaj Bjorner
|
dc78da4873
|
case analysis for commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 23:29:31 -08:00 |
|
Nikolaj Bjorner
|
ba05f79415
|
bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 22:40:43 -08:00 |
|
Nikolaj Bjorner
|
b573b94f84
|
nits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 21:59:38 -08:00 |
|
Nikolaj Bjorner
|
21058c38fd
|
fix bounds for weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 21:26:05 -08:00 |
|
Nikolaj Bjorner
|
6e1c186017
|
enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 20:55:01 -08:00 |
|
Nikolaj Bjorner
|
816029c862
|
missing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 20:04:30 -08:00 |
|
Nikolaj Bjorner
|
f997b639a0
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-08 18:22:18 -08:00 |
|
Nikolaj Bjorner
|
c6c7093a4c
|
make max-smt solvers generic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 18:22:07 -08:00 |
|
Anh-Dung Phan
|
5a27c035e4
|
Add a vector of edges to handle spanning trees
|
2013-11-08 18:00:48 -08:00 |
|
Nikolaj Bjorner
|
9f53a4aa18
|
working on supporting multiple max-sat objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 16:54:34 -08:00 |
|
Nikolaj Bjorner
|
f350efffc7
|
working on pareto and upper/lower bound facilities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 13:52:27 -08:00 |
|
Nikolaj Bjorner
|
6caee5e3ca
|
more refactoring
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 13:16:10 -08:00 |
|
Nikolaj Bjorner
|
29cc9025cb
|
renaming to optsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 12:41:05 -08:00 |
|
Nikolaj Bjorner
|
33be06c6dc
|
continued re-factoring
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-08 09:00:24 -08:00 |
|
Nikolaj Bjorner
|
acbeed2e97
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-07 18:09:58 -08:00 |
|
Nikolaj Bjorner
|
401fced400
|
separate out file for objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 18:09:44 -08:00 |
|
Anh-Dung Phan
|
ab4efe2da0
|
Update interface of network flows
|
2013-11-07 15:56:53 -08:00 |
|
Nikolaj Bjorner
|
759d80dfe3
|
fix regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 12:15:51 -08:00 |
|