extending the graph structure to handle last dtd modifications

[simgrid.git] / src / xbt / graph_private.h

diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h
index 922f164..6074161 100644 (file)
--- a/src/xbt/graph_private.h
+++ b/src/xbt/graph_private.h
@@ -15,8 +15,12 @@
 typedef struct xbt_node 
 {
   xbt_dynar_t out;
-  xbt_dynar_t in;
-  void *data;
+  xbt_dynar_t in;  /* not used when the graph is directed */
+  double position_x; /* positive value: negative means undefined */
+  double position_y; /* positive value: negative means undefined */
+  void *data;      /* user data */
+  void *xbtdata;   /* private xbt data: should be reinitialized at the
+                     beginning of your algorithm if you need to use it */  
 } s_xbt_node_t;
 
 /* edge structure */
@@ -25,7 +29,10 @@ typedef struct xbt_edge
 {
   xbt_node_t src;
   xbt_node_t dst;
-  void *data;
+  void *data;      /* user data */
+  void *xbtdata;   /* private xbt data: should be reinitialized at the
+                     beginning of your algorithm if you need to use it */  
+  double length;   /* positive value: negative means undefined */
 } s_xbt_edge_t;
 
 /* Graph structure */
@@ -35,7 +42,11 @@ typedef struct xbt_graph
   xbt_dynar_t nodes;
   xbt_dynar_t edges;
   unsigned short int directed;
-  void *data;
+  void *data;      /* user data */
+  void *xbtdata;   /* private xbt data: should be reinitialized at the
+                     beginning of your algorithm if you need to use it */  
 } s_xbt_graph_t;
+void xbt_floyd_algorithm(xbt_graph_t g, double* adj,double* d,  xbt_node_t* p);
+
 
 #endif                         /* _XBT_GRAPH_PRIVATE_H */