Added flags to hashmap and added some hotfixes

This commit is contained in:
Leonardo committed 2020-02-28 17:29:55 -03:00
1 parent 5794760ceb
commit 4b7678a621
6 files changed
+231 -24

No files matched your search

+9 -4
View File
@@ -934,7 +934,6 @@ struct cmc_callbacks_bidimap
\ \
bool PFX##_resize(struct SNAME *_map_, size_t capacity) \ bool PFX##_resize(struct SNAME *_map_, size_t capacity) \
{ \ { \
\
_map_->flag = cmc_flags.OK; \ _map_->flag = cmc_flags.OK; \
\ \
if (_map_->capacity == capacity) \ if (_map_->capacity == capacity) \
@@ -1026,9 +1025,15 @@ struct cmc_callbacks_bidimap
struct SNAME *PFX##_copy_of(struct SNAME *_map_) \ struct SNAME *PFX##_copy_of(struct SNAME *_map_) \
{ \ { \
/* TODO this function can be optimized */ \ /* TODO this function can be optimized */ \
struct SNAME *result = \ struct SNAME *result = PFX##_new_custom( \
PFX##_new_custom(_map_->capacity, _map_->load, _map_->f_key, \ _map_->capacity * _map_->load, _map_->load, _map_->f_key, \
_map_->f_val, _map_->alloc, _map_->callbacks); \ _map_->f_val, _map_->alloc, _map_->callbacks); \
\
if (!result) \
{ \
_map_->flag = cmc_flags.ERROR; \
return NULL; \
} \
\ \
for (size_t i = 0; i < _map_->capacity; i++) \ for (size_t i = 0; i < _map_->capacity; i++) \
{ \ { \
-2
View File
@@ -594,8 +594,6 @@ struct cmc_callbacks_deque
\ \
if (!result) \ if (!result) \
{ \ { \
/* Can't guarantee that it is an allocation error */ \
/* Could be that _deque_ has some invalid field */ \
_deque_->flag = cmc_flags.ERROR; \ _deque_->flag = cmc_flags.ERROR; \
return NULL; \ return NULL; \
} \ } \
+101 -15
View File
@@ -337,6 +337,7 @@ struct cmc_callbacks_hashmap
size_t PFX##_count(struct SNAME *_map_); \ size_t PFX##_count(struct SNAME *_map_); \
size_t PFX##_capacity(struct SNAME *_map_); \ size_t PFX##_capacity(struct SNAME *_map_); \
double PFX##_load(struct SNAME *_map_); \ double PFX##_load(struct SNAME *_map_); \
int PFX##_flag(struct SNAME *_map_); \
/* Collection Utility */ \ /* Collection Utility */ \
bool PFX##_resize(struct SNAME *_map_, size_t capacity); \ bool PFX##_resize(struct SNAME *_map_, size_t capacity); \
struct SNAME *PFX##_copy_of(struct SNAME *_map_); \ struct SNAME *PFX##_copy_of(struct SNAME *_map_); \
@@ -494,6 +495,7 @@ struct cmc_callbacks_hashmap
sizeof(struct SNAME##_entry) * _map_->capacity); \ sizeof(struct SNAME##_entry) * _map_->capacity); \
\ \
_map_->count = 0; \ _map_->count = 0; \
_map_->flag = cmc_flags.OK; \
} \ } \
\ \
void PFX##_free(struct SNAME *_map_) \ void PFX##_free(struct SNAME *_map_) \
@@ -526,13 +528,15 @@ struct cmc_callbacks_hashmap
\ \
if (callbacks) \ if (callbacks) \
_map_->callbacks = callbacks; \ _map_->callbacks = callbacks; \
\
_map_->flag = cmc_flags.OK; \
} \ } \
\ \
bool PFX##_insert(struct SNAME *_map_, K key, V value) \ bool PFX##_insert(struct SNAME *_map_, K key, V value) \
{ \ { \
if (PFX##_full(_map_)) \ if (PFX##_full(_map_)) \
{ \ { \
if (!PFX##_resize(_map_, PFX##_capacity(_map_) + 1)) \ if (!PFX##_resize(_map_, _map_->capacity + 1)) \
return false; \ return false; \
} \ } \
\ \
@@ -543,7 +547,10 @@ struct cmc_callbacks_hashmap
struct SNAME##_entry *target = &(_map_->buffer[pos]); \ struct SNAME##_entry *target = &(_map_->buffer[pos]); \
\ \
if (PFX##_impl_get_entry(_map_, key) != NULL) \ if (PFX##_impl_get_entry(_map_, key) != NULL) \
{ \
_map_->flag = cmc_flags.DUPLICATE; \
return false; \ return false; \
} \
\ \
if (target->state == CMC_ES_EMPTY || target->state == CMC_ES_DELETED) \ if (target->state == CMC_ES_EMPTY || target->state == CMC_ES_DELETED) \
{ \ { \
@@ -587,31 +594,52 @@ struct cmc_callbacks_hashmap
} \ } \
\ \
_map_->count++; \ _map_->count++; \
_map_->flag = cmc_flags.OK; \
\ \
return true; \ return true; \
} \ } \
\ \
bool PFX##_update(struct SNAME *_map_, K key, V new_value, V *old_value) \ bool PFX##_update(struct SNAME *_map_, K key, V new_value, V *old_value) \
{ \ { \
if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \
} \
\
struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \ struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \
\ \
if (!entry) \ if (!entry) \
{ \
_map_->flag = cmc_flags.NOT_FOUND; \
return false; \ return false; \
} \
\ \
if (old_value) \ if (old_value) \
*old_value = entry->value; \ *old_value = entry->value; \
\ \
entry->value = new_value; \ entry->value = new_value; \
\ \
_map_->flag = cmc_flags.OK; \
\
return true; \ return true; \
} \ } \
\ \
bool PFX##_remove(struct SNAME *_map_, K key, V *out_value) \ bool PFX##_remove(struct SNAME *_map_, K key, V *out_value) \
{ \ { \
if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \
} \
\
struct SNAME##_entry *result = PFX##_impl_get_entry(_map_, key); \ struct SNAME##_entry *result = PFX##_impl_get_entry(_map_, key); \
\ \
if (result == NULL) \ if (result == NULL) \
{ \
_map_->flag = cmc_flags.NOT_FOUND; \
return false; \ return false; \
} \
\ \
if (out_value) \ if (out_value) \
*out_value = result->value; \ *out_value = result->value; \
@@ -622,6 +650,7 @@ struct cmc_callbacks_hashmap
result->state = CMC_ES_DELETED; \ result->state = CMC_ES_DELETED; \
\ \
_map_->count--; \ _map_->count--; \
_map_->flag = cmc_flags.OK; \
\ \
return true; \ return true; \
} \ } \
@@ -629,7 +658,10 @@ struct cmc_callbacks_hashmap
bool PFX##_max(struct SNAME *_map_, K *key, V *value) \ bool PFX##_max(struct SNAME *_map_, K *key, V *value) \
{ \ { \
if (PFX##_empty(_map_)) \ if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \ return false; \
} \
\ \
struct SNAME##_iter iter; \ struct SNAME##_iter iter; \
PFX##_iter_init(&iter, _map_); \ PFX##_iter_init(&iter, _map_); \
@@ -639,6 +671,7 @@ struct cmc_callbacks_hashmap
\ \
PFX##_iter_next(&iter); \ PFX##_iter_next(&iter); \
\ \
/* TODO Turn this into a normal loop */ \
for (; !PFX##_iter_end(&iter); PFX##_iter_next(&iter)) \ for (; !PFX##_iter_end(&iter); PFX##_iter_next(&iter)) \
{ \ { \
K iter_key = PFX##_iter_key(&iter); \ K iter_key = PFX##_iter_key(&iter); \
@@ -662,7 +695,10 @@ struct cmc_callbacks_hashmap
bool PFX##_min(struct SNAME *_map_, K *key, V *value) \ bool PFX##_min(struct SNAME *_map_, K *key, V *value) \
{ \ { \
if (PFX##_empty(_map_)) \ if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \ return false; \
} \
\ \
struct SNAME##_iter iter; \ struct SNAME##_iter iter; \
PFX##_iter_init(&iter, _map_); \ PFX##_iter_init(&iter, _map_); \
@@ -672,6 +708,7 @@ struct cmc_callbacks_hashmap
\ \
PFX##_iter_next(&iter); \ PFX##_iter_next(&iter); \
\ \
/* TODO Turn this into a normal loop */ \
for (; !PFX##_iter_end(&iter); PFX##_iter_next(&iter)) \ for (; !PFX##_iter_end(&iter); PFX##_iter_next(&iter)) \
{ \ { \
K iter_key = PFX##_iter_key(&iter); \ K iter_key = PFX##_iter_key(&iter); \
@@ -694,26 +731,50 @@ struct cmc_callbacks_hashmap
\ \
V PFX##_get(struct SNAME *_map_, K key) \ V PFX##_get(struct SNAME *_map_, K key) \
{ \ { \
if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \
} \
\
struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \ struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \
\ \
if (!entry) \ if (!entry) \
{ \
_map_->flag = cmc_flags.NOT_FOUND; \
return (V){ 0 }; \ return (V){ 0 }; \
} \
\
_map_->flag = cmc_flags.OK; \
\ \
return entry->value; \ return entry->value; \
} \ } \
\ \
V *PFX##_get_ref(struct SNAME *_map_, K key) \ V *PFX##_get_ref(struct SNAME *_map_, K key) \
{ \ { \
if (PFX##_empty(_map_)) \
{ \
_map_->flag = cmc_flags.EMPTY; \
return false; \
} \
\
struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \ struct SNAME##_entry *entry = PFX##_impl_get_entry(_map_, key); \
\ \
if (!entry) \ if (!entry) \
{ \
_map_->flag = cmc_flags.NOT_FOUND; \
return NULL; \ return NULL; \
} \
\
_map_->flag = cmc_flags.OK; \
\ \
return &(entry->value); \ return &(entry->value); \
} \ } \
\ \
bool PFX##_contains(struct SNAME *_map_, K key) \ bool PFX##_contains(struct SNAME *_map_, K key) \
{ \ { \
_map_->flag = cmc_flags.OK; \
\
return PFX##_impl_get_entry(_map_, key) != NULL; \ return PFX##_impl_get_entry(_map_, key) != NULL; \
} \ } \
\ \
@@ -724,8 +785,7 @@ struct cmc_callbacks_hashmap
\ \
bool PFX##_full(struct SNAME *_map_) \ bool PFX##_full(struct SNAME *_map_) \
{ \ { \
return (double)PFX##_capacity(_map_) * PFX##_load(_map_) <= \ return (double)_map_->capacity * _map_->load <= (double)_map_->count; \
(double)PFX##_count(_map_); \
} \ } \
\ \
size_t PFX##_count(struct SNAME *_map_) \ size_t PFX##_count(struct SNAME *_map_) \
@@ -743,34 +803,49 @@ struct cmc_callbacks_hashmap
return _map_->load; \ return _map_->load; \
} \ } \
\ \
int PFX##_flag(struct SNAME *_map_) \
{ \
return _map_->flag; \
} \
\
bool PFX##_resize(struct SNAME *_map_, size_t capacity) \ bool PFX##_resize(struct SNAME *_map_, size_t capacity) \
{ \ { \
if (PFX##_capacity(_map_) == capacity) \ if (_map_->capacity == capacity) \
return true; \ return true; \
\ \
if (PFX##_capacity(_map_) > capacity / _map_->load) \ if (_map_->capacity > capacity / _map_->load) \
return true; \ return true; \
\ \
/* Prevent integer overflow */ \ /* Prevent integer overflow */ \
if (capacity >= UINTMAX_MAX * _map_->load) \ if (capacity >= UINTMAX_MAX * _map_->load) \
{ \
_map_->flag = cmc_flags.ERROR; \
return false; \ return false; \
} \
\ \
/* Calculate required capacity based on the prime numbers */ \ /* Calculate required capacity based on the prime numbers */ \
size_t theoretical_size = PFX##_impl_calculate_size(capacity); \ size_t theoretical_size = PFX##_impl_calculate_size(capacity); \
\ \
/* Not possible to shrink with current available prime numbers */ \ /* Not possible to shrink with current available prime numbers */ \
if (theoretical_size < _map_->count / _map_->load) \ if (theoretical_size < _map_->count / _map_->load) \
{ \
_map_->flag = cmc_flags.ERROR; \
return false; \ return false; \
} \
\ \
struct SNAME *_new_map_ = \ struct SNAME *_new_map_ = \
PFX##_new_custom(capacity, _map_->load, _map_->f_key, \ PFX##_new_custom(capacity, _map_->load, _map_->f_key, \
_map_->f_val, _map_->alloc, _map_->callbacks); \ _map_->f_val, _map_->alloc, _map_->callbacks); \
\ \
if (!_new_map_) \ if (!_new_map_) \
{ \
_map_->flag = cmc_flags.ALLOC; \
return false; \ return false; \
} \
\ \
struct SNAME##_iter iter; \ struct SNAME##_iter iter; \
\ \
/* TODO turn this into a normal loop */ \
for (PFX##_iter_init(&iter, _map_); !PFX##_iter_end(&iter); \ for (PFX##_iter_init(&iter, _map_); !PFX##_iter_end(&iter); \
PFX##_iter_next(&iter)) \ PFX##_iter_next(&iter)) \
{ \ { \
@@ -780,9 +855,11 @@ struct cmc_callbacks_hashmap
PFX##_insert(_new_map_, key, value); \ PFX##_insert(_new_map_, key, value); \
} \ } \
\ \
if (PFX##_count(_map_) != PFX##_count(_new_map_)) \ if (_map_->count != _new_map_->count) \
{ \ { \
PFX##_free(_new_map_); \ PFX##_free(_new_map_); \
\
_map_->flag = cmc_flags.ERROR; \
return false; \ return false; \
} \ } \
\ \
@@ -801,12 +878,15 @@ struct cmc_callbacks_hashmap
\ \
struct SNAME *PFX##_copy_of(struct SNAME *_map_) \ struct SNAME *PFX##_copy_of(struct SNAME *_map_) \
{ \ { \
struct SNAME *result = \ struct SNAME *result = PFX##_new_custom( \
PFX##_new_custom(_map_->capacity, _map_->load, _map_->f_key, \ _map_->capacity * _map_->load, _map_->load, _map_->f_key, \
_map_->f_val, _map_->alloc, _map_->callbacks); \ _map_->f_val, _map_->alloc, _map_->callbacks); \
\ \
if (!result) \ if (!result) \
{ \
_map_->flag = cmc_flags.ERROR; \
return NULL; \ return NULL; \
} \
\ \
if (_map_->f_key->cpy || _map_->f_val->cpy) \ if (_map_->f_key->cpy || _map_->f_val->cpy) \
{ \ { \
@@ -844,17 +924,23 @@ struct cmc_callbacks_hashmap
\ \
result->count = _map_->count; \ result->count = _map_->count; \
\ \
_map_->flag = cmc_flags.OK; \
\
return result; \ return result; \
} \ } \
\ \
bool PFX##_equals(struct SNAME *_map1_, struct SNAME *_map2_) \ bool PFX##_equals(struct SNAME *_map1_, struct SNAME *_map2_) \
{ \ { \
if (PFX##_count(_map1_) != PFX##_count(_map2_)) \ _map1_->flag = cmc_flags.OK; \
_map2_->flag = cmc_flags.OK; \
\
if (_map1_->count != _map2_->count) \
return false; \ return false; \
\ \
struct SNAME##_iter iter; \ struct SNAME##_iter iter; \
PFX##_iter_init(&iter, _map1_); \ PFX##_iter_init(&iter, _map1_); \
\ \
/* TODO optimize this loop */ \
for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \ for (PFX##_iter_to_start(&iter); !PFX##_iter_end(&iter); \
PFX##_iter_next(&iter)) \ PFX##_iter_next(&iter)) \
{ \ { \
@@ -961,7 +1047,7 @@ struct cmc_callbacks_hashmap
if (!PFX##_empty(iter->target)) \ if (!PFX##_empty(iter->target)) \
{ \ { \
iter->cursor = iter->last; \ iter->cursor = iter->last; \
iter->index = PFX##_count(iter->target) - 1; \ iter->index = iter->target->count - 1; \
iter->start = PFX##_empty(iter->target); \ iter->start = PFX##_empty(iter->target); \
iter->end = true; \ iter->end = true; \
} \ } \
@@ -972,7 +1058,7 @@ struct cmc_callbacks_hashmap
if (iter->end) \ if (iter->end) \
return false; \ return false; \
\ \
if (iter->index + 1 == PFX##_count(iter->target)) \ if (iter->index + 1 == iter->target->count) \
{ \ { \
iter->end = true; \ iter->end = true; \
return false; \ return false; \
@@ -1031,13 +1117,13 @@ struct cmc_callbacks_hashmap
if (iter->end) \ if (iter->end) \
return false; \ return false; \
\ \
if (iter->index + 1 == PFX##_count(iter->target)) \ if (iter->index + 1 == iter->target->count) \
{ \ { \
iter->end = true; \ iter->end = true; \
return false; \ return false; \
} \ } \
\ \
if (steps == 0 || iter->index + steps >= PFX##_count(iter->target)) \ if (steps == 0 || iter->index + steps >= iter->target->count) \
return false; \ return false; \
\ \
for (size_t i = 0; i < steps; i++) \ for (size_t i = 0; i < steps; i++) \
@@ -1071,7 +1157,7 @@ struct cmc_callbacks_hashmap
/* given index */ \ /* given index */ \
bool PFX##_iter_go_to(struct SNAME##_iter *iter, size_t index) \ bool PFX##_iter_go_to(struct SNAME##_iter *iter, size_t index) \
{ \ { \
if (index >= PFX##_count(iter->target)) \ if (index >= iter->target->count) \
return false; \ return false; \
\ \
if (iter->index > index) \ if (iter->index > index) \
+3 -3
View File
@@ -997,9 +997,9 @@ struct cmc_callbacks_multimap
\ \
struct SNAME *PFX##_copy_of(struct SNAME *_map_) \ struct SNAME *PFX##_copy_of(struct SNAME *_map_) \
{ \ { \
struct SNAME *result = \ struct SNAME *result = PFX##_new_custom( \
PFX##_new_custom(_map_->capacity, _map_->load, _map_->f_key, \ _map_->capacity * _map_->load, _map_->load, _map_->f_key, \
_map_->f_val, _map_->alloc, _map_->callbacks); \ _map_->f_val, _map_->alloc, _map_->callbacks); \
\ \
if (!result) \ if (!result) \
return NULL; \ return NULL; \
+9
View File
@@ -493,6 +493,15 @@ CMC_CREATE_UNIT(bidimap_test, true, {
cmc_assert_equals(int32_t, cmc_flags.OK, bm_flag(map2)); cmc_assert_equals(int32_t, cmc_flags.OK, bm_flag(map2));
size_t tmp = map->capacity;
map->capacity = 0;
struct bidimap *map3 = bm_copy_of(map);
cmc_assert_equals(ptr, NULL, map3);
cmc_assert_equals(int32_t, cmc_flags.ERROR, bm_flag(map));
map->capacity = tmp;
// equals // equals
bm_get_key(map, 100); bm_get_key(map, 100);
bm_get_key(map2, 100); bm_get_key(map2, 100);
+109
View File
@@ -493,4 +493,113 @@ CMC_CREATE_UNIT(hashmap_test, true, {
hm_free(map); hm_free(map);
}); });
CMC_CREATE_TEST(flags, {
struct hashmap *map = hm_new(100, 0.6, hm_ftab_key, hm_ftab_val);
cmc_assert_not_equals(ptr, NULL, map);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
// insert
cmc_assert(hm_insert(map, 1, 1));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert(!hm_insert(map, 1, 2));
cmc_assert_equals(int32_t, cmc_flags.DUPLICATE, hm_flag(map));
// clear
hm_clear(map);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
// update
cmc_assert(!hm_update(map, 1, 2, NULL));
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
cmc_assert(hm_insert(map, 1, 1));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert(!hm_update(map, 2, 1, NULL));
cmc_assert_equals(int32_t, cmc_flags.NOT_FOUND, hm_flag(map));
cmc_assert(hm_update(map, 1, 2, NULL));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
// remove
cmc_assert(!hm_remove(map, 2, NULL));
cmc_assert_equals(int32_t, cmc_flags.NOT_FOUND, hm_flag(map));
cmc_assert(hm_remove(map, 1, NULL));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert(!hm_remove(map, 1, NULL));
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
// max
cmc_assert(hm_insert(map, 1, 1));
cmc_assert(hm_max(map, NULL, NULL));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert(hm_remove(map, 1, NULL));
cmc_assert(!hm_max(map, NULL, NULL));
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
// min
cmc_assert(hm_insert(map, 1, 1));
cmc_assert(hm_min(map, NULL, NULL));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert(hm_remove(map, 1, NULL));
cmc_assert(!hm_min(map, NULL, NULL));
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
// get
hm_get(map, 1);
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
cmc_assert(hm_insert(map, 1, 1));
hm_get(map, 1);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
hm_get(map, 2);
cmc_assert_equals(int32_t, cmc_flags.NOT_FOUND, hm_flag(map));
hm_clear(map);
// get_ref
hm_get_ref(map, 1);
cmc_assert_equals(int32_t, cmc_flags.EMPTY, hm_flag(map));
cmc_assert(hm_insert(map, 1, 1));
hm_get_ref(map, 1);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
hm_get_ref(map, 2);
cmc_assert_equals(int32_t, cmc_flags.NOT_FOUND, hm_flag(map));
// contains
hm_contains(map, 1);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
// copy
struct hashmap *map2 = hm_copy_of(map);
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map2));
size_t tmp = map->capacity;
map->capacity = 0;
struct hashmap *map3 = hm_copy_of(map);
cmc_assert_equals(ptr, NULL, map3);
cmc_assert_equals(int32_t, cmc_flags.ERROR, hm_flag(map));
map->capacity = tmp;
cmc_assert(hm_equals(map, map2));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map));
cmc_assert_equals(int32_t, cmc_flags.OK, hm_flag(map2));
hm_free(map);
hm_free(map2);
});
}); });