X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6534c58a2afafe609a4671073f6b20f839e20fd7..b5f37dd9e482e2303c9437870784fcb923e8c9f1:/src/surf/surf_routing_dijkstra.hpp

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 74a33cb698..ae5e000bfc 100644
--- a/src/surf/surf_routing_dijkstra.hpp
+++ b/src/surf/surf_routing_dijkstra.hpp
@@ -6,7 +6,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 #ifndef SURF_ROUTING_DIJKSTRA_HPP_
 #define SURF_ROUTING_DIJKSTRA_HPP_
@@ -35,7 +35,7 @@ namespace surf {
 class XBT_PRIVATE AsDijkstra;
 
 /** Dijkstra routing data: fast initialization, slow lookup, small memory requirements, shortest path routing only */
-class AsDijkstra : public AsGeneric {
+class AsDijkstra : public AsRoutedGraph {
 public:
   AsDijkstra(const char*name, bool cached);
   void Seal() override;
@@ -56,18 +56,14 @@ public:
      * After this function returns, any node in the graph
      * will have a loopback attached to it.
      */
-  void addLoopback();
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) override;
-  xbt_dynar_t getOneLinkRoutes() override;
   void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype
-  void parseASroute(sg_platf_route_cbarg_t route) override;
-  void parseRoute(sg_platf_route_cbarg_t route) override;
-  void end();
+  xbt_dynar_t getOneLinkRoutes() override;
+  void addRoute(sg_platf_route_cbarg_t route) override;
 
-  xbt_graph_t p_routeGraph = nullptr;      /* xbt_graph */
-  xbt_dict_t p_graphNodeMap = nullptr;    /* map */
-  xbt_dict_t p_routeCache = nullptr;       /* use in cache mode */
-  bool m_cached = false;
+  xbt_graph_t routeGraph_ = nullptr;     /* xbt_graph */
+  xbt_dict_t graphNodeMap_ = nullptr;    /* map */
+  xbt_dict_t routeCache_ = nullptr;      /* use in cache mode */
 };
 
 }