Remove more occurences of 'surf' with uppercases

[simgrid.git] / include / simgrid / kernel / routing / VivaldiZone.hpp

diff --git a/include/simgrid/kernel/routing/VivaldiZone.hpp b/include/simgrid/kernel/routing/VivaldiZone.hpp
index 38c89db..0af8f0e 100644 (file)
--- a/include/simgrid/kernel/routing/VivaldiZone.hpp
+++ b/include/simgrid/kernel/routing/VivaldiZone.hpp
@@ -1,12 +1,12 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2023. 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_
+#ifndef SIMGRID_ROUTING_VIVALDI_HPP_
+#define SIMGRID_ROUTING_VIVALDI_HPP_
 
-#include <simgrid/kernel/routing/ClusterZone.hpp>
+#include <simgrid/kernel/routing/StarZone.hpp>
 #include <xbt/Extendable.hpp>
 
 namespace simgrid {
@@ -44,20 +44,18 @@ namespace routing {
  *  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(const NetPoint* src, const 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;
 };
@@ -66,4 +64,4 @@ public:
 } // namespace kernel
 } // namespace simgrid
 
-#endif /* SURF_ROUTING_VIVALDI_HPP_ */
+#endif /* SIMGRID_ROUTING_VIVALDI_HPP_ */