mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 11:55:51 +00:00
Code Activity
16101 commits 24 branches 48 tags 158 MiB
Commit graph

64 commits

Author SHA1 Message Date
Nikolaj Bjorner
bb5ff8db24 rename conflict_core to conflict: 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-20 14:05:55 -07:00
Nikolaj Bjorner
1e3ff3179e handle empty clauses created as lemmas as unsat state. 
add unit tests
 2021-09-19 15:43:47 -04:00
Nikolaj Bjorner
58c66ffee8 remove propagate_bool_at, it is technically not propagating but assigning 2021-09-19 08:47:14 -04:00
Nikolaj Bjorner
fa3886136b adding Boolean propagation, watch; and factoring 2021-09-18 22:18:15 -04:00
Nikolaj Bjorner
c25fd71bf4 fixes 2021-09-16 10:10:50 +01:00
Nikolaj Bjorner
689c5b4e12 generalize level 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-15 16:46:30 +01:00
Nikolaj Bjorner
7e7f88ae3d fix backtracking from fi 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-15 09:28:59 +01:00
Nikolaj Bjorner
3c8c8f5d40 update var dependency tracking 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-15 09:10:36 +01:00
Jakob Rath
c4e098b5d4 add hack for testing conflict resolution (but commented out) 2021-09-14 14:49:56 +02:00
Jakob Rath
66a41383e8 remove remove_var 2021-09-14 14:45:03 +02:00
Jakob Rath
8103627e47 fix test_l4 2021-09-14 14:45:03 +02:00
Jakob Rath
f04345724c Ensure core is conflicting also after set(v) 2021-09-14 11:24:09 +02:00
Jakob Rath
d935714874 Track FI lemma in core; remove bailout_lemma 2021-09-14 11:01:06 +02:00
Nikolaj Bjorner
c082ea4357 update dep 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-13 17:35:36 +02:00
Nikolaj Bjorner
9e6fd7cb70 Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2021-09-13 16:49:45 +02:00
Nikolaj Bjorner
705fd0d01d bailout quick 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-13 16:49:43 +02:00
Jakob Rath
a4c3a8c640 more fixes 2021-09-13 16:01:22 +02:00
Jakob Rath
e5289f84a0 some fixes 2021-09-13 15:09:50 +02:00
Jakob Rath
cf80225fee lemma 2021-09-13 14:46:35 +02:00
Jakob Rath
8edcb9e268 deal with literals in conflict_core 2021-09-13 14:41:13 +02:00
Jakob Rath
1a810cc696 update saturation 2021-09-13 13:49:29 +02:00
Jakob Rath
412b6ffd4a fix build 2021-09-13 13:37:17 +02:00
Nikolaj Bjorner
6ffcea0bde Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2021-09-13 13:14:29 +02:00
Nikolaj Bjorner
73b4e7f2a8 update set/unset mark for propagation 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-13 13:14:07 +02:00
Jakob Rath
0ff87a9943 stats, comment 2021-09-13 11:51:19 +02:00
Jakob Rath
f1ce0e233a Handle bailouts in conflict_core 2021-09-13 11:48:28 +02:00
Jakob Rath
79d7ae5417 Remove fallback lemma 2021-09-13 11:43:04 +02:00
Jakob Rath
bb227c0d6e Track existing constraints with indexed_uint_set 2021-09-13 11:00:08 +02:00
Jakob Rath
6c8e8dada6 comments 2021-09-13 04:48:22 +02:00
Nikolaj Bjorner
7b9726a95c simpler 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-12 18:35:39 +02:00
Nikolaj Bjorner
8bc4932092 nits 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-12 18:30:55 +02:00
Nikolaj Bjorner
e365ad0e9e merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-12 18:14:25 +02:00
Nikolaj Bjorner
f5fd295e01 reorganize variable tracking for lemmas 
this is going to break a bunch
 2021-09-12 18:05:29 +02:00
Jakob Rath
a8c132f769 merge 'keep' and 'handle_saturation_premises' 2021-09-12 16:05:34 +02:00
Nikolaj Bjorner
af0e4d402b merge 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-10 15:43:36 +02:00
Nikolaj Bjorner
516ca06c28 levels take 1 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-10 15:40:25 +02:00
Jakob Rath
8a1a202133 wip 2021-09-10 14:20:07 +02:00
Nikolaj Bjorner
2b6ae0070f na 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
 2021-09-10 13:35:49 +02:00
Jakob Rath
6766c1c349 re-enable saturation engine 2021-09-08 16:57:27 +02:00
Jakob Rath
75bac21574 Re-integrate forbidden intervals 2021-09-08 16:51:16 +02:00
Jakob Rath
a0570908fb Add support for bailout lemma 2021-09-08 16:37:47 +02:00
Jakob Rath
f2c79b851f propagate at the right level 2021-09-08 16:00:57 +02:00
Jakob Rath
40d62af796 some fixes 2021-09-08 15:46:50 +02:00
Jakob Rath
e7894873c8 fix 2021-09-08 15:06:23 +02:00
Jakob Rath
ba8fa1f072 update polynomial superposition 2021-09-08 14:01:41 +02:00
Jakob Rath
2de443c74f disable conflict_var handling for now 2021-09-08 14:01:41 +02:00
Jakob Rath
c0f51eacf8 conflict_core helpers 2021-09-08 14:01:41 +02:00
Jakob Rath
05b846a472 Activate constraints when their boolean literal is propagated 2021-09-08 14:01:41 +02:00
Jakob Rath
3f15bf5963 assign conflict_var 2021-09-08 14:01:41 +02:00
Jakob Rath
e74cf72cef fix cjust update when backtracking over boolean decision 2021-09-07 17:03:47 +02:00