Final update - fixed foreach, tests and benchmark

This commit is contained in:
Leonardo committed 2019-05-16 13:41:35 -03:00
1 parent 22e84db11a
commit 5f39eb011c
8 files changed
+841 -1197

No files matched your search

+20
View File
@@ -150,24 +150,44 @@ int main(void)
printf("-------------------- CONTAINS --------------------\n");
if (c[0] && !a[0] && !b[0])
printf("%10s PASSED\n", "DEQUE");
else
printf("%10s FAILED\n", "DEQUE");
if (c[1] && !a[1] && !b[1])
printf("%10s PASSED\n", "HASHMAP");
else
printf("%10s FAILED\n", "HASHMAP");
if (c[2] && !a[2] && !b[2])
printf("%10s PASSED\n", "HASHSET");
else
printf("%10s FAILED\n", "HASHSET");
if (c[3] && !a[3] && !b[3])
printf("%10s PASSED\n", "HEAP");
else
printf("%10s FAILED\n", "HEAP");
if (c[4] && !a[4] && !b[4])
printf("%10s PASSED\n", "LINKEDLIST");
else
printf("%10s FAILED\n", "LINKEDLIST");
if (c[5] && !a[5] && !b[5])
printf("%10s PASSED\n", "LIST");
else
printf("%10s FAILED\n", "LIST");
if (c[6] && !a[6] && !b[6])
printf("%10s PASSED\n", "QUEUE");
else
printf("%10s FAILED\n", "QUEUE");
if (c[7] && !a[7] && !b[7])
printf("%10s PASSED\n", "STACK");
else
printf("%10s FAILED\n", "STACK");
if (c[8] && !a[8] && !b[8])
printf("%10s PASSED\n", "TREEMAP");
else
printf("%10s FAILED\n", "TREEMAP");
if (c[9] && !a[9] && !b[9])
printf("%10s PASSED\n", "TREESET");
else
printf("%10s FAILED\n", "TREESET");
l_free(l);
ll_free(ll);
+86 -46
View File
@@ -70,138 +70,178 @@ int main(void)
int sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0,
sum7 = 0, sum8 = 0, sum9 = 0, sum10 = 0, sum11 = 0;
FOR_EACH(l, list, int, l, {
sum0 += value;
FOR_EACH(d, deque, d, {
sum3 += d_iter_value(&iter);
})
FOR_EACH(s, stack, int, s, {
sum1 += value;
FOR_EACH(hm, hmap, hm, {
sum10 += hm_iter_key(&iter);
sum11 += hm_iter_value(&iter);
})
FOR_EACH(q, queue, int, q, {
sum2 += value;
FOR_EACH(hs, hset, hs, {
sum9 += hs_iter_value(&iter);
})
FOR_EACH(d, deque, int, d, {
sum3 += value;
FOR_EACH(h, heap, h, {
sum5 += h_iter_value(&iter);
})
FOR_EACH(ll, linked, int, ll, {
sum4 += value;
FOR_EACH(ll, linked, ll, {
sum4 += ll_iter_value(&iter);
})
FOR_EACH(h, heap, int, h, {
sum5 += value;
FOR_EACH(l, list, l, {
sum0 += l_iter_value(&iter);
})
FOR_EACH(ts, tset, int, ts, {
sum6 += value;
FOR_EACH(q, queue, q, {
sum2 += q_iter_value(&iter);
})
FOR_EACH_MAP(tm, tmap, int, int, tm, {
sum7 += key;
sum8 += value;
FOR_EACH(s, stack, s, {
sum1 += s_iter_value(&iter);
})
FOR_EACH(hs, hset, int, hs, {
sum9 += value;
FOR_EACH(tm, tmap, tm, {
sum7 += tm_iter_key(&iter);
sum8 += tm_iter_value(&iter);
})
FOR_EACH_MAP(hm, hmap, int, int, hm, {
sum10 += key;
sum11 += value;
FOR_EACH(ts, tset, ts, {
sum6 += ts_iter_value(&iter);
})
printf("\n-------------------- FOR_EACH --------------------\n");
if (sum3 == 50005000)
printf("%10s PASSED\n", "DEQUE");
else
printf("%10s FAILED\n", "DEQUE");
if (sum9 == 50005000)
printf("%10s PASSED\n", "HASHSET");
else
printf("%10s FAILED\n", "HASHSET");
if (sum10 == 50005000 && sum11 == 50005000)
printf("%10s PASSED\n", "HASHMAP");
else
printf("%10s FAILED\n", "HASHMAP");
if (sum5 == 50005000)
printf("%10s PASSED\n", "HEAP");
else
printf("%10s FAILED\n", "HEAP");
if (sum4 == 50005000)
printf("%10s PASSED\n", "LINKEDLIST");
else
printf("%10s FAILED\n", "LINKEDLIST");
if (sum0 == 50005000)
printf("%10s PASSED\n", "LIST");
else
printf("%10s FAILED\n", "LIST");
if (sum2 == 50005000)
printf("%10s PASSED\n", "QUEUE");
else
printf("%10s FAILED\n", "QUEUE");
if (sum1 == 50005000)
printf("%10s PASSED\n", "STACK");
else
printf("%10s FAILED\n", "STACK");
if (sum7 == 50005000 && sum8 == 50005000)
printf("%10s PASSED\n", "TREEMAP");
else
printf("%10s FAILED\n", "TREEMAP");
if (sum6 == 50005000)
printf("%10s PASSED\n", "TREESET");
else
printf("%10s FAILED\n", "TREESET");
printf("\n\n");
sum0 = 0, sum1 = 0, sum2 = 0, sum3 = 0, sum4 = 0, sum5 = 0, sum6 = 0,
sum7 = 0, sum8 = 0, sum9 = 0, sum10 = 0, sum11 = 0;
FOR_EACH_REV(l, list, int, l, {
sum0 += value;
FOR_EACH_REV(d, deque, d, {
sum3 += d_iter_value(&iter);
})
FOR_EACH_REV(s, stack, int, s, {
sum1 += value;
FOR_EACH_REV(hm, hmap, hm, {
sum10 += hm_iter_key(&iter);
sum11 += hm_iter_value(&iter);
})
FOR_EACH_REV(q, queue, int, q, {
sum2 += value;
FOR_EACH_REV(hs, hset, hs, {
sum9 += hs_iter_value(&iter);
})
FOR_EACH_REV(d, deque, int, d, {
sum3 += value;
FOR_EACH_REV(h, heap, h, {
sum5 += h_iter_value(&iter);
})
FOR_EACH_REV(ll, linked, int, ll, {
sum4 += value;
FOR_EACH_REV(ll, linked, ll, {
sum4 += ll_iter_value(&iter);
})
FOR_EACH_REV(h, heap, int, h, {
sum5 += value;
FOR_EACH_REV(l, list, l, {
sum0 += l_iter_value(&iter);
})
FOR_EACH_REV(ts, tset, int, ts, {
sum6 += value;
FOR_EACH_REV(q, queue, q, {
sum2 += q_iter_value(&iter);
})
FOR_EACH_MAP_REV(tm, tmap, int, int, tm, {
sum7 += key;
sum8 += value;
FOR_EACH_REV(s, stack, s, {
sum1 += s_iter_value(&iter);
})
FOR_EACH_REV(hs, hset, int, hs, {
sum9 += value;
FOR_EACH_REV(tm, tmap, tm, {
sum7 += tm_iter_key(&iter);
sum8 += tm_iter_value(&iter);
})
FOR_EACH_MAP_REV(tm, tmap, int, int, tm, {
sum10 += key;
sum11 += value;
FOR_EACH_REV(ts, tset, ts, {
sum6 += ts_iter_value(&iter);
})
printf("-------------------- FOR_EACH_REV --------------------\n");
if (sum3 == 50005000)
printf("%10s PASSED\n", "DEQUE");
if (sum9 == 50005000)
printf("%10s PASSED\n", "HASHSET");
else
printf("%10s FAILED\n", "DEQUE");
if (sum10 == 50005000 && sum11 == 50005000)
printf("%10s PASSED\n", "HASHMAP");
else
printf("%10s FAILED\n", "HASHMAP");
if (sum9 == 50005000)
printf("%10s PASSED\n", "HASHSET");
else
printf("%10s FAILED\n", "HASHSET");
if (sum5 == 50005000)
printf("%10s PASSED\n", "HEAP");
else
printf("%10s FAILED\n", "HEAP");
if (sum4 == 50005000)
printf("%10s PASSED\n", "LINKEDLIST");
else
printf("%10s FAILED\n", "LINKEDLIST");
if (sum0 == 50005000)
printf("%10s PASSED\n", "LIST");
else
printf("%10s FAILED\n", "LIST");
if (sum2 == 50005000)
printf("%10s PASSED\n", "QUEUE");
else
printf("%10s FAILED\n", "QUEUE");
if (sum1 == 50005000)
printf("%10s PASSED\n", "STACK");
else
printf("%10s FAILED\n", "STACK");
if (sum7 == 50005000 && sum8 == 50005000)
printf("%10s PASSED\n", "TREEMAP");
else
printf("%10s FAILED\n", "TREEMAP");
if (sum6 == 50005000)
printf("%10s PASSED\n", "TREESET");
else
printf("%10s FAILED\n", "TREESET");
l_free(l);
ll_free(ll);
+65 -439
View File
@@ -30,451 +30,77 @@ COLLECTION_GENERATE(TREEMAP, PUBLIC, tm, tmap, /* FMOD */, int, double)
COLLECTION_GENERATE(HASHSET, PUBLIC, hs, hset, /* FMOD */, /* K */, int)
COLLECTION_GENERATE(HASHMAP, PUBLIC, hm, hmap, /* FMOD */, int, double)
void deque_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize deque and add some elements
deque *d = d_new(10);
for (int i = 0; i < 10; i++)
{
i % 2 == 0 ? d_push_back(d, i) : d_push_front(d, i);
#define ITERATOR_TEST(NAME, PFX, sname, initfunc, insertbody, sumbody, validation1, validation2) \
void NAME##_iterator_test(void) \
{ \
int sum1 = 0; \
double sum2 = 0.0; \
\
sname *coll = initfunc; \
for (int i = 0; i < 10; i++) \
{ \
insertbody; \
} \
\
sname##_iter iter; \
PFX##_iter_init(&iter, coll); \
\
for (int j = 0; j < 4; j++) \
{ \
while (!PFX##_iter_end(&iter)) \
{ \
sumbody; \
PFX##_iter_next(&iter); \
} \
while (!PFX##_iter_start(&iter)) \
{ \
sumbody; \
PFX##_iter_prev(&iter); \
} \
} \
\
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); PFX##_iter_next(&iter)) \
{ \
sumbody; \
} \
\
for (PFX##_iter_to_end(&iter); !PFX##_iter_start(&iter); PFX##_iter_prev(&iter)) \
{ \
sumbody; \
} \
\
PFX##_free(coll); \
\
if (validation1 && validation2) \
printf("%10s PASSED\n", #NAME); \
else \
printf("%10s FAILED\n", #NAME); \
}
// Initialize iterator
deque_iter iter;
d_iter_init(&iter, d);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (d_iter_next(&iter, &r, &i))
sum += r;
while (d_iter_prev(&iter, &r, &i))
sum += r;
}
for (d_iter_tostart(&iter); !d_iter_end(&iter); /**/)
{
d_iter_next(&iter, &r, &i);
sum += r;
}
for (d_iter_toend(&iter); !d_iter_start(&iter); /**/)
{
d_iter_prev(&iter, &r, &i);
sum += r;
}
d_free(d);
if (sum == 450)
printf("%10s PASSED\n", "DEQUE");
}
void hashmap_iter_test(void)
{
size_t i;
int k, sum = 0;
double dsum = 0.0, v, varr[10] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9};
// Initialize hashmap and add some element
hmap *hm = hm_new(50, 0.9, intcmp, inthash);
for (int i = 0; i < 10; i++)
hm_insert(hm, i, varr[i]);
// Initialize iterator
hmap_iter iter;
hm_iter_init(&iter, hm);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (hm_iter_next(&iter, &k, &v, &i))
{
sum += k;
dsum += v;
}
while (hm_iter_prev(&iter, &k, &v, &i))
{
sum += k;
dsum += v;
}
}
for (hm_iter_tostart(&iter); !hm_iter_end(&iter); /**/)
{
hm_iter_next(&iter, &k, &v, &i);
sum += k;
dsum += v;
}
for (hm_iter_toend(&iter); !hm_iter_start(&iter); /**/)
{
hm_iter_prev(&iter, &k, &v, &i);
{
sum += k;
dsum += v;
}
}
hm_free(hm);
if (sum == 450 && dsum == 45.0)
printf("%10s PASSED\n", "HASHMAP");
}
void hashset_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize hash set and add some elements
hset *hs = hs_new(10, 0.9, intcmp, inthash);
for (int i = 0; i < 10; i++)
hs_insert(hs, i);
// Initialize iterator
hset_iter iter;
hs_iter_init(&iter, hs);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (hs_iter_next(&iter, &r, &i))
sum += r;
while (hs_iter_prev(&iter, &r, &i))
sum += r;
}
for (hs_iter_tostart(&iter); !hs_iter_end(&iter); /**/)
{
hs_iter_next(&iter, &r, &i);
sum += r;
}
for (hs_iter_toend(&iter); !hs_iter_start(&iter); /**/)
{
hs_iter_prev(&iter, &r, &i);
sum += r;
}
hs_free(hs);
if (sum == 450)
printf("%10s PASSED\n", "HASHSET");
}
void heap_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize heap and add some elements
heap *h = h_new(10, MinHeap, intcmp);
for (int i = 9; i >= 0; i--)
h_insert(h, i);
// Initialize iterator
heap_iter iter;
h_iter_init(&iter, h);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (h_iter_next(&iter, &r, &i))
sum += r;
while (h_iter_prev(&iter, &r, &i))
sum += r;
}
for (h_iter_tostart(&iter); !h_iter_end(&iter); /**/)
{
h_iter_next(&iter, &r, &i);
sum += r;
}
for (h_iter_toend(&iter); !h_iter_start(&iter); /**/)
{
h_iter_prev(&iter, &r, &i);
sum += r;
}
h_free(h);
if (sum == 450)
printf("%10s PASSED\n", "HEAP");
}
void linkedlist_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize linked list and add some elements
linked *ll = ll_new();
for (int i = 0; i < 10; i++)
ll_push_back(ll, i);
// Initialize iterator
linked_iter iter;
ll_iter_init(&iter, ll);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (ll_iter_next(&iter, &r, &i))
sum += r;
while (ll_iter_prev(&iter, &r, &i))
sum += r;
}
for (ll_iter_tostart(&iter); !ll_iter_end(&iter); /**/)
{
ll_iter_next(&iter, &r, &i);
sum += r;
}
for (ll_iter_toend(&iter); !ll_iter_start(&iter); /**/)
{
ll_iter_prev(&iter, &r, &i);
sum += r;
}
ll_free(ll);
if (sum == 450)
printf("%10s PASSED\n", "LINKEDLIST");
}
void list_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize list and add some elements
list *l = l_new(10);
for (int i = 0; i < 10; i++)
l_push_back(l, i);
// Initialize iterator
list_iter iter;
l_iter_init(&iter, l);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (l_iter_next(&iter, &r, &i))
sum += r;
while (l_iter_prev(&iter, &r, &i))
sum += r;
}
for (l_iter_tostart(&iter); !l_iter_end(&iter); /**/)
{
l_iter_next(&iter, &r, &i);
sum += r;
}
for (l_iter_toend(&iter); !l_iter_start(&iter); /**/)
{
l_iter_prev(&iter, &r, &i);
sum += r;
}
l_free(l);
if (sum == 450)
printf("%10s PASSED\n", "LIST");
}
void queue_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize queue and add some elements
queue *q = q_new(10);
for (int i = 0; i < 10; i++)
q_enqueue(q, i);
// Initialize iterator
queue_iter iter;
q_iter_init(&iter, q);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (q_iter_next(&iter, &r, &i))
sum += r;
while (q_iter_prev(&iter, &r, &i))
sum += r;
}
for (q_iter_tostart(&iter); !q_iter_end(&iter); /**/)
{
q_iter_next(&iter, &r, &i);
sum += r;
}
for (q_iter_toend(&iter); !q_iter_start(&iter); /**/)
{
q_iter_prev(&iter, &r, &i);
sum += r;
}
q_free(q);
if (sum == 450)
printf("%10s PASSED\n", "QUEUE");
}
void stack_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize stack and add some elements
stack *s = s_new(10);
for (int i = 0; i < 10; i++)
s_push(s, i);
// Initialize iterator
stack_iter iter;
s_iter_init(&iter, s);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (s_iter_next(&iter, &r, &i))
sum += r;
while (s_iter_prev(&iter, &r, &i))
sum += r;
}
for (s_iter_tostart(&iter); !s_iter_end(&iter); /**/)
{
s_iter_next(&iter, &r, &i);
sum += r;
}
for (s_iter_toend(&iter); !s_iter_start(&iter); /**/)
{
s_iter_prev(&iter, &r, &i);
sum += r;
}
s_free(s);
if (sum == 450)
printf("%10s PASSED\n", "STACK");
}
void treemap_iter_test(void)
{
size_t i;
int k, sum = 0;
double dsum = 0, v, varr[10] = {0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9};
// Initialize treemap and add some element
tmap *tm = tm_new(intcmp);
for (int i = 0; i < 10; i++)
tm_insert(tm, i, varr[i]);
// Initialize iterator
tmap_iter iter;
tm_iter_init(&iter, tm);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (tm_iter_next(&iter, &k, &v, &i))
{
sum += k;
dsum += v;
}
while (tm_iter_prev(&iter, &k, &v, &i))
{
sum += k;
dsum += v;
}
}
for (tm_iter_tostart(&iter); !tm_iter_end(&iter); /**/)
{
tm_iter_next(&iter, &k, &v, &i);
sum += k;
dsum += v;
}
for (tm_iter_toend(&iter); !tm_iter_start(&iter); /**/)
{
tm_iter_prev(&iter, &k, &v, &i);
sum += k;
dsum += v;
}
tm_free(tm);
if (sum == 450 && dsum == 45.0)
printf("%10s PASSED\n", "TREEMAP");
}
void treeset_iter_test(void)
{
size_t i;
int r, sum = 0;
// Initialize treeset and add some elements
tset *ts = ts_new(intcmp);
for (int i = 0; i < 10; i++)
ts_insert(ts, i);
// Initialize iterator
tset_iter iter;
ts_iter_init(&iter, ts);
// Make the iterator go back and forward
for (int j = 0; j < 4; j++)
{
while (ts_iter_next(&iter, &r, &i))
sum += r;
while (ts_iter_prev(&iter, &r, &i))
sum += r;
}
for (ts_iter_tostart(&iter); !ts_iter_end(&iter); /**/)
{
ts_iter_next(&iter, &r, &i);
sum += r;
}
for (ts_iter_toend(&iter); !ts_iter_start(&iter); /**/)
{
ts_iter_prev(&iter, &r, &i);
sum += r;
}
ts_free(ts);
if (sum == 450)
printf("%10s PASSED\n", "TREESET");
}
ITERATOR_TEST(DEQUE, d, deque, d_new(20), d_push_front(coll, i), sum1 += d_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(HASHMAP, hm, hmap, hm_new(50, 0.6, intcmp, inthash), hm_insert(coll, i, (double)i / 10.0), sum1 += hm_iter_key(&iter); sum2 += hm_iter_value(&iter), sum1 == 450, sum2 == 45.0)
ITERATOR_TEST(HASHSET, hs, hset, hs_new(50, 0.6, intcmp, inthash), hs_insert(coll, i), sum1 += hs_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(HEAP, h, heap, h_new(20, MaxHeap, intcmp), h_insert(coll, i), sum1 += h_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(LINKEDLIST, ll, linked, ll_new(), ll_push_back(coll, i), sum1 += ll_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(LIST, l, list, l_new(20), l_push_back(coll, i), sum1 += l_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(QUEUE, q, queue, q_new(20), q_enqueue(coll, i), sum1 += q_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(STACK, s, stack, s_new(20), s_push(coll, i), sum1 += s_iter_value(&iter), sum1 == 450, 1)
ITERATOR_TEST(TREEMAP, tm, tmap, tm_new(intcmp), tm_insert(coll, i, (double)i / 10.0), sum1 += tm_iter_key(&iter); sum2 += tm_iter_value(&iter), sum1 == 450, sum2 == 45.0)
ITERATOR_TEST(TREESET, ts, tset, ts_new(intcmp), ts_insert(coll, i), sum1 += ts_iter_value(&iter), sum1 == 450, 1)
int main(void)
{
printf("\n-------------------- ITERATORS --------------------\n");
deque_iter_test();
hashmap_iter_test();
hashset_iter_test();
heap_iter_test();
linkedlist_iter_test();
list_iter_test();
queue_iter_test();
stack_iter_test();
treemap_iter_test();
treeset_iter_test();
DEQUE_iterator_test();
HASHMAP_iterator_test();
HASHSET_iterator_test();
HEAP_iterator_test();
LINKEDLIST_iterator_test();
LIST_iterator_test();
QUEUE_iterator_test();
STACK_iterator_test();
TREEMAP_iterator_test();
TREESET_iterator_test();
return 0;
}