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
model-checker : add state equality reduction in ddfs algorithm
[simgrid.git]
/
src
/
xbt
/
heap.c
diff --git
a/src/xbt/heap.c
b/src/xbt/heap.c
index
5468fc3
..
c795b76
100644
(file)
--- a/
src/xbt/heap.c
+++ b/
src/xbt/heap.c
@@
-11,6
+11,7
@@
#include "heap_private.h"
#include <stdio.h>
#include "heap_private.h"
#include <stdio.h>
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_heap, xbt, "Heap");
static void xbt_heap_max_heapify(xbt_heap_t H);
static void xbt_heap_increase_key(xbt_heap_t H, int i);
static void xbt_heap_max_heapify(xbt_heap_t H);
static void xbt_heap_increase_key(xbt_heap_t H, int i);
@@
-61,7
+62,7
@@
void xbt_heap_free(xbt_heap_t H)
int i;
if (H->free)
for (i = 0; i < H->count; i++)
int i;
if (H->free)
for (i = 0; i < H->count; i++)
-
(*(H->free))
(H->items[i].content);
+
H->free
(H->items[i].content);
free(H->items);
free(H);
return;
free(H->items);
free(H);
return;
@@
-95,7
+96,7
@@
void xbt_heap_push(xbt_heap_t H, void *content, double key)
if (count > size) {
H->size = (size << 1) + 1;
H->items =
if (count > size) {
H->size = (size << 1) + 1;
H->items =
- (void *) realloc(H->items,
+ (void *)
xbt_
realloc(H->items,
(H->size) * sizeof(struct xbt_heap_item));
}
(H->size) * sizeof(struct xbt_heap_item));
}
@@
-103,6
+104,7
@@
void xbt_heap_push(xbt_heap_t H, void *content, double key)
item->key = key;
item->content = content;
xbt_heap_increase_key(H, count - 1);
item->key = key;
item->content = content;
xbt_heap_increase_key(H, count - 1);
+ XBT_DEBUG("Heap has now %d elements and max elem is %g",xbt_heap_size(H),xbt_heap_maxkey(H));
return;
}
return;
}
@@
-121,6
+123,8
@@
void *xbt_heap_pop(xbt_heap_t H)
int size = H->size;
void *max;
int size = H->size;
void *max;
+ XBT_DEBUG("Heap has %d elements before extraction and max elem was %g",xbt_heap_size(H),xbt_heap_maxkey(H));
+
if (H->count == 0)
return NULL;
if (H->count == 0)
return NULL;
@@
-132,7
+136,7
@@
void *xbt_heap_pop(xbt_heap_t H)
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
- (void *) realloc(items,
+ (void *)
xbt_
realloc(items,
size * sizeof(struct xbt_heap_item));
H->size = size;
}
size * sizeof(struct xbt_heap_item));
H->size = size;
}
@@
-145,13
+149,15
@@
void *xbt_heap_pop(xbt_heap_t H)
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
/**
* @brief Extracts from the heap and returns the element at position i.
* \param H the heap we're working on
- * \param i
element position
+ * \param i element position
* \return the element at position i if ok, NULL otherwise
*
* \return the element at position i if ok, NULL otherwise
*
- * Extracts from the heap and returns the element at position i. The hea
d
is automatically reorded.
+ * Extracts from the heap and returns the element at position i. The hea
p
is automatically reorded.
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
*/
void *xbt_heap_remove(xbt_heap_t H, int i)
{
+ XBT_DEBUG("Heap has %d elements: extracting element %d",xbt_heap_size(H),i);
+
if ((i < 0) || (i > H->count - 1))
return NULL;
/* put element i at head */
if ((i < 0) || (i > H->count - 1))
return NULL;
/* put element i at head */
@@
-171,7
+177,7
@@
void *xbt_heap_remove(xbt_heap_t H, int i)
*/
XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
{
*/
XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
{
- xbt_assert
0
(H->count != 0, "Empty heap");
+ xbt_assert(H->count != 0, "Empty heap");
return KEY(H, 0);
}
return KEY(H, 0);
}
@@
-184,7
+190,7
@@
XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
*/
void *xbt_heap_maxcontent(xbt_heap_t H)
{
- xbt_assert
0
(H->count != 0, "Empty heap");
+ xbt_assert(H->count != 0, "Empty heap");
return CONTENT(H, 0);
}
return CONTENT(H, 0);
}