This merges in the branch cvc4/branches/arithmetic/matrix into trunk.

- Splits the functionality of having a sparse matrix of Ts and a solved matrix of rationals in tableau.
- Splits ArithVarSet into DenseMap and CDDenseSet and simplifies the code.
- No performance loss!
 

1 files changed, 5 insertions, 3 deletions

diff --git a/src/theory/arith/arithvar.h b/src/theory/arith/arithvar.h
index 432f9f0c2..924e91bf5 100644
--- a/src/theory/arith/arithvar.h
+++ b/src/theory/arith/arithvar.h
@@ -14,7 +14,7 @@
  ** \brief Defines ArithVar which is the internal representation of variables in arithmetic
  **
  ** This defines ArithVar which is the internal representation of variables in
- ** arithmetic. This is a typedef from uint32_t to ArithVar.
+ ** arithmetic. This is a typedef from Index to ArithVar.
  ** This file also provides utilities for ArithVars.
  **/
 
@@ -25,16 +25,18 @@
 #define __CVC4__THEORY__ARITH__ARITHVAR_H
 
 #include <limits>
-#include <stdint.h>
 #include <ext/hash_map>
 #include "expr/node.h"
 #include "context/cdhashset.h"
+#include "context/cdhashset.h"
+
+#include "util/index.h"
 
 namespace CVC4 {
 namespace theory {
 namespace arith {
 
-typedef uint32_t ArithVar;
+typedef Index ArithVar;
 const ArithVar ARITHVAR_SENTINEL = std::numeric_limits<ArithVar>::max();
 
 //Maps from Nodes -> ArithVars, and vice versa