3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-13 20:38:43 +00:00
Commit graph

251 commits

Author SHA1 Message Date
Nuno Lopes b26735a887 fix build with gcc
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-11-22 11:24:30 +00:00
Nikolaj Bjorner 0592e76574 Enhancement for Valentin #332
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-19 10:26:01 -08:00
Nikolaj Bjorner c58e640563 extract labels for optimal model. Fix to #325
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 14:53:08 -08:00
Nikolaj Bjorner 1575dd06a7 expose labels from optimization. Move printing of objectives to after sat/unsat. Cahnge format to something that is somewhat related to how other output is created. Issue #325.
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-18 09:42:12 -08:00
Nikolaj Bjorner 0a26bcf14c ensure unique symbols when MaxSAT problems are extracted from linear objectives such that multiple objectives can be supported. Fixes issue #308
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-13 15:12:08 -05:00
Nikolaj Bjorner 2865f60f8c deal with case of unsatisfiable context and bit-vector objectives that are not normalized to maxsmt. Issue #304
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-11-11 11:39:34 -05:00
Nikolaj Bjorner 7838213675 eliminate to_real coersions to make mixed integer problems easier to digest. Issue #277
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-10-30 15:12:21 -07:00
Nikolaj Bjorner 9b3e242990 adding rlimit resource limit facility to provide platform and architecture independent method for canceling activities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-28 13:37:59 -07:00
Nikolaj Bjorner b25e8e2288 tune lexicographic products, avoid push/pop and ensure correction sets are not used for multiple objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-09-13 16:00:45 +02:00
Nikolaj Bjorner da0c12cdba move display method to before first SAT call
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-21 18:29:36 -07:00
Nikolaj Bjorner a9807878ea reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:20:30 -07:00
Nikolaj Bjorner e3cb0e2d8b reworking pd-maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 12:06:27 -07:00
Nikolaj Bjorner 980e74b4ff add tactic to recognize small discrete domains and convert them into bit-vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-20 06:39:11 -07:00
Nikolaj Bjorner eb5af100bd adding optimize bindings for ML, adding get_reason_unknown to optimize, mentioned in pull request issue #188, second edition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-09 17:49:20 +02:00
Nikolaj Bjorner aa431bb67f ensure pb on lex > 1 constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-08 14:10:11 +02:00
Nikolaj Bjorner a3c43c34fb change default behavior of solver pretty printer to include declarations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-06 18:57:11 +02:00
Nikolaj Bjorner f96c0b6963 fixes #186, remove ite-lifting from opt_context to detect weighted maxsat
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-08-06 11:52:59 +02:00
Nikolaj Bjorner 77c8e5b0a0 add model on unknown, to address issue #139
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-23 14:45:52 +02:00
Nikolaj Bjorner 564da787fb add count of memory allocations and way to limit allocations globally. Fix purification in nlsat_smt to fix regressions on QF_UFNRA
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-06-22 07:45:40 +02:00
Nikolaj Bjorner d06207f072 remove ite terms from objectives to synchronize values in tableau with objective value. Fixes part of (three repros) from issue #120
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
2015-06-02 10:38:22 -07:00
Nikolaj Bjorner 1714182c38 Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-05-29 11:08:25 -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 ed7e0e11a8 n/a
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-05-28 20:55:13 -07:00
Nuno Lopes 6c22edc988 fix assorted compiler warnings
Signed-off-by: Nuno Lopes <nlopes@microsoft.com>
2015-05-16 11:44:58 +01:00
Nikolaj Bjorner a0f0b53686 fixes to #52, #53
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-04-28 14:48:59 -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
nikolajbjorner fbf8289394 probe also hard constraints before enabling SAT solver. Bug reported by Zvonimir Pavlinovic
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
2015-02-24 14:02:23 -08: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 761c7d9a40 adding annotation to logging to show number of columns and rows, adding dual propagation sketch
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2015-01-25 04:01:18 -08: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 21ea48bfd8 epsilon should have real type, reported by GeorgeKarpenkov, codeplex issue 145
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-12-15 16:27:35 -08:00
Nikolaj Bjorner f4dfb9ac82 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-12-09 20:57:34 +01: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 f71fd2afb5 disable unconstrained elimination pre-processing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-11-24 16:17:22 -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 630a3d6ea8 integrate bounds from original model
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-15 15:11:31 -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 f7f4feaa47 fix lex bug for maxres case
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-11 01:05:30 -07:00
Nikolaj Bjorner cb88968588 tuning maxres
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-02 17:10:51 -07:00
Nikolaj Bjorner 0b1c180808 fix lexicographic product for MaxSMT
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-10-01 13:49:23 -07:00
Nikolaj Bjorner 08dcd51594 fix bugs in incremental operation of sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-27 12:04:54 -07:00
Nikolaj Bjorner e6725b2344 merge unstable into opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-26 12:12:24 -07:00
Nikolaj Bjorner 73070585b8 fix bug in core generation in legacy core: it ignores complementary literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-14 13:06:01 -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 18b491eee0 fixes to maxres/mss
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-03 10:03:56 -07:00
Nikolaj Bjorner b5bbf83847 update core generation to be partial, update maxres to use current model too
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-02 19:05:28 -07:00
Nikolaj Bjorner 3f8083dfa6 fix push/pop bugs in optimize context, add example to c++, fix bug in arithemtic bounds axiom addition
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-02 09:32:38 -07:00
Nikolaj Bjorner 75c114feab fix regression on push/pop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-09-01 14:37:58 -07:00
Nikolaj Bjorner 83a7d1a658 adding options to maxres for experiments, include option to pretty print module parameters in smt2 style
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-30 11:46:29 -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 f748a03ac7 opt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-08-16 22:31:54 -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 53f82e3239 update model during Lex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-07-06 17:33:54 +02:00
Nikolaj Bjorner 4415df3fcf various fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-06-02 19:10:20 +05:30
Nikolaj Bjorner 6821d61ac4 working on incremental sat solver
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-13 17:19:19 -07:00
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 cad1e5cab3 move to scoped state, change default parameter for sls until bv is debugged
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-11 18:39:36 -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 252b9e8819 fix lower/upper bound estimate with respect to offset
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 16:32:17 -07:00
Nikolaj Bjorner 4dc71acde0 add logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-09 11:31:54 -07:00
Nikolaj Bjorner 182fea2d7b fix bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-05-05 10: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 beaa50e0d8 fixing sls
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-21 18:07:02 +02:00
Nikolaj Bjorner e3b346df6f working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-18 08:04:18 -07:00
Nikolaj Bjorner ae1656a92c working on bcd2
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2014-04-17 15:37:03 -07: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 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
Anh-Dung Phan 5ed8a48ac2 Add push/pop to box optimization 2013-11-26 14:16:59 -08:00
Anh-Dung Phan 4aa9c742ab Revise optimize commands 2013-11-26 12:54:18 -08:00
Anh-Dung Phan dbc791d385 Reorganize combination of objectives 2013-11-26 09:20:11 +01:00
Nikolaj Bjorner 86e22c1186 add validation option
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-18 09:44:20 -08:00
Nikolaj Bjorner dc78da4873 case analysis for commit
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 23:29:31 -08:00
Nikolaj Bjorner ba05f79415 bug fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 22:40:43 -08:00
Nikolaj Bjorner b573b94f84 nits
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 21:59:38 -08:00
Nikolaj Bjorner 6e1c186017 enable answer generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 20:55:01 -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 f350efffc7 working on pareto and upper/lower bound facilities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 13:52:27 -08:00
Nikolaj Bjorner 6caee5e3ca more refactoring
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 13:16:10 -08:00
Nikolaj Bjorner 33be06c6dc continued re-factoring
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-08 09:00:24 -08:00
Nikolaj Bjorner 401fced400 separate out file for objectives
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-07 18:09:44 -08:00
Nikolaj Bjorner acb26d0cf9 review of network flow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-11-04 16:00:50 -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 86151b4d52 dealing with cancel
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:38:47 -07:00
Nikolaj Bjorner 9fc84f1389 adding timeout, parameters, statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-30 13:23:04 -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
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 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 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 cfedbe3dfd add opt_solver layer
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2013-10-17 17:33:43 -07:00