michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test(splay_tree): add missing test

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2013-09-29 17:28:10 -07:00
parent 790c2a72d5
commit 21f9699661
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tests/util/splay_tree.cpp
View file

@ -66,7 +66,7 @@ static void tst1() {
s.insert(34);
std::cout << s2 << "\n";
std::cout << s << "\n";
int const * v = s.find_memoize(11);
int const * v = s.splay_find(11);
lean_assert(*v == 11);
std::cout << s << "\n";
lean_assert(!s.empty());
@ -155,10 +155,20 @@ static void tst3() {
lean_assert(out.str() == "1 3 5 10 ");
}
static void tst4() {
int_splay_tree s;
s.insert(10);
s.insert(20);
lean_assert(s.splay_find(30) == nullptr);
lean_assert(*(s.splay_find(20)) == 20);
lean_assert(*(s.splay_find(10)) == 10);
}
int main() {
tst0();
tst1();
tst2();
tst3();
tst4();
return has_violations() ? 1 : 0;
}

2
src/util/splay_map.h
View file

@ -32,7 +32,7 @@ public:
void insert(K const & k, T const & v) { m_map.insert(mk_pair(k, v)); }
entry const * find(K const & k) const { return m_map.find(mk_pair(k, T())); }
bool contains(K const & k) const { return m_map.contains(mk_pair(k, T())); }
entry const * find_memoize(K const & k) { return m_map.contains(mk_pair(k, T())); }
entry const * splay_find(K const & k) { return m_map.contains(mk_pair(k, T())); }
void erase(K const & k) { m_map.erase(mk_pair(k, T())); }
class ref {

4
src/util/splay_tree.h
View file

@ -367,10 +367,10 @@ public:
/**
\brief Similar to \c find, but the splay tree is reorganized.
If <tt>find(v)</tt> is invoked after <tt>find_memoize(v)</tt>, then the cost will be O(1).
If <tt>find(v)</tt> is invoked after <tt>splay_find(v)</tt>, then the cost will be O(1).
The idea is to move recently accessed elements close to the root.
*/
T const * find_memoize(T const & v) {
T const * splay_find(T const & v) {
if (pull(v)) {
lean_assert(cmp(m_ptr->m_value, v) == 0);
return &(m_ptr->m_value);