Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/surf/surf_routing_full.hpp b/src/surf/surf_routing_full.hpp
index 0473e92..30dd1cb 100644 (file)
--- a/src/surf/surf_routing_full.hpp
+++ b/src/surf/surf_routing_full.hpp
@@ -9,7 +9,7 @@
 
 #include <xbt/base.h>
 
-#include "surf_routing_generic.hpp"
+#include "surf_routing_RoutedGraph.hpp"
 
 namespace simgrid {
 namespace surf {
@@ -20,19 +20,18 @@ namespace surf {
 class XBT_PRIVATE AsFull;
 
 /** Full routing: fast, large memory requirements, fully expressive */
-class AsFull: public AsGeneric {
+class AsFull: public AsRoutedGraph {
 public:
 
-  AsFull() {}
+  AsFull(const char*name);
   void Seal() override;
   ~AsFull();
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   xbt_dynar_t getOneLinkRoutes() override;
-  void parseRoute(sg_platf_route_cbarg_t route) override;
-  void parseASroute(sg_platf_route_cbarg_t route) override;
+  void addRoute(sg_platf_route_cbarg_t route) override;
 
-  sg_platf_route_cbarg_t *p_routingTable = nullptr;
+  sg_platf_route_cbarg_t *routingTable_ = nullptr;
 };
 
 }