diff options
Diffstat (limited to 'src/theory/arith')
-rw-r--r-- | src/theory/arith/arith_rewriter.cpp | 5 | ||||
-rw-r--r-- | src/theory/arith/arith_rewriter.h | 23 | ||||
-rw-r--r-- | src/theory/arith/row_vector.cpp | 4 | ||||
-rw-r--r-- | src/theory/arith/row_vector.h | 4 | ||||
-rw-r--r-- | src/theory/arith/tableau.cpp | 2 |
5 files changed, 21 insertions, 17 deletions
diff --git a/src/theory/arith/arith_rewriter.cpp b/src/theory/arith/arith_rewriter.cpp index 75216dac6..cc80e2dd8 100644 --- a/src/theory/arith/arith_rewriter.cpp +++ b/src/theory/arith/arith_rewriter.cpp @@ -2,10 +2,10 @@ /*! \file arith_rewriter.cpp ** \verbatim ** Original author: taking - ** Major contributors: none + ** Major contributors: dejan ** Minor contributors (to current version): mdeters ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) + ** 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 @@ -17,7 +17,6 @@ ** \todo document this file **/ - #include "theory/theory.h" #include "theory/arith/normal_form.h" #include "theory/arith/arith_rewriter.h" diff --git a/src/theory/arith/arith_rewriter.h b/src/theory/arith/arith_rewriter.h index e161bd8d6..3a8fc191a 100644 --- a/src/theory/arith/arith_rewriter.h +++ b/src/theory/arith/arith_rewriter.h @@ -2,10 +2,10 @@ /*! \file arith_rewriter.h ** \verbatim ** Original author: taking - ** Major contributors: mdeters + ** Major contributors: mdeters, dejan ** Minor contributors (to current version): none ** This file is part of the CVC4 prototype. - ** Copyright (c) 2009, 2010 The Analysis of Computer Systems Group (ACSys) + ** 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 @@ -17,6 +17,11 @@ ** \todo document this file **/ +#include "cvc4_private.h" + +#ifndef __CVC4__THEORY__ARITH__ARITH_REWRITER_H +#define __CVC4__THEORY__ARITH__ARITH_REWRITER_H + #include "theory/theory.h" #include "theory/arith/arith_constants.h" #include "theory/arith/arith_utilities.h" @@ -24,9 +29,6 @@ #include "theory/rewriter.h" -#ifndef __CVC4__THEORY__ARITH__REWRITER_H -#define __CVC4__THEORY__ARITH__REWRITER_H - namespace CVC4 { namespace theory { namespace arith { @@ -88,11 +90,10 @@ private: return !isAtom(n); } -}; - +};/* class ArithRewriter */ -}; /* namesapce rewrite */ -}; /* namespace theory */ -}; /* namespace CVC4 */ +}/* CVC4::theory::arith namespace */ +}/* CVC4::theory namespace */ +}/* CVC4 namespace */ -#endif /* __CVC4__THEORY__ARITH__REWRITER_H */ +#endif /* __CVC4__THEORY__ARITH__ARITH_REWRITER_H */ diff --git a/src/theory/arith/row_vector.cpp b/src/theory/arith/row_vector.cpp index 2463adf47..0dc483126 100644 --- a/src/theory/arith/row_vector.cpp +++ b/src/theory/arith/row_vector.cpp @@ -3,7 +3,9 @@ using namespace CVC4; using namespace CVC4::theory; -using namespace CVC4::theory::arith ; +using namespace CVC4::theory::arith; + +using namespace std; bool RowVector::isSorted(const VarCoeffArray& arr, bool strictlySorted) { if(arr.size() >= 2){ diff --git a/src/theory/arith/row_vector.h b/src/theory/arith/row_vector.h index 29b79ddd5..bed33349d 100644 --- a/src/theory/arith/row_vector.h +++ b/src/theory/arith/row_vector.h @@ -85,7 +85,7 @@ protected: std::vector<ArithVarSet>& d_columnMatrix; NonZeroIterator lower_bound(ArithVar x_j) const{ - return std::lower_bound(d_entries.begin(), d_entries.end(), make_pair(x_j,0), cmp); + return std::lower_bound(d_entries.begin(), d_entries.end(), std::make_pair(x_j,0), cmp); } typedef VarCoeffArray::iterator iterator; @@ -120,7 +120,7 @@ public: private: /** Debugging code. */ bool hasInEntries(ArithVar x_j) const { - return std::binary_search(d_entries.begin(), d_entries.end(), make_pair(x_j,0), cmp); + return std::binary_search(d_entries.begin(), d_entries.end(), std::make_pair(x_j,0), cmp); } public: diff --git a/src/theory/arith/tableau.cpp b/src/theory/arith/tableau.cpp index ebf7dbee8..a85765303 100644 --- a/src/theory/arith/tableau.cpp +++ b/src/theory/arith/tableau.cpp @@ -24,6 +24,8 @@ using namespace CVC4; using namespace CVC4::theory; using namespace CVC4::theory::arith; +using namespace std; + Tableau::~Tableau(){ while(!d_basicVariables.empty()){ ArithVar curr = *(d_basicVariables.begin()); |