X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/43af7aead466095c362d1cd34d2ddd51ae4f3ce0..0a03cd809dd45e3645a54feffe364d8f2b33d71e:/src/xbt/heap_private.h diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h index 6726edbd32..a426393df3 100644 --- a/src/xbt/heap_private.h +++ b/src/xbt/heap_private.h @@ -1,24 +1,27 @@ -/* Authors: Arnaud Legrand */ +/* $Id$ */ + +/* Copyright (c) 2004 Arnaud Legrand. All rights reserved. */ /* 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #ifndef _XBT_HEAP_PRIVATE_H #define _XBT_HEAP_PRIVATE_H -#include -#include "xbt_heap.h" +#include "xbt/dynar.h" /* void_f_pvoid_t */ +#include "xbt/heap.h" typedef struct xbt_heapItem { void *content; - xbt_heap_float_t key; + double key; } s_xbt_heapItem_t, *xbt_heapItem_t; typedef struct xbt_heap { int size; int count; xbt_heapItem_t items; - void_f_pvoid_t *free; + void_f_pvoid_t free; + void (*update_callback) (void *, int); } s_xbt_heap_t; #define PARENT(i) i/2 @@ -28,7 +31,9 @@ typedef struct xbt_heap { #define KEY(H,i) ((H->items)[i]).key #define CONTENT(H,i) ((H->items)[i]).content -void xbt_heap_maxHeapify(xbt_heap_t H); -void xbt_heap_increaseKey(xbt_heap_t H, int i); +#define MIN_KEY_VALUE -10000 + +static void xbt_heap_maxHeapify(xbt_heap_t H); +static void xbt_heap_increaseKey(xbt_heap_t H, int i); -#endif /* _XBT_HEAP_PRIVATE_H */ +#endif /* _XBT_HEAP_PRIVATE_H */