3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 03:45:51 +00:00
Commit graph

99 commits

Author SHA1 Message Date
Nikolaj Bjorner
c3232693f0 use PB solver instead of full arithmetic for bouding Pareto fronts so that difference logic theory isn't broken. Codeplex issue 175
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-22 09:46:21 -08:00
Nikolaj Bjorner
e24db56650 integrating new integer primal loop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-20 16:38:45 -08:00
Nikolaj Bjorner
ef57e4abe5 extract theory symbols from Boolean objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-05 19:42:06 -08:00
Nikolaj Bjorner
08cb8b8de8 address divergence in the case of shared theory symbols. Codeplex issue 147, thanks to George Karpenkov
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-09 16:04:25 +01:00
Nikolaj Bjorner
444879db5f fix bug reported on stackoverflow on crash for unconstrained variables
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-05 13:51:27 +01:00
Nikolaj Bjorner
301f441801 bypass simplifier if (m_is_clausal) {
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-22 09:02:08 -07:00
Nikolaj Bjorner
ce18421a7a fix box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 14:29:39 -07:00
Nikolaj Bjorner
c1580fb85a follow logic annotation/enable diff logic when configured
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-07 11:52:14 -07:00
Nikolaj Bjorner
ee1a1b1135 refactor sat/sls interface. Remove wpm2 and bvsls dependencies
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-15 10:40:44 -07:00
Nikolaj Bjorner
63550d8a1a bug fixes in hsmax
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-15 05:44:03 -07:00
Nikolaj Bjorner
d2db8007d8 tuning pb/max
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-06 04:01:10 -07:00
Nikolaj Bjorner
d67f1f36c4 refactor weighted theory solver into own file
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-29 16:54:12 -07:00
Nikolaj Bjorner
ede9549818 fix compilation errors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-25 13:43:45 -07:00
Nikolaj Bjorner
ff1543d700 fix APIs, add python API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 21:28:11 -07:00
Nikolaj Bjorner
0181f0f9df add bvmax tactic, add proviso for non-0 lower bounds in elim01
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-23 18:03:20 -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
f82f7f83b9 adding optimization to dense difference logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-14 14:42:01 -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
eb6d39ba46 fix memory smash
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-02-27 11:49:25 -08:00
Nikolaj Bjorner
c5b82796ca moving parameters to theory_pb
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 20:00:10 -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
670f56e5e4 adjust benchmark generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-21 07:09:39 -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
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
8c85ee6b7c fixing lex optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-13 23:36:42 +01: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
a617eac010 enable bounding for various domains
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-06 19:36:12 -08:00
Anh-Dung Phan
dbc791d385 Reorganize combination of objectives 2013-11-26 09:20:11 +01:00
Anh-Dung Phan
87a2b99091 Clean up 2013-11-25 12:16:34 -08:00
Nikolaj Bjorner
2ff51e9a60 move model_evaluator from pdr to model, call it model_implicant
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-23 21:33:35 +01:00
Anh-Dung Phan
c837f62863 Use quick explain for unsat core in Fu Malik algorithm by default 2013-11-15 16:58:42 -08:00
Anh-Dung Phan
074e851d49 Display Fu Malik statistics 2013-11-15 12:58:11 -08:00
Anh-Dung Phan
d729e89a7b Fix a minor bug on cardinality solver 2013-11-14 12:36:39 -08:00
Anh-Dung Phan
5921628f53 Dump opt_solver checksat calls for profiling 2013-11-13 18:46:18 -08:00
Nikolaj Bjorner
9f53a4aa18 working on supporting multiple max-sat objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 16:54:34 -08:00
Nikolaj Bjorner
6caee5e3ca more refactoring
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 13:16:10 -08:00
Anh-Dung Phan
034b33b6da Remove m_final from spanning tree representation 2013-11-06 13:30:29 -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
2a907ea52a fix objective value regression in simplex maximation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-01 12:45:26 -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
946b888b32 adding timeout, parameters, statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:24:21 -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
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
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