3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 11:25:51 +00:00
Commit graph

37 commits

Author SHA1 Message Date
Nikolaj Bjorner
f6fd426c28 moved network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-21 08:46:02 -08:00
Nikolaj Bjorner
5fc429c501 debugging network simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-05 16:31:29 -08:00
Nikolaj Bjorner
56c4fa8f6d expose models, working on network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-04 17:39:54 -08:00
Nikolaj Bjorner
a1a8aad09b start working on network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-04 14:38:03 -08:00
Anh-Dung Phan
87a2b99091 Clean up 2013-11-25 12:16:34 -08:00
Anh-Dung Phan
8fe50ff2d9 Display diff logic optimization and min cost flow in smt2 format 2013-11-25 02:15:21 +01:00
Anh-Dung Phan
cc3d65e544 Add facilities to get optimal assignments 2013-11-24 22:31:52 +01:00
Anh-Dung Phan
b35088f7e5 Update diff logic optimization 2013-11-22 18:15:34 -08:00
Anh-Dung Phan
37f5628824 Update basic spanning tree to be on par with threaded one 2013-11-22 13:44:12 -08:00
Anh-Dung Phan
3b2dd47cd4 Refactor pivot rules 2013-11-21 19:05:17 -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
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
Anh-Dung Phan
5a27c035e4 Add a vector of edges to handle spanning trees 2013-11-08 18:00:48 -08:00
Anh-Dung Phan
ab4efe2da0 Update interface of network flows 2013-11-07 15:56:53 -08:00
Anh-Dung Phan
bc9bfe7f97 Use templates on spanning trees 2013-11-07 07:33:25 +01: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
bd33e466c2 network update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-05 16:10:51 -08:00
Anh-Dung Phan
8b776569e0 Add fix_depth 2013-11-05 07:30:42 +01:00
Nikolaj Bjorner
acb26d0cf9 review of network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-04 16:00:50 -08:00
Nikolaj Bjorner
89989627d0 add blast method for ite terms
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-04 13:33:02 -08:00
Nikolaj Bjorner
ae3a69b32e Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 18:51:28 -07:00
Anh-Dung Phan
195df69a1b Use optional<_> for infinite check 2013-10-31 18:34:40 -07:00
Nikolaj Bjorner
cfac32c57d add outline of object invariant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-31 17:21:10 -07:00
Anh-Dung Phan
29622229cb Add lower bound case for edge_state 2013-10-31 13:03:24 -07:00
Anh-Dung Phan
1a32a64b96 Use constraint graphs for minimum cost flow correctly 2013-10-31 12:11:56 -07:00
Anh-Dung Phan
01c3dd779b Add visualization of spanning trees 2013-10-30 16:52:37 -07:00
Anh-Dung Phan
49aba844b8 Refactor network_flow
Use a template method for pretty printing
2013-10-30 10:04:56 -07:00
Anh-Dung Phan
b67d333cf9 First complete version of Network Simplex 2013-10-29 18:32:10 -07:00
Anh-Dung Phan
e715ccbc98 Minor updates 2013-10-29 15:49:53 -07:00
Anh-Dung Phan
905f230b8f Add pretty printing for network_flow
Reuse the original graph as much as possible
2013-10-29 14:20:29 -07:00
Anh-Dung Phan
906bbb4eeb Update Network Simplex implementation 2013-10-28 18:29:14 -07:00
Nikolaj Bjorner
9903c722af adding review notes to code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-26 16:24:21 +08:00
Anh-Dung Phan
532c345fd1 Reduce difference logic solver to min cost flow 2013-10-25 17:42:03 -07:00
Anh-Dung Phan
ebed5fa037 WIP on min cost flow problem
Remarks:
1. Follow the template structure of diff_logic.h
2. Try to reuse dl_graph<Ext> with some ready-to-use graph algorithms
3. Need to add 'explanation' to 'GExt' in order to instantiate
dl_graph<_>
2013-10-24 17:58:15 -07:00