mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-03 21:09:11 +00:00
Code Activity
18127 commits 49 branches 53 tags 182 MiB
Commit graph

4178 commits

Author SHA1 Message Date
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
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
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
133ba2d02a fixes to pb solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-13 13:41:14 -05: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
293a97bdfc working on core-maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-09 15:54:38 -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
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
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
Nikolaj Bjorner
e84c5e7e90 adding simple sorting network 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:53:35 -08:00
Nikolaj Bjorner
cf75a7743e network update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:18:21 -08:00
Nikolaj Bjorner
bd33e466c2 network update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 16:10:51 -08:00
Ken McMillan
a785a5a4b8 Merge branch 'unstable' into interp 2013-11-05 12:28:13 -08:00
Nikolaj Bjorner
9467806a5c debugging cardinality theory 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-05 09:39:28 -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
Anh-Dung Phan
53d365bc44 Debug Network Simplex implementation 2013-11-04 09:12:25 +01:00
Nikolaj Bjorner
883018b405 v1 of conflict driven optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 19:27:06 -08:00
Nikolaj Bjorner
a0d52e835b missing new files 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:55:39 -08:00
Nikolaj Bjorner
c0de1e34ac working on upper bound optimziation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-03 14:54:42 -08:00
Nikolaj Bjorner
b35ed169b1 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-11-01 17:26:48 -07:00
Nikolaj Bjorner
3c6f0c737a debugging infinite upper bound checking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 17:26:27 -07:00
Anh-Dung Phan
926f2e0834 Add more object invariants 2013-11-01 14:50:17 -07:00
Nikolaj Bjorner
2a907ea52a fix objective value regression in simplex maximation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-11-01 12:45:26 -07:00