mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-17 06:15:37 +00:00
Code Activity
1534 commits 23 branches 48 tags 157 MiB
Commit graph

1534 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Nikolaj Bjorner 1878d64b02 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:32:41 -07:00
Nikolaj Bjorner d30f183476 working on weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 21:30:57 -07:00
Anh-Dung Phan 906bbb4eeb Update Network Simplex implementation 2013-10-28 18:29:14 -07:00
Nikolaj Bjorner d78d22deb6 working on weighted max smt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-28 17:13:23 -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
Nikolaj Bjorner 36d7948399 fixing optimizer for multi-objectives and epsilon 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-22 10:36:13 +08: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 3dd72f8f16 more updates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-19 17:43:59 -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
Anh-Dung Phan f4e2b23238 Create placeholders to optimization methods 2013-10-16 17:56:35 -07:00
Anh-Dung Phan 3da47a280e Complete Fu & Malik MAXSAT implementation 
Mistakes:
(1) ast_manager shouldn't be replicated.
(2) assumptions should be used to compare with unsat cores
 2013-10-16 17:55:53 -07:00
Nikolaj Bjorner 8ae0b06912 fill in details on max sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-16 02:07:30 -07:00
Nikolaj Bjorner 45eda6c6ad Fu&Malik v1 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-15 17:03:52 -07:00
Anh-Dung Phan ac97a12bb8 Create callbacks for min_maximize_cmd 
Enable VS_PROJ = true for temporary use
 2013-10-15 11:52:27 -07:00
Anh-Dung Phan 7993ca53fe Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-14 17:10:12 -07:00
Nikolaj Bjorner 726f66a77c initial opt commands 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-14 17:08:24 -07:00
Nikolaj Bjorner 9b34350646 test output predicates 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-13 06:25:26 -07:00
Christoph M. Wintersteiger 65a202873f Bugfix for equality rewriting on floats. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-10 15:38:54 +01:00
Christoph M. Wintersteiger 9a9f8bbb34 rewriter and value recognition bugfixes for floats 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-08 20:01:39 +01: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
Christoph M. Wintersteiger daaab05923 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-09-26 11:36:16 +01:00
Christoph M. Wintersteiger 5e6a47e2d3 Example fixed (substitute does not include a rewriter call anymore). 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-09-26 11:35:08 +01:00
Leonardo de Moura 8ef2fe7ddb Fix z3.py doctests to reflect recent changes in the substitute API 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
 2013-09-25 18:58:13 -07:00
Christoph M. Wintersteiger 07a4fb4381 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-09-24 18:06:59 +01:00
Nikolaj Bjorner 4363c9f44f use safe replace for external substitution 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-24 18:47:19 +03:00
Nikolaj Bjorner 1b8d1a1ccc fix bug in ackerman reduction found by Anvesh 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-24 10:42:31 +03:00
Nikolaj Bjorner 2d01c4d50f update join planner to take projected columns into account 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-24 06:41:46 +03:00
Nikolaj Bjorner 1733af2641 test case for non-termination of substitution/rewriting 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-24 05:33:16 +03:00
Nikolaj Bjorner 6554ac787a add test case for substitution 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-24 05:13:11 +03:00
Christoph M. Wintersteiger 1e7f760b01 Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable 2013-09-23 21:32:14 +01:00
Nikolaj Bjorner c1384095f3 fix default argument identification 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-23 21:44:24 +03:00
Nikolaj Bjorner 2e7f5303eb address incompleteness bug in axiomatization of int2bv 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-23 04:56:38 +03:00
Nikolaj Bjorner fd1f4b9191 fix bugs reported by Anvesh 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-23 04:07:08 +03:00
Nikolaj Bjorner 0a964c324e test for undetermined accessor for PDR 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-09-20 12:32:16 -07:00