A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the possibility to remove an item in the middle of the list.
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
917cd6c
..
355a401
100644
(file)
--- a/
src/xbt/heap.c
+++ b/
src/xbt/heap.c
@@
-5,7
+5,8
@@
/* This program is free software; you can redistribute it and/or modify it
under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
under the terms of the license (GNU LGPL) which comes with this package. */
-#include "xbt_heap_private.h"
+#include "xbt/sysdep.h"
+#include "heap_private.h"
/**
* xbt_heap_new:
/**
* xbt_heap_new:
@@
-16,11
+17,12
@@
*/
xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
{
*/
xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
{
- xbt_heap_t H =
calloc(1, sizeof(struct xbt_heap)
);
- H->size
= init_size;
+ xbt_heap_t H =
xbt_new0(struct xbt_heap, 1
);
+ H->size = init_size;
H->count = 0;
H->count = 0;
- H->items = (xbt_heapItem_t) calloc(init_size, sizeof(struct xbt_heapItem));
- H->free = free;
+ H->items =
+ (xbt_heapItem_t) xbt_new0(struct xbt_heapItem, init_size);
+ H->free = free_func;
return H;
}
return H;
}
@@
-32,12
+34,12
@@
xbt_heap_t xbt_heap_new(int init_size, void_f_pvoid_t * const free_func)
*/
void xbt_heap_free(xbt_heap_t H)
{
*/
void xbt_heap_free(xbt_heap_t H)
{
- int i
;
- if(H->free)
- for
(i=0;i < H->size;i++)
+ int i;
+ if
(H->free)
+ for
(i = 0; i < H->size; i++)
H->free(H->items[i].content);
H->free(H->items[i].content);
- free(H->items);
- free(H);
+
xbt_
free(H->items);
+
xbt_
free(H);
return;
}
return;
}
@@
-120,10
+122,10
@@
void *xbt_heap_maxcontent(xbt_heap_t H)
*
* Restores the heap property once an element has been deleted.
*/
*
* Restores the heap property once an element has been deleted.
*/
-void xbt_heap_maxHeapify(xbt_heap_t H)
+
static
void xbt_heap_maxHeapify(xbt_heap_t H)
{
{
- int i
=
0;
- while(1) {
+ int i
=
0;
+ while
(1) {
int greatest = i;
int l = LEFT(i);
int r = RIGHT(i);
int greatest = i;
int l = LEFT(i);
int r = RIGHT(i);
@@
-136,8
+138,9
@@
void xbt_heap_maxHeapify(xbt_heap_t H)
struct xbt_heapItem tmp = H->items[i];
H->items[i] = H->items[greatest];
H->items[greatest] = tmp;
struct xbt_heapItem tmp = H->items[i];
H->items[i] = H->items[greatest];
H->items[greatest] = tmp;
- i=greatest;
- } else return;
+ i = greatest;
+ } else
+ return;
}
}
}
}
@@
-149,7
+152,7
@@
void xbt_heap_maxHeapify(xbt_heap_t H)
* Moves up an item at position i to its correct position. Works only
* when called from xbt_heap_push. Do not use otherwise.
*/
* Moves up an item at position i to its correct position. Works only
* when called from xbt_heap_push. Do not use otherwise.
*/
-void xbt_heap_increaseKey(xbt_heap_t H, int i)
+
static
void xbt_heap_increaseKey(xbt_heap_t H, int i)
{
while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
struct xbt_heapItem tmp = H->items[i];
{
while (i > 0 && KEY(H, PARENT(i)) > KEY(H, i)) {
struct xbt_heapItem tmp = H->items[i];