Don't define variables in header file.!

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

diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h
index a05b65f..70a9728 100644 (file)
--- a/src/xbt/graph_private.h
+++ b/src/xbt/graph_private.h
@@ -1,7 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2006 Darina Dimitrova, Arnaud Legrand. 
-   All rights reserved.                  */
+/* Copyright (c) 2006, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* 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. */
@@ -9,37 +7,15 @@
 #ifndef _XBT_GRAPH_PRIVATE_H
 #define _XBT_GRAPH_PRIVATE_H
 #include "xbt/dynar.h"
+#include "xbt/graph.h"
 
-/* Node structure */
-/* typedef struct xbt_node *xbt_node_t; */
-typedef struct xbt_node 
-{
-  xbt_dynar_t out;
-  xbt_dynar_t in;
-/*   int index; */
-  void *data;
-} s_xbt_node_t;
-
-/* edge structure */
-/* typedef struct xbt_edge *xbt_edge_t; */
-typedef struct xbt_edge 
-{
-  xbt_node_t src;
-  xbt_node_t dst;
-  void *data;
-  double length;
-} s_xbt_edge_t;
-
-/* Graph structure */
-/* typedef struct xbt_graph *xbt_graph_t; */
-typedef struct xbt_graph 
-{
-  xbt_dynar_t nodes;
-  xbt_dynar_t edges;
-  unsigned short int directed;
-  void *data;
-} s_xbt_graph_t;
-void xbt_floyd_algorithm(xbt_graph_t g, double* adj,double* d,  xbt_node_t* p);
+#define NOT_EXPLORED 0
+#define CURRENTLY_EXPLORING 1
+#define ALREADY_EXPLORED 2
 
+void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d,
+                         xbt_node_t * p);
+void xbt_graph_depth_visit(xbt_graph_t g, xbt_node_t n,
+                           xbt_node_t * sorted, int *idx);
 
-#endif                         /* _XBT_GRAPH_PRIVATE_H */
+#endif                          /* _XBT_GRAPH_PRIVATE_H */