mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-16 05:48:44 +00:00
Code Activity
10237 commits 23 branches 48 tags 157 MiB
Commit graph

611 commits

Author SHA1 Message Date
Nikolaj Bjorner 9cfd412cd0 enable pb theory always as pb terms can be introduced during transformations. Issue #884 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-01 15:28:29 -08:00
Nikolaj Bjorner 669c018242 updates on cardinality solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-02-01 07:43:43 -08:00
Nikolaj Bjorner 0aa912371b Another fix for #847. Reset wmax theory solver state between lex calls, otherwise it uses stale constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-17 14:19:24 -08:00
Nikolaj Bjorner 7df803c131 Fix unsound handling of upper bounds in wmax, thanks to Patrick Trentin for report and careful repros #847 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-15 11:52:48 -08:00
Nikolaj Bjorner bc6b3007de remove unused features related to weighted check-sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2017-01-13 20:53:22 -08:00
Nikolaj Bjorner aaf6e67ec8 add restart.max parameter to control cancellation based on restart count 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-25 17:43:47 -08:00
Nikolaj Bjorner 2bd29548da improve parser error message over API, streamline names of statistics for arithmetic solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-25 17:27:56 -08:00
Nikolaj Bjorner 1787fa8296 remove redundant disjunction in compilation of at-most-1 constraints, log mutexes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-22 20:54:09 -08:00
Nikolaj Bjorner 2307a7ffa7 fix bug in handling of repeated soft constraints. #815 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-11 10:19:57 +01:00
Nikolaj Bjorner dea3b8ddf7 address warnings from #836 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-10 13:14:36 +01:00
Nikolaj Bjorner 0ab2067b69 produce error message for cores with optimization. Issue #825 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-12-09 13:15:40 +01:00
Nikolaj Bjorner 024082a45f adding preferred sat, currently disabled, to wmax. Fixing issue #815 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-30 09:52:05 -08:00
Nikolaj Bjorner df0e3a100c tune initialization for wmax and sortmax 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-19 08:04:06 -08:00
Nikolaj Bjorner ea601dd403 fix and coallesce clique functionality 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-19 03:55:48 -08:00
Nikolaj Bjorner e9db934f1a improving perf of mutex finding, revert semantics of 0 timeout to no-timeout. Issue #791 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-17 04:26:17 +02:00
Nikolaj Bjorner e21bd8dacc fix lexicographic combinations for wmax: pb constrsaints were not interpreted in Boolean benchmarks. #782 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-15 15:07:05 +02:00
Nikolaj Bjorner 84172302a2 fix bug in mutex extraction, reported by Patrick Trentin 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-11-01 00:16:16 +01:00
Nikolaj Bjorner ba942af5a8 disable sat solver when proofs are turned on. Fixes issue #768 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-31 23:27:39 +01:00
Nikolaj Bjorner 3778048eb4 add bounded-int and pb2bv solvers to fd_solver, use sorting networks for pb2bv rewriter when applicable, hoist to pb2bv_rewriter module and remove it from the pb2bv_tactic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-23 20:31:59 -07:00
Nikolaj Bjorner 23b9d3ef55 fix at-most-1 constraint compiler bug 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-22 18:50:16 -07:00
Nikolaj Bjorner 8d2b70a5e2 better encodings for at-most-1, #755 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-10 23:46:03 -07:00
Nikolaj Bjorner 619cce0a52 add mutex preprocessing to maxsat, add parsing functions to C++ API 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-07 12:42:08 -07:00
Nikolaj Bjorner f452895f5f add mutex pass 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-04 14:45:23 -07:00
Nikolaj Bjorner e3f0aff318 address ubuntu warning and add shortcuts for maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-03 16:22:13 -07:00
Nikolaj Bjorner b2db2f1eb6 allow negative weights for weighted maxsat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-10-02 10:21:58 -07:00
Nikolaj Bjorner 527c5191a6 Add C++ functions for set operations per stackoverflow post, set relevancy = 2 for quantified maxsmt per example from Aaron Gember, fix conversion of default weights based on bug report from Patrick Trentin on maxsat. Annotating soft constraints with weight=0 caused the weight to be adjusted to 1 and therefore produce wrong results 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-09-21 12:24:24 -07:00
Nikolaj Bjorner 491b3b34aa tune consequence finding. Factor solver pretty-printing as SMT-LIB into top-level 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-08-03 11:14:29 -07:00
Nikolaj Bjorner cb2d8d2107 add detection of non-fixed variables to consequence finding 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-30 19:12:41 -07:00
Nikolaj Bjorner 56c78753f0 updating default solver selection. Add dt2bv transformation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-24 18:16:32 -07:00
Nikolaj Bjorner 3581f6de42 remove stale SLS option 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-21 18:18:42 -07:00
Nikolaj Bjorner f522d995d1 apply 'to-real' coercion only on integers. bug reported by Geoff 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-20 19:03:25 -07:00
Nikolaj Bjorner 4f5b0667ef fix rounding mode for pseudo-boolean constraint creation, Issue #683 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-07-14 12:34:18 -07:00
Nikolaj Bjorner 5d5004193b avoid crash on box models under cancellation. Issue #654 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-29 04:54:31 -07:00
Nikolaj Bjorner 0fdf01e410 avoid crash on box models under cancellation. Issue # SASSERT(!m_box_models.empty()); 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-29 04:53:28 -07:00
Nikolaj Bjorner c72ed3e6b4 update core minimization code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-23 21:39:28 -07:00
Nikolaj Bjorner 5b497b6249 reduce set of mainly verbose warnings raised by -Wmaybe-uninitialized and unused variable warnings from release mode builds 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-22 20:25:47 -07:00
Nikolaj Bjorner 9c099d6b1b fix mb maximization logic, so far not accessible 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-20 16:39:03 -07:00
Nikolaj Bjorner c7ff05cc78 enable core minimization with qsat in case it turns out to be useful 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-12 15:58:12 -07:00
Nikolaj Bjorner 9f5a117443 move mus to solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-06-10 16:24:14 -07:00
Nikolaj Bjorner c725fe7698 tune lra optimization 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-22 17:03:29 -07:00
Nikolaj Bjorner 1aa3fdab8a remove min/max, use qmax; disable cancellation during model evaluation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-19 13:04:20 -07:00
Nikolaj Bjorner 96e157e201 fix warnings for unused variables 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 13:54:22 -07:00
Nikolaj Bjorner ec565ae7a0 fixes to #596 and #592: use exponential step increments on integer problems, align int.to.str with canonizer and disequality checker 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-17 01:00:42 -07:00
Nikolaj Bjorner 5b31f54501 max/min 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-05-05 14:11:13 -07:00
Nikolaj Bjorner e29adbf304 fix issues #581: nested timeouts canceled each-other 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-30 11:18:34 -07:00
Nikolaj Bjorner 2428bf18f1 add model correction 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-29 19:08:10 -07:00
Nikolaj Bjorner c75fd02c95 qsat-opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-28 21:31:16 -07:00
Nikolaj Bjorner 0094b36636 fix bounds check to fix segfault reported in issue #565 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-04-16 12:25:29 -07:00
Nikolaj Bjorner fe4f3e7772 fix regressions exposed in QF_LIA: manager got initialized early and Euclidean solver is not safe even with some throttle 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-23 20:38:18 -07:00
Nikolaj Bjorner 45fdb95f53 fix performance for model construction, recognize concats of values as a value for pre-processing 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-23 17:23:57 -07:00
Nikolaj Bjorner 55956df8d8 remove critical sections that are now redundant due to different cancellation model 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-13 12:10:14 -04:00
Nuno Lopes 8b53628d67 remove a few unused decls 2016-03-09 17:01:06 +00:00
Nikolaj Bjorner 5db84575f6 fix regression in o7.smt2 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-08 22:27:47 -08:00
Nikolaj Bjorner 5994c5a948 fix partial model tracking over cancellation/exceptions, reported by August Shi. Fix regression test for fp-to-real, reset the pre-processor in inc_sat_solver on exceptions 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-07 16:42:29 -08:00
Nikolaj Bjorner 67397bf71e enable logic parameter update to configure SMTLIB logic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-03-01 09:48:24 -08:00
Nikolaj Bjorner 2a65503235 fix #425 and report from Patrick Trentin of same bug in preprocessing soft constraints that are simplified to true/false 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-02-04 22:35:02 +00:00
Nikolaj Bjorner 85d44c5d66 fix axioms for extract, add extensionality checking for shared variables, convert exceptions to unknown status per #419 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2016-01-18 11:09:41 +05:30
Nikolaj Bjorner baee4225a7 reworking cancellation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 16:21:24 -08:00
Nikolaj Bjorner 32b6b2da44 moving to resource managed cancellation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 13:13:11 -08:00
Nikolaj Bjorner 61dbb6168e cleanup cancelation logic 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-12-11 12:35:35 -08:00
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 c1a6163bda disable aig tactic in inc_sat_solver (it can blow up the size of formulas significantly without sharing) and fix configuration update bug for optimization context exposed in example by Corina 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2015-11-20 14:34:31 -08: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 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
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 bd8875bf5f add MUS/MCS plan 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-28 21:18:17 -07:00
Nikolaj Bjorner 16e0ad14aa add MUS/MCS plan 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-28 20:56:41 -07:00
Nikolaj Bjorner 9e7cef7d6b working on product sets 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-26 16:45:45 -07:00
Nikolaj Bjorner 3ae10abf04 remove extra qualifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 13:15:29 -07:00
Nikolaj Bjorner ff501986f1 remove extra qualifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 13:15:01 -07:00
Nikolaj Bjorner 2dcbf192cc remove extra qualifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 13:14:20 -07:00
Nikolaj Bjorner 4d589de970 remove extra qualifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 13:13:43 -07:00
Nikolaj Bjorner 20728535e8 remove extra qualifier 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 13:12:49 -07:00
Nikolaj Bjorner 15734398d8 Merge branch 'opt' of https://git01.codeplex.com/z3 into opt 2014-08-25 12:11:49 -07:00
Nikolaj Bjorner 8938de2ba2 fix build error reported by Ari 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-25 12:11:34 -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 b596828d23 add DDNF based engine 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-21 18:04:46 -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 1c56d6ee95 align lengths of weights and soft constraints 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-18 01:17:26 -07:00
Nikolaj Bjorner f748a03ac7 opt 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-16 22:31:54 -07:00
Nikolaj Bjorner 33f74b9c9f sls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-15 22:49:21 -07:00
Nikolaj Bjorner ddb9e6e8d4 fix flipper 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-15 18:30:06 -07:00
Nikolaj Bjorner be1cceba34 fix scope and mus with user-scopes 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-15 11:29:08 -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 180b0d4ec9 add sls 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-12 19:24:31 -07:00
Nikolaj Bjorner 1652c16163 add missing code 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-10 22:13:55 -07:00
Nikolaj Bjorner 39d90f914d NA 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-10 21:27:07 -07:00
Nikolaj Bjorner e832bdd257 fix bug in blocked clause elimination that was enabled for external variables, fix other bugs in maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-10 21:23:05 -07:00
Nikolaj Bjorner 317e76a11b mss and mss-mus-maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-03 20:23:10 -07:00
Nikolaj Bjorner d429e72e92 v2 of dual maxres engine 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-03 18:50:21 -07:00
Nikolaj Bjorner 622d8b5cd1 moving to maxres consolidation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-03 00:18:09 -07:00
Nikolaj Bjorner 6a4c08c7cb moving to maxres consolidation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-03 00:17:55 -07:00
Nikolaj Bjorner a41b1d34ce moving dual solver to maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-03 00:08:57 -07:00
Nikolaj Bjorner 5e026b7897 mss and maxres tuning 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-02 23:34:43 -07:00
Nikolaj Bjorner 9681dc12b1 tuning auxiliary literals and clauses 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-02 14:25:04 -07:00
Nikolaj Bjorner 8814ba0629 testing maxres with sat core 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-02 12:27:57 -07:00
Nikolaj Bjorner b928734348 perf improvements, mus 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-08-01 16:11:52 -07:00
Nikolaj Bjorner 6438c477b3 working on maxres 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-31 23:35:41 -07:00
Nikolaj Bjorner 39414d8b8d testing inc_sat 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-31 22:29:47 -07:00
Nikolaj Bjorner 365f05b41a testing inc-sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-30 17:49:51 -07:00
Nikolaj Bjorner bfc0af7820 testing inc-sat solver 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2014-07-30 16:35:46 -07:00