diff options
author | Tim King <taking@cs.nyu.edu> | 2012-04-27 14:47:10 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-04-27 14:47:10 +0000 |
commit | f813ed144b0945334e03bfd769ea3c2cf8b75843 (patch) | |
tree | e70c9bddf5445aac50b5080c2b1719e6ffb478e0 /src/theory/arith/congruence_manager.h | |
parent | 68237f7d39a03905be4cc133a42083fc3342adb4 (diff) |
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!
Diffstat (limited to 'src/theory/arith/congruence_manager.h')
-rw-r--r-- | src/theory/arith/congruence_manager.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/theory/arith/congruence_manager.h b/src/theory/arith/congruence_manager.h index e70773030..a72989498 100644 --- a/src/theory/arith/congruence_manager.h +++ b/src/theory/arith/congruence_manager.h @@ -5,7 +5,6 @@ #pragma once #include "theory/arith/arithvar.h" -#include "theory/arith/arithvar_set.h" #include "theory/arith/arithvar_node_map.h" #include "theory/arith/constraint_forward.h" @@ -18,6 +17,7 @@ #include "context/cdmaybe.h" #include "util/stats.h" +#include "util/dense_map.h" namespace CVC4 { namespace theory { @@ -32,7 +32,7 @@ private: * If this is 0 or cannot be 0, this can be signalled. * The pair of terms for the congruence is stored in watched equalities. */ - PermissiveBackArithVarSet d_watchedVariables; + DenseSet d_watchedVariables; /** d_watchedVariables |-> (= x y) */ ArithVarToNodeMap d_watchedEqualities; |