X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aecc62c76f48c4d984e4e7924a21d3d7893de589..f35db13138682b1be530a509d1eeadeafff84ca7:/src/xbt/graph_private.h diff --git a/src/xbt/graph_private.h b/src/xbt/graph_private.h index 6e005a71f3..53bd160be5 100644 --- a/src/xbt/graph_private.h +++ b/src/xbt/graph_private.h @@ -1,47 +1,15 @@ -/* $Id$ */ - -/* Copyright (c) 2006 Darina Dimitrova, Arnaud Legrand. - All rights reserved. */ +/* Copyright (c) 2006-2017. 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. */ -#ifndef _XBT_GRAPH_PRIVATE_H -#define _XBT_GRAPH_PRIVATE_H -#include "xbt/dynar.h" - -/* 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 */ - void *data; /* used data */ - void *xbtdata; /* private xbt data */ -} s_xbt_node_t; +#ifndef XBT_GRAPH_PRIVATE_H +#define XBT_GRAPH_PRIVATE_H -/* edge structure */ -/* typedef struct xbt_edge *xbt_edge_t; */ -typedef struct xbt_edge -{ - xbt_node_t src; - xbt_node_t dst; - void *data; /* used data */ - void *xbtdata; /* private xbt 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; /* used data */ - void *xbtdata; /* private xbt data */ -} s_xbt_graph_t; -void xbt_floyd_algorithm(xbt_graph_t g, double* adj,double* d, xbt_node_t* p); +#include "xbt/base.h" +#include "xbt/dynar.h" +#include "xbt/graph.h" +XBT_PRIVATE void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d, xbt_node_t * p); -#endif /* _XBT_GRAPH_PRIVATE_H */ +#endif