/* 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 <fstream>
+#include <sstream>
+
#include "src/surf/AsClusterFatTree.hpp"
#include "src/surf/network_interface.hpp"
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/classification.hpp>
-#include <iostream>
-#include <fstream>
-#include <sstream>
-
#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_fat_tree, surf, "Routing for fat trees");
namespace simgrid {
-namespace surf {
+namespace routing {
AsClusterFatTree::AsClusterFatTree(const char*name)
: AsCluster(name)
/* In case destination is the source, and there is a loopback, let's get
through it instead of going up to a switch*/
- if(source->id == destination->id && this->has_loopback_) {
+ if(source->id == destination->id && this->hasLoopback_) {
into->link_list->push_back(source->loopback);
if(latency) {
*latency += source->loopback->getLatency();
*latency += currentNode->parents[d]->upLink->getLatency();
}
- if (this->has_limiter_) {
+ if (this->hasLimiter_) {
into->link_list->push_back(currentNode->limiterLink);
}
currentNode = currentNode->parents[d]->upNode;
*latency += currentNode->children[i]->downLink->getLatency();
}
currentNode = currentNode->children[i]->downNode;
- if (this->has_limiter_) {
+ if (this->hasLimiter_) {
into->link_list->push_back(currentNode->limiterLink);
}
XBT_DEBUG("%d(%u,%u) is accessible through %d(%u,%u)", destination->id,
// TODO : we have to check for zeros and negative numbers, or it might crash
if (parameters.size() != 4){
- surf_parse_error("Fat trees are defined by the levels number and 3 vectors, see the documentation for more informations");
+ surf_parse_error("Fat trees are defined by the levels number and 3 vectors, see the documentation for more information");
}
// The first parts of topo_parameters should be the levels number
boost::split(tmp, parameters[1], boost::is_any_of(","));
if(tmp.size() != this->levels_) {
surf_parse_error("Fat trees are defined by the levels number and 3 vectors"
- ", see the documentation for more informations");
+ ", see the documentation for more information");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
this->lowerLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid lower level node number: %s"));
boost::split(tmp, parameters[2], boost::is_any_of(","));
if(tmp.size() != this->levels_) {
surf_parse_error("Fat trees are defined by the levels number and 3 vectors"
- ", see the documentation for more informations");
+ ", see the documentation for more information");
}
for(size_t i = 0 ; i < tmp.size() ; i++){
this->upperLevelNodesNumber_.push_back(xbt_str_parse_int(tmp[i].c_str(), "Invalid upper level node number: %s"));
boost::split(tmp, parameters[3], boost::is_any_of(","));
if(tmp.size() != this->levels_) {
surf_parse_error("Fat trees are defined by the levels number and 3 vectors"
- ", see the documentation for more informations");
+ ", see the documentation for more information");
}
for(size_t i = 0 ; i < tmp.size() ; i++){