mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 03:32:28 +00:00
Code Activity
16083 commits 49 branches 53 tags 182 MiB
Commit graph

16083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jakob Rath
381d13993c Add TODO notes from discussion 2021-09-06 16:45:20 +02:00
Jakob Rath
ec1e6725de Merge resolve_bailout into resolve_conflict 2021-09-06 16:44:47 +02:00
Jakob Rath
39d42913cf bailout 2021-09-06 15:16:13 +02:00
Jakob Rath
56b33b1b3e resolve_bailout etc. 2021-09-06 14:08:07 +02:00
Nikolaj Bjorner
ed200f4214
na (#5536) 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-05 12:13:08 +02:00
Jakob Rath
9f387f5738
Polysat: conflict resolution updates (#5534) 
* variable elimination / saturation sketch

* conflict resolution updates
 2021-09-03 10:17:06 -07:00
Jakob Rath
dc547510db
Polysat: conflict resolution wip (#5529) 
* conflict_core doesn't need gc() anymore

* update comments, ensure_bvar for new constraints

* Make sure constraints can only be created through constraint_manager

* fix constraint::display if no boolean variable is assigned

* Move clause into separate file

* Add conflict_core binary resolution

* conflict_core additions

* reactivate conflict resolution outer loop

* wip

* seems commented includes break CI build
 2021-09-01 09:10:10 -07:00
Jakob Rath
8b374c3745
Merge pull request #5525 from Z3Prover/polysat-pull 
remove scoped
 2021-09-01 09:37:50 +02:00
Nikolaj Bjorner
2348667304 build 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-31 11:31:14 -07:00
Nikolaj Bjorner
475ac77897 na 2021-08-31 11:27:06 -07:00
Nikolaj Bjorner
22b5b63743 Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2021-08-31 11:26:51 -07:00
Nikolaj Bjorner
05d564e828 bug fixes 
values cannot change on basic variables from inequalities
arithmetic modulo can produce 0 coefficients
 2021-08-31 11:26:44 -07:00
Nikolaj Bjorner
978bd9e560 remove scoped 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-31 08:55:48 -07:00
Jakob Rath
dde8fb0c37
Polysat updates (#5524) 
* Move boolean resolution into conflict_core

* Move store() into dedup functionality

* comments

* Call gc()

* Add inference_engine sketch
 2021-08-31 08:16:45 -07:00
Nikolaj Bjorner
d1118cb178 cc 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-30 11:45:41 -07:00
Nikolaj Bjorner
7cff3d4236 more code review 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-30 11:37:08 -07:00
Nikolaj Bjorner
7ea1bf12b6 add code review to constraint 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-30 11:11:55 -07:00
Nikolaj Bjorner
ef297ced13 merge current master 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-30 10:01:11 -07:00
Nikolaj Bjorner
39f50d46cc Merge branch 'master' of https://github.com/z3prover/z3 into polysat 2021-08-30 10:00:58 -07:00
Jakob Rath
0c1e44da77
Polysat: constraint refactor cont'd, deduplicate constraints (#5520) 
* Assign boolean variables only to long-lived constraints, and deduplicate constraints when they are created

* scoped_signed_constraint

* update other classes

* fix

* Don't use scoped_ptr<constraint> with dedup()
 2021-08-30 10:00:27 -07:00
Nikolaj Bjorner
148cb83b0d #5482 fix default case for model construction 
port mg_merge functionality from theory_array_base that ensures default values in arrays congruent modulo stores are the same
 2021-08-29 17:30:39 -07:00
Nuno Lopes
9b5ec6d004 logging cleanup 
move everything out-of-line as common path doesn't log
fix some race conditions on file ptr vs enable_logging vars
 2021-08-29 12:24:19 +01:00
Nuno Lopes
1f4a7c5101 logging: don't call the returned function twice (one for log, one for return) 
Z3_simplify() does RETURN_Z3(simplify(...)), hence the function was being called twice
it turns out simplify is not idempotent, so calling it twice can result in different results
thus breaking the log.
 2021-08-29 11:06:19 +01:00
Nuno Lopes
9a172939e0 fix logging in Z3_fpa_get_[es]bits 2021-08-29 10:58:54 +01:00
Nikolaj Bjorner
b1bc890992 fix #5515 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-28 18:05:51 -07:00
Nikolaj Bjorner
e7fcbd9563 bail on first model validation failure 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-28 17:08:34 -07:00
Nikolaj Bjorner
4f064ee5d6 simplify based on comment from Jamie Sharp #5512 2021-08-28 17:08:34 -07:00
Nuno Lopes
e5a2f08cc9 fix logging of Z3_mk_lambda and Z3_mk_lambda_const 
In preparation of a bug report just for you @NikolajBjorner
 2021-08-29 00:37:45 +01:00
Nikolaj Bjorner
e3a83dd0dd Integrate fixes from #5512 
Pull request #5512 identifies a in line 1139 where the const-case-multiplier constructor returns false and does useless work.
In this update we also remove mk_const_multiplier because code path is subsumed by mk_const_case_multiplier.
 2021-08-28 10:46:45 -07:00
Nikolaj Bjorner
992daa6d2e #5482 
remove overly permissive filter on select_store axiom
 2021-08-27 21:03:30 -07:00
Nikolaj Bjorner
e9a30385cf remove wtm and booth 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-27 15:32:06 -07:00
Jamey Sharp
cd7a826083
bit_blaster unit tests for adder and multiplier (#5514) 
These tests cover a mix of constant and non-constant input bits.
 2021-08-27 14:19:12 -07:00
Nikolaj Bjorner
8f306c6a8f handle constants 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-27 11:59:41 -07:00
Nikolaj Bjorner
09696e989e add missing lambda defs per #5509 
the result is now unknown because the nested expression contains exists, which doesn't get replaced by universal quantifier which is assumed by the legacy core.
The legacy core should not depend on universal quantifiers only, but fixing this is a risk. Workaround is to rewrite goals using forall only (replace exists by de-Morgan dual).
 2021-08-27 11:57:26 -07:00
Nikolaj Bjorner
9790a8aa43 #5507 
can't use auto-config if there are no assertions. Auto-config only works properly for one-shot mode since theories aren't loaded on demand in this solver.
 2021-08-27 09:42:40 -07:00
Nikolaj Bjorner
828fc72754 types 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-26 18:55:53 -07:00
Nikolaj Bjorner
d6848175eb re-add API for creating propagator from a context for "fresh" 2021-08-26 18:12:40 -07:00
Nikolaj Bjorner
f7c1ed8273 missing this 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-08-26 10:41:37 -07:00
Nikolaj Bjorner
4d39af3d7b #5507 missing init 2021-08-26 09:37:06 -07:00
Nikolaj Bjorner
07c26208fa regressions from previous push 2021-08-25 18:30:50 -07:00
Nikolaj Bjorner
2daf569da6 update Bool rewriter to pull negations up 2021-08-25 17:50:49 -07:00
Nikolaj Bjorner
e6264a80ff extend macro detection to negated equivalences #5496 2021-08-25 17:47:30 -07:00
Nikolaj Bjorner
f03d756e08 missing rewrite exposed by #5498 2021-08-25 06:34:27 -07:00
Nikolaj Bjorner
17663acf75 #5482 other relevancy tracking 2021-08-25 05:59:42 -07:00
Nikolaj Bjorner
e75b5e9513 don't copy "true" 2021-08-25 05:59:42 -07:00
Nikolaj Bjorner
037c93b258 #5482 2021-08-25 05:59:42 -07:00
Nikolaj Bjorner
7bae297297 #5482 
add unit propagation
 2021-08-24 11:24:31 -07:00
Nikolaj Bjorner
26db68bf2c #5482 2021-08-24 11:15:52 -07:00
Nikolaj Bjorner
e5b6cd36f0 use datatype name instead of instantiation for cycle detection #5482 2021-08-24 11:14:41 -07:00
Nikolaj Bjorner
e90ec457c3 #5482 
non-termination (stack overflow) bug in recursive comparison
 2021-08-24 09:49:36 -07:00