X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..b872718938013e4f8ed157c19cda97679ca0df8d:/src/surf/surf_routing_vivaldi.hpp

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index 0ebfef3ef5..3ab9c59658 100644
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -4,9 +4,9 @@
 /* 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 "surf_routing_RoutedGraph.hpp"
 #include "xbt/swag.h"
 
-#include "surf_routing_generic.hpp"
 
 #ifndef SURF_ROUTING_VIVALDI_HPP_
 #define SURF_ROUTING_VIVALDI_HPP_
@@ -14,9 +14,6 @@
 /* ************************************************** */
 /* **************  Vivaldi ROUTING   **************** */
 XBT_PRIVATE AS_t model_vivaldi_create(void);      /* create structures for vivaldi routing model */
-#define HOST_PEER(peername) bprintf("peer_%s", peername)
-#define ROUTER_PEER(peername) bprintf("router_%s", peername)
-#define LINK_PEER(peername) bprintf("link_%s", peername)
 
 namespace simgrid {
 namespace surf {
@@ -26,25 +23,12 @@ namespace surf {
  ***********/
 class XBT_PRIVATE AsVivaldi;
 
-class AsVivaldi: public AsGeneric {
+class AsVivaldi: public AsRoutedGraph {
 public:
-  sg_platf_route_cbarg_t *p_routingTable;
-
-  AsVivaldi() : AsGeneric() {};
+  AsVivaldi(const char *name);
   ~AsVivaldi() {};
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-  //void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges);
-  //sg_platf_route_cbarg_t getBypassRoute(RoutingEdge *src, RoutingEdge *dst, double *lat);
-
-  /* The parser calls the following functions to inform the routing models
-   * that a new element is added to the AS currently built.
-   *
-   * Of course, only the routing model of this AS is informed, not every ones */
-  int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
-  //virtual int parseAS( RoutingEdge *elm)=0;
-
-  //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
 };
 
 }