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
|
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 |
|
Nikolaj Bjorner
|
8fb92e6312
|
tested network sorting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 10:49:36 -08:00 |
|
Nikolaj Bjorner
|
c57594d463
|
tested network sorting
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 10:47:12 -08:00 |
|
Nikolaj Bjorner
|
31e2d823c9
|
add cutting plane
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 01:35:25 -08:00 |
|
Nikolaj Bjorner
|
220b339e5e
|
add cutting plane
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 01:30:19 -08:00 |
|
Nikolaj Bjorner
|
d434cbea41
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-07 00:53:23 -08:00 |
|
Nikolaj Bjorner
|
3ee8c3efb5
|
pb/car constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-07 00:53:08 -08:00 |
|
Anh-Dung Phan
|
bc9bfe7f97
|
Use templates on spanning trees
|
2013-11-07 07:33:25 +01:00 |
|
Anh-Dung Phan
|
55e91c099f
|
Merge branch 'opt' of https://git01.codeplex.com/z3 into opt
|
2013-11-06 18:34:28 -08:00 |
|
Anh-Dung Phan
|
676e38ad0b
|
Minor updates
|
2013-11-06 18:34:09 -08:00 |
|
Anh-Dung Phan
|
f7fdf134fd
|
Create a separate class for spanning tree
Remarks:
1. Templates should be in header files only
2. Should pass in svector<_> instead of returning a local one
|
2013-11-06 17:42:09 -08:00 |
|
Anh-Dung Phan
|
034b33b6da
|
Remove m_final from spanning tree representation
|
2013-11-06 13:30:29 -08:00 |
|
Nikolaj Bjorner
|
05b37b2f07
|
working on cardinality tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-06 12:40:56 -08:00 |
|
Nikolaj Bjorner
|
2f04918c39
|
working on cardinality tactic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
|
2013-11-06 12:33:09 -08:00 |
|