3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-15 05:18:44 +00:00
Commit graph

317 commits

Author SHA1 Message Date
Nikolaj Bjorner 96f10b8c1c user propagator
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-22 19:01:04 -07:00
Nikolaj Bjorner 2d5b749745 extend solver callbacks with methods
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-21 19:24:59 -07:00
Nikolaj Bjorner 080be7a2af merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-21 12:14:28 -07:00
Nikolaj Bjorner 4857d60c99 user propagator over the API 2020-08-18 21:53:02 -07:00
Nikolaj Bjorner 0c93c7aa08 adding user propagation to API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-18 10:30:10 -07:00
Nikolaj Bjorner 152c95f72a adding user-propagator ability
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-17 22:39:55 -07:00
Nikolaj Bjorner ca3ec22b7a handle better cancellation for parallel, switch between cube mode and base level mode in smt.threads, expose parameters to control theory_bv and phase caching
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-16 23:29:24 -07:00
Nikolaj Bjorner fae206b738 add command-line help descriptions on tactics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-14 19:29:35 -07:00
Nikolaj Bjorner a892e4793b typo
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-08-13 12:48:18 -07:00
Nikolaj Bjorner 59d8895d15 add accessors for implied values to API
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-07-28 19:46:39 -07:00
Nikolaj Bjorner 8857a67e4f fix model return after shutdown, reported in #4532
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-07-27 23:48:19 -07:00
Nikolaj Bjorner 61b85d7123 verbosity
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-07-20 14:11:59 -07:00
Nuno Lopes bb26f219fe remove unneeded constructors (last round) 2020-07-12 17:41:57 +01:00
Nuno Lopes 23e6adcad3 fix a couple hundred deref-after-free bugs due to .c_str() on a temporary string 2020-07-11 20:24:45 +01:00
Nikolaj Bjorner d0e20e44ff booyah
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-07-04 15:56:30 -07:00
Nikolaj Bjorner fd57faee7c another module level ifdef for #4382
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-18 15:03:58 -07:00
Nikolaj Bjorner c8c02060ee another module level ifdef for #4382
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-18 15:01:27 -07:00
Murphy Berzish 6f0a367357
add SMTLIB2.6 names for QF_SLIA and string-int conversion operators (#4341) 2020-05-16 14:31:47 -07:00
Nikolaj Bjorner fdc87f286f
na (#4254)
* remove level of indirection for context and ast_manager in smt_theory

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* add request by #4252

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* move to def

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* int

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4251

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4255

* fix #4257

* add code to debug #4246

* restore new solver as default

* na

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

* fix #4246

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-05-09 17:40:02 -07:00
Nikolaj Bjorner 16bc5b8432 build warning 2020-04-30 19:30:54 -07:00
Nikolaj Bjorner e67112f289 NYI control paths 2020-04-28 20:19:20 -07:00
Nikolaj Bjorner 21a31fcd26 add missing fixed propagations on negated integer inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-11 02:28:38 -07:00
Nikolaj Bjorner 296a97d0d3 build
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 01:03:38 -07:00
Nikolaj Bjorner 4842c71019 fix #3537
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-05 00:38:14 -07:00
Nikolaj Bjorner 426e4cc75c fix #3557
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-03 16:37:59 -07:00
Nikolaj Bjorner 918b6a8c03 trace & threads = undef
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-03 13:58:22 -07:00
Nikolaj Bjorner 50624723af fix #3704
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-03 10:38:31 -07:00
Nikolaj Bjorner 8290cfadcc fix #3694
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-02 08:05:43 -07:00
Nikolaj Bjorner 78ebe0a94c fix #3701
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-04-02 06:22:32 -07:00
Nikolaj Bjorner 4ee0462beb fix #3590
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 15:43:33 -07:00
Nikolaj Bjorner c108b7f99c early givup #3604
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 13:46:02 -07:00
Nikolaj Bjorner 98b43322b1 collect statistics under lock #3604
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-31 13:33:18 -07:00
Nikolaj Bjorner 03d7a9acff #3581, bail out when smt solver gives up
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-30 17:19:57 -07:00
Nikolaj Bjorner 493671aa72 fix #3520
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-26 09:58:06 -07:00
Nikolaj Bjorner 0cf401c67b fix #3458
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-23 17:27:10 -07:00
Nikolaj Bjorner 41965acaf1 less is even more correct, fix #3244
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-18 15:17:01 -07:00
Arie Gurfinkel 6180a5276d
Logging facility for spacer plus minor improvements (#3368)
* [spacer] logging solver events

New option fp.spacer.trace_file='file.log' enables logging solving events
into a file.

These events are useful for debugging the solver, but also for visualizing
the solving process in a variety of ways

* [spacer] allow setting logic for solvers used by spacer

* [spacer] option to set arithmetic solver explicitly

* [spacer] improve of dumping solver_pool state for debugging

* fix propagate_ineqs to handle strict inequality

Co-authored-by: Nham Van Le <nv3le@precious3.eng.uwaterloo.ca>
2020-03-16 20:31:44 -07:00
Nikolaj Bjorner 825fbf1832 fix #3268
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-13 10:49:39 -07:00
Nikolaj Bjorner dd4eb7f97c fix #3230 fix #3231 - make rmodel converter additive
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-10 14:08:57 -07:00
Nikolaj Bjorner a51d65d58a fix #3118 (without breaking #3101, #3111)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-09 21:20:27 +01:00
Nikolaj Bjorner f7747d9e76 fix parameter collection for tactic-based solvers reported in #3065
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-09 19:59:26 +01:00
Nikolaj Bjorner ba79700096 remove mc printing from goals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 18:06:23 -08:00
Nikolaj Bjorner 8b720a0d66 fix #3115 fix #3116 regressions from #3111 etc
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 16:38:33 -08:00
Nikolaj Bjorner c4d168205a revert a breaking change
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 14:49:45 -08:00
Nikolaj Bjorner bfca26b972 fix #3111
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-02 04:46:12 -08:00
Nikolaj Bjorner 79fae355b8 fix #3101
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-03-01 12:50:00 -08:00
Nikolaj Bjorner dcd4fff284 fixes to cuts
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-02-21 18:06:57 -08:00
Nikolaj Bjorner 541658fe02 move to abstract symbols
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-10 12:14:13 -08:00
Nikolaj Bjorner 1d0572354b add bit-matrix, avoid flattening and/or after bit-blasting, split pdd_grobner into solver/simplifier, add xlin, add smtfd option for incremental mode logic
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2020-01-01 20:14:20 -08:00
Nikolaj Bjorner cb600a9329 consolidate model.compact and model_compress #2704
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-11-15 11:07:08 -08:00
Nikolaj Bjorner 11736f078e ensure statistics survive cancelation in tactics, fix propagation for smtfd
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-10-18 19:22:46 -07:00
Nikolaj Bjorner 5122b2da7e add solver.timeout as another entry point #2354
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-10-16 09:01:11 -07:00
Nikolaj Bjorner 7a5ca96095 remove separate API for setting solver log, use parameter setting instead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-10-09 09:01:17 -07:00
Nikolaj Bjorner 63840806d8 fix #2546, retrieve model in optsmt lex before iterating
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-09-10 11:19:59 +02:00
Bruce Mitchener e2122c0d3d Fix whitespace issues in *.pyg. 2019-08-15 10:19:33 -07:00
Nikolaj Bjorner fc41a61b6e expose strategic solver factory prototype at level of solver module
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-09 15:52:12 -07:00
Nikolaj Bjorner e950453685 force propagation for smt cubing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-06 14:19:16 -07:00
Nikolaj Bjorner 7f073a0585 fix #2452 fix #2451
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-08-01 16:28:15 +08:00
Nikolaj Bjorner 42ac3a5363 merge with csp
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-12 19:48:45 -07:00
Nikolaj Bjorner e731a44880
Merge pull request #2329 from Z3Prover/nomp
Nomp
2019-06-07 02:05:11 +02:00
Nikolaj Bjorner 71009a9d02 suspend limits during assert and macro expansion
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-06 11:07:57 -07:00
Nikolaj Bjorner 9262908ebb mux
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-06-05 09:06:17 +01:00
Nikolaj Bjorner 8893913c98 remove internal referenes to set_activity
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-05-30 16:06:05 -07:00
Nikolaj Bjorner fc4c162e31 add clause proof module, small improvements to bapa
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-05-30 15:59:28 -07:00
Nikolaj Bjorner d2dcb39c11 add smt lookahead
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-05-17 20:24:29 +03:00
Max Zinkus 45595af665
Require verbosity=1 to log parallel tactic progress 2019-04-09 12:35:04 -04:00
Nikolaj Bjorner 5c67c9d907 print certificate for #2202, enable CTL-C for API fix #2203
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-03-24 17:09:02 -07:00
Nikolaj Bjorner 598fc810b5 adding FP
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-20 15:34:47 +01: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 96c05b0289 remove reference to deprecated code in cmd_context
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-02-14 17:00:02 -08:00
Nikolaj Bjorner 1e90be62bc fix drat for lookahead, fixes for binary drat format
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-31 14:58:51 -08:00
Nikolaj Bjorner 8d20310758 adding trail/levels
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-29 14:45:51 -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 498864c582 adding dump facility for cancelation #2095, easing dimacs in/out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-24 12:21:23 -08:00
Nikolaj Bjorner 6bd87f837a fix Boolean argument
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-20 14:14:26 -08:00
Nikolaj Bjorner e954f59052 ensure that solver objects have timeout/rlimit/ctrl-c exposed as possible parameters
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2019-01-14 13:50:17 -08:00
Nikolaj Bjorner b0b6394c6c fixing #1971
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-21 17:10:37 -08:00
Nikolaj Bjorner 2aa7ccc4a9 hide bit-vector dependencies under seq_util
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-12-03 08:45:17 -08:00
Bruce Mitchener e570940662 Prefer using empty rather than size comparisons. 2018-11-27 21:42:04 +07:00
Nikolaj Bjorner 102d23f780 Merge branch 'master' of https://github.com/z3prover/z3 2018-11-18 10:40:14 -08:00
Nikolaj Bjorner a9e6d83c6e std::cout -> out
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-18 10:40:08 -08:00
Nikolaj Bjorner 9ec59fdb93 fix #1934
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-11-17 15:04:25 -08:00
Nikolaj Bjorner ccca063e54 Merge branch 'master' of https://github.com/Z3Prover/z3 into csp 2018-10-21 12:26:53 -07:00
Florian Pigorsch 326bf401b9 Fix some spelling errors (mostly in comments). 2018-10-20 17:07:41 +02:00
Nikolaj Bjorner e9d615e309 merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-10-14 15:16:22 -07:00
Nikolaj Bjorner 5bf57c2700 fix cubing semantics
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-10-02 08:14:19 -07:00
Bruce Mitchener 373b691709 Use 'override' where possible. 2018-10-02 10:26:38 +07:00
Bruce Mitchener cdfc19a885 Use nullptr. 2018-10-02 09:11:19 +07:00
Nikolaj Bjorner 7b3b1b6e9f pop to base before incremental internalization to ensure that units are not lost
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-22 14:04:15 -07:00
Nikolaj Bjorner 3113901c8f rename is_atom
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-21 23:15:57 -07:00
Nikolaj Bjorner f349d3d013 fix extraction of non-units
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-21 21:15:28 -07:00
Nikolaj Bjorner 0c4754d94b rename version.h to z3_version.h to differentiate name in install include directory. Add support for z3_version.h in python build system. #1833
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-21 20:13:58 -07:00
Nikolaj Bjorner 618e1bee5b merge
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-20 20:41:00 -07:00
Nikolaj Bjorner c59a957737 add non-units method
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-20 20:37:14 -07:00
Nikolaj Bjorner 4ffd860375 narrowing incorrect lemma generation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-09-11 11:31:19 -07:00
Nikolaj Bjorner 3478b8b924 add js-model interfacing
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-08-12 18:14:06 -07:00
Nikolaj Bjorner 114f31c16a do not update assertions within scopes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-31 15:12:46 -07:00
Nikolaj Bjorner c7898b1977 trace push/pop
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-31 14:22:57 -07:00
Nikolaj Bjorner 98d42421bc harness more pop uses
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-31 08:42:19 -07:00
Nikolaj Bjorner fdcedee887 hardening pop abuse and exception safety for #1776
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2018-07-30 09:56:16 -07:00