X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..f43bc484f697666583ba779d3adb325f1eee498b:/src/xbt/graph_private.h

diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h
index 09e9232ffb..819a11fc39 100644
--- a/src/xbt/graph_private.h
+++ b/src/xbt/graph_private.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006, 2009-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -7,44 +7,12 @@
 #ifndef _XBT_GRAPH_PRIVATE_H
 #define _XBT_GRAPH_PRIVATE_H
 #include "xbt/dynar.h"
+#include "xbt/graph.h"
 
 #define NOT_EXPLORED 0
 #define CURRENTLY_EXPLORING 1
 #define ALREADY_EXPLORED 2
 
-/* Node structure */
-/* typedef struct xbt_node *xbt_node_t; */
-typedef struct xbt_node {
-  xbt_dynar_t out;
-  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 */
-/* typedef struct xbt_edge *xbt_edge_t; */
-typedef struct xbt_edge {
-  xbt_node_t src;
-  xbt_node_t dst;
-  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 */
-/* 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;                   /* 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);
 void xbt_graph_depth_visit(xbt_graph_t g, xbt_node_t n,