I'm glad: this prototype was not used

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

diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp
index 7e3b8ff..0bf2e1f 100644 (file)
--- 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,15 +56,13 @@ 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;
-  void getRouteAndLatency(sg_platf_route_cbarg_t route, double *lat); // FIXME: this function is dangerously not overriding because of diverging prototype
   xbt_dynar_t getOneLinkRoutes() override;
-  void parseRoute(sg_platf_route_cbarg_t route) 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 */
+  xbt_graph_t routeGraph_ = nullptr;     /* xbt_graph */
+  xbt_dict_t graphNodeMap_ = nullptr;    /* map */
+  xbt_dict_t routeCache_ = nullptr;      /* use in cache mode */
 };
 
 }