X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa222c38f9b796be07ab4351ffc810a61a8fd705..507785035fffb029577ed608142f0cb8a43f77e9:/src/surf/surf_routing_full.hpp

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index e4bc28d302..0abbae3fa7 100644
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -7,37 +7,33 @@
 #ifndef SURF_ROUTING_FULL_HPP_
 #define SURF_ROUTING_FULL_HPP_
 
-#include "surf_routing_generic.hpp"
+#include <xbt/base.h>
+
+#include "surf_routing_RoutedGraph.hpp"
+
+namespace simgrid {
+namespace surf {
 
 /***********
  * Classes *
  ***********/
-class AsFull;
+class XBT_PRIVATE AsFull;
 
-class AsFull: public AsGeneric {
+/** Full routing: fast, large memory requirements, fully expressive */
+class AsFull: public AsRoutedGraph {
 public:
-  sg_platf_route_cbarg_t *p_routingTable;
 
-  AsFull();
+  AsFull(const char*name);
+  void Seal() override;
   ~AsFull();
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-  xbt_dynar_t getOneLinkRoutes();
-  void parseRoute(sg_platf_route_cbarg_t route);
-  void parseASroute(sg_platf_route_cbarg_t route);
-
-  //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 */
-  //virtual int parsePU(RoutingEdge *elm)=0; /* A host or a router, whatever */
-  //virtual int parseAS( RoutingEdge *elm)=0;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void addRoute(sg_platf_route_cbarg_t route) override;
 
-  //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
+  sg_platf_route_cbarg_t *routingTable_ = nullptr;
 };
 
+}
+}
 
 #endif /* SURF_ROUTING_FULL_HPP_ */