snake case for better consistency

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

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index a0c0de0..4ee72d2 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -133,8 +133,8 @@ namespace kernel {
 namespace resource {
 
 NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
 namespace resource {
 
 NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))

-    : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::Full
-                                                                                      : Model::UpdateAlgo::Lazy)
+    : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::FULL
+                                                                                      : Model::UpdateAlgo::LAZY)

 {
   std::string optim = simgrid::config::get_value<std::string>("network/optim");
   bool select       = simgrid::config::get_value<bool>("network/maxmin-selective-update");
 {
   std::string optim = simgrid::config::get_value<std::string>("network/optim");
   bool select       = simgrid::config::get_value<bool>("network/maxmin-selective-update");


@@ -242,21 +242,21 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
   action->weight_ = latency;
   action->latency_ = latency;
   action->rate_ = rate;
   action->weight_ = latency;
   action->latency_ = latency;
   action->rate_ = rate;

-  if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
+  if (get_update_algorithm() == Model::UpdateAlgo::LAZY) {

     action->set_last_update();
   }
 
   if (sg_weight_S_parameter > 0) {
     action->weight_ =
         std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {
     action->set_last_update();
   }
 
   if (sg_weight_S_parameter > 0) {
     action->weight_ =
         std::accumulate(route.begin(), route.end(), action->weight_, [](double total, LinkImpl* const& link) {

-          return total + sg_weight_S_parameter / link->bandwidth();
+          return total + sg_weight_S_parameter / link->get_bandwidth();

         });
   }
 
         });
   }
 

-  double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->bandwidth();
+  double bandwidth_bound = route.empty() ? -1.0 : bandwidthFactor(size) * route.front()->get_bandwidth();

 
   for (auto const& link : route)
 
   for (auto const& link : route)

-    bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->bandwidth());
+    bandwidth_bound = std::min(bandwidth_bound, bandwidthFactor(size) * link->get_bandwidth());

 
   action->lat_current_ = action->latency_;
   action->latency_ *= latencyFactor(size);
 
   action->lat_current_ = action->latency_;
   action->latency_ *= latencyFactor(size);


@@ -267,7 +267,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
 
   if (action->latency_ > 0) {
     action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable));
 
   if (action->latency_ > 0) {
     action->set_variable(get_maxmin_system()->variable_new(action, 0.0, -1.0, constraints_per_variable));

-    if (get_update_algorithm() == Model::UpdateAlgo::Lazy) {
+    if (get_update_algorithm() == Model::UpdateAlgo::LAZY) {

       // add to the heap the event when the latency is payed
       double date = action->latency_ + action->get_last_update();
 
       // add to the heap the event when the latency is payed
       double date = action->latency_ + action->get_last_update();
 


@@ -330,14 +330,14 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
 {
   /* Find out which of my iterators was triggered, and react accordingly */
   if (triggered == bandwidth_.event) {
 {
   /* Find out which of my iterators was triggered, and react accordingly */
   if (triggered == bandwidth_.event) {

-    setBandwidth(value);
+    set_bandwidth(value);

     tmgr_trace_event_unref(&bandwidth_.event);
 
   } else if (triggered == latency_.event) {
     tmgr_trace_event_unref(&bandwidth_.event);
 
   } else if (triggered == latency_.event) {

-    setLatency(value);
+    set_latency(value);

     tmgr_trace_event_unref(&latency_.event);
 
     tmgr_trace_event_unref(&latency_.event);
 

-  } else if (triggered == stateEvent_) {
+  } else if (triggered == state_event_) {

     if (value > 0)
       turn_on();
     else {
     if (value > 0)
       turn_on();
     else {


@@ -355,7 +355,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
         }
       }
     }
         }
       }
     }

-    tmgr_trace_event_unref(&stateEvent_);
+    tmgr_trace_event_unref(&state_event_);

   } else {
     xbt_die("Unknown event!\n");
   }
   } else {
     xbt_die("Unknown event!\n");
   }


@@ -364,7 +364,7 @@ void NetworkCm02Link::apply_event(tmgr_trace_event_t triggered, double value)
             get_constraint());
 }
 
             get_constraint());
 }
 

-void NetworkCm02Link::setBandwidth(double value)
+void NetworkCm02Link::set_bandwidth(double value)

 {
   bandwidth_.peak = value;
 
 {
   bandwidth_.peak = value;
 


@@ -389,7 +389,7 @@ void NetworkCm02Link::setBandwidth(double value)
   }
 }
 
   }
 }
 

-void NetworkCm02Link::setLatency(double value)
+void NetworkCm02Link::set_latency(double value)

 {
   double delta                 = value - latency_.peak;
   kernel::lmm::Variable* var   = nullptr;
 {
   double delta                 = value - latency_.peak;
   kernel::lmm::Variable* var   = nullptr;