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

1818 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anh-Dung Phan
49aba844b8 Refactor network_flow 
Use a template method for pretty printing
 2013-10-30 10:04:56 -07:00
Nikolaj Bjorner
42cbbe830e working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:28:50 -07:00
Nikolaj Bjorner
6302d1b7db wmax nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-30 01:18:10 -07:00
Anh-Dung Phan
a6e103dd36 Make a few variables private 2013-10-30 06:30:51 +01:00
Nikolaj Bjorner
f5e6a18015 working on wmaxsmt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 21:16:02 -07: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
b0fddd8e60 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-29 18:33:06 -07:00
Anh-Dung Phan
b67d333cf9 First complete version of Network Simplex 2013-10-29 18:32:10 -07:00
Nikolaj Bjorner
5170cbbd7e Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2013-10-29 17:40:50 -07:00
Nikolaj Bjorner
96562962fa working on wmaxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-29 17:40:37 -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
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
Ken McMillan
81df4932fb added quantifiers in new interpolation 2013-10-25 18:40:26 -07:00
Anh-Dung Phan
532c345fd1 Reduce difference logic solver to min cost flow 2013-10-25 17:42:03 -07:00
Ken McMillan
79b0f83ab3 working on new interpolation 2013-10-25 13:58:56 -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
Christoph M. Wintersteiger
ff265c6c6c bugfix for variable unmarking in the sat solver. 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-24 17:48:03 +01: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
Christoph M. Wintersteiger
2b627b0821 fixed parameters to disallow overwriting them with illegal combinations on the command line 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
 2013-10-21 17:28:21 +01: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
Ken McMillan
3a0947b3ba merged with unstable 2013-10-18 17:26:41 -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
f54b068669 added floating point standard draft version 3 function symbols 2013-10-17 15:29:55 +01: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
Nikolaj Bjorner
eb4c10c037 fixing bugs with validation code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2013-10-15 03:53:33 -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