-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2021. 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. */
#ifndef SURF_ROUTING_VIVALDI_HPP_
#define SURF_ROUTING_VIVALDI_HPP_
-#include <simgrid/kernel/routing/ClusterZone.hpp>
+#include <simgrid/kernel/routing/StarZone.hpp>
#include <xbt/Extendable.hpp>
namespace simgrid {
* were shown superior to the Vivaldi system and could be also implemented in SimGrid.
*/
-class XBT_PRIVATE VivaldiZone : public ClusterZone {
+class XBT_PRIVATE VivaldiZone : public StarZone {
public:
- explicit VivaldiZone(NetZoneImpl* father, const std::string& name, resource::NetworkModel* netmodel);
-
- void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out, const std::string& coord);
- void get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* into, double* latency) override;
+ using StarZone::StarZone;
+ void set_peer_link(NetPoint* netpoint, double bw_in, double bw_out);
+ void get_local_route(NetPoint* src, NetPoint* dst, Route* into, double* latency) override;
};
namespace vivaldi {
class XBT_PRIVATE Coords {
public:
- static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
+ static xbt::Extension<NetPoint, Coords> EXTENSION_ID;
explicit Coords(NetPoint* host, const std::string& str);
- virtual ~Coords() = default;
std::vector<double> coords;
};