namespace vivaldi {
simgrid::xbt::Extension<NetPoint, Coords> Coords::EXTENSION_ID;
-Coords::Coords(NetPoint* netpoint, const char* coordStr)
+Coords::Coords(NetPoint* netpoint, std::string coordStr)
{
if (not Coords::EXTENSION_ID.valid())
Coords::EXTENSION_ID = NetPoint::extension_create<Coords>();
xbt_assert(string_values.size() == 3, "Coordinates of %s must have 3 dimensions", netpoint->cname());
for (auto str : string_values)
- coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s"));
+ try {
+ coords.push_back(std::stod(str));
+ } catch (std::invalid_argument const& ia) {
+ throw std::invalid_argument(std::string("Invalid coordinate: ") + ia.what());
+ }
coords.shrink_to_fit();
netpoint->extension_set<Coords>(this);
- XBT_DEBUG("Coords of %s %p: %s", netpoint->cname(), netpoint, coordStr);
+ XBT_DEBUG("Coords of %s %p: %s", netpoint->cname(), netpoint, coordStr.c_str());
}
-Coords::~Coords() = default;
}; // namespace vivaldi
static inline double euclidean_dist_comp(int index, std::vector<double>* src, std::vector<double>* dst)
{
}
-void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, const char* coord)
+void VivaldiZone::setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord)
{
xbt_assert(netpoint->netzone() == this, "Cannot add a peer link to a netpoint that is not in this netzone");
}
/* Retrieve the private links */
- if (privateLinks_.find(src->id()) != privateLinks_.end()) {
+ try {
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
if (info.first) {
route->link_list->push_back(info.first);
if (lat)
*lat += info.first->latency();
}
+ } catch (std::out_of_range& unfound) {
+ XBT_DEBUG("Source of private link (%u) doesn't exist", src->id());
}
- if (privateLinks_.find(dst->id()) != privateLinks_.end()) {
+
+ try {
std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id());
if (info.second) {
route->link_list->push_back(info.second);
if (lat)
*lat += info.second->latency();
}
+ } catch (std::out_of_range& unfound) {
+ XBT_DEBUG("Destination of private link (%u) doesn't exist", dst->id());
}
/* Compute the extra latency due to the euclidean distance if needed */