X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea7dcd482958d0b2316519f22f754e0074295388..a28f8d4f0a7734d65dafa41486ca0ab78038a975:/src/surf/surf_routing_dijkstra.hpp diff --git a/src/surf/surf_routing_dijkstra.hpp b/src/surf/surf_routing_dijkstra.hpp index 7f6e4b8c26..dd1523bfce 100644 --- a/src/surf/surf_routing_dijkstra.hpp +++ b/src/surf/surf_routing_dijkstra.hpp @@ -34,12 +34,12 @@ namespace surf { class XBT_PRIVATE AsDijkstra; +/** Dijkstra routing data: fast initialization, slow lookup, small memory requirements, shortest path routing only */ class AsDijkstra : public AsGeneric { public: - AsDijkstra(); + AsDijkstra(const char*name, bool cached); void Seal() override; - AsDijkstra(bool cached); ~AsDijkstra(); xbt_node_t routeGraphNewNode(int id, int graph_id); graph_node_map_element_t nodeMapSearch(int id); @@ -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; + xbt_dynar_t getOneLinkRoutes() override; void parseRoute(sg_platf_route_cbarg_t route) override; - void end(); - 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 */ }; }