some simple cleanups in the routing code

[simgrid.git] / src / surf / surf_routing_floyd.hpp

diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp
index 1302a84..5f498f4 100644 (file)
--- a/src/surf/surf_routing_floyd.hpp
+++ b/src/surf/surf_routing_floyd.hpp
@@ -25,26 +25,14 @@ public:
   AsFloyd();
   ~AsFloyd();
 
   AsFloyd();
   ~AsFloyd();
 

-  void getRouteAndLatency(NetCard *src, NetCard *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 getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
+  xbt_dynar_t getOneLinkRoutes() override;
+  void parseASroute(sg_platf_route_cbarg_t route) override;
+  void parseRoute(sg_platf_route_cbarg_t route) override;

   void end();
   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. */
+private:
+  /* vars to compute the Floyd algorithm. */

   int *p_predecessorTable;
   double *p_costTable;
   sg_platf_route_cbarg_t *p_linkTable;
   int *p_predecessorTable;
   double *p_costTable;
   sg_platf_route_cbarg_t *p_linkTable;