3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2026-02-26 18:15:37 +00:00
Commit graph

122 commits

Author SHA1 Message Date
Nikolaj Bjorner
4bc044c982 update header guards to be C++ style. Fixes issue #9
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-07-08 23:18:40 -07:00
Nikolaj Bjorner
a2448be0cd print pareto model in check-sat too
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-05-29 08:55:44 -07:00
Nikolaj Bjorner
e944f89505 fix bug introduced when clearing state between calls to Pareto/Box
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-02 02:36:01 -07:00
Nikolaj Bjorner
fc36d861a7 update default to maxres for MaxSAT, reset pareto and box state on every constraint update
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-01 19:32:50 -07:00
Nikolaj Bjorner
f8d04118d8 switch models for multiple box objectives. Feature request at codeplex issue 194, George Karpenov. Usage model is same as Pareto fronts you call check-sat multiple times until retrieving unsat
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-04-01 16:21:56 -07:00
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
911ffc370a separate MaxSMT functionality to enable using this independently (and incrementally) of overall context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-16 09:11:28 +01:00
Nikolaj Bjorner
8141dadc89 break on small cores
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-02-08 10:22:06 +01:00
Nikolaj Bjorner
552cbd840f adding soft-assertions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-23 13:06:11 -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
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
69a5634e7e adding symba designated strategy (back?) to optsmt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-14 16:33:55 -07:00
Nikolaj Bjorner
a96fa0c555 remove deprecated maxsat solvers, adjust values inline
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-14 11:55:47 -07:00
Nikolaj Bjorner
019ff77613 fix sorting network bug, add network compilation,...
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-11 18:47:21 -07:00
Nikolaj Bjorner
72f09e4729 better verbose pretty printing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-09 16:57:43 -07:00
Nikolaj Bjorner
f151879c0b enable neat vs. less neat pretty priting as an option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-09 16:25:41 -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
1b9529e1e1 fix scope bugs per Klaus Becker's examples
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-29 01:55:32 -07:00
Nikolaj Bjorner
b82a68f4d4 fix bug in sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-24 19:53:55 -07:00
Nikolaj Bjorner
a47f3df703 fix bug in unsat core extraction in sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-18 23:43:51 -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
4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner
03979fd580 fix up pareto callback mechanism
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 12:48:17 -07:00
Nikolaj Bjorner
e9a11bd93b fix emptines check
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-10 17:43:42 -07:00
Nikolaj Bjorner
fb0305d5ec update timeout logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 22:27:35 -07:00
Nikolaj Bjorner
cf55854d22 adding scoped state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 17:21:16 -07:00
Nikolaj Bjorner
20cb8a3092 added pareto utility
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-25 03:00:31 +02:00
Nikolaj Bjorner
7237be768b fixing bugs in refactored code exposed from White's example
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 11:06:43 -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
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
99b4ce037d integrating diff opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-03-05 16:29:26 -08:00
Nikolaj Bjorner
af27efbf4a pareto0
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-01-01 21:13:25 -08: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
8c85ee6b7c fixing lex optimization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-13 23:36:42 +01: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
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
da348fe1c0 first pass on normalization
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-12-07 14:38:09 -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