mirror of
				https://github.com/Z3Prover/z3
				synced 2025-10-31 19:52:29 +00:00 
			
		
		
		
	arrays (#4684)
* arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * arrays Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * fill Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * update drat and fix euf bugs Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * const qualifiers Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * na Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * reorg ba Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * reorg Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com> * build warnings Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
		
							parent
							
								
									d56dd1db7b
								
							
						
					
					
						commit
						796e2fd9eb
					
				
					 79 changed files with 2571 additions and 1850 deletions
				
			
		|  | @ -96,10 +96,12 @@ namespace euf { | |||
|     void ackerman::cg_conflict_eh(expr * n1, expr * n2) { | ||||
|         if (!is_app(n1) || !is_app(n2)) | ||||
|             return; | ||||
|         SASSERT(!s.m_drating); | ||||
|         app* a = to_app(n1); | ||||
|         app* b = to_app(n2); | ||||
|         if (a->get_decl() != b->get_decl() || a->get_num_args() != b->get_num_args()) | ||||
|             return; | ||||
|         TRACE("ack", tout << "conflict eh: " << mk_pp(a, m) << " == " << mk_pp(b, m) << "\n";); | ||||
|         insert(a, b); | ||||
|         gc(); | ||||
|     } | ||||
|  | @ -107,13 +109,19 @@ namespace euf { | |||
|     void ackerman::used_eq_eh(expr* a, expr* b, expr* c) { | ||||
|         if (a == b || a == c || b == c) | ||||
|             return; | ||||
|         if (s.m_drating) | ||||
|             return; | ||||
|         TRACE("ack", tout << mk_pp(a, m) << " " << mk_pp(b, m) << " " << mk_pp(c, m) << "\n";); | ||||
|         insert(a, b, c); | ||||
|         gc(); | ||||
|     } | ||||
|          | ||||
|     void ackerman::used_cc_eh(app* a, app* b) { | ||||
|         if (s.m_drating) | ||||
|             return; | ||||
|         TRACE("ack", tout << "used cc: " << mk_pp(a, m) << " == " << mk_pp(b, m) << "\n";); | ||||
|         SASSERT(a->get_decl() == b->get_decl()); | ||||
|         SASSERT(a->get_num_args() == b->get_num_args());         | ||||
|         SASSERT(a->get_num_args() == b->get_num_args()); | ||||
|         insert(a, b); | ||||
|         gc(); | ||||
|     } | ||||
|  | @ -153,15 +161,15 @@ namespace euf { | |||
|         } | ||||
|     } | ||||
| 
 | ||||
|     void ackerman::add_cc(expr* _a, expr* _b) { | ||||
|     void ackerman::add_cc(expr* _a, expr* _b) {         | ||||
|         app* a = to_app(_a); | ||||
|         app* b = to_app(_b); | ||||
|         TRACE("ack", tout << mk_pp(a, m) << " " << mk_pp(b, m) << "\n";); | ||||
|         sat::literal_vector lits; | ||||
|         unsigned sz = a->get_num_args(); | ||||
|         for (unsigned i = 0; i < sz; ++i) { | ||||
|             expr_ref eq(m.mk_eq(a->get_arg(i), b->get_arg(i)), m); | ||||
|             sat::literal lit = s.internalize(eq, true, false, true); | ||||
|             lits.push_back(~lit); | ||||
|             lits.push_back(s.internalize(eq, true, false, true)); | ||||
|         } | ||||
|         expr_ref eq(m.mk_eq(a, b), m); | ||||
|         lits.push_back(s.internalize(eq, false, false, true)); | ||||
|  | @ -173,6 +181,7 @@ namespace euf { | |||
|         expr_ref eq1(m.mk_eq(a, c), m); | ||||
|         expr_ref eq2(m.mk_eq(b, c), m); | ||||
|         expr_ref eq3(m.mk_eq(a, b), m); | ||||
|         TRACE("ack", tout << mk_pp(a, m) << " " << mk_pp(b, m) << " " << mk_pp(c, m) << "\n";); | ||||
|         lits[0] = s.internalize(eq1, true, false, true); | ||||
|         lits[1] = s.internalize(eq2, true, false, true); | ||||
|         lits[2] = s.internalize(eq3, false, false, true); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue