/* a generic and efficient heap */
-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2005, 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#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_max_heapify(xbt_heap_t H, int i);
static void xbt_heap_increase_key(xbt_heap_t H, int i);
/** @addtogroup XBT_heap
*
* Creates a new heap.
*/
-XBT_INLINE xbt_heap_t xbt_heap_new(int init_size,
+inline xbt_heap_t xbt_heap_new(int init_size,
void_f_pvoid_t const free_func)
{
xbt_heap_t H = xbt_new0(struct xbt_heap, 1);
* @param H the heap we're working on
* \param update_callback function to call on each element to update its index when needed.
*/
-XBT_INLINE void xbt_heap_set_update_callback(xbt_heap_t H,
+inline void xbt_heap_set_update_callback(xbt_heap_t H,
void (*update_callback) (void
*,
int))
* @param H the heap we're working on
* @return the number of elements in the heap
*/
-XBT_INLINE int xbt_heap_size(xbt_heap_t H)
+inline int xbt_heap_size(xbt_heap_t H)
{
return (H->count);
}
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;
+ XBT_DEBUG("Heap has %d elements before extraction and max elem was %g",xbt_heap_size(H),xbt_heap_maxkey(H));
+
max = CONTENT(H, 0);
items[0] = items[(H->count) - 1];
(H->count)--;
- xbt_heap_max_heapify(H);
+ xbt_heap_max_heapify(H,0);
if (H->count < size >> 2 && size > 16) {
size = (size >> 1) + 1;
H->items =
return xbt_heap_pop(H);
}
+/** @brief Remove an arbitrary element from the heap
+ * @param H the heap we're working on
+ * @param content the object you want to add to the heap
+ * @param key the key associated to this object
+ */
+void xbt_heap_rm_elm(xbt_heap_t H, void *content, double key) {
+ int i=0;
+ while (i < H->count && (KEY(H, i) != key || CONTENT(H, i) != content))
+ i++;
+ if (i == H->count)
+ return;
+ xbt_heap_remove(H,i);
+}
+
+/**
+ * @brief Updates an element of the heap with a new value.
+ * \param H the heap we're working on
+ * \param i element position
+ * \param key new value for the element
+ *
+ * Updates an element of the heap with a new value.
+ */
+void xbt_heap_update(xbt_heap_t H, int i, double key)
+{
+ XBT_DEBUG("Heap has %d elements: updating element %d : was %1.12f to %1.12f ",xbt_heap_size(H),i,KEY(H, i), key);
+
+ if ((i < 0) || (i > H->count - 1) || key == KEY(H, i))
+ return ;
+
+ if(key< KEY(H, i)){
+ KEY(H, i)=key;
+ xbt_heap_increase_key(H, i);
+ }else{
+ KEY(H, i)=key;
+ xbt_heap_max_heapify(H,i);
+ }
+}
/**
* @brief returns the smallest key in the heap (heap unchanged)
*
* \return the smallest key in the heap without modifying the heap.
*/
-XBT_INLINE double xbt_heap_maxkey(xbt_heap_t H)
+inline double xbt_heap_maxkey(xbt_heap_t H)
{
xbt_assert(H->count != 0, "Empty heap");
return KEY(H, 0);
*
* Restores the heap property once an element has been deleted.
*/
-static void xbt_heap_max_heapify(xbt_heap_t H)
+static void xbt_heap_max_heapify(xbt_heap_t H, int index)
{
- int i = 0;
+ int i = index;
int count = H->count;
xbt_heap_item_t items = H->items;