3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-17 09:56:39 +00:00
Commit graph

77 commits

Author SHA1 Message Date
Nikolaj Bjorner
00f45579cc refactor weighted maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-14 16:24:23 -07:00
Nikolaj Bjorner
efe2a70f6f integrating SLS
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-28 14:30:36 -07:00
Christoph M. Wintersteiger
c068db16e8 first attempts at getting to the bvsls from opt_context. 2014-03-28 17:46:26 +00:00
Nikolaj Bjorner
92145f2bfa integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:31:48 -07:00
Nikolaj Bjorner
fdaeb9bb73 integrate opt with push/pop/check-sat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 16:15:50 -07:00
Nikolaj Bjorner
7c4bd23b3d check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 01:07:38 -07:00
Nikolaj Bjorner
9556a223f3 check types
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 00:54:14 -07:00
Nikolaj Bjorner
2c69aa0df1 fix duplicate class
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-22 00:06:34 -07:00
Nikolaj Bjorner
af55088b78 debugging opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-17 10:34:32 -07:00
Nikolaj Bjorner
99b4ce037d integrating diff opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-05 16:29:26 -08:00
Nikolaj Bjorner
51cb63b6c0 adding simplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-12 20:20:52 -08:00
Nikolaj Bjorner
236b2d2ff3 working on incremtal PB theory
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-13 10:12:45 -08:00
Nikolaj Bjorner
5adb4a22d1 enable partial results
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:23:37 -08:00
Nikolaj Bjorner
f1710e5618 check parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-06 16:06:47 -08:00
Nikolaj Bjorner
a307bd67e0 pareto take 3
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-02 01:35:31 -08:00
Nikolaj Bjorner
8883234647 pareto2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 22:32:27 -08:00
Nikolaj Bjorner
af27efbf4a pareto0
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 21:13:25 -08:00
Nikolaj Bjorner
58f8181a74 fixes to dotnet interface
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-26 17:14:29 -08:00
Nikolaj Bjorner
0641c4f694 working on pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-26 09:53:33 -08:00
Nikolaj Bjorner
0deb951873 different strategies for weighted
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-20 12:04:17 +01:00
Nikolaj Bjorner
26237a3727 debug benchmarks, theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-19 07:40:18 +02:00
Nikolaj Bjorner
72130ac7b9 fix lower bound update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-18 05:49:43 +02:00
Nikolaj Bjorner
fe5c42c90f fixes to bugs exposed by regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 05:23:47 +02:00
Nikolaj Bjorner
50f18a77af disable 'optimization' that led to wrong model'
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-15 02:40:52 +02:00
Nikolaj Bjorner
ac893e907f fixes to maxsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 16:06:03 +02:00
Nikolaj Bjorner
5f72325e99 working on maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 10:00:21 +02:00
Nikolaj Bjorner
04824d86df fixes to model generation of weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 09:37:42 +02:00
Nikolaj Bjorner
5225ea18b7 fix lower/upper bound updates
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-14 09:04:48 +02:00
Nikolaj Bjorner
8c85ee6b7c fixing lex optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-13 23:36:42 +01:00
Nikolaj Bjorner
df5c2adc4e debug opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-12 15:39:38 -06:00
Nikolaj Bjorner
f41d23bc0f debugging model generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-12 12:18:34 -06:00
Nikolaj Bjorner
eacb48268c fixing bugs exposed by msf unit tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-11 19:02:36 -06:00
Nikolaj Bjorner
2c577a304d bug fixes to pb; working on model extraction
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-10 15:16:58 -08:00
Nikolaj Bjorner
0f0397b05f hunt bugs exposed by so.smt2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-08 18:58:48 -08:00
Nikolaj Bjorner
97b2fc9ee7 fix bugs exposed by testSolver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-08 18:34:28 -08:00
Nikolaj Bjorner
ddb30c51b5 debugging lia2maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-08 12:17:33 -08:00
Nikolaj Bjorner
370a4b66de update lower bounds from feasible solutiosn
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-07 22:09:57 -08:00
Nikolaj Bjorner
e307c5fdda fix minimize->maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-07 14:47:47 -08:00
Nikolaj Bjorner
da348fe1c0 first pass on normalization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-07 14:38:09 -08:00
Nikolaj Bjorner
437a545c3b fix pretty printer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-06 13:12:35 -08:00
Nikolaj Bjorner
4d6aa1a0f3 add to_string and get_help methods to optimize API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-06 11:34:41 -08:00
Anh-Dung Phan
d38e2b9b78 Expose objective indices to .NET API 2013-12-05 17:30:40 -08:00
Nikolaj Bjorner
192ce11ca6 change model binding time
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-05 11:42:04 -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
e3fe80fd4d add .NET interface and finish C interface for optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 20:20:24 -08:00
Nikolaj Bjorner
9e2908c3f5 exposing lower/upper
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 17:46:52 -08:00
Nikolaj Bjorner
18815e3e53 reorganizing input
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 13:36:25 -08:00
Nikolaj Bjorner
51704b7b95 tweaking input processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-03 08:51:46 -08:00
Nikolaj Bjorner
03f5020d0b Nits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 22:06:15 -08:00
Nikolaj Bjorner
191efbb72f use expression structure for objectives instead of custom s-expression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-02 13:00:51 -08:00