X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..f757db3e61c8c5cbcab605a1beba36b5e21dc6f9:/src/xbt/heap_private.h

diff --git a/src/xbt/heap_private.h b/src/xbt/heap_private.h
index f6b4d98617..6ff1e78220 100644
--- a/src/xbt/heap_private.h
+++ b/src/xbt/heap_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2005, 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2005, 2007, 2009-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,30 +9,28 @@
 
 #include "xbt/dynar.h"          /* void_f_pvoid_t */
 #include "xbt/heap.h"
+#include <float.h>
 
-typedef struct xbt_heapItem {
+typedef struct xbt_heap_item {
   void *content;
   double key;
-} s_xbt_heapItem_t, *xbt_heapItem_t;
+} s_xbt_heap_item_t, *xbt_heap_item_t;
 
 typedef struct xbt_heap {
   int size;
   int count;
-  xbt_heapItem_t items;
+  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
 
-#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);
+#define MIN_KEY_VALUE -DBL_MAX
 
 #endif                          /* _XBT_HEAP_PRIVATE_H */