3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-18 21:40:27 +00:00
Commit graph

121 commits

Author SHA1 Message Date
Jakob Rath
9b907d709f minor 2022-09-29 18:25:28 +02:00
Jakob Rath
49590e0e01 Conflict from viable_fallback also depends on the current assignment 2022-09-23 16:45:56 +02:00
Jakob Rath
8ed6938cbe remove/update comment 2022-09-23 16:06:14 +02:00
Jakob Rath
a4f0e3a228 Add level to conflict
- reset conflict at correct level when popping user scopes
- functions as flag when handling inconsistent input (e.g., opposite literals)
- now all constraints in the conflict core should have bvalue == l_true
2022-09-23 16:06:14 +02:00
Jakob Rath
86d00b536a move todo notes to cpp file 2022-09-23 15:45:53 +02:00
Nikolaj Bjorner
0888f92efd remove 'change' just return
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-09-21 08:53:00 -07:00
Jakob Rath
1020f38e1a reconnect saturation 2022-09-21 16:47:16 +02:00
Jakob Rath
6abe0c9be8 set, lemma, minor 2022-09-21 16:29:36 +02:00
Jakob Rath
b43971bb4a Connect conflict2 2022-09-21 12:14:44 +02:00
Jakob Rath
a978604a7e move files (conflict2 -> conflict) 2022-09-20 10:26:38 +02:00
Jakob Rath
acf9976df9 make it compile 2022-08-26 16:28:52 +02:00
Jakob Rath
b9588af07a fix output 2022-08-03 10:01:54 +02:00
Jakob Rath
d65dc82ef0 bailout state: add premises of assignment 2022-07-25 13:49:21 +02:00
Jakob Rath
c31503f67d improve output 2022-07-14 10:47:35 +02:00
Jakob Rath
d473c23e5b bailout for saturation lemmas 2022-07-01 11:51:52 +02:00
Jakob Rath
0fb8c72f50 print more information 2022-06-29 14:26:25 +02:00
Jakob Rath
6bf897aad8 backtrack_fi 2022-04-25 17:39:07 +02:00
Nikolaj Bjorner
f1b10b0ea4 Merge branch 'polysat' of https://github.com/z3prover/z3 into polysat 2022-04-13 12:22:49 +02:00
Nikolaj Bjorner
da168cad2d track _all_ interval end-points for propagation (in fact only need end-points at unit location, not the others so this can be tuned
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-04-13 12:22:43 +02:00
Jakob Rath
88a17ef33e print more 2022-04-13 11:42:41 +02:00
Jakob Rath
be488f75ab Add some fi info 2022-04-13 09:34:59 +02:00
Jakob Rath
9fa5096776 conflict logging 2022-04-12 16:06:20 +02:00
Jakob Rath
63031548cb Store only literals in the conflict state 2022-04-11 15:00:06 +02:00
Nikolaj Bjorner
8c9835bca6 smul no overflow
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-02-16 18:55:07 +02:00
Nikolaj Bjorner
89d6f1c191 update mk_project
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-02-02 18:04:52 -08:00
Nikolaj Bjorner
c48f14e537 updated conflict state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-02-01 11:47:33 -08:00
Nikolaj Bjorner
b488a1fadd WIP revamp conflict state
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-29 16:17:58 -08:00
Nikolaj Bjorner
60248d0981 resolution is still wrong
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-29 09:32:14 -08:00
Nikolaj Bjorner
0eb0306ae2 update comment
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-27 17:47:27 -08:00
Nikolaj Bjorner
0677eb1c05 fixing up missing dependencies during resolution
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-27 16:58:16 -08:00
Nikolaj Bjorner
be790b8892 add back minimize vars
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-26 18:01:26 -08:00
Nikolaj Bjorner
cd11b70864 add value-propagate flag to patch regression
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-23 12:09:49 +01:00
Nikolaj Bjorner
5e7ff769b4 add assertion back for failing unit test, add comment about what is the bug
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-23 11:30:26 +01:00
Nikolaj Bjorner
cbbf1381f7 update to use incremental substitution
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2022-01-23 03:00:25 +01:00
Jakob Rath
c4c9c84aeb Treat eval'd literals as propagations (not as decisions) 2022-01-21 15:56:16 +01:00
Jakob Rath
e005838129 clause_builder should not fail on always-true literals
Otherwise, e.g. when adding axioms, the caller would have to check each literal before adding it.
2022-01-18 10:32:33 +01:00
Nikolaj Bjorner
adb3d68743 fixes to literal propagation exposed by bitwise and unit test
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-12-19 15:21:12 -08:00
Nikolaj Bjorner
2afc58cc08 fix missing dependency, expose inefficiency 2021-12-19 12:32:20 -08:00
Nikolaj Bjorner
c7da31a67d na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-12-13 10:24:42 -08:00
Nikolaj Bjorner
83efb1413a na 2021-12-11 08:41:04 -08:00
Nikolaj Bjorner
7b85afbe9c na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-26 18:27:44 +01:00
Nikolaj Bjorner
fc6e127cca don't add viable premises on decisions
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-25 20:19:58 +01:00
Nikolaj Bjorner
caef8d026f add unsat core, activity, quick pass for viable 2021-11-24 13:23:28 +01:00
Nikolaj Bjorner
b82c3cfd33 remove deprecated comment 2021-11-24 11:26:13 +01:00
Nikolaj Bjorner
21c604e7b4 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-23 18:56:32 +01:00
Nikolaj Bjorner
8db711bc3c retire deprecated functionality
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-22 18:14:15 +01:00
Nikolaj Bjorner
d86570ce75 prepare for new viable 2021-11-21 06:18:35 +01:00
Nikolaj Bjorner
de424713e4 if you are really reading this commit message, you must be a programmer who has no life. 2021-11-18 10:10:50 -08:00
Nikolaj Bjorner
0bec8520e1 adding new viable using forbidden intervals
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-10 08:23:45 -08:00
Nikolaj Bjorner
931e1624b2 na
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
2021-11-10 02:58:35 -08:00