A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix some 'signed/unsigned comparison' warnings
[simgrid.git]
/
src
/
xbt
/
heap_private.h
diff --git
a/src/xbt/heap_private.h
b/src/xbt/heap_private.h
index
4092814
..
0186ee1
100644
(file)
--- a/
src/xbt/heap_private.h
+++ b/
src/xbt/heap_private.h
@@
-1,29
+1,36
@@
-/* Authors: Arnaud Legrand */
+/* Copyright (c) 2004-2005, 2007, 2009-2014. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* 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. */
-#i
nclude <stdlib.h>
-#
include "xbt_heap.h"
+#i
fndef _XBT_HEAP_PRIVATE_H
+#
define _XBT_HEAP_PRIVATE_H
-typedef struct xbt_heapItem {
+#include "xbt/dynar.h" /* void_f_pvoid_t */
+#include "xbt/heap.h"
+#include <float.h>
+
+typedef struct xbt_heap_item {
void *content;
void *content;
-
xbt_heap_float_t
key;
-} s_xbt_heap
Item_t ,*xbt_heapI
tem_t;
+
double
key;
+} s_xbt_heap
_item_t, *xbt_heap_i
tem_t;
typedef struct xbt_heap {
int size;
int count;
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;
} 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 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 /* _XBT_HEAP_PRIVATE_H */