fix cout, fix statname, rm deadcode

diff --git a/src/decision/relevancy.h b/src/decision/relevancy.h
index 93fb3c999ec6028a79d1da24bf71d2842d4246b5..3a33a5cb804d940b81076de5ba65f2bc498d64f3 100644 (file)
--- a/src/decision/relevancy.h
+++ b/src/decision/relevancy.h
@@ -255,9 +255,7 @@ public:
         // we are becuase of not getting information about literals
         // created using newLiteral command... need to figure how to
         // handle that
-        Warning() << "isRelevant: WARNING: didn't find node when we should had" << std::endl;
-        // Warning() doesn't work for some reason
-        cout << "isRelevant: WARNING: didn't find node when we should had" << std::endl;
+        Message() << "isRelevant: WARNING: didn't find node when we should had" << std::endl;
       }      
     }
 

diff --git a/src/theory/arith/theory_arith.cpp b/src/theory/arith/theory_arith.cpp
index 62a258fe218b80532ce8ca354e3cebc28651ca63..16fd28649c184e87f3b8fa70f9643078c71a07cc 100644 (file)
--- a/src/theory/arith/theory_arith.cpp
+++ b/src/theory/arith/theory_arith.cpp
@@ -96,7 +96,7 @@ TheoryArith::Statistics::Statistics():
   d_simplifyTimer("theory::arith::simplifyTimer"),
   d_staticLearningTimer("theory::arith::staticLearningTimer"),
   d_presolveTime("theory::arith::presolveTime"),
-  d_newPropTime("::newPropTimer"),
+  d_newPropTime("theory::arith::newPropTimer"),
   d_externalBranchAndBounds("theory::arith::externalBranchAndBounds",0),
   d_initialTableauSize("theory::arith::initialTableauSize", 0),
   d_currSetToSmaller("theory::arith::currSetToSmaller", 0),

diff --git a/src/util/decision_engine.cpp b/src/util/decision_engine.cpp
deleted file mode 100644 (file)
index 46807b1..0000000
--- a/src/util/decision_engine.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*********************                                                        */
-/*! \file decision_engine.cpp
- ** \verbatim
- ** Original author: mdeters
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010, 2011  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief A decision engine for CVC4
- **
- ** A decision engine for CVC4.
- **/
-
-#include "util/decision_engine.h"
-#include "util/Assert.h"
-
-namespace CVC4 {
-
-DecisionEngine::~DecisionEngine() {
-}
-
-/**
- * Only here to permit compilation and linkage.  This may be pure
- * virtual in the final design (?)
- */
-Node DecisionEngine::nextDecision() {
-  Unimplemented();
-}
-
-}/* CVC4 namespace */

diff --git a/src/util/decision_engine.h b/src/util/decision_engine.h
deleted file mode 100644 (file)
index 1c2bd3e..0000000
--- a/src/util/decision_engine.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*********************                                                        */
-/*! \file decision_engine.h
- ** \verbatim
- ** Original author: mdeters
- ** Major contributors: none
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010, 2011  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief A decision engine for CVC4
- **
- ** A decision engine for CVC4.
- **/
-
-#include "cvc4_private.h"
-
-#ifndef __CVC4__DECISION_ENGINE_H
-#define __CVC4__DECISION_ENGINE_H
-
-#include "expr/node.h"
-
-namespace CVC4 {
-
-// In terms of abstraction, this is below (and provides services to)
-// PropEngine.
-
-/**
- * A decision mechanism for the next decision.
- */
-class DecisionEngine {
-public:
-  /**
-   * Destructor.
-   */
-  virtual ~DecisionEngine();
-
-  /**
-   * Get the next decision.
-   */
-  virtual Node nextDecision();// = 0
-
-  /**
-   * This is called by SmtEngine, at shutdown time, just before
-   * destruction.  It is important because there are destruction
-   * ordering issues between some parts of the system.  For now,
-   * there's nothing to do here in the DecisionEngine.
-   */
-  virtual void shutdown() {
-  }
-
-  // TODO: design decision: decision engine should be notified of
-  // propagated lits, and also why(?) (so that it can make decisions
-  // based on the utility of various theories and various theory
-  // literals).  How?  Maybe TheoryEngine has a backdoor into
-  // DecisionEngine "behind the back" of the PropEngine?
-
-};/* class DecisionEngine */
-
-}/* CVC4 namespace */
-
-#endif /* __CVC4__DECISION_ENGINE_H */