X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c41f6db03c1da0871287a5b70f919ab44278d938..ee19528d56a6480e640d0a03d856980a6ef5f5db:/include/xbt/graph.h

diff --git a/include/xbt/graph.h b/include/xbt/graph.h
index 654e0259f1..9c829a370c 100644
--- a/include/xbt/graph.h
+++ b/include/xbt/graph.h
@@ -9,7 +9,7 @@
 #ifndef _XBT_GRAPH_H
 #define _XBT_GRAPH_H
 #include "xbt/misc.h" /* SG_BEGIN_DECL */
-
+#include "xbt/dynar.h"
 SG_BEGIN_DECL()
 
 typedef struct xbt_node *xbt_node_t;
@@ -17,35 +17,41 @@ typedef struct xbt_edge  *xbt_edge_t;
 typedef struct xbt_graph  *xbt_graph_t;
 
 /* API */
-xbt_graph_t xbt_graph_new_graph(const char *name, 
-				unsigned short int directed, void *data);
-xbt_node_t xbt_graph_new_node(xbt_graph_t g,const char *name, void *data);
-xbt_edge_t xbt_graph_new_edge(xbt_graph_t g,const char *name,
-			      xbt_node_t src, xbt_node_t dst, void *data);
-
-void xbt_graph_remove_node(xbt_graph_t g, xbt_node_t n, 
-			   void_f_pvoid_t *free_function);
-void xbt_graph_remove_edge(xbt_graph_t g, xbt_edge_t e, 
+xbt_graph_t xbt_graph_new_graph(unsigned short int directed, void *data);
+xbt_node_t xbt_graph_new_node(xbt_graph_t g, void *data);
+xbt_edge_t xbt_graph_new_edge(xbt_graph_t g, xbt_node_t src, xbt_node_t dst, 
+			      void *data);
+void xbt_graph_edge_set_length(xbt_edge_t e, double length);
+double xbt_graph_edge_get_length(xbt_edge_t e);
+double* xbt_graph_get_length_matrix(xbt_graph_t g);
+
+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 xbt_graph_free_edge(xbt_graph_t g, xbt_edge_t e, 
 			   void_f_pvoid_t *free_function);
 void xbt_graph_free_graph(xbt_graph_t g, 
 			  void_f_pvoid_t *node_free_function,
 			  void_f_pvoid_t *edge_free_function,
 			  void_f_pvoid_t *graph_free_function);
 
+int __xbt_find_in_dynar(xbt_dynar_t dynar, void *p);
+
+xbt_dynar_t xbt_graph_get_nodes(xbt_graph_t g);
+xbt_dynar_t xbt_graph_get_edges(xbt_graph_t g);
+xbt_node_t xbt_graph_edge_get_source(xbt_edge_t e);
+xbt_node_t xbt_graph_edge_get_target(xbt_edge_t e);
+xbt_graph_t xbt_graph_read(const char *filename);
+ 
+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));
+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));
+
 /* Not implemented yet ! */
-void xbt_export_graphviz(xbt_graph_t g, const char *filename,
-			 const char *(node_name)(xbt_node_t),
-			 const char *(edge_name)(xbt_edge_t)
-			 );
-
-void xbt_graph_export_surfxml(xbt_graph_t g,
-			      const char *filename,
-			      const char *(node_name)(xbt_node_t),
-			      const char *(edge_name)(xbt_edge_t)
-			      );
-
-void *xbt_graph_to_array(xbt_graph_t g); 
-void xbt_graph_shortest_paths(xbt_graph_t g);
+/* void *xbt_graph_to_array(xbt_graph_t g);  */
+xbt_node_t* xbt_graph_shortest_paths(xbt_graph_t g);
 void xbt_graph_topological_sort(xbt_graph_t g);