admin/C-Macro-Collections
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding more things to EXT and some changes to heap

Browse Source
This commit is contained in:
Leonardo Vencovsky committed 2020-06-01 15:33:17 -03:00
1 parent 69eed72838
commit 546ac80030
13 files changed
+534 -470
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/cmc/heap.h
+85 -354
View File
@@ -38,33 +38,7 @@
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Heap Implementation * Heap Implementation
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/** #include "../cor/heap.h"
* enum cmc_heap_order
*
* Defines the two possible heaps:
* - Max Heap has the greatest element at the top
* - Min Heap has the smallest element at the top
*/
enum cmc_heap_order
{
cmc_max_heap = 1,
cmc_min_heap = -1
};
/* -------------------------------------------------------------------------
* Heap specific
* ------------------------------------------------------------------------- */
/* to_string format */
static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"type:%s, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks: %p}";
/** /**
* Core Heap implementation * Core Heap implementation
@@ -84,128 +58,88 @@ static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Header * Header
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
#define CMC_CMC_HEAP_CORE_HEADER_(PFX, SNAME, V) \ #define CMC_CMC_HEAP_CORE_HEADER_(PFX, SNAME, V) \
\ \
/* Heap Structure */ \ /* Heap Structure */ \
struct SNAME \ struct SNAME \
{ \ { \
/* Dynamic array of elements */ \ /* Dynamic array of elements */ \
V *buffer; \ V *buffer; \
\ \
/* Current array capacity */ \ /* Current array capacity */ \
size_t capacity; \ size_t capacity; \
\ \
/* Current amount of elements in the heap */ \ /* Current amount of elements in the heap */ \
size_t count; \ size_t count; \
\ \
/* Heap order (MaxHeap or MinHeap) */ \ /* Heap order (MaxHeap or MinHeap) */ \
enum cmc_heap_order HO; \ enum cmc_heap_order HO; \
\ \
/* Flags indicating errors or success */ \ /* Flags indicating errors or success */ \
int flag; \ int flag; \
\ \
/* Value function table */ \ /* Value function table */ \
struct CMC_DEF_FVAL(SNAME) * f_val; \ struct CMC_DEF_FVAL(SNAME) * f_val; \
\ \
/* Custom allocation functions */ \ /* Custom allocation functions */ \
struct cmc_alloc_node *alloc; \ struct cmc_alloc_node *alloc; \
\ \
/* Custom callback functions */ \ /* Custom callback functions */ \
struct cmc_callbacks *callbacks; \ struct cmc_callbacks *callbacks; \
}; \ }; \
\ \
/* Value struct function table */ \ /* Value struct function table */ \
struct CMC_DEF_FVAL(SNAME) \ struct CMC_DEF_FVAL(SNAME) \
{ \ { \
/* Comparator function */ \ /* Comparator function */ \
int (*cmp)(V, V); \ int (*cmp)(V, V); \
\ \
/* Copy function */ \ /* Copy function */ \
V (*cpy)(V); \ V (*cpy)(V); \
\ \
/* To string function */ \ /* To string function */ \
bool (*str)(FILE *, V); \ bool (*str)(FILE *, V); \
\ \
/* Free from memory function */ \ /* Free from memory function */ \
void (*free)(V); \ void (*free)(V); \
\ \
/* Hash function */ \ /* Hash function */ \
size_t (*hash)(V); \ size_t (*hash)(V); \
\ \
/* Priority function */ \ /* Priority function */ \
int (*pri)(V, V); \ int (*pri)(V, V); \
}; \ }; \
\ \
/* Heap Iterator */ \ /* Collection Functions */ \
struct CMC_DEF_ITER(SNAME) \ /* Collection Allocation and Deallocation */ \
{ \ struct SNAME *CMC_(PFX, _new)(size_t capacity, enum cmc_heap_order HO, \
/* Target heap */ \ struct CMC_DEF_FVAL(SNAME) * f_val); \
struct SNAME *target; \ struct SNAME *CMC_(PFX, _new_custom)( \
\ size_t capacity, enum cmc_heap_order HO, \
/* Cursor's position (index) */ \ struct CMC_DEF_FVAL(SNAME) * f_val, struct cmc_alloc_node * alloc, \
size_t cursor; \ struct cmc_callbacks * callbacks); \
\ void CMC_(PFX, _clear)(struct SNAME * _heap_); \
/* If the iterator has reached the start of the iteration */ \ void CMC_(PFX, _free)(struct SNAME * _heap_); \
bool start; \ /* Customization of Allocation and Callbacks */ \
\ void CMC_(PFX, _customize)(struct SNAME * _heap_, \
/* If the iterator has reached the end of the iteration */ \ struct cmc_alloc_node * alloc, \
bool end; \ struct cmc_callbacks * callbacks); \
}; \ /* Collection Input and Output */ \
\ bool CMC_(PFX, _insert)(struct SNAME * _heap_, V value); \
/* Collection Functions */ \ bool CMC_(PFX, _remove)(struct SNAME * _heap_); \
/* Collection Allocation and Deallocation */ \ /* Element Access */ \
struct SNAME *CMC_(PFX, _new)(size_t capacity, enum cmc_heap_order HO, \ V CMC_(PFX, _peek)(struct SNAME * _heap_); \
struct CMC_DEF_FVAL(SNAME) * f_val); \ /* Collection State */ \
struct SNAME *CMC_(PFX, _new_custom)( \ bool CMC_(PFX, _contains)(struct SNAME * _heap_, V value); \
size_t capacity, enum cmc_heap_order HO, \ bool CMC_(PFX, _empty)(struct SNAME * _heap_); \
struct CMC_DEF_FVAL(SNAME) * f_val, struct cmc_alloc_node * alloc, \ bool CMC_(PFX, _full)(struct SNAME * _heap_); \
struct cmc_callbacks * callbacks); \ size_t CMC_(PFX, _count)(struct SNAME * _heap_); \
void CMC_(PFX, _clear)(struct SNAME * _heap_); \ size_t CMC_(PFX, _capacity)(struct SNAME * _heap_); \
void CMC_(PFX, _free)(struct SNAME * _heap_); \ int CMC_(PFX, _flag)(struct SNAME * _heap_); \
/* Customization of Allocation and Callbacks */ \ /* Collection Utility */ \
void CMC_(PFX, _customize)(struct SNAME * _heap_, \ bool CMC_(PFX, _resize)(struct SNAME * _heap_, size_t capacity); \
struct cmc_alloc_node * alloc, \ struct SNAME *CMC_(PFX, _copy_of)(struct SNAME * _heap_); \
struct cmc_callbacks * callbacks); \ bool CMC_(PFX, _equals)(struct SNAME * _heap1_, struct SNAME * _heap2_);
/* Collection Input and Output */ \
bool CMC_(PFX, _insert)(struct SNAME * _heap_, V value); \
bool CMC_(PFX, _remove)(struct SNAME * _heap_); \
/* Element Access */ \
V CMC_(PFX, _peek)(struct SNAME * _heap_); \
/* Collection State */ \
bool CMC_(PFX, _contains)(struct SNAME * _heap_, V value); \
bool CMC_(PFX, _empty)(struct SNAME * _heap_); \
bool CMC_(PFX, _full)(struct SNAME * _heap_); \
size_t CMC_(PFX, _count)(struct SNAME * _heap_); \
size_t CMC_(PFX, _capacity)(struct SNAME * _heap_); \
int CMC_(PFX, _flag)(struct SNAME * _heap_); \
/* Collection Utility */ \
bool CMC_(PFX, _resize)(struct SNAME * _heap_, size_t capacity); \
struct SNAME *CMC_(PFX, _copy_of)(struct SNAME * _heap_); \
bool CMC_(PFX, _equals)(struct SNAME * _heap1_, struct SNAME * _heap2_); \
struct cmc_string CMC_(PFX, _to_string)(struct SNAME * _heap_); \
bool CMC_(PFX, _print)(struct SNAME * _heap_, FILE * fptr); \
\
/* Iterator Functions */ \
/* Iterator Initialization */ \
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_start)(struct SNAME * target); \
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_end)(struct SNAME * target); \
/* Iterator State */ \
bool CMC_(PFX, _iter_at_start)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_at_end)(struct CMC_DEF_ITER(SNAME) * iter); \
/* Iterator Movement */ \
bool CMC_(PFX, _iter_to_start)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_to_end)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_next)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_prev)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_advance)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps); \
bool CMC_(PFX, _iter_rewind)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps); \
bool CMC_(PFX, _iter_go_to)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t index); \
/* Iterator Access */ \
V CMC_(PFX, _iter_value)(struct CMC_DEF_ITER(SNAME) * iter); \
size_t CMC_(PFX, _iter_index)(struct CMC_DEF_ITER(SNAME) * iter);
/* ------------------------------------------------------------------------- /* -------------------------------------------------------------------------
* Source * Source
@@ -226,7 +160,7 @@ static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
if (capacity < 1) \ if (capacity < 1) \
return NULL; \ return NULL; \
\ \
if (HO != cmc_min_heap && HO != cmc_max_heap) \ if (HO != CMC_MIN_HEAP && HO != CMC_MAX_HEAP) \
return NULL; \ return NULL; \
\ \
if (!f_val) \ if (!f_val) \
@@ -264,7 +198,7 @@ static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
if (capacity < 1) \ if (capacity < 1) \
return NULL; \ return NULL; \
\ \
if (HO != cmc_min_heap && HO != cmc_max_heap) \ if (HO != CMC_MIN_HEAP && HO != CMC_MAX_HEAP) \
return NULL; \ return NULL; \
\ \
if (!f_val) \ if (!f_val) \
@@ -529,209 +463,6 @@ static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
return true; \ return true; \
} \ } \
\ \
struct cmc_string CMC_(PFX, _to_string)(struct SNAME * _heap_) \
{ \
struct cmc_string str; \
struct SNAME *h_ = _heap_; \
const char *t = h_->HO == 1 ? "MaxHeap" : "MinHeap"; \
\
int n = snprintf(str.s, cmc_string_len, cmc_cmc_string_fmt_heap, \
#SNAME, #V, h_, h_->buffer, h_->capacity, h_->count, \
t, h_->flag, h_->f_val, h_->alloc, h_->callbacks); \
\
return n >= 0 ? str : (struct cmc_string){ 0 }; \
} \
\
bool CMC_(PFX, _print)(struct SNAME * _heap_, FILE * fptr) \
{ \
for (size_t i = 0; i < _heap_->count; i++) \
{ \
if (!_heap_->f_val->str(fptr, _heap_->buffer[i])) \
return false; \
} \
\
return true; \
} \
\
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_start)(struct SNAME * target) \
{ \
struct CMC_DEF_ITER(SNAME) iter; \
\
iter.target = target; \
iter.cursor = 0; \
iter.start = true; \
iter.end = CMC_(PFX, _empty)(target); \
\
return iter; \
} \
\
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_end)(struct SNAME * target) \
{ \
struct CMC_DEF_ITER(SNAME) iter; \
\
iter.target = target; \
iter.cursor = 0; \
iter.start = CMC_(PFX, _empty)(target); \
iter.end = true; \
\
if (!CMC_(PFX, _empty)(target)) \
iter.cursor = target->count - 1; \
\
return iter; \
} \
\
bool CMC_(PFX, _iter_at_start)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return CMC_(PFX, _empty)(iter->target) || iter->start; \
} \
\
bool CMC_(PFX, _iter_at_end)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return CMC_(PFX, _empty)(iter->target) || iter->end; \
} \
\
bool CMC_(PFX, _iter_to_start)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (!CMC_(PFX, _empty)(iter->target)) \
{ \
iter->cursor = 0; \
iter->start = true; \
iter->end = CMC_(PFX, _empty)(iter->target); \
\
return true; \
} \
\
return false; \
} \
\
bool CMC_(PFX, _iter_to_end)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (!CMC_(PFX, _empty)(iter->target)) \
{ \
iter->cursor = iter->target->count - 1; \
iter->start = CMC_(PFX, _empty)(iter->target); \
iter->end = true; \
\
return true; \
} \
\
return false; \
} \
\
bool CMC_(PFX, _iter_next)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (iter->end) \
return false; \
\
if (iter->cursor + 1 == iter->target->count) \
{ \
iter->end = true; \
return false; \
} \
\
iter->start = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor++; \
\
return true; \
} \
\
bool CMC_(PFX, _iter_prev)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (iter->start) \
return false; \
\
if (iter->cursor == 0) \
{ \
iter->start = true; \
return false; \
} \
\
iter->end = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor--; \
\
return true; \
} \
\
/* Returns true only if the iterator moved */ \
bool CMC_(PFX, _iter_advance)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps) \
{ \
if (iter->end) \
return false; \
\
if (iter->cursor + 1 == iter->target->count) \
{ \
iter->end = true; \
return false; \
} \
\
if (steps == 0 || iter->cursor + steps >= iter->target->count) \
return false; \
\
if (iter->end) \
return false; \
\
iter->start = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor += steps; \
\
return true; \
} \
\
/* Returns true only if the iterator moved */ \
bool CMC_(PFX, _iter_rewind)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps) \
{ \
if (iter->start) \
return false; \
\
if (iter->cursor == 0) \
{ \
iter->start = true; \
return false; \
} \
\
if (steps == 0 || iter->cursor < steps) \
return false; \
\
iter->end = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor -= steps; \
\
return true; \
} \
\
/* Returns true only if the iterator was able to be positioned at the */ \
/* given index */ \
bool CMC_(PFX, _iter_go_to)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t index) \
{ \
if (index >= iter->target->count) \
return false; \
\
if (iter->cursor > index) \
return CMC_(PFX, _iter_rewind)(iter, iter->cursor - index); \
else if (iter->cursor < index) \
return CMC_(PFX, _iter_advance)(iter, index - iter->cursor); \
\
return true; \
} \
\
V CMC_(PFX, _iter_value)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (CMC_(PFX, _empty)(iter->target)) \
return (V){ 0 }; \
\
return iter->target->buffer[iter->cursor]; \
} \
\
size_t CMC_(PFX, _iter_index)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return iter->cursor; \
} \
\
static void CMC_(PFX, _impl_float_up)(struct SNAME * _heap_, size_t index) \ static void CMC_(PFX, _impl_float_up)(struct SNAME * _heap_, size_t index) \
{ \ { \
/* Current index */ \ /* Current index */ \
src/cor/heap.h
+31
View File
@@ -0,0 +1,31 @@
/**
* cor/heap.h
*
* Creation Date: 01/06/2020
*
* Authors:
* Leonardo Vencovsky (https://github.com/LeoVen)
*
*/
/**
* Things commonly used by heap collections.
*/
#ifndef CMC_COR_HEAP_H
#define CMC_COR_HEAP_H
/**
* enum cmc_heap_order
*
* Defines the two possible heaps:
* - Max Heap has the greatest element at the top
* - Min Heap has the smallest element at the top
*/
enum cmc_heap_order
{
CMC_MAX_HEAP = 1,
CMC_MIN_HEAP = -1
};
#endif /* CMC_COR_HEAP_H */
src/ext/cmc/deque.h
+12 -13
View File
@@ -18,19 +18,6 @@
*/ */
#define CMC_EXT_CMC_DEQUE_PARTS INIT, ITER, STR #define CMC_EXT_CMC_DEQUE_PARTS INIT, ITER, STR
/* Used by STR */
static const char *cmc_cmc_string_fmt_deque = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"front:%" PRIuMAX ", "
"back:%" PRIuMAX ", "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
/** /**
* INIT * INIT
* *
@@ -374,6 +361,18 @@ static const char *cmc_cmc_string_fmt_deque = "struct %s<%s> "
/** /**
* STR * STR
*/ */
static const char *cmc_cmc_string_fmt_deque = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"front:%" PRIuMAX ", "
"back:%" PRIuMAX ", "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
#define CMC_EXT_CMC_DEQUE_STR(BODY) \ #define CMC_EXT_CMC_DEQUE_STR(BODY) \
CMC_EXT_CMC_DEQUE_STR_HEADER(BODY) \ CMC_EXT_CMC_DEQUE_STR_HEADER(BODY) \
CMC_EXT_CMC_DEQUE_STR_SOURCE(BODY) CMC_EXT_CMC_DEQUE_STR_SOURCE(BODY)
src/ext/cmc/hashmap.h
+12 -13
View File
@@ -18,19 +18,6 @@
*/ */
#define CMC_EXT_CMC_HASHMAP_PARTS INIT, ITER, STR #define CMC_EXT_CMC_HASHMAP_PARTS INIT, ITER, STR
/* Used by STR */
static const char *cmc_cmc_string_fmt_hashmap = "struct %s<%s, %s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_key:%p, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
/** /**
* INIT * INIT
* *
@@ -450,6 +437,18 @@ static const char *cmc_cmc_string_fmt_hashmap = "struct %s<%s, %s> "
/** /**
* STR * STR
*/ */
static const char *cmc_cmc_string_fmt_hashmap = "struct %s<%s, %s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_key:%p, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
#define CMC_EXT_CMC_HASHMAP_STR(BODY) \ #define CMC_EXT_CMC_HASHMAP_STR(BODY) \
CMC_EXT_CMC_HASHMAP_STR_HEADER(BODY) \ CMC_EXT_CMC_HASHMAP_STR_HEADER(BODY) \
CMC_EXT_CMC_HASHMAP_STR_SOURCE(BODY) CMC_EXT_CMC_HASHMAP_STR_SOURCE(BODY)
src/ext/cmc/hashmultimap.h
+12 -13
View File
@@ -18,19 +18,6 @@
*/ */
#define CMC_EXT_CMC_HASHMULTIMAP_PARTS ITER, STR #define CMC_EXT_CMC_HASHMULTIMAP_PARTS ITER, STR
/* Used by STR */
static const char *cmc_cmc_string_fmt_hashmultimap = "struct %s<%s, %s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_key:%p, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
/** /**
* ITER * ITER
*/ */
@@ -392,6 +379,18 @@ static const char *cmc_cmc_string_fmt_hashmultimap = "struct %s<%s, %s> "
/** /**
* STR * STR
*/ */
static const char *cmc_cmc_string_fmt_hashmultimap = "struct %s<%s, %s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_key:%p, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
#define CMC_EXT_CMC_HASHMULTIMAP_STR(BODY) \ #define CMC_EXT_CMC_HASHMULTIMAP_STR(BODY) \
CMC_EXT_CMC_HASHMULTIMAP_STR_HEADER(BODY) \ CMC_EXT_CMC_HASHMULTIMAP_STR_HEADER(BODY) \
CMC_EXT_CMC_HASHMULTIMAP_STR_SOURCE(BODY) CMC_EXT_CMC_HASHMULTIMAP_STR_SOURCE(BODY)
src/ext/cmc/hashmultiset.h
+13 -14
View File
@@ -18,20 +18,6 @@
*/ */
#define CMC_EXT_CMC_HASHMULTISET_PARTS ITER, STR #define CMC_EXT_CMC_HASHMULTISET_PARTS ITER, STR
/* Used by STR */
static const char *cmc_cmc_string_fmt_hashmultiset =
"struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"cardinality:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
/** /**
* ITER * ITER
*/ */
@@ -359,6 +345,19 @@ static const char *cmc_cmc_string_fmt_hashmultiset =
/** /**
* STR * STR
*/ */
static const char *cmc_cmc_string_fmt_hashmultiset =
"struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"cardinality:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks:%p }";
#define CMC_EXT_CMC_HASHMULTISET_STR(BODY) \ #define CMC_EXT_CMC_HASHMULTISET_STR(BODY) \
CMC_EXT_CMC_HASHMULTISET_STR_HEADER(BODY) \ CMC_EXT_CMC_HASHMULTISET_STR_HEADER(BODY) \
CMC_EXT_CMC_HASHMULTISET_STR_SOURCE(BODY) CMC_EXT_CMC_HASHMULTISET_STR_SOURCE(BODY)
src/ext/cmc/hashset.h
+11 -12
View File
@@ -18,18 +18,6 @@
*/ */
#define CMC_EXT_CMC_HASHSET_PARTS ITER, STR #define CMC_EXT_CMC_HASHSET_PARTS ITER, STR
/* Used by STR */
static const char *cmc_cmc_string_fmt_hashset = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks: %p }";
/** /**
* ITER * ITER
*/ */
@@ -348,6 +336,17 @@ static const char *cmc_cmc_string_fmt_hashset = "struct %s<%s> "
/** /**
* STR * STR
*/ */
static const char *cmc_cmc_string_fmt_hashset = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"load:%lf, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks: %p }";
#define CMC_EXT_CMC_HASHSET_STR(BODY) \ #define CMC_EXT_CMC_HASHSET_STR(BODY) \
CMC_EXT_CMC_HASHSET_STR_HEADER(BODY) \ CMC_EXT_CMC_HASHSET_STR_HEADER(BODY) \
CMC_EXT_CMC_HASHSET_STR_SOURCE(BODY) CMC_EXT_CMC_HASHSET_STR_SOURCE(BODY)
src/ext/cmc/heap.h
+319
View File
@@ -0,0 +1,319 @@
/**
* ext/cmc/heap.h
*
* Creation Date: 01/06/2020
*
* Authors:
* Leonardo Vencovsky (https://github.com/LeoVen)
*
*/
#ifndef CMC_EXT_CMC_HEAP_H
#define CMC_EXT_CMC_HEAP_H
#include "../../cor/core.h"
/**
* All the EXT parts of CMC Heap.
*/
#define CMC_EXT_CMC_HEAP_PARTS ITER, STR
#define CMC_EXT_CMC_HEAP_ITER(BODY) \
CMC_EXT_CMC_HEAP_ITER_HEADER(BODY) \
CMC_EXT_CMC_HEAP_ITER_SOURCE(BODY)
#define CMC_EXT_CMC_HEAP_ITER_HEADER(BODY) \
CMC_EXT_CMC_HEAP_ITER_HEADER_(CMC_PARAM_PFX(BODY), CMC_PARAM_SNAME(BODY), \
CMC_PARAM_V(BODY))
#define CMC_EXT_CMC_HEAP_ITER_SOURCE(BODY) \
CMC_EXT_CMC_HEAP_ITER_SOURCE_(CMC_PARAM_PFX(BODY), CMC_PARAM_SNAME(BODY), \
CMC_PARAM_V(BODY))
#define CMC_EXT_CMC_HEAP_ITER_HEADER_(PFX, SNAME, V) \
\
/* Heap Iterator */ \
struct CMC_DEF_ITER(SNAME) \
{ \
/* Target heap */ \
struct SNAME *target; \
\
/* Cursor's position (index) */ \
size_t cursor; \
\
/* If the iterator has reached the start of the iteration */ \
bool start; \
\
/* If the iterator has reached the end of the iteration */ \
bool end; \
}; \
\
/* Iterator Initialization */ \
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_start)(struct SNAME * target); \
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_end)(struct SNAME * target); \
/* Iterator State */ \
bool CMC_(PFX, _iter_at_start)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_at_end)(struct CMC_DEF_ITER(SNAME) * iter); \
/* Iterator Movement */ \
bool CMC_(PFX, _iter_to_start)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_to_end)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_next)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_prev)(struct CMC_DEF_ITER(SNAME) * iter); \
bool CMC_(PFX, _iter_advance)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps); \
bool CMC_(PFX, _iter_rewind)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps); \
bool CMC_(PFX, _iter_go_to)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t index); \
/* Iterator Access */ \
V CMC_(PFX, _iter_value)(struct CMC_DEF_ITER(SNAME) * iter); \
size_t CMC_(PFX, _iter_index)(struct CMC_DEF_ITER(SNAME) * iter);
#define CMC_EXT_CMC_HEAP_ITER_SOURCE_(PFX, SNAME, V) \
\
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_start)(struct SNAME * target) \
{ \
struct CMC_DEF_ITER(SNAME) iter; \
\
iter.target = target; \
iter.cursor = 0; \
iter.start = true; \
iter.end = CMC_(PFX, _empty)(target); \
\
return iter; \
} \
\
struct CMC_DEF_ITER(SNAME) CMC_(PFX, _iter_end)(struct SNAME * target) \
{ \
struct CMC_DEF_ITER(SNAME) iter; \
\
iter.target = target; \
iter.cursor = 0; \
iter.start = CMC_(PFX, _empty)(target); \
iter.end = true; \
\
if (!CMC_(PFX, _empty)(target)) \
iter.cursor = target->count - 1; \
\
return iter; \
} \
\
bool CMC_(PFX, _iter_at_start)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return CMC_(PFX, _empty)(iter->target) || iter->start; \
} \
\
bool CMC_(PFX, _iter_at_end)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return CMC_(PFX, _empty)(iter->target) || iter->end; \
} \
\
bool CMC_(PFX, _iter_to_start)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (!CMC_(PFX, _empty)(iter->target)) \
{ \
iter->cursor = 0; \
iter->start = true; \
iter->end = CMC_(PFX, _empty)(iter->target); \
\
return true; \
} \
\
return false; \
} \
\
bool CMC_(PFX, _iter_to_end)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (!CMC_(PFX, _empty)(iter->target)) \
{ \
iter->cursor = iter->target->count - 1; \
iter->start = CMC_(PFX, _empty)(iter->target); \
iter->end = true; \
\
return true; \
} \
\
return false; \
} \
\
bool CMC_(PFX, _iter_next)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (iter->end) \
return false; \
\
if (iter->cursor + 1 == iter->target->count) \
{ \
iter->end = true; \
return false; \
} \
\
iter->start = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor++; \
\
return true; \
} \
\
bool CMC_(PFX, _iter_prev)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (iter->start) \
return false; \
\
if (iter->cursor == 0) \
{ \
iter->start = true; \
return false; \
} \
\
iter->end = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor--; \
\
return true; \
} \
\
/* Returns true only if the iterator moved */ \
bool CMC_(PFX, _iter_advance)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps) \
{ \
if (iter->end) \
return false; \
\
if (iter->cursor + 1 == iter->target->count) \
{ \
iter->end = true; \
return false; \
} \
\
if (steps == 0 || iter->cursor + steps >= iter->target->count) \
return false; \
\
if (iter->end) \
return false; \
\
iter->start = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor += steps; \
\
return true; \
} \
\
/* Returns true only if the iterator moved */ \
bool CMC_(PFX, _iter_rewind)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t steps) \
{ \
if (iter->start) \
return false; \
\
if (iter->cursor == 0) \
{ \
iter->start = true; \
return false; \
} \
\
if (steps == 0 || iter->cursor < steps) \
return false; \
\
iter->end = CMC_(PFX, _empty)(iter->target); \
\
iter->cursor -= steps; \
\
return true; \
} \
\
/* Returns true only if the iterator was able to be positioned at the */ \
/* given index */ \
bool CMC_(PFX, _iter_go_to)(struct CMC_DEF_ITER(SNAME) * iter, \
size_t index) \
{ \
if (index >= iter->target->count) \
return false; \
\
if (iter->cursor > index) \
return CMC_(PFX, _iter_rewind)(iter, iter->cursor - index); \
else if (iter->cursor < index) \
return CMC_(PFX, _iter_advance)(iter, index - iter->cursor); \
\
return true; \
} \
\
V CMC_(PFX, _iter_value)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
if (CMC_(PFX, _empty)(iter->target)) \
return (V){ 0 }; \
\
return iter->target->buffer[iter->cursor]; \
} \
\
size_t CMC_(PFX, _iter_index)(struct CMC_DEF_ITER(SNAME) * iter) \
{ \
return iter->cursor; \
}
/**
* STR
*/
static const char *cmc_cmc_string_fmt_heap = "struct %s<%s> "
"at %p { "
"buffer:%p, "
"capacity:%" PRIuMAX ", "
"count:%" PRIuMAX ", "
"type:%s, "
"flag:%d, "
"f_val:%p, "
"alloc:%p, "
"callbacks: %p}";
#define CMC_EXT_CMC_HEAP_STR(BODY) \
CMC_EXT_CMC_HEAP_STR_HEADER(BODY) \
CMC_EXT_CMC_HEAP_STR_SOURCE(BODY)
#define CMC_EXT_CMC_HEAP_STR_HEADER(BODY) \
CMC_EXT_CMC_HEAP_STR_HEADER_(CMC_PARAM_PFX(BODY), CMC_PARAM_SNAME(BODY), \
CMC_PARAM_V(BODY))
#define CMC_EXT_CMC_HEAP_STR_SOURCE(BODY) \
CMC_EXT_CMC_HEAP_STR_SOURCE_(CMC_PARAM_PFX(BODY), CMC_PARAM_SNAME(BODY), \
CMC_PARAM_V(BODY))
#define CMC_EXT_CMC_HEAP_STR_HEADER_(PFX, SNAME, V) \
\
bool CMC_(PFX, _to_string)(struct SNAME * _heap_, FILE * fptr); \
bool CMC_(PFX, _print)(struct SNAME * _heap_, FILE * fptr, \
const char *start, const char *separator, \
const char *end);
#define CMC_EXT_CMC_HEAP_STR_SOURCE_(PFX, SNAME, V) \
\
bool CMC_(PFX, _to_string)(struct SNAME * _heap_, FILE * fptr) \
{ \
struct SNAME *h_ = _heap_; \
const char *t = h_->HO == 1 ? "MaxHeap" : "MinHeap"; \
\
return 0 <= fprintf(fptr, cmc_cmc_string_fmt_heap, \
CMC_TO_STRING(SNAME), CMC_TO_STRING(V), h_, \
h_->buffer, h_->capacity, h_->count, t, h_->flag, \
h_->f_val, h_->alloc, h_->callbacks); \
} \
\
bool CMC_(PFX, _print)(struct SNAME * _heap_, FILE * fptr, \
const char *start, const char *separator, \
const char *end) \
{ \
fprintf(fptr, "%s", start); \
\
for (size_t i = 0; i < _heap_->count; i++) \
{ \
if (!_heap_->f_val->str(fptr, _heap_->buffer[i])) \
return false; \
\
if (i + 1 < _heap_->count) \
fprintf(fptr, "%s", separator); \
} \
\
fprintf(fptr, "%s", end); \
\
return true; \
}
#endif /* CMC_EXT_CMC_HEAP_H */
src/macro_collections.h
+2
View File
@@ -51,12 +51,14 @@
#include "cor/flags.h" /* Added in 14/05/2020 */ #include "cor/flags.h" /* Added in 14/05/2020 */
#include "cor/ftable.h" /* Added in 27/05/2020 */ #include "cor/ftable.h" /* Added in 27/05/2020 */
#include "cor/hashtable.h" /* Added in 17/03/2020 */ #include "cor/hashtable.h" /* Added in 17/03/2020 */
#include "cor/heap.h" /* Added in 01/06/2020 */
#include "ext/cmc/deque.h" /* Added in 25/05/2020 */ #include "ext/cmc/deque.h" /* Added in 25/05/2020 */
#include "ext/cmc/hashmap.h" /* Added in 25/05/2020 */ #include "ext/cmc/hashmap.h" /* Added in 25/05/2020 */
#include "ext/cmc/hashmultimap.h" /* Added in 29/05/2020 */ #include "ext/cmc/hashmultimap.h" /* Added in 29/05/2020 */
#include "ext/cmc/hashmultiset.h" /* Added in 30/05/2020 */ #include "ext/cmc/hashmultiset.h" /* Added in 30/05/2020 */
#include "ext/cmc/hashset.h" /* Added in 31/05/2020 */ #include "ext/cmc/hashset.h" /* Added in 31/05/2020 */
#include "ext/cmc/heap.h" /* Added in 01/06/2020 */
#include "utl/assert.h" /* Added in 27/06/2019 */ #include "utl/assert.h" /* Added in 27/06/2019 */
#include "utl/foreach.h" /* Added in 25/02/2019 */ #include "utl/foreach.h" /* Added in 25/02/2019 */
tests/main/src/heap.c
+2 -23
View File
@@ -74,7 +74,7 @@ struct heap *h_new(size_t capacity, enum cmc_heap_order HO,
struct cmc_alloc_node *alloc = &cmc_alloc_node_default; struct cmc_alloc_node *alloc = &cmc_alloc_node_default;
if (capacity < 1) if (capacity < 1)
return ((void *)0); return ((void *)0);
if (HO != cmc_min_heap && HO != cmc_max_heap) if (HO != CMC_MIN_HEAP && HO != CMC_MAX_HEAP)
return ((void *)0); return ((void *)0);
if (!f_val) if (!f_val)
return ((void *)0); return ((void *)0);
@@ -102,7 +102,7 @@ struct heap *h_new_custom(size_t capacity, enum cmc_heap_order HO,
{ {
if (capacity < 1) if (capacity < 1)
return ((void *)0); return ((void *)0);
if (HO != cmc_min_heap && HO != cmc_max_heap) if (HO != CMC_MIN_HEAP && HO != CMC_MAX_HEAP)
return ((void *)0); return ((void *)0);
if (!f_val) if (!f_val)
return ((void *)0); return ((void *)0);
@@ -300,27 +300,6 @@ _Bool h_equals(struct heap *_heap1_, struct heap *_heap2_)
} }
return 1; return 1;
} }
struct cmc_string h_to_string(struct heap *_heap_)
{
struct cmc_string str;
struct heap *h_ = _heap_;
const char *t = h_->HO == 1 ? "MaxHeap" : "MinHeap";
int n = snprintf(str.s, cmc_string_len, cmc_cmc_string_fmt_heap,
"CMC_PARAM_SNAME((h, heap, , , size_t))",
"CMC_PARAM_V((h, heap, , , size_t))", h_, h_->buffer,
h_->capacity, h_->count, t, h_->flag, h_->f_val, h_->alloc,
h_->callbacks);
return n >= 0 ? str : (struct cmc_string){ 0 };
}
_Bool h_print(struct heap *_heap_, FILE *fptr)
{
for (size_t i = 0; i < _heap_->count; i++)
{
if (!_heap_->f_val->str(fptr, _heap_->buffer[i]))
return 0;
}
return 1;
}
struct heap_iter h_iter_start(struct heap *target) struct heap_iter h_iter_start(struct heap *target)
{ {
struct heap_iter iter; struct heap_iter iter;
tests/main/unt/foreach.c
+1 -1
View File
@@ -231,7 +231,7 @@ CMC_CREATE_UNIT(ForEach, true, {
}); });
CMC_CREATE_TEST(CMC<Heap>, { CMC_CREATE_TEST(CMC<Heap>, {
struct heap *h = h_new(10000, cmc_max_heap, struct heap *h = h_new(10000, CMC_MAX_HEAP,
&(struct heap_fval){ .cmp = cmc_size_cmp, &(struct heap_fval){ .cmp = cmc_size_cmp,
.cpy = NULL, .cpy = NULL,
.str = cmc_size_str, .str = cmc_size_str,
tests/main/unt/heap.c
+27 -27
View File
@@ -13,7 +13,7 @@ struct heap_fval *h_fval = &(struct heap_fval){ .cmp = cmc_size_cmp,
CMC_CREATE_UNIT(Heap, true, { CMC_CREATE_UNIT(Heap, true, {
CMC_CREATE_TEST(new, { CMC_CREATE_TEST(new, {
struct heap *h = h_new(1000000, cmc_max_heap, h_fval); struct heap *h = h_new(1000000, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
cmc_assert_not_equals(ptr, NULL, h->buffer); cmc_assert_not_equals(ptr, NULL, h->buffer);
@@ -24,19 +24,19 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(new[edge_case capacity = 0], { CMC_CREATE_TEST(new[edge_case capacity = 0], {
struct heap *h = h_new(0, cmc_max_heap, h_fval); struct heap *h = h_new(0, CMC_MAX_HEAP, h_fval);
cmc_assert_equals(ptr, NULL, h); cmc_assert_equals(ptr, NULL, h);
}); });
CMC_CREATE_TEST(new[edge_case capacity = UINT64_MAX], { CMC_CREATE_TEST(new[edge_case capacity = UINT64_MAX], {
struct heap *h = h_new(UINT64_MAX, cmc_max_heap, h_fval); struct heap *h = h_new(UINT64_MAX, CMC_MAX_HEAP, h_fval);
cmc_assert_equals(ptr, NULL, h); cmc_assert_equals(ptr, NULL, h);
}); });
CMC_CREATE_TEST(clear[count capacity], { CMC_CREATE_TEST(clear[count capacity], {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -54,7 +54,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(buffer_growth[edge_case capacity = 1], { CMC_CREATE_TEST(buffer_growth[edge_case capacity = 1], {
struct heap *h = h_new(1, cmc_max_heap, h_fval); struct heap *h = h_new(1, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -67,7 +67,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(insert, { CMC_CREATE_TEST(insert, {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -77,7 +77,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(insert[item preservation], { CMC_CREATE_TEST(insert[item preservation], {
struct heap *h = h_new(50, cmc_max_heap, h_fval); struct heap *h = h_new(50, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -94,7 +94,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(remove, { CMC_CREATE_TEST(remove, {
struct heap *h = h_new(50, cmc_max_heap, h_fval); struct heap *h = h_new(50, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -109,7 +109,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(remove[count = 0], { CMC_CREATE_TEST(remove[count = 0], {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -119,7 +119,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(remove[sorted], { CMC_CREATE_TEST(remove[sorted], {
struct heap *h = h_new(100, cmc_min_heap, h_fval); struct heap *h = h_new(100, CMC_MIN_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -141,7 +141,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(peek, { CMC_CREATE_TEST(peek, {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -154,7 +154,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(peek[count = 0], { CMC_CREATE_TEST(peek[count = 0], {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -164,7 +164,7 @@ CMC_CREATE_UNIT(Heap, true, {
}); });
CMC_CREATE_TEST(flags, { CMC_CREATE_TEST(flags, {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
cmc_assert_equals(int32_t, CMC_FLAG_OK, h_flag(h)); cmc_assert_equals(int32_t, CMC_FLAG_OK, h_flag(h));
@@ -223,7 +223,7 @@ CMC_CREATE_UNIT(Heap, true, {
CMC_CREATE_TEST(callbacks, { CMC_CREATE_TEST(callbacks, {
struct heap *h = struct heap *h =
h_new_custom(100, cmc_max_heap, h_fval, NULL, callbacks); h_new_custom(100, CMC_MAX_HEAP, h_fval, NULL, callbacks);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -293,7 +293,7 @@ CMC_CREATE_UNIT(Heap, true, {
CMC_CREATE_UNIT(HeapIter, true, { CMC_CREATE_UNIT(HeapIter, true, {
CMC_CREATE_TEST(PFX##_iter_start(), { CMC_CREATE_TEST(PFX##_iter_start(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -319,7 +319,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_end(), { CMC_CREATE_TEST(PFX##_iter_end(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -346,7 +346,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_at_start(), { CMC_CREATE_TEST(PFX##_iter_at_start(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -368,7 +368,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_at_end(), { CMC_CREATE_TEST(PFX##_iter_at_end(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -390,7 +390,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_to_start(), { CMC_CREATE_TEST(PFX##_iter_to_start(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -422,7 +422,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_to_end(), { CMC_CREATE_TEST(PFX##_iter_to_end(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -450,7 +450,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_next(), { CMC_CREATE_TEST(PFX##_iter_next(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -488,7 +488,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_prev(), { CMC_CREATE_TEST(PFX##_iter_prev(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -526,7 +526,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_advance(), { CMC_CREATE_TEST(PFX##_iter_advance(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -577,7 +577,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_rewind(), { CMC_CREATE_TEST(PFX##_iter_rewind(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -628,7 +628,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_go_to(), { CMC_CREATE_TEST(PFX##_iter_go_to(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -669,7 +669,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_value(), { CMC_CREATE_TEST(PFX##_iter_value(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
@@ -689,7 +689,7 @@ CMC_CREATE_UNIT(HeapIter, true, {
}); });
CMC_CREATE_TEST(PFX##_iter_index(), { CMC_CREATE_TEST(PFX##_iter_index(), {
struct heap *h = h_new(100, cmc_max_heap, h_fval); struct heap *h = h_new(100, CMC_MAX_HEAP, h_fval);
cmc_assert_not_equals(ptr, NULL, h); cmc_assert_not_equals(ptr, NULL, h);
tests/to_string.c
+7
View File
@@ -8,6 +8,7 @@ C_MACRO_COLLECTIONS_ALL(CMC, HASHMAP, ( hm, hashmap, , int, int))
C_MACRO_COLLECTIONS_ALL(CMC, HASHMULTIMAP, (hmm, hashmultimap, , int, int)) C_MACRO_COLLECTIONS_ALL(CMC, HASHMULTIMAP, (hmm, hashmultimap, , int, int))
C_MACRO_COLLECTIONS_ALL(CMC, HASHMULTISET, (hms, hashmultiset, , , int)) C_MACRO_COLLECTIONS_ALL(CMC, HASHMULTISET, (hms, hashmultiset, , , int))
C_MACRO_COLLECTIONS_ALL(CMC, HASHSET, ( hs, hashset, , , int)) C_MACRO_COLLECTIONS_ALL(CMC, HASHSET, ( hs, hashset, , , int))
C_MACRO_COLLECTIONS_ALL(CMC, HEAP, ( h, heap, , , int))
struct struct
{ {
@@ -31,6 +32,7 @@ int main(void)
(struct hashmultiset_fval *)&int_ftab); (struct hashmultiset_fval *)&int_ftab);
struct hashset *hs = hs_new(100, 0.6, struct hashset *hs = hs_new(100, 0.6,
(struct hashset_fval *)&int_ftab); (struct hashset_fval *)&int_ftab);
struct heap *h = h_new(100, CMC_MAX_HEAP, (struct heap_fval *)&int_ftab);
d_to_string(d, stdout); d_to_string(d, stdout);
d_print(d, stdout, "\n[ ", ", ", " ]\n"); d_print(d, stdout, "\n[ ", ", ", " ]\n");
@@ -42,6 +44,8 @@ int main(void)
hms_print(hms, stdout, "\n[ {", "}, {", "} ]\n", " : "); hms_print(hms, stdout, "\n[ {", "}, {", "} ]\n", " : ");
hs_to_string(hs, stdout); hs_to_string(hs, stdout);
hs_print(hs, stdout, "\n[ ", ", ", " ]\n"); hs_print(hs, stdout, "\n[ ", ", ", " ]\n");
h_to_string(h, stdout);
h_print(h, stdout, "\n[ ", ", ", " ]\n");
for (int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
{ {
@@ -50,6 +54,7 @@ int main(void)
hmm_insert(hmm, i, i); hmm_insert(hmm, i, i);
hms_insert(hms, i); hms_insert(hms, i);
hs_insert(hs, i); hs_insert(hs, i);
h_insert(h, i);
} }
fprintf(stdout, "\n"); fprintf(stdout, "\n");
@@ -64,6 +69,8 @@ int main(void)
hms_print(hms, stdout, "\n[ {", "}, {", "} ]\n", " : "); hms_print(hms, stdout, "\n[ {", "}, {", "} ]\n", " : ");
hs_to_string(hs, stdout); hs_to_string(hs, stdout);
hs_print(hs, stdout, "\n[ ", ", ", " ]\n"); hs_print(hs, stdout, "\n[ ", ", ", " ]\n");
h_to_string(h, stdout);
h_print(h, stdout, "\n[ ", ", ", " ]\n");
d_free(d); d_free(d);
hm_free(hm); hm_free(hm);