-/* $Id$ */
-
/* a generic graph library. */
/* Copyright (c) 2006 Darina Dimitrova, Arnaud Legrand. */
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(graph, xbt, "Graph");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph");
xbt_node_t node = NULL;
node = xbt_new0(struct xbt_node, 1);
node->data = data;
- node->in = xbt_dynar_new(sizeof(xbt_edge_t), NULL);
+ if (g->directed)
+ /* only the "out" field is used */
+ node->in = xbt_dynar_new(sizeof(xbt_edge_t), NULL);
+
node->out = xbt_dynar_new(sizeof(xbt_edge_t), NULL);
node->position_x = -1.0;
node->position_y = -1.0;
/** @brief add an edge to the given graph */
xbt_edge_t xbt_graph_new_edge(xbt_graph_t g,
- xbt_node_t src, xbt_node_t dst, void *data)
+ xbt_node_t src, xbt_node_t dst, void *data)
{
xbt_edge_t edge = NULL;
-
edge = xbt_new0(struct xbt_edge, 1);
xbt_dynar_push(src->out, &edge);
if (g->directed)
xbt_dynar_push(dst->in, &edge);
- else /* only the "out" field is used */
+ else /* only the "out" field is used */
xbt_dynar_push(dst->out, &edge);
edge->data = data;
edge->src = src;
edge->dst = dst;
- if (!g->directed) {
- xbt_dynar_push(src->in, &edge);
- xbt_dynar_push(dst->out, &edge);
- }
-
xbt_dynar_push(g->edges, &edge);
return edge;
}
+xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst)
+{
+ xbt_edge_t edge;
+ unsigned int cursor;
+
+ xbt_dynar_foreach(src->out, cursor, edge) {
+ DEBUG3("%p = %p--%p", edge, edge->src, edge->dst);
+ if ((edge->src == src) && (edge->dst == dst))
+ return edge;
+ }
+ if (!g->directed) {
+ xbt_dynar_foreach(src->out, cursor, edge) {
+ DEBUG3("%p = %p--%p", edge, edge->src, edge->dst);
+ if ((edge->dst == src) && (edge->src == dst))
+ return edge;
+ }
+ }
+ return NULL;
+}
+
void *xbt_graph_node_get_data(xbt_node_t node)
{
return node->data;
node->data = data;
}
-
void *xbt_graph_edge_get_data(xbt_edge_t edge)
{
return edge->data;
}
+void xbt_graph_edge_set_data(xbt_edge_t edge, void *data)
+{
+ edge->data = data;
+}
+
/** @brief Destructor
- * @param l: poor victim
+ * @param g: poor victim
+ * @param node_free_function: function to use to free data associated to each node
+ * @param edge_free_function: function to use to free data associated to each edge
+ * @param graph_free_function: function to use to free data associated to g
*
- * Free the graph structure.
+ * Free the graph structure.
*/
void xbt_graph_free_graph(xbt_graph_t g,
- void node_free_function(void *ptr),
- void edge_free_function(void *ptr),
- void graph_free_function(void *ptr))
+ void_f_pvoid_t node_free_function,
+ void_f_pvoid_t edge_free_function,
+ void_f_pvoid_t graph_free_function)
{
- int cursor = 0;
+ unsigned int cursor = 0;
xbt_node_t node = NULL;
xbt_edge_t edge = NULL;
xbt_dynar_free(&(node->out));
xbt_dynar_free(&(node->in));
if (node_free_function)
- node_free_function(node->data);
+ (*node_free_function) (node->data);
}
xbt_dynar_foreach(g->edges, cursor, edge) {
if (edge_free_function)
- edge_free_function(edge->data);
+ (*edge_free_function) (edge->data);
}
xbt_dynar_foreach(g->nodes, cursor, node)
- free(node);
+ free(node);
xbt_dynar_free(&(g->nodes));
xbt_dynar_foreach(g->edges, cursor, edge)
- free(edge);
+ free(edge);
xbt_dynar_free(&(g->edges));
-
+ if (graph_free_function)
+ (*graph_free_function) (g->data);
free(g);
return;
/** @brief remove the given node from the given graph */
void xbt_graph_free_node(xbt_graph_t g, xbt_node_t n,
- void_f_pvoid_t * node_free_function,
- void_f_pvoid_t * edge_free_function)
+ void_f_pvoid_t node_free_function,
+ void_f_pvoid_t edge_free_function)
{
unsigned long nbr;
- int i;
- int cursor = 0;
+ unsigned long i;
+ unsigned int cursor = 0;
xbt_node_t node = NULL;
xbt_edge_t edge = NULL;
nbr = xbt_dynar_length(g->edges);
cursor = 0;
for (i = 0; i < nbr; i++) {
- xbt_dynar_cursor_get(g->edges, &cursor, &edge);
+ xbt_dynar_get_cpy(g->edges, cursor, &edge);
if ((edge->dst == n) || (edge->src == n)) {
xbt_graph_free_edge(g, edge, edge_free_function);
} else
- xbt_dynar_cursor_step(g->edges, &cursor);
+ cursor++;
}
if ((node_free_function) && (n->data))
- node_free_function(n->data);
+ (*node_free_function) (n->data);
cursor = 0;
xbt_dynar_foreach(g->nodes, cursor, node)
if (node == n)
- xbt_dynar_cursor_rm(g->nodes, &cursor);
+ xbt_dynar_cursor_rm(g->nodes, &cursor);
xbt_dynar_free(&(n->in));
xbt_dynar_free(&(n->out));
/** @brief remove the given edge from the given graph */
void xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e,
- void free_function(void *ptr))
+ void_f_pvoid_t free_function)
{
int idx;
- int cursor = 0;
+ unsigned int cursor = 0;
xbt_edge_t edge = NULL;
if ((free_function) && (e->data))
- free_function(e->data);
+ (*free_function) (e->data);
xbt_dynar_foreach(g->edges, cursor, edge) {
if (edge == e) {
if (g->directed) {
- idx = __xbt_find_in_dynar(edge->dst->in, edge);
- xbt_dynar_remove_at(edge->dst->in, idx, NULL);
- } else { /* only the out field is used */
- idx = __xbt_find_in_dynar(edge->dst->out, edge);
- xbt_dynar_remove_at(edge->dst->out, idx, NULL);
+ idx = __xbt_find_in_dynar(edge->dst->in, edge);
+ xbt_dynar_remove_at(edge->dst->in, idx, NULL);
+ } else { /* only the out field is used */
+ idx = __xbt_find_in_dynar(edge->dst->out, edge);
+ xbt_dynar_remove_at(edge->dst->out, idx, NULL);
}
idx = __xbt_find_in_dynar(edge->src->out, edge);
int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p)
{
- int cursor = 0;
+ unsigned int cursor = 0;
void *tmp = NULL;
xbt_dynar_foreach(dynar, cursor, tmp) {
/** @brief Retrieve the node at the source of the given edge */
xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e)
{
-
return e->src;
}
return e->dst;
}
+/** @brief Retrieve the outgoing edges of the given node */
+xbt_dynar_t xbt_graph_node_get_outedges(xbt_node_t n)
+{
+ return n->out;
+}
/** @brief Set the weight of the given edge */
void xbt_graph_edge_set_length(xbt_edge_t e, double length)
/** @brief construct the adjacency matrix corresponding to the given graph
- *
+ *
* The weights are the distances between nodes
*/
double *xbt_graph_get_length_matrix(xbt_graph_t g)
{
- int cursor = 0;
- int in_cursor = 0;
- int idx, i;
+ unsigned int cursor = 0;
+ unsigned int in_cursor = 0;
+ unsigned long idx, i;
unsigned long n;
xbt_edge_t edge = NULL;
xbt_node_t node = NULL;
xbt_dynar_foreach(node->out, in_cursor, edge) {
if (edge->dst == node)
- idx = __xbt_find_in_dynar(g->nodes, edge->src);
- else /*case of undirected graphs */
- idx = __xbt_find_in_dynar(g->nodes, edge->dst);
+ idx = __xbt_find_in_dynar(g->nodes, edge->src);
+ else /*case of undirected graphs */
+ idx = __xbt_find_in_dynar(g->nodes, edge->dst);
D(cursor, idx) = edge->length;
}
}
}
/** @brief Floyd-Warshall algorithm for shortest path finding
- *
- * From wikipedia:
- *
+ *
+ * From wikipedia:
+ *
* The Floyd–Warshall algorithm takes as input an adjacency matrix
* representation of a weighted, directed graph (V, E). The weight of a
* path between two vertices is the sum of the weights of the edges along
* the two vertices. The running time complexity is Θ(|V|3).
*/
void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d,
- xbt_node_t * p)
+ xbt_node_t * p)
{
- int i, j, k;
+ unsigned long i, j, k;
unsigned long n;
n = xbt_dynar_length(g->nodes);
for (i = 0; i < n; i++) {
for (j = 0; j < n; j++) {
if (D(i, j) != -1) {
- P(i, j) = *((xbt_node_t *) xbt_dynar_get_ptr(g->nodes, i));
+ P(i, j) = *((xbt_node_t *) xbt_dynar_get_ptr(g->nodes, i));
}
}
}
for (k = 0; k < n; k++) {
for (i = 0; i < n; i++) {
for (j = 0; j < n; j++) {
- if ((D(i, k) != -1) && (D(k, j) != -1)) {
- if ((D(i, j) == -1) || (D(i, j) > D(i, k) + D(k, j))) {
- D(i, j) = D(i, k) + D(k, j);
- P(i, j) = P(k, j);
- }
- }
+ if ((D(i, k) != -1) && (D(k, j) != -1)) {
+ if ((D(i, j) == -1) || (D(i, j) > D(i, k) + D(k, j))) {
+ D(i, j) = D(i, k) + D(k, j);
+ P(i, j) = P(k, j);
+ }
+ }
}
}
}
{
xbt_node_t *p;
xbt_node_t *r;
- int i, j, k;
+ unsigned long i, j, k;
unsigned long n;
double *adj = NULL;
k = j;
while ((P(i, k)) && (__xbt_find_in_dynar(g->nodes, P(i, k)) != i)) {
- k = __xbt_find_in_dynar(g->nodes, P(i, k));
+ k = __xbt_find_in_dynar(g->nodes, P(i, k));
}
if (P(i, j)) {
- R(i, j) = *((xbt_node_t *) xbt_dynar_get_ptr(g->nodes, k));
+ R(i, j) = *((xbt_node_t *) xbt_dynar_get_ptr(g->nodes, k));
}
}
}
xbt_node_t node = NULL;
xbt_dynar_t edge_list = NULL;
xbt_heap_t heap = xbt_heap_new(10, NULL);
- int cursor;
+ unsigned int cursor;
xbt_assert0(!(g->directed),
- "Spanning trees do not make sense on directed graphs");
+ "Spanning trees do not make sense on directed graphs");
xbt_dynar_foreach(g->nodes, cursor, node) {
node->xbtdata = NULL;
node->xbtdata = (void *) 1;
edge_list = node->out;
xbt_dynar_foreach(edge_list, cursor, e)
- xbt_heap_push(heap, e, -(e->length));
+ xbt_heap_push(heap, e, -(e->length));
while ((edge = xbt_heap_pop(heap))) {
if ((edge->src->xbtdata) && (edge->dst->xbtdata))
edge->src->xbtdata = (void *) 1;
edge_list = edge->src->out;
xbt_dynar_foreach(edge_list, cursor, e) {
- xbt_heap_push(heap, e, -(e->length));
+ xbt_heap_push(heap, e, -(e->length));
}
} else {
edge->dst->xbtdata = (void *) 1;
edge_list = edge->dst->out;
xbt_dynar_foreach(edge_list, cursor, e) {
- xbt_heap_push(heap, e, -(e->length));
+ xbt_heap_push(heap, e, -(e->length));
}
}
if (tree_size == tree_size_max)
return tree;
}
-/** @brief Topological sort on the given graph
+/** @brief Topological sort on the given graph
*
* From wikipedia:
- *
+ *
* In graph theory, a topological sort of a directed acyclic graph (DAG) is
* a linear ordering of its nodes which is compatible with the partial
* order R induced on the nodes where x comes before y (xRy) if there's a
{
xbt_node_t *sorted;
- int cursor, idx;
+ unsigned int cursor;
+ int idx;
xbt_node_t node;
unsigned long n;
/** @brief First-depth graph traversal */
void xbt_graph_depth_visit(xbt_graph_t g, xbt_node_t n,
- xbt_node_t * sorted, int *idx)
+ xbt_node_t * sorted, int *idx)
{
- int cursor;
+ unsigned int cursor;
xbt_edge_t edge;
if (*((int *) (n->xbtdata)) == ALREADY_EXPLORED)
static xbt_dict_t parsed_nodes = NULL;
static void *(*__parse_node_label_and_data) (xbt_node_t, const char *,
- const char *) = NULL;
+ const char *) = NULL;
static void *(*__parse_edge_label_and_data) (xbt_edge_t, const char *,
- const char *) = NULL;
+ const char *) = NULL;
static void __parse_graph_begin(void)
{
DEBUG1("<node name=\"%s\"/>", A_graphxml_node_name);
if (__parse_node_label_and_data)
node->data = __parse_node_label_and_data(node, A_graphxml_node_label,
- A_graphxml_node_data);
- xbt_graph_parse_get_double(&(node->position_x),
- A_graphxml_node_position_x);
- xbt_graph_parse_get_double(&(node->position_y),
- A_graphxml_node_position_y);
+ A_graphxml_node_data);
+ xbt_graph_parse_get_double(&(node->position_x), A_graphxml_node_position_x);
+ xbt_graph_parse_get_double(&(node->position_y), A_graphxml_node_position_y);
xbt_dict_set(parsed_nodes, A_graphxml_node_name, (void *) node, NULL);
}
static void __parse_edge(void)
{
xbt_edge_t edge = xbt_graph_new_edge(parsed_graph,
- xbt_dict_get(parsed_nodes,
- A_graphxml_edge_source),
- xbt_dict_get(parsed_nodes,
- A_graphxml_edge_target),
- NULL);
+ xbt_dict_get(parsed_nodes,
+ A_graphxml_edge_source),
+ xbt_dict_get(parsed_nodes,
+ A_graphxml_edge_target),
+ NULL);
if (__parse_edge_label_and_data)
edge->data = __parse_edge_label_and_data(edge, A_graphxml_edge_label,
- A_graphxml_edge_data);
+ A_graphxml_edge_data);
xbt_graph_parse_get_double(&(edge->length), A_graphxml_edge_length);
DEBUG3("<edge source=\"%s\" target=\"%s\" length=\"%f\"/>",
- (char *) (edge->src)->data,
- (char *) (edge->dst)->data, xbt_graph_edge_get_length(edge));
+ (char *) (edge->src)->data,
+ (char *) (edge->dst)->data, xbt_graph_edge_get_length(edge));
}
/** @brief Import a graph from a file following the GraphXML format */
xbt_graph_t xbt_graph_read(const char *filename,
- void *(node_label_and_data) (xbt_node_t,
- const char *,
- const char *),
- void *(edge_label_and_data) (xbt_edge_t,
- const char *,
- const char *))
+ void *(*node_label_and_data) (xbt_node_t,
+ const char *,
+ const char *),
+ void *(*edge_label_and_data) (xbt_edge_t,
+ const char *,
+ const char *))
{
xbt_graph_t graph = NULL;
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
- xbt_assert1((!xbt_graph_parse()), "Parse error in %s", filename);
+ xbt_assert1((!(*xbt_graph_parse) ()), "Parse error in %s", filename);
xbt_graph_parse_close();
graph = parsed_graph;
/** @brief Export the given graph in the GraphViz formatting for visualization */
void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
- const char *(node_name) (xbt_node_t),
- const char *(edge_name) (xbt_edge_t))
+ const char *(node_name) (xbt_node_t),
+ const char *(edge_name) (xbt_edge_t))
{
- int cursor = 0;
+ unsigned int cursor = 0;
xbt_node_t node = NULL;
xbt_edge_t edge = NULL;
FILE *file = NULL;
fprintf(file, " node [shape=box, style=filled]\n");
fprintf(file,
- " node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
+ " node [width=.3, height=.3, style=filled, color=skyblue]\n\n");
xbt_dynar_foreach(g->nodes, cursor, node) {
fprintf(file, " \"%p\" ", node);
/** @brief Export the given graph in the GraphXML format */
void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
- const char *(node_name) (xbt_node_t),
- const char *(edge_name) (xbt_edge_t),
- const char *(node_data_print) (void *),
- const char *(edge_data_print) (void *))
+ const char *(node_name) (xbt_node_t),
+ const char *(edge_name) (xbt_edge_t),
+ const char *(node_data_print) (void *),
+ const char *(edge_data_print) (void *))
{
- int cursor = 0;
+ unsigned int cursor = 0;
xbt_node_t node = NULL;
xbt_edge_t edge = NULL;
FILE *file = NULL;
}
xbt_dynar_foreach(g->edges, cursor, edge) {
fprintf(file, " <edge source=\"%p\" target =\"%p\" ",
- edge->src, edge->dst);
+ edge->src, edge->dst);
if ((edge_name) && ((name = edge_name(edge))))
fprintf(file, "label=\"%s\" ", name);
if (edge->length >= 0.0)
