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
stringify cluster
[simgrid.git]
/
src
/
kernel
/
routing
/
FloydZone.cpp
diff --git
a/src/kernel/routing/FloydZone.cpp
b/src/kernel/routing/FloydZone.cpp
index
894aa18
..
329eff9
100644
(file)
--- a/
src/kernel/routing/FloydZone.cpp
+++ b/
src/kernel/routing/FloydZone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2009-201
6
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-201
7
. 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. */
/* 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. */
@@
-8,7
+8,7
@@
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
#include "src/surf/network_interface.hpp"
#include "xbt/log.h"
-#include <
float.h
>
+#include <
cfloat
>
#include <limits>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
#include <limits>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
@@
-21,7
+21,7
@@
namespace simgrid {
namespace kernel {
namespace routing {
namespace kernel {
namespace routing {
-FloydZone::FloydZone(NetZone* father,
const char*
name) : RoutedZone(father, name)
+FloydZone::FloydZone(NetZone* father,
std::string
name) : RoutedZone(father, name)
{
predecessorTable_ = nullptr;
costTable_ = nullptr;
{
predecessorTable_ = nullptr;
costTable_ = nullptr;
@@
-32,10
+32,10
@@
FloydZone::~FloydZone()
{
if (linkTable_ == nullptr) // Dealing with a parse error in the file?
return;
{
if (linkTable_ == nullptr) // Dealing with a parse error in the file?
return;
-
int table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
/* Delete link_table */
/* Delete link_table */
- for (int i = 0; i < table_size; i++)
- for (int j = 0; j < table_size; j++)
+ for (
unsigned
int i = 0; i < table_size; i++)
+ for (
unsigned
int j = 0; j < table_size; j++)
routing_route_free(TO_FLOYD_LINK(i, j));
xbt_free(linkTable_);
routing_route_free(TO_FLOYD_LINK(i, j));
xbt_free(linkTable_);
@@
-45,7
+45,7
@@
FloydZone::~FloydZone()
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
{
-
size_t table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
getRouteCheckParams(src, dst);
getRouteCheckParams(src, dst);
@@
-87,7
+87,7
@@
void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
{
/* set the size of table routing */
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
{
/* set the size of table routing */
-
int table_size = static_cast<int>(vertices_.size()
);
+
unsigned int table_size = getTableSize(
);
addRouteCheckParams(route);
addRouteCheckParams(route);
@@
-98,8
+98,8
@@
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */
/* Initialize costs and predecessors */
linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */
/* Initialize costs and predecessors */
- for (int i = 0; i < table_size; i++)
- for (int j = 0; j < table_size; j++) {
+ for (
unsigned
int i = 0; i < table_size; i++)
+ for (
unsigned
int j = 0; j < table_size; j++) {
TO_FLOYD_COST(i, j) = DBL_MAX;
TO_FLOYD_PRED(i, j) = -1;
TO_FLOYD_LINK(i, j) = nullptr;
TO_FLOYD_COST(i, j) = DBL_MAX;
TO_FLOYD_PRED(i, j) = -1;
TO_FLOYD_LINK(i, j) = nullptr;
@@
-156,7
+156,7
@@
void FloydZone::addRoute(sg_platf_route_cbarg_t route)
void FloydZone::seal()
{
/* set the size of table routing */
void FloydZone::seal()
{
/* set the size of table routing */
-
size_t table_size = vertices_.s
ize();
+
unsigned int table_size = getTableS
ize();
if (not linkTable_) {
/* Create Cost, Predecessor and Link tables */
if (not linkTable_) {
/* Create Cost, Predecessor and Link tables */