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
remove parsing cruft from forward.h, move it to platf.h
[simgrid.git]
/
src
/
surf
/
surf_routing_cluster_fat_tree.cpp
diff --git
a/src/surf/surf_routing_cluster_fat_tree.cpp
b/src/surf/surf_routing_cluster_fat_tree.cpp
index
7667c22
..
9ecbb8a
100644
(file)
--- a/
src/surf/surf_routing_cluster_fat_tree.cpp
+++ b/
src/surf/surf_routing_cluster_fat_tree.cpp
@@
-6,7
+6,8
@@
#include <vector>
#include <iostream>
#include <vector>
#include <iostream>
-#include "surf_routing_cluster_fat_tree.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_cluster_fat_tree.hpp"
#include "xbt/lib.h"
#include <boost/algorithm/string/split.hpp>
#include "xbt/lib.h"
#include <boost/algorithm/string/split.hpp>
@@
-430,7
+431,7
@@
void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
}
// The first parts of topo_parameters should be the levels number
}
// The first parts of topo_parameters should be the levels number
- this->levels =
std::atoi(parameters[0].c_str()); // stoi() only in C++11...
+ this->levels =
xbt_str_parse_int(parameters[0].c_str(), "First parameter is not the amount of levels: %s");
// Then, a l-sized vector standing for the childs number by level
boost::split(tmp, parameters[1], boost::is_any_of(","));
// Then, a l-sized vector standing for the childs number by level
boost::split(tmp, parameters[1], boost::is_any_of(","));
@@
-439,7
+440,7
@@
void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->lowerLevelNodesNumber.push_back(
std::atoi(tmp[i].c_str()));
+ this->lowerLevelNodesNumber.push_back(
xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
}
// Then, a l-sized vector standing for the parents number by level
}
// Then, a l-sized vector standing for the parents number by level
@@
-449,7
+450,7
@@
void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
", see the documentation for more informations");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->upperLevelNodesNumber.push_back(
std::atoi(tmp[i].c_str()));
+ this->upperLevelNodesNumber.push_back(
xbt_str_parse_int(tmp[i].c_str(), "Invalid upper level node number: %s"));
}
// Finally, a l-sized vector standing for the ports number with the lower level
}
// Finally, a l-sized vector standing for the ports number with the lower level
@@
-460,7
+461,7
@@
void AsClusterFatTree::parse_specific_arguments(sg_platf_cluster_cbarg_t
}
for(size_t i = 0 ; i < tmp.size() ; i++){
}
for(size_t i = 0 ; i < tmp.size() ; i++){
- this->lowerLevelPortsNumber.push_back(
std::atoi(tmp[i].c_str()));
+ this->lowerLevelPortsNumber.push_back(
xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
}
this->cluster = cluster;
}
}
this->cluster = cluster;
}