diff options
| author | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2011-05-02 21:40:06 +0000 |
|---|---|---|
| committer | Andrew Reynolds <andrew.j.reynolds@gmail.com> | 2011-05-02 21:40:06 +0000 |
| commit | f04cbfc62ae22d00b1a37af29f86258a902770e4 (patch) | |
| tree | 6d7b5d2c4eabb7dc9ce60850d45b9ee2e74f908f /src/util/trans_closure.h | |
| parent | 70336ce1430a857029e972942d1ba0d9019c7cb6 (diff) | |
minor updates to exp manager, fixed 32bit vs 64bit issues in transitive closure module, theory datatypes now uses transitive closure for cycle detection, bug 261 fixed
Diffstat (limited to 'src/util/trans_closure.h')
| -rw-r--r-- | src/util/trans_closure.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/util/trans_closure.h b/src/util/trans_closure.h index af16d2e13..c7538bc41 100644 --- a/src/util/trans_closure.h +++ b/src/util/trans_closure.h @@ -76,7 +76,7 @@ public: void write(unsigned index) { if (index < 64) { - unsigned mask = uint64_t(1) << index; + uint64_t mask = uint64_t(1) << index; if ((d_data & mask) != 0) return; makeCurrent(); d_data = d_data | mask; @@ -127,7 +127,6 @@ public: class TransitiveClosureNode : public TransitiveClosure{ context::CDO< unsigned > d_counter; context::CDMap< Node, unsigned, NodeHashFunction > nodeMap; - unsigned getId( Node i ); //for debugging context::CDList< std::pair< Node, Node > > currEdges; public: @@ -135,7 +134,9 @@ public: TransitiveClosure(context), d_counter( context, 0 ), nodeMap( context ), currEdges(context) {} ~TransitiveClosureNode(){} - /* Add an edge from node i to node j. Return false if successful, true if this edge would create a cycle */ + /** get id for node */ + unsigned getId( Node i ); + /** Add an edge from node i to node j. Return false if successful, true if this edge would create a cycle */ bool addEdgeNode(Node i, Node j) { currEdges.push_back( std::pair< Node, Node >( i, j ) ); return addEdge( getId( i ), getId( j ) ); |