X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13bf12b18f191192a6ba4f0ef5452b88986aa88f..b4ac368a8512fa8ec30d04f55c4a3c660e9439b9:/src/kernel/routing/VivaldiZone.hpp

diff --git a/src/kernel/routing/VivaldiZone.hpp b/src/kernel/routing/VivaldiZone.hpp
index 28d53aadc6..64ea9bd5f2 100644
--- a/src/kernel/routing/VivaldiZone.hpp
+++ b/src/kernel/routing/VivaldiZone.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2017. 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. */
@@ -34,30 +34,29 @@ namespace routing {
  *  links), but naturally correspond to the values provided when the peer was created.
  *  More information in the relevant section of the XML reference guide: @ref pf_peer.
  *
+ *  You can find some Coordinate-based platforms from the OptorSim project, as well as a
+ *  script to turn them into SimGrid platforms in examples/platforms/syscoord.
+ *
  *  Such Network Coordinate systems were shown to provide rather good latency estimations
  *  in a compact way. Other systems, such as
  *  <a href="https://en.wikipedia.org/wiki/Phoenix_network_coordinates"Phoenix network coordinates</a>
  *  were shown superior to the Vivaldi system and could be also implemented in SimGrid.
- *
- *
- *  @todo: we should provide a script to compute the coordinates from a matrix of latency measurements,
- *  according to the corresponding publications.
  */
 
 class XBT_PRIVATE VivaldiZone : public ClusterZone {
 public:
-  explicit VivaldiZone(NetZone* father, const char* name);
+  explicit VivaldiZone(NetZone* father, std::string name);
 
-  void setPeerLink(NetCard* netcard, double bw_in, double bw_out, const char* coord);
-  void getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t into, double* latency) override;
+  void setPeerLink(NetPoint* netpoint, double bw_in, double bw_out, std::string coord);
+  void getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t into, double* latency) override;
 };
 
 namespace vivaldi {
 class XBT_PRIVATE Coords {
 public:
-  static simgrid::xbt::Extension<NetCard, Coords> EXTENSION_ID;
-  explicit Coords(NetCard* host, const char* str);
-  virtual ~Coords();
+  static simgrid::xbt::Extension<NetPoint, Coords> EXTENSION_ID;
+  explicit Coords(NetPoint* host, std::string str);
+  virtual ~Coords() = default;
 
   std::vector<double> coords;
 };