Improved output for theory uf

diff --git a/src/theory/uf/theory_uf.cpp b/src/theory/uf/theory_uf.cpp
index b4597c7c7aaf9fc722743a14613c001c4537f20e..111f06fe94c10a97c820d0231fb842a28cc51325 100644 (file)
--- a/src/theory/uf/theory_uf.cpp
+++ b/src/theory/uf/theory_uf.cpp
@@ -38,14 +38,20 @@ TheoryUF::TheoryUF(Context* c, OutputChannel& out) :
 TheoryUF::~TheoryUF(){}
 
 void TheoryUF::preRegisterTerm(TNode n){
+  Debug("uf") << "uf: begin preRegisterTerm(" << n << ")" << std::endl;
+  Debug("uf") << "uf: end preRegisterTerm(" << n << ")" << std::endl;
 }
 
 void TheoryUF::registerTerm(TNode n){
 
+  Debug("uf") << "uf: begin registerTerm(" << n << ")" << std::endl;
+  n.printAst(Debug("uf"));
+
+
   d_registered.push_back(n);
-#ifdef CVC4_DEBUG
-  n.printAst(Warning());
-#endif /* CVC4_DEBUG */
+
+
+
 
   ECData* ecN;
 
@@ -132,6 +138,7 @@ void TheoryUF::registerTerm(TNode n){
       ecChild->addPredecessor(n, d_context);
     }
   }
+  Debug("uf") << "uf: end registerTerm(" << n << ")" << std::endl;
 
 }
 
@@ -238,20 +245,41 @@ void TheoryUF::merge(){
     if(ecX == ecY)
       continue;
 
+    Debug("uf") << "merging equivalence classes for " << std::endl;
+    Debug("uf") << "left equivalence class :";
+    (ecX->getRep()).printAst(Debug("uf"));
+    Debug("uf") << "right equivalence class :";
+    (ecY->getRep()).printAst(Debug("uf"));
+
+
     ccUnion(ecX, ecY);
   }
 }
 
 Node TheoryUF::constructConflict(TNode diseq){
+  Debug("uf") << "uf: begin constructConflict()" << std::endl;
+
   NodeBuilder<> nb(kind::AND);
   nb << diseq;
   for(unsigned i=0; i<d_assertions.size(); ++i)
     nb << d_assertions[i];
 
-  return nb;
+  Node conflict = nb;
+
+
+  Debug("uf") << "conflict constructed : ";
+  conflict.printAst(Debug("uf"));
+  Debug("uf") << std::endl;
+
+  Debug("uf") << "uf: ending constructConflict()" << std::endl;
+
+  return conflict;
 }
 
 void TheoryUF::check(Effort level){
+
+  Debug("uf") << "uf: begin check(" << level << ")" << std::endl;
+
   while(!done()){
     Node assertion = get();
 
@@ -288,4 +316,7 @@ void TheoryUF::check(Effort level){
       }
     }
   }
+
+  Debug("uf") << "uf: end check(" << level << ")" << std::endl;
+
 }

diff --git a/test/unit/theory/theory_uf_white.h b/test/unit/theory/theory_uf_white.h
index 86266e923d17306ae0565b8a27e8538b84cdd6d6..6958634e6327c0fcc1664b3e8c3ab4b5f2791558 100644 (file)
--- a/test/unit/theory/theory_uf_white.h
+++ b/test/unit/theory/theory_uf_white.h
@@ -126,18 +126,14 @@ public:
 
     Node f3_x_eq_x = f_f_f_x.eqNode(x);
     Node f5_x_eq_x = f_f_f_f_f_x.eqNode(x);
-    Node f5_x_eq_f5_x = f_f_f_f_f_x.eqNode(f_f_f_f_f_x);
     Node f1_x_neq_x = f_x.eqNode(x).notNode();
 
     Node expectedConflict = d_nm->mkNode(kind::AND,
                                          f1_x_neq_x,
-                                         f5_x_eq_f5_x,
                                          f3_x_eq_x,
                                          f5_x_eq_x
                                          );
 
-    d_euf->assertFact( f5_x_eq_f5_x );
-
     d_euf->assertFact( f3_x_eq_x );
     d_euf->assertFact( f1_x_neq_x );
     d_euf->check(d_level);