diff options
author | Tim King <taking@cs.nyu.edu> | 2012-12-05 19:06:21 +0000 |
---|---|---|
committer | Tim King <taking@cs.nyu.edu> | 2012-12-05 19:06:21 +0000 |
commit | 7f52115ab0dcba4c8ba9403a5f25b8e8c588911a (patch) | |
tree | 14b74c89069cd6e9b443853ac1f15cca2ce586a1 /src/theory/arith/arith_static_learner.h | |
parent | 7efd777609f7fbc20701402ad949971cbc251f8f (diff) |
This commit merges in CDTrailHashMap and CDInsertHashMap. CDHashSet now uses CDInsertHashMap. CDHashSet<TNode> have been changed to CDHashSet<Node>. Switching CnfStream to use CDInsertSet. Switches a few CDHashMaps in arithmetic to use CDTrailHashMap. Documentation changes to CDHashMap.
Diffstat (limited to 'src/theory/arith/arith_static_learner.h')
-rw-r--r-- | src/theory/arith/arith_static_learner.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/theory/arith/arith_static_learner.h b/src/theory/arith/arith_static_learner.h index b047018e8..0de28c5ab 100644 --- a/src/theory/arith/arith_static_learner.h +++ b/src/theory/arith/arith_static_learner.h @@ -27,7 +27,7 @@ #include "context/context.h" #include "context/cdlist.h" -#include "context/cdhashmap.h" +#include "context/cdtrail_hashmap.h" #include <set> namespace CVC4 { @@ -41,8 +41,7 @@ private: * (=> _ (= x c)) * where c is a constant. */ - //typedef __gnu_cxx::hash_map<Node, std::set<Node>, NodeHashFunction> VarToNodeSetMap; - typedef context::CDHashMap<Node, Node, NodeHashFunction> CDNodeToNodeListMap; + typedef context::CDTrailHashMap<Node, Node, NodeHashFunction> CDNodeToNodeListMap; // The domain is an implicit list OR(x, OR(y, ..., FALSE )) // or FALSE CDNodeToNodeListMap d_miplibTrick; @@ -50,8 +49,7 @@ private: /** * Map from a node to it's minimum and maximum. */ - //typedef __gnu_cxx::hash_map<Node, DeltaRational, NodeHashFunction> NodeToMinMaxMap; - typedef context::CDHashMap<Node, DeltaRational, NodeHashFunction> CDNodeToMinMaxMap; + typedef context::CDTrailHashMap<Node, DeltaRational, NodeHashFunction> CDNodeToMinMaxMap; CDNodeToMinMaxMap d_minMap; CDNodeToMinMaxMap d_maxMap; |