X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..50fcdd05d9ecd83944f369e6c7a9d118b1092f54:/src/xbt/graph.c
diff --git a/src/xbt/graph.c b/src/xbt/graph.c
index 2079dfc7da..e3ce876fd2 100644
--- a/src/xbt/graph.c
+++ b/src/xbt/graph.c
@@ -14,6 +14,7 @@
#include "xbt/graphxml_parse.h"
#include "xbt/dict.h"
#include "xbt/heap.h"
+#include "xbt/str.h"
@@ -85,13 +86,13 @@ xbt_edge_t xbt_graph_get_edge(xbt_graph_t g, xbt_node_t src,
unsigned int cursor;
xbt_dynar_foreach(src->out, cursor, edge) {
- DEBUG3("%p = %p--%p", edge, edge->src, edge->dst);
+ XBT_DEBUG("%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);
+ XBT_DEBUG("%p = %p--%p", edge, edge->src, edge->dst);
if ((edge->dst == src) && (edge->src == dst))
return edge;
}
@@ -159,7 +160,7 @@ void xbt_graph_free_graph(xbt_graph_t g,
if (graph_free_function)
(*graph_free_function) (g->data);
free(g);
-
+ xbt_graph_parse_lex_destroy();
return;
}
@@ -440,7 +441,7 @@ xbt_edge_t *xbt_graph_spanning_tree_prim(xbt_graph_t g)
xbt_heap_t heap = xbt_heap_new(10, NULL);
unsigned int cursor;
- xbt_assert0(!(g->directed),
+ xbt_assert(!(g->directed),
"Spanning trees do not make sense on directed graphs");
xbt_dynar_foreach(g->nodes, cursor, node) {
@@ -528,7 +529,7 @@ void xbt_graph_depth_visit(xbt_graph_t g, xbt_node_t n,
if (*((int *) (n->xbtdata)) == ALREADY_EXPLORED)
return;
else if (*((int *) (n->xbtdata)) == CURRENTLY_EXPLORING)
- THROW0(0, 0, "There is a cycle");
+ THROWF(0, 0, "There is a cycle");
else {
*((int *) (n->xbtdata)) = CURRENTLY_EXPLORING;
@@ -552,7 +553,7 @@ static void *(*__parse_edge_label_and_data) (xbt_edge_t, const char *,
static void __parse_graph_begin(void)
{
- DEBUG0("");
+ XBT_DEBUG("");
if (A_graphxml_graph_isDirected == A_graphxml_graph_isDirected_true)
parsed_graph = xbt_graph_new_graph(1, NULL);
else
@@ -564,14 +565,14 @@ static void __parse_graph_begin(void)
static void __parse_graph_end(void)
{
xbt_dict_free(&parsed_nodes);
- DEBUG0("");
+ XBT_DEBUG("");
}
static void __parse_node(void)
{
xbt_node_t node = xbt_graph_new_node(parsed_graph, NULL);
- DEBUG1("", A_graphxml_node_name);
+ XBT_DEBUG("", 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);
@@ -598,7 +599,7 @@ static void __parse_edge(void)
xbt_graph_parse_get_double(&(edge->length), A_graphxml_edge_length);
- DEBUG3("",
+ XBT_DEBUG("",
(char *) (edge->src)->data,
(char *) (edge->dst)->data, xbt_graph_edge_get_length(edge));
}
@@ -626,7 +627,9 @@ xbt_graph_t xbt_graph_read(const char *filename,
ETag_graphxml_edge_fun = __parse_edge;
xbt_graph_parse_open(filename);
- xbt_assert1((!(*xbt_graph_parse) ()), "Parse error in %s", filename);
+ int res;
+ res = (*xbt_graph_parse) ();
+ xbt_assert(!res, "Parse error in %s", filename);
xbt_graph_parse_close();
graph = parsed_graph;
@@ -647,7 +650,7 @@ void xbt_graph_export_graphviz(xbt_graph_t g, const char *filename,
const char *name = NULL;
file = fopen(filename, "w");
- xbt_assert1(file, "Failed to open %s \n", filename);
+ xbt_assert(file, "Failed to open %s \n", filename);
if (g->directed)
fprintf(file, "digraph test {\n");
@@ -693,7 +696,7 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
const char *name = NULL;
file = fopen(filename, "w");
- xbt_assert1(file, "Failed to open %s \n", filename);
+ xbt_assert(file, "Failed to open %s \n", filename);
fprintf(file, "\n");
fprintf(file, "\n");
@@ -723,3 +726,101 @@ void xbt_graph_export_graphxml(xbt_graph_t g, const char *filename,
fprintf(file, "\n");
fclose(file);
}
+
+/** @brief Load a graph from a file (in the SimGrid Graph format) */
+xbt_graph_t xbt_graph_load (const char *filename)
+{
+ FILE *file = NULL;
+ file = fopen (filename, "r");
+ xbt_assert(file, "Failed to open %s \n", filename);
+
+ xbt_dict_t nodes_dict = xbt_dict_new ();
+ xbt_graph_t ret = xbt_graph_new_graph (0, NULL);
+
+ //read the number of nodes
+ size_t size;
+ char *nnodes_str = NULL;
+ getline (&nnodes_str, &size, file);
+ int i, nnodes = atoi (nnodes_str);
+ free (nnodes_str);
+
+ //read all nodes
+ for (i = 0; i < nnodes; i++){
+ char *node_str = NULL;
+ getline (&node_str, &size, file);
+ xbt_node_t n;
+ char *name = xbt_strdup (node_str);
+ xbt_str_subst (name, '\n', '\0', 0);
+ n = xbt_graph_new_node (ret, name);
+ xbt_dict_set (nodes_dict, name, n, NULL);
+ free (node_str);
+ }
+
+ //read the number of edges
+ char *nedges_str = NULL;
+ getline (&nedges_str, &size, file);
+ int nedges = atoi (nedges_str);
+ free (nedges_str);
+
+ //read all edges
+ for (i = 0; i < nedges; i++){
+ char *edge_str = NULL, edge_id[200], node_source[200], node_target[200];
+ getline (&edge_str, &size, file);
+ sscanf (edge_str, "%s %s %s", edge_id, node_source, node_target);
+ free (edge_str);
+ xbt_str_subst (edge_id, '\n', '\0', 0);
+ xbt_str_subst (node_source, '\n', '\0', 0);
+ xbt_str_subst (node_target, '\n', '\0', 0);
+
+ xbt_node_t source = xbt_dict_get (nodes_dict, node_source);
+ xbt_node_t target = xbt_dict_get (nodes_dict, node_target);
+ xbt_edge_t e;
+ e = xbt_graph_new_edge (ret, source, target, xbt_strdup(edge_id));
+ }
+ xbt_dict_free (&nodes_dict);
+ return ret;
+}
+
+/** @brief Save a graph from a file (in the SimGrid Graph format) */
+void xbt_graph_save (xbt_graph_t span,
+ const char *filename,
+ const char *(nname) (xbt_node_t),
+ const char *(ename) (xbt_edge_t))
+{
+ FILE *file = NULL;
+ file = fopen(filename, "w");
+ xbt_assert(file, "Failed to open %s \n", filename);
+
+ xbt_dynar_t nodes = xbt_graph_get_nodes (span);
+ xbt_dynar_t edges = xbt_graph_get_edges (span);
+ unsigned int cpt;
+ xbt_node_t node;
+ fprintf (file, "%ld\n", xbt_dynar_length (nodes));
+ xbt_dynar_foreach (nodes, cpt, node) {
+ if (nname){
+ fprintf (file, "%s\n", nname(node));
+ }else{
+ fprintf (file, "%p\n", node);
+ }
+ }
+ fprintf (file, "%ld\n", xbt_dynar_length (edges));
+ xbt_edge_t edge;
+ xbt_dynar_foreach (edges, cpt, edge) {
+ xbt_node_t source = xbt_graph_edge_get_source (edge);
+ xbt_node_t target = xbt_graph_edge_get_target (edge);
+ if (ename){
+ if (nname){
+ fprintf (file, "%s %s %s\n", ename(edge), nname(source), nname(target));
+ }else{
+ fprintf (file, "%s %p %p\n", ename(edge), source, target);
+ }
+ }else{
+ if (nname){
+ fprintf (file, "%p %s %s\n", edge, nname(source), nname(target));
+ }else{
+ fprintf (file, "%p %p %p\n", edge, source, target);
+ }
+ }
+ }
+ fclose (file);
+}