3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-14 21:08:46 +00:00
Commit graph

360 commits

Author SHA1 Message Date
Nikolaj Bjorner a337a51374 fixes for #2513
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-23 23:29:24 +03:00
Nikolaj Bjorner 53aded3198 fix #2416 exposed bugs: unsat-core extraction in combination with chronological backracking, equivalence elimination in combination with PB constraints
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-25 18:55:44 -07:00
Nikolaj Bjorner 604e6b2705 fix #2418, change types in sat_solver to avoid cast
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-24 11:52:28 -07:00
Nikolaj Bjorner 1a70fce92e add back nvars
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-24 09:51:04 -07:00
Nikolaj Bjorner 364fbda925 expose reorder config
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-22 15:30:06 -07:00
Nikolaj Bjorner a9a26e5f2e review comments by Elffers
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-21 06:52:02 -07:00
Nikolaj Bjorner 43a19cadf6 avoid reorder regression. affects performance of SAT and also noticably for #2405
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-20 12:40:22 -07:00
Nikolaj Bjorner 41ca956012 expose import model converter over Python, document it, add partial order axioms for lex, disable linear order axioms, prepare ground for re-adding clauses from reconstruction stack
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-18 13:45:13 -07:00
Nikolaj Bjorner cd93cdd819 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-07-09 07:40:29 +01:00
Nikolaj Bjorner 3985cfa33c ensure parameters are passed to local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-17 12:31:13 -07:00
Nikolaj Bjorner d17248821a include chronological backtracking, two-phase sat, xor inprocessing, probsat, ddfw
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-13 08:45:21 -07:00
Nikolaj Bjorner 7f74382863 capture i by value
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:18 +01:00
Nikolaj Bjorner 9f3089b098 try with std::vector and ptr_vectors
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner f5511b4174 missing include
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner 1f84381c4c pfor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner 59330b3855 pfor
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner 9262908ebb mux
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner d4410d0872 address compilation warnings of unused parameters, add shorthands to set parameters on Optimize
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-04-16 14:32:48 -07:00
Nikolaj Bjorner dc0e9c1919 completing user print experience with seq/re #2200
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-24 11:46:36 -07:00
Nikolaj Bjorner 7399f78dfd disable model compression for regressions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-03 12:40:59 -08:00
Nikolaj Bjorner 73060ecaec remove debug code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-22 13:57:09 +01:00
Nikolaj Bjorner bceff4b3fa Merge branch 'master' of https://github.com/z3prover/z3 2019-02-22 11:17:03 +01:00
Nikolaj Bjorner 4c799c144a fix gc to not remove ternary clauses that are on assignment trail. This addresses issue with drat proofs that don't pass drat-trim due to deletion during gc, but use in conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-22 11:14:20 +01:00
Nuno Lopes 6598aedbb2 fix VS build, take 2 2019-02-21 15:52:52 +00:00
Nikolaj Bjorner 3548057bd1 fix detection of arithmetic operations
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-20 14:00:05 +01:00
Nikolaj Bjorner caa15ea04d enable cardinality constraints in nla2bv
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-19 18:17:07 +01:00
Nikolaj Bjorner 7fb2c6a908 turn off model validation unless specified by parameter
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-18 15:55:24 +01:00
Nikolaj Bjorner c1402ad70f tone down verbosity of integrity checking
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-16 20:39:15 -08:00
Nikolaj Bjorner 39f73fa595 ensure that activity works for sat solver from cold state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-15 16:56:55 -08:00
Nikolaj Bjorner 89bf2d4368 add API for setting variable activity
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-15 12:05:24 -08:00
Nikolaj Bjorner eec1da5a15 move restart test to after propagation, clean up drat generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-12 15:49:12 -08:00
Nikolaj Bjorner 5fe40a25dc revise local search
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:14:20 -08:00
Nikolaj Bjorner 22783a4bcb import more from csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 13:09:28 -08:00
Nikolaj Bjorner 93ee05648e add shortcuts for unit assertions, conflicts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-11 10:56:36 -08:00
Nikolaj Bjorner 24dfdfe9bc disable fixes for #2128 and related as it breaks model evaluation time in regressions, set longer delay for inprocessing in sat solver, report stats
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-09 16:06:02 -08:00
Nikolaj Bjorner d04e72819a abstract solver API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-06 19:42:01 +01:00
Nikolaj Bjorner 08ce6f7ac1 working on binary drat format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-30 08:54:59 -08:00
Nikolaj Bjorner 58f5531cff fix #2114 introduced while working on #2095
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-29 08:18:03 -08:00
Nikolaj Bjorner f2e636c598 record simplified input clauses as lemmas
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 16:37:21 -08:00
Nikolaj Bjorner 247980c5a2 don't assign already assigned literals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 11:41:32 -08:00
Nikolaj Bjorner e01a668da0 coordinate drat with clause removal
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-16 02:29:33 -08:00
Nikolaj Bjorner 3298486136 don't reach max conflicts if state is inconsistent
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:40:38 -08:00
Nikolaj Bjorner 5328454c77 const
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:37:23 -08:00
Nikolaj Bjorner 161c83795f remember inconsistent states when cloning
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-15 08:34:55 -08:00
Nikolaj Bjorner f238460597 neatify statistics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 16:45:04 -08:00
Nikolaj Bjorner ed7cac8cc0 neatify logging
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 16:42:13 -08:00
Nikolaj Bjorner f835a3c2b2 revert assumption tracking choice in unit literals inferred from binary clauses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 11:08:35 -08:00
Nikolaj Bjorner e4d6aa07dc use vectors instead of hash-tables in dimacs serialization to avoid hash-table contention
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 11:05:00 -08:00
Nikolaj Bjorner 3c96b51e97 lvl -> _lvl
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 00:40:36 -08:00
Nikolaj Bjorner 0b8dbf2854 fixing drat proofs
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-12 00:30:21 -08:00