X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..53b9ff1b6972dffeabd543a09c89170663c30ad1:/src/surf/surf_routing_floyd.hpp

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 761969747d..e5258f83bd 100644
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -10,7 +10,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -20,34 +20,21 @@ namespace surf {
  ***********/
 class XBT_PRIVATE AsFloyd;
 
-class AsFloyd: public AsGeneric {
+/** Floyd routing data: slow initialization, fast lookup, lesser memory requirements, shortest path routing only */
+class AsFloyd: public AsRoutedGraph {
 public:
-  AsFloyd();
+  AsFloyd(const char *name);
   ~AsFloyd();
 
-  void getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t into, double *latency);
-  xbt_dynar_t getOneLinkRoutes();
-  void parseASroute(sg_platf_route_cbarg_t route);
-  void parseRoute(sg_platf_route_cbarg_t route);
-  void end();
-  //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 */
-  //int parsePU(RoutingEdge *elm); /* A host or a router, whatever */
-  //int parseAS(RoutingEdge *elm);
-
-  //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0;
-
-  /* vars for calculate the floyd algorith. */
-  int *p_predecessorTable;
-  double *p_costTable;
-  sg_platf_route_cbarg_t *p_linkTable;
+  void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  void addRoute(sg_platf_route_cbarg_t route) override;
+  void Seal() override;
+
+private:
+  /* vars to compute the Floyd algorithm. */
+  int *predecessorTable_;
+  double *costTable_;
+  sg_platf_route_cbarg_t *linkTable_;
 };
 
 }