Merge branch 'master' into master

[simgrid.git] / examples / simdag / test / sd_test.cpp

diff --git a/examples/simdag/test/sd_test.cpp b/examples/simdag/test/sd_test.cpp
index ea379dc..89e1a9f 100644 (file)
--- a/examples/simdag/test/sd_test.cpp
+++ b/examples/simdag/test/sd_test.cpp
@@ -5,11 +5,9 @@
 
 #include "simgrid/s4u.hpp"
 #include "simgrid/simdag.h"
-#include "xbt/ex.h"
-#include "xbt/log.h"
+
 #include <cmath>
 #include <set>
-#include <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, "Logging specific to this SimDag example");
 
@@ -33,13 +31,13 @@ int main(int argc, char **argv)
   double comp_amount2 = 1000000;
   double comm_amount12 = 2000000;
   double comm_amount21 = 3000000;
-  XBT_INFO("Computation time for %f flops on %s: %f", comp_amount1, h1->get_cname(), comp_amount1 / h1->getSpeed());
-  XBT_INFO("Computation time for %f flops on %s: %f", comp_amount2, h2->get_cname(), comp_amount2 / h2->getSpeed());
+  XBT_INFO("Computation time for %f flops on %s: %f", comp_amount1, h1->get_cname(), comp_amount1 / h1->get_speed());
+  XBT_INFO("Computation time for %f flops on %s: %f", comp_amount2, h2->get_cname(), comp_amount2 / h2->get_speed());
 
   XBT_INFO("Route between %s and %s:", h1->get_cname(), h2->get_cname());
   std::vector<sg_link_t> route;
   double latency = 0;
-  h1->routeTo(h2, route, &latency);
+  h1->route_to(h2, route, &latency);
 
   for (auto const& link : route)
     XBT_INFO("   Link %s: latency = %f, bandwidth = %f", sg_link_name(link), sg_link_latency(link),