X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05ac54fdc9965fd0ba06ee3a036d8cf212608e89..9b14512ff2a75b435a9d0b8f8810b3a22ad3a309:/src/xbt/graph.c diff --git a/src/xbt/graph.c b/src/xbt/graph.c index 42c211f3bd..befa76cd7d 100644 --- a/src/xbt/graph.c +++ b/src/xbt/graph.c @@ -1,6 +1,6 @@ /* a generic graph library. */ -/* Copyright (c) 2006-2014. The SimGrid Team. +/* Copyright (c) 2006-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -12,10 +12,10 @@ #include "graph_private.h" #include "xbt/dict.h" #include "xbt/heap.h" -#include "xbt/str.h" #include "xbt/file.h" #include +#include #include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_graph, xbt, "Graph"); @@ -227,11 +227,10 @@ void xbt_floyd_algorithm(xbt_graph_t g, double *adj, double *d, xbt_node_t * p) for (k = 0; k < n; k++) { for (i = 0; i < n; i++) { for (j = 0; j < n; j++) { - if ((d[i*n+k] > -1) && (d[k*n+j] > -1)) { - if ((d[i*n+j] < 0) || (d[i*n+j] > d[i*n+k] + d[k*n+j])) { - d[i*n+j] = d[i*n+k] + d[k*n+j]; - p[i*n+j] = p[k*n+j]; - } + if (d[i * n + k] > -1 && d[k * n + j] > -1 && + (d[i * n + j] < 0 || d[i * n + j] > d[i * n + k] + d[k * n + j])) { + d[i * n + j] = d[i * n + k] + d[k * n + j]; + p[i * n + j] = p[k * n + j]; } } }