A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
convert S4U to my current coding convention
[simgrid.git]
/
src
/
surf
/
surf_routing_floyd.cpp
diff --git
a/src/surf/surf_routing_floyd.cpp
b/src/surf/surf_routing_floyd.cpp
index
9a51912
..
2f297fd
100644
(file)
--- a/
src/surf/surf_routing_floyd.cpp
+++ b/
src/surf/surf_routing_floyd.cpp
@@
-4,7
+4,6
@@
/* 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. */
/* 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. */
-#include "src/surf/surf_routing_private.hpp"
#include "src/surf/surf_routing_floyd.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_routing_floyd.hpp"
#include "src/surf/network_interface.hpp"
@@
-18,7
+17,7
@@
namespace simgrid {
namespace surf {
AsFloyd::AsFloyd(const char*name)
namespace surf {
AsFloyd::AsFloyd(const char*name)
- : As
Generic
(name)
+ : As
RoutedGraph
(name)
{
predecessorTable_ = NULL;
costTable_ = NULL;
{
predecessorTable_ = NULL;
costTable_ = NULL;
@@
-27,19
+26,15
@@
AsFloyd::AsFloyd(const char*name)
AsFloyd::~AsFloyd(){
int i, j;
AsFloyd::~AsFloyd(){
int i, j;
- int table_size;
- table_size = (int)xbt_dynar_length(vertices_);
+ int table_size = (int)xbt_dynar_length(vertices_);
if (linkTable_ == NULL) // Dealing with a parse error in the file?
return;
/* Delete link_table */
for (i = 0; i < table_size; i++)
if (linkTable_ == NULL) // Dealing with a parse error in the file?
return;
/* Delete link_table */
for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++)
{
+ for (j = 0; j < table_size; j++)
routing_route_free(TO_FLOYD_LINK(i, j));
routing_route_free(TO_FLOYD_LINK(i, j));
- }
xbt_free(linkTable_);
xbt_free(linkTable_);
- /* Delete bypass dict */
- xbt_dict_free(&bypassRoutes_);
- /* Delete predecessor and cost table */
+
xbt_free(predecessorTable_);
xbt_free(costTable_);
}
xbt_free(predecessorTable_);
xbt_free(costTable_);
}