mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-08 18:31:49 +00:00
Code Activity
5898 commits 23 branches 48 tags 156 MiB
Commit graph

448 commits

Author SHA1 Message Date
Nikolaj Bjorner 5948013b1b clear label buffer 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-18 18:56:54 -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 c2108f74f1 fix uninitialized variable 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-14 10:35:06 -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 b4cb51cdb3 working on Forking/Serializing a z3 Solver #209 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-06 17:29:24 -08:00
Nikolaj Bjorner 653416153d use appropriate MaxSAT solver even if there are no soft constraints. Also avoid PB constraints when all soft constraints are false. Reported by Klaus Becker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-02 08:18:51 -08: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
Christoph M. Wintersteiger f3441c6a9b tabs and indentation 2015-09-17 13:25:22 +01: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 cc5d719d9e enable incremental bit-vector solving 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-09-01 09:48:35 -07:00
Nikolaj Bjorner 0ed38ed59b add option for using corr set and use partial cores 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-30 14:48:24 -07:00
Nikolaj Bjorner b2ebd095cb fix for unintialized variable m_conflict_lvl 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-24 17:01:46 -07:00
Nikolaj Bjorner 149549dd52 fix wcnf front-end and unsat case in pd 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-23 14:24:51 -07:00
Nikolaj Bjorner ee458fa601 revising pd-maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-23 12:09:07 -07:00
Nikolaj Bjorner 546a9b8f03 revising pd-maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-23 10:53:39 -07: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 a78fc031bc adding facility to dump wcnf benchmarks 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-21 07:26:49 -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 655b44c07b make :weight understand both decimal and integral values, remove dweight, remove deprecated commands for optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-08-15 00:48:22 +02: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 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 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 4675643271 fixes to githup issue #133 and stackoverflow reported bug on assertion violation in poly_simplifier_plugin 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-06-21 13:49:15 -07:00
Nikolaj Bjorner 6f0d76a62e Merge branch 'unstable' of https://github.com/Z3Prover/z3 into unstable 2015-06-21 09:39:32 -07:00
Nikolaj Bjorner fe7c577d99 isolate inc_sat_solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-06-21 01:54:52 -07: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 ffff006945 remove old files 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-06-02 09:15:08 -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
Nikolaj Bjorner 203c5015c8 fix debian amd64 warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-18 15:17:21 -07:00
Nikolaj Bjorner 5632900f35 fix gcc compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-16 12:04:10 +01:00
Nikolaj Bjorner 64bd62b17e fix gcc compiler warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-16 11:56:04 +01: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 e6b8af402f fix build warnings 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-05-15 15:56:21 +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 bd162588b2 enable SAT solver by default for MaxSAT constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-04-02 17:09:01 -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 52619b9dbb pull unstable 
Signed-off-by: Nikolaj Bjorner <nbjorner@hotmail.com>
 2015-04-01 14:57:11 -07:00
nikolajbjorner fe6af38d97 debugging assertion violation 
Signed-off-by: nikolajbjorner <nbjorner@microsoft.com>
 2015-03-10 20:57:01 -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 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 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 e50e02e656 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2015-01-20 16:38:55 -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 f1d9228b94 fix bug in context push/pop for sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-01-20 16:30:46 -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 e9baaa0900 rename 'or' to 'fml' toe mae gcc happy, reported by Geroge Karpenkov 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-11-25 10:23:41 -08:00
Nikolaj Bjorner 2dccfc0ce2 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-11-24 16:17:41 -08: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 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 630a3d6ea8 integrate bounds from original model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-15 15:11:31 -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 ff69ee049b fix non-termination 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-14 16:45:54 -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 e1c2049343 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-10-06 08:37:41 -07:00
Nikolaj Bjorner db20b2502d try qx 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-04 19:50:42 -07:00
Nikolaj Bjorner f3d2535b46 another unit test for Nuno 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-10-03 16:58:46 -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 caa35f6270 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-09-27 09:59:00 -07:00
Nikolaj Bjorner 1392dc020f local debug update 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-27 09:58:43 -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 99ff13b651 opt + udoc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-09-17 11:39:25 -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 afe7fc367b working on maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-30 12:40:37 -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 b45b2872d8 basic primal/dual 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-29 16:24:46 -07:00
Nikolaj Bjorner 5fdb58348e working on mus-mss 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-29 15:34:48 -07:00
Nikolaj Bjorner 3da60804fc basic primal/dual 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-29 09:52:56 -07:00
Nikolaj Bjorner c928f776da working on mss/mus v2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-29 08:39:31 -07:00