mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity
1481 commits 24 branches 48 tags 158 MiB
Commit graph

185 commits

Author SHA1 Message Date
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
Anh-Dung Phan
736d43c084 Block lower bound of difference logic objectives 2013-11-01 08:05:29 +01:00
Nikolaj Bjorner
87141f4cb3 fix bugs 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 22:09:52 -07: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
a66a14dbf0 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-31 16:41:42 -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
Nikolaj Bjorner
72e82532b2 enabling upper bound test 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 09:43:15 -07:00
Nikolaj Bjorner
5106c74b3e preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:13:24 -07:00
Nikolaj Bjorner
0b65aa83e8 preparing for inf extension of arithmetic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-31 02:02:37 -07:00
Anh-Dung Phan
a3a7af84c5 Minor updates 2013-10-30 18:25:39 -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
a6e103dd36 Make a few variables private 2013-10-30 06:30:51 +01:00
Nikolaj Bjorner
bc44bcad10 push blocking code to optimizer context 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 20:26:54 -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
72c3473400 cleanup 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 20:48:19 +08: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
Nikolaj Bjorner
3852b3a753 working on internalizer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-26 15:03:39 +08:00
Anh-Dung Phan
3d943bf70d Fix a mistake in previous commit causing imcompilable code 
Also correct my alias
 2013-10-26 05:22:52 +02: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
Phan Anh Dung
be81e77c70 Some progress on Network Simplex 2013-10-24 09:50:12 +02:00
Phan Anh Dung
1ff373072d Add objective functions to difference logic solver 2013-10-24 08:57:21 +02:00
Nikolaj Bjorner
7c8fbbb06a fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 12:03:05 +08:00
Nikolaj Bjorner
11010086be fixing bug with optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-24 11:57:30 +08:00
Anh-Dung Phan
6919f335a1 Sketch a skeleton of Difference Logic optimizer 2013-10-22 16:28:03 -07:00
Anh-Dung Phan
3441fc2942 A few changes based on previous reviews 
Tested the optimization procedure with:
- unbounded objectives
- bounded with rational solutions
- bounded with irrational solutions
 2013-10-21 17:25:34 -07:00
Nikolaj Bjorner
3996f58a8e tidy & todo notes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 12:22:56 -07:00
Phan Anh Dung
53f78f7d19 Replace the use of optional<rational> by inf_eps_rational<rational> 
Also handle composite objectives correctly.
 2013-10-19 06:03:21 +02:00
Anh-Dung Phan
a44044fb15 A rudimentary version of MathSAT optimization 
Remarks:
(1) The core procedure accepts maximization only
(2) Add lazy initialization to min_maximize_cmd
(3) The procedure isn't working with composite objective yet.
 2013-10-18 18:00:24 -07:00
Nikolaj Bjorner
898609a3ef cleanup macro usage 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 20:50:33 -07:00
Nikolaj Bjorner
cfedbe3dfd add opt_solver layer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-17 17:33:43 -07:00
Christoph M. Wintersteiger
3d910028bf fixed potential performance problem with fully interpreted sorts in the quantifier instantiation. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-09-27 16:55:05 +01:00