Merge branch 'master' of github.com:mquinson/simgrid

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

diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp
index 36e615d..0d2108d 100644 (file)
--- a/src/surf/surf_routing_dijkstra.cpp
+++ b/src/surf/surf_routing_dijkstra.cpp
@@ -4,7 +4,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/surf/surf_routing_private.hpp"
 #include "src/surf/surf_routing_dijkstra.hpp"
 #include "src/surf/network_interface.hpp"
 
@@ -343,20 +342,20 @@ AsDijkstra::~AsDijkstra()
 /* Creation routing model functions */
 
 AsDijkstra::AsDijkstra(const char*name, bool cached)
-  : AsGeneric(name)
+  : AsRoutedGraph(name)
 {
   if (cached)
     routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free);
 }
 
-void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route)
+void AsDijkstra::addRoute(sg_platf_route_cbarg_t route)
 {
   const char *srcName = route->src;
   const char *dstName = route->dst;
   NetCard *src = sg_netcard_by_name_or_null(srcName);
   NetCard *dst = sg_netcard_by_name_or_null(dstName);
 
-  parseRouteCheckParams(route);
+  addRouteCheckParams(route);
 
   /* Create the topology graph */
   if(!routeGraph_)