From 7a962524dde4462c012866f371f0a0810915508c Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 21 Jul 2018 23:06:04 +0200 Subject: [PATCH] snake_case k::r::NetworkConstant --- src/surf/network_constant.cpp | 4 ++-- src/surf/network_constant.hpp | 18 +++--------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 0ebd1813df..e602e94792 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -59,7 +59,7 @@ void NetworkConstantModel::update_actions_state(double /*now*/, double delta) action.latency_ = 0.0; } } - action.update_remains(action.get_cost() * delta / action.initialLatency_); + action.update_remains(action.get_cost() * delta / action.initial_latency_); if (action.get_max_duration() != NO_MAX_DURATION) action.update_max_duration(delta); @@ -82,7 +82,7 @@ kernel::resource::Action* NetworkConstantModel::communicate(s4u::Host* src, s4u: * Action * **********/ NetworkConstantAction::NetworkConstantAction(NetworkConstantModel* model_, double size, double latency) - : NetworkAction(model_, size, false), initialLatency_(latency) + : NetworkAction(model_, size, false), initial_latency_(latency) { latency_ = latency; if (latency_ <= 0.0) diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp index ab7a8f1e24..2576c59fbf 100644 --- a/src/surf/network_constant.hpp +++ b/src/surf/network_constant.hpp @@ -14,16 +14,6 @@ namespace simgrid { namespace kernel { namespace resource { -/*********** - * Classes * - ***********/ - -class XBT_PRIVATE NetworkConstantModel; -class XBT_PRIVATE NetworkConstantAction; - -/********* - * Model * - *********/ class NetworkConstantModel : public NetworkModel { public: NetworkConstantModel(); @@ -34,17 +24,15 @@ public: LinkImpl* create_link(const std::string& name, double bw, double lat, s4u::Link::SharingPolicy policy) override; }; -/********** - * Action * - **********/ class NetworkConstantAction : public NetworkAction { public: NetworkConstantAction(NetworkConstantModel* model_, double size, double latency); ~NetworkConstantAction(); - double initialLatency_; + double initial_latency_; void update_remains_lazy(double now) override; }; -} + +} // namespace resource } // namespace kernel } // namespace simgrid -- 2.20.1