3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 00:55:31 +00:00
Commit graph

15891 commits

Author SHA1 Message Date
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
Jakob Rath
ebaea2159e
Polysat: use constraint_literal and begin move to core-based conflict representation (#5489)
* Rename solver_scope for fixplex tests

(otherwise the wrong constructor is called for polysat's solver_scope)

* Update conflict_core

* simplify

* Be clearer about constraint_literal lifetime

* remove old comment

* Remove status (positive/negative) from constraint

* Use constraint_literal in the solver

* Fix build (constraint -> get_constraint)
2021-08-18 11:02:46 -07:00
Nikolaj Bjorner
30e9f24fa3 dbg
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-15 00:48:36 -07:00
Nikolaj Bjorner
6af314c6d9 simplify inequality propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 23:36:51 -07:00
Nikolaj Bjorner
204b417396 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 22:33:41 -07:00
Nikolaj Bjorner
11a048d5f9 add auxiliary propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 17:55:48 -07:00
Nikolaj Bjorner
1e3c3dc48f enable fixed propagation from inequalities
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 11:58:19 -07:00
Nikolaj Bjorner
41d6087f6b kremlin include paths to math/bigfix
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 01:34:16 -07:00
Nikolaj Bjorner
fecd354b27 access
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-14 01:24:30 -07:00
Nikolaj Bjorner
6ac7c2b942 fixplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-13 23:18:52 -07:00
Nikolaj Bjorner
60dbfed69e scenario saving
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-13 11:01:07 -07:00
Nikolaj Bjorner
bd2e73014c wip
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-12 19:40:33 -07:00
Nikolaj Bjorner
cdbd121b5e wip
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-12 17:08:59 -07:00
Nikolaj Bjorner
39e98b3835 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-12 08:38:54 -07:00
Nikolaj Bjorner
f1f5b9e311 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 21:40:23 -07:00
Nikolaj Bjorner
524ebed44f Merge branch 'master' of https://github.com/z3prover/z3 into polysat 2021-08-11 09:21:58 -07:00
Nikolaj Bjorner
d6d24d7839 Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2021-08-11 09:21:48 -07:00
Nikolaj Bjorner
008f88ae1c na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 09:20:44 -07:00
Nikolaj Bjorner
2b6308af74 testing fixplex
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 08:33:19 -07:00
Nikolaj Bjorner
496ec5f2b4 #5454
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 05:00:02 -07:00
Nikolaj Bjorner
d1d64bbe59 #5454 2021-08-11 04:55:20 -07:00
Nikolaj Bjorner
4f2211baab fix solver-subsumption again, #5468 (negation was swapped in original wrong subsumption check, then soundness fix removed core subsumption functionality)
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 04:36:48 -07:00
Nikolaj Bjorner
8d43d98710 prepare tests
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-11 04:23:05 -07:00
Nikolaj Bjorner
7ab7b8646b #5454 2021-08-10 14:47:26 -07:00
Nikolaj Bjorner
1197c4d416 sketch vnext
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-10 12:25:30 -07:00
Nikolaj Bjorner
c1365b6ba8 add inequality propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-10 11:45:59 -07:00
Nikolaj Bjorner
081cdbd762 fix #5468 2021-08-10 10:46:47 -07:00
Nikolaj Bjorner
391db898d3 lost update from August 3 #5468 2021-08-10 09:45:17 -07:00
Nikolaj Bjorner
2075cb9fa4 remove useless literal found during review #5470 2021-08-10 09:29:39 -07:00
Nikolaj Bjorner
4beb29d45e fix #5469 documentation bug 2021-08-10 09:22:24 -07:00
Margus Veanes
22bb4c2db7
more fixes related to issue #5140 (#5466)
* instead of u in to_re(s) make u = s

* bug fix: added missing emptiness check
2021-08-09 17:48:35 -07:00
Nikolaj Bjorner
3eb849ad9e rewrite equality too
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-09 15:32:04 -07:00
Nikolaj Bjorner
aa7e9b09f3 fix equality rewrite with itos
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-09 14:22:48 -07:00
Nikolaj Bjorner
7b3eaf75ce validate and fix fixed/diff
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-09 13:53:15 -07:00
Nikolaj Bjorner
d07b508ecd more unit testing and fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-09 10:50:30 -07:00
Margus Veanes
225204e2f4
updates related to issue #5140 (#5463)
* updates related to issue #5140

* updated/simplified some cases

* fixing feedback comments

* fixed comments and added missing case for get_re_head_tail_reversed

* two bug fixes and some other code improvements
2021-08-09 10:48:56 -07:00
Nikolaj Bjorner
af5fd1014f #5460 2021-08-08 17:33:49 -07:00
Nikolaj Bjorner
85da7407dc #5460
NB @nunoplopes - the code path regarding rewrite_uncstr could use some unit tests.
2021-08-08 17:18:31 -07:00
Nikolaj Bjorner
e27a71bbcb #5460 2021-08-08 16:29:41 -07:00
Jamey Sharp
5de5f5a442
report which operator bit-blast failed on (#5459) 2021-08-08 15:53:07 -07:00
Jamey Sharp
1d3ee70af4
support bit-blasting bvand (#5458) 2021-08-08 15:52:54 -07:00
Nikolaj Bjorner
6a829f831d inequality propagation
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-08 13:21:15 -07:00
Nikolaj Bjorner
a4696a1c27 Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2021-08-06 17:06:02 -07:00
Nikolaj Bjorner
f47930a4ff testing bounds strengthening code
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-06 17:05:54 -07:00
Nikolaj Bjorner
9267f6cebe start u128
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-05 13:44:01 -07:00
Nikolaj Bjorner
dcfd7b76c9 more rewrites based on example in #5457 2021-08-05 11:54:13 -07:00
Nikolaj Bjorner
e10850e66a fix #5457 2021-08-05 11:27:03 -07:00
Nikolaj Bjorner
481e20bc20 compute with deps
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-05 10:03:42 -07:00
Nikolaj Bjorner
40027df32f deps
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-05 07:44:36 -07:00
Nikolaj Bjorner
9d5349ff10 include paths
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-08-05 04:49:11 -07:00