diff options
author | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-03-25 20:20:29 +0000 |
---|---|---|
committer | Christopher L. Conway <christopherleeconway@gmail.com> | 2010-03-25 20:20:29 +0000 |
commit | 56837b30117fda75298138cdd052e0c5ba201b86 (patch) | |
tree | b96d684f9926ea49c2b39e6193a8925f95d0287d /src/prop | |
parent | e3e0b625862ba23ba97eb72fcdd3811448ad855a (diff) |
Adding comments to NodeManager
Minor name changes for cleanup and hash function templates
Diffstat (limited to 'src/prop')
-rw-r--r-- | src/prop/cnf_stream.h | 4 | ||||
-rw-r--r-- | src/prop/sat.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/prop/cnf_stream.h b/src/prop/cnf_stream.h index 7d7912e10..7a05c618a 100644 --- a/src/prop/cnf_stream.h +++ b/src/prop/cnf_stream.h @@ -46,11 +46,11 @@ private: SatSolver *d_satSolver; /** Cache of what literal have been registered to a node. */ - typedef __gnu_cxx::hash_map<Node, SatLiteral, NodeHashFcn> TranslationCache; + typedef __gnu_cxx::hash_map<Node, SatLiteral, NodeHashFunction> TranslationCache; TranslationCache d_translationCache; /** Cache of what nodes have been registered to a literal. */ - typedef __gnu_cxx::hash_map<SatLiteral, Node, SatSolver::SatLiteralHashFcn> NodeCache; + typedef __gnu_cxx::hash_map<SatLiteral, Node, SatSolver::SatLiteralHashFunction> NodeCache; NodeCache d_nodeCache; protected: diff --git a/src/prop/sat.h b/src/prop/sat.h index 7844008e8..93e95eedf 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -73,7 +73,7 @@ class SatSolver { public: /** Hash function for literals */ - struct SatLiteralHashFcn { + struct SatLiteralHashFunction { inline size_t operator()(const SatLiteral& literal) const; }; @@ -136,7 +136,7 @@ inline std::ostream& operator <<(std::ostream& out, const SatClause& clause) { } inline size_t -SatSolver::SatLiteralHashFcn::operator()(const SatLiteral& literal) const { +SatSolver::SatLiteralHashFunction::operator()(const SatLiteral& literal) const { return (size_t) minisat::toInt(literal); } |