-/* Authors: Arnaud Legrand */
+/* Copyright (c) 2004-2017. 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. */
-#include <stdlib.h>
-#include "xbt_heap.h"
+#ifndef XBT_HEAP_PRIVATE_H
+#define XBT_HEAP_PRIVATE_H
-typedef struct xbt_heapItem {
+#include <float.h>
+#include <xbt/dynar.h>
+#include <xbt/heap.h>
+
+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
-void xbt_heap_maxHeapify(xbt_heap_t H);
-void xbt_heap_increaseKey(xbt_heap_t H, int i);
+#define MIN_KEY_VALUE -DBL_MAX
+
+#endif