start snake_casing NetZone. Many cleanups to come

[simgrid.git] / src / kernel / routing / FloydZone.cpp

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index f1b25bed251e7f43211930655d2bc469fe43a035..dd92bc8fa1b9d3141e5418d8601bfa693849f2d8 100644 (file)
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -6,8 +6,8 @@
 #include "simgrid/kernel/routing/FloydZone.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
 #include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
 
 #include <cfloat>
 #include <limits>
@@ -33,7 +33,7 @@ FloydZone::~FloydZone()
 {
   if (link_table_ == nullptr) // Dealing with a parse error in the file?
     return;
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
   /* Delete link_table */
   for (unsigned int i = 0; i < table_size; i++)
     for (unsigned int j = 0; j < table_size; j++)
@@ -46,7 +46,7 @@ FloydZone::~FloydZone()
 
 void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
 {
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
   getRouteCheckParams(src, dst);
 
@@ -78,7 +78,7 @@ void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
     for (auto const& link : e_route->link_list) {
       route->link_list.push_back(link);
       if (lat)
-        *lat += link->latency();
+        *lat += link->get_latency();
     }
 
     prev_dst_gw = e_route->gw_dst;
@@ -86,10 +86,10 @@ void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
 }
 
 void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
-                          std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+                          std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
   addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
 
@@ -157,7 +157,7 @@ void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoi
 void FloydZone::seal()
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
   if (not link_table_) {
     /* Create Cost, Predecessor and Link tables */