X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e13ce5b2e888ecb8a373501a4332860f71a1e97c..a4e41762b17bf6a411ffc728bfd0e49de5eb110a:/src/surf/network_cm02.cpp

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 4ee72d2e9b..72d1a9af5d 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -84,7 +84,7 @@ void surf_network_model_init_Reno()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -101,7 +101,7 @@ void surf_network_model_init_Reno2()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -117,7 +117,7 @@ void surf_network_model_init_Vegas()
   if (surf_network_model)
     return;
 
-  using namespace simgrid::kernel;
+  namespace lmm = simgrid::kernel::lmm;
   lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
 
   simgrid::config::set_default<double>("network/latency-factor", 13.01);
@@ -146,11 +146,11 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
   }
 
   set_maxmin_system(make_new_lmm_system(select));
-  loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
+  loopback_ = NetworkCm02Model::create_link("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
 }
 
-LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency,
-                                       s4u::Link::SharingPolicy policy)
+LinkImpl* NetworkCm02Model::create_link(const std::string& name, double bandwidth, double latency,
+                                        s4u::Link::SharingPolicy policy)
 {
   return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system());
 }
@@ -253,14 +253,14 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
         });
   }
 
-  double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->get_bandwidth();
+  double bandwidth_bound = route.empty() ? -1.0 : get_bandwidth_factor(size) * route.front()->get_bandwidth();
 
   for (auto const& link : route)
-    bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->get_bandwidth());
+    bandwidth_bound = std::min(bandwidth_bound, get_bandwidth_factor(size) * link->get_bandwidth());
 
   action->lat_current_ = action->latency_;
-  action->latency_ *= latencyFactor(size);
-  action->rate_ = bandwidthConstraint(action->rate_, bandwidth_bound, size);
+  action->latency_ *= get_latency_factor(size);
+  action->rate_ = get_bandwidth_constraint(action->rate_, bandwidth_bound, size);
 
   int constraints_per_variable = route.size();
   constraints_per_variable += back_route.size();