From: lianah <lianahady@gmail.com>
Date: Wed, 1 May 2013 19:31:10 +0000 (-0400)
Subject: removed tracing code causing slowdown; cleaned up some code
X-Git-Tag: cvc5-1.0.0~7291
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0cf1089d3d9c36b4493de3e0498464bb50d950b;p=cvc5.git

removed tracing code causing slowdown; cleaned up some code
---

diff --git a/src/theory/bv/theory_bv.cpp b/src/theory/bv/theory_bv.cpp
index 6f450d08e..4c31f3f44 100644
--- a/src/theory/bv/theory_bv.cpp
+++ b/src/theory/bv/theory_bv.cpp
@@ -173,14 +173,9 @@ void TheoryBV::check(Effort e)
     return;
   }
 
-  if (Theory::fullEffort(e)) {
-    Trace("bitvector-fulleffort") << "TheoryBV::fullEffort \n"; 
-    printFacts( Trace("bitvector-fulleffort") ); 
-  }
-  
   while (!done()) {
     TNode fact = get().assertion;
-    checkForLemma(fact); 
+    // checkForLemma(fact); 
     for (unsigned i = 0; i < d_subtheories.size(); ++i) {
       d_subtheories[i]->assertFact(fact); 
     }
diff --git a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
index 626116453..cf36633fa 100644
--- a/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
+++ b/src/theory/bv/theory_bv_rewrite_rules_operator_elimination.h
@@ -103,24 +103,6 @@ Node RewriteRule<SltEliminate>::apply(TNode node) {
   
 }
 
-// template <>
-// bool RewriteRule<SleEliminate>::applies(TNode node) {
-//   return (node.getKind() == kind::BITVECTOR_SLE); 
-// }
-
-// template <>
-// Node RewriteRule<SleEliminate>::apply(TNode node) {
-//   Debug("bv-rewrite") << "RewriteRule<SleEliminate>(" << node << ")" << std::endl;
-  
-//   unsigned size = utils::getSize(node[0]);
-//   Node pow_two = utils::mkConst(BitVector(size, Integer(1).multiplyByPow2(size - 1)));
-//   Node a = utils::mkNode(kind::BITVECTOR_PLUS, node[0], pow_two);
-//   Node b = utils::mkNode(kind::BITVECTOR_PLUS, node[1], pow_two);
-  
-//   return utils::mkNode(kind::BITVECTOR_ULE, a, b); 
-
-// }
-
 template <>
 bool RewriteRule<SleEliminate>::applies(TNode node) {
   return (node.getKind() == kind::BITVECTOR_SLE); 
diff --git a/src/theory/bv/theory_bv_rewriter.cpp b/src/theory/bv/theory_bv_rewriter.cpp
index 0775cb1f8..5a43e2c57 100644
--- a/src/theory/bv/theory_bv_rewriter.cpp
+++ b/src/theory/bv/theory_bv_rewriter.cpp
@@ -106,16 +106,16 @@ RewriteResponse TheoryBVRewriter::RewriteUle(TNode node, bool preregister){
       RewriteRule<UleMax>,
       RewriteRule<ZeroUle>,
       RewriteRule<UleZero>,
-      RewriteRule<UleSelf>,
-      RewriteRule<UleEliminate>
+      RewriteRule<UleSelf>//,
+      //      RewriteRule<UleEliminate>
       >::apply(node);
   return RewriteResponse(resultNode == node ? REWRITE_DONE : REWRITE_AGAIN, resultNode); 
 }
 
 RewriteResponse TheoryBVRewriter::RewriteSle(TNode node, bool preregister){
   Node resultNode = LinearRewriteStrategy
-    < RewriteRule <EvalSle>, 
-      RewriteRule <SleEliminate>
+    < RewriteRule <EvalSle>//, 
+      //      RewriteRule <SleEliminate>
       >::apply(node);
   return RewriteResponse(resultNode == node? REWRITE_DONE : REWRITE_AGAIN, resultNode); 
 }
diff --git a/src/theory/term_registration_visitor.h b/src/theory/term_registration_visitor.h
index d573213b7..768508d2c 100644
--- a/src/theory/term_registration_visitor.h
+++ b/src/theory/term_registration_visitor.h
@@ -95,6 +95,7 @@ public:
    * Notifies the engine of all the theories used.
    */
   bool done(TNode node);
+
 };