X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2FPriorityQueue.c;h=ef7079bca2851ede48d5bcdc9319dd95ba282904;hb=eed1b5d2fca21abae2540b500f4a4ed94a809403;hp=f0b71e49a41c3a8daf86805eeb4f6c58112c79f9;hpb=1ff641f9960fa6c6081817a5641afb22fad91dcd;p=cgds.git diff --git a/src/PriorityQueue.c b/src/PriorityQueue.c index f0b71e4..ef7079b 100644 --- a/src/PriorityQueue.c +++ b/src/PriorityQueue.c @@ -4,55 +4,55 @@ #include "cgds/PriorityQueue.h" -// NOTE: no _init() method here, +// NOTE: no init() method here, // since PriorityQueue has no specific initialization PriorityQueue* _priorityqueue_new(size_t dataSize, OrderType pType, UInt arity) { - PriorityQueue* priorityQueue = + PriorityQueue* priorityQueue = (PriorityQueue*) safe_malloc(sizeof (PriorityQueue)); - Heap* heap = _heap_new(dataSize, pType, arity); - priorityQueue->heap = heap; - return priorityQueue; + Heap* heap = _heap_new(dataSize, pType, arity); + priorityQueue->heap = heap; + return priorityQueue; } PriorityQueue* priorityqueue_copy(PriorityQueue* priorityQueue) { - PriorityQueue* priorityQueueCopy = _priorityqueue_new( - priorityQueue->heap->array->dataSize, - priorityQueue->heap->hType, priorityQueue->heap->arity); - heap_destroy(priorityQueueCopy->heap); //TODO: bad style... - priorityQueueCopy->heap = heap_copy(priorityQueue->heap); - return priorityQueueCopy; + PriorityQueue* priorityQueueCopy = _priorityqueue_new( + priorityQueue->heap->array->dataSize, + priorityQueue->heap->hType, priorityQueue->heap->arity); + heap_destroy(priorityQueueCopy->heap); //TODO: bad style... + priorityQueueCopy->heap = heap_copy(priorityQueue->heap); + return priorityQueueCopy; } bool priorityqueue_empty(PriorityQueue* priorityQueue) { - return heap_empty(priorityQueue->heap); + return heap_empty(priorityQueue->heap); } UInt priorityqueue_size(PriorityQueue* priorityQueue) { - return heap_size(priorityQueue->heap); + return heap_size(priorityQueue->heap); } ItemValue* priorityqueue_peek_raw(PriorityQueue* priorityQueue) { - return heap_top_raw(priorityQueue->heap); + return heap_top_raw(priorityQueue->heap); } void priorityqueue_pop(PriorityQueue* priorityQueue) { - heap_pop(priorityQueue->heap); + heap_pop(priorityQueue->heap); } void priorityqueue_clear(PriorityQueue* priorityQueue) { - heap_clear(priorityQueue->heap); + heap_clear(priorityQueue->heap); } void priorityqueue_destroy(PriorityQueue* priorityQueue) { - heap_destroy(priorityQueue->heap); - safe_free(priorityQueue); + heap_destroy(priorityQueue->heap); + safe_free(priorityQueue); }