X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/188feea2cf5d0362ee0863cd59f5738b07da2aae..38259232fa161bc8e422b08cc363a3b046b1626c:/src/xbt/heap_private.h

diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h
index 59e7dbdd89..cd2b6a81a2 100644
--- a/src/xbt/heap_private.h
+++ b/src/xbt/heap_private.h
@@ -1,34 +1,35 @@
-/* Authors: Arnaud Legrand                                                  */
+/* Copyright (c) 2004, 2005, 2007, 2009, 2010. The SimGrid Team.
+ * 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 <stdlib.h>
+#include "xbt/dynar.h"          /* void_f_pvoid_t */
 #include "xbt/heap.h"
 
-typedef struct xbt_heapItem {
+typedef struct xbt_heap_item {
   void *content;
-  xbt_heap_float_t key;
-} s_xbt_heapItem_t, *xbt_heapItem_t;
+  double key;
+} s_xbt_heap_item_t, *xbt_heap_item_t;
 
 typedef struct xbt_heap {
   int size;
   int count;
-  xbt_heapItem_t items;
-  void_f_pvoid_t *free;
+  s_xbt_heap_item_t* items; /* array of structs */
+  void_f_pvoid_t free;
+  void (*update_callback) (void *, int);
 } s_xbt_heap_t;
 
-#define PARENT(i)  i/2
-#define LEFT(i)    2*i
-#define RIGHT(i)   2*i+1
+#define PARENT(i)  (i >> 1)
+#define LEFT(i)    (i << 1)
+#define RIGHT(i)   ((i << 1) + 1)
 
 #define KEY(H,i)     ((H->items)[i]).key
 #define CONTENT(H,i) ((H->items)[i]).content
 
-static void xbt_heap_maxHeapify(xbt_heap_t H);
-static void xbt_heap_increaseKey(xbt_heap_t H, int i);
+#define MIN_KEY_VALUE -10000
 
-#endif				/* _XBT_HEAP_PRIVATE_H */
+#endif                          /* _XBT_HEAP_PRIVATE_H */