From 783dacaf0fb0e39b260f8bfddc990df8603f657d Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 8 Jun 2017 01:06:08 +0200 Subject: [PATCH 1/1] reindent --- src/surf/network_cm02.hpp | 99 +++++++++++++++++++-------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp index 04f6d98786..a04f21518f 100644 --- a/src/surf/network_cm02.hpp +++ b/src/surf/network_cm02.hpp @@ -31,56 +31,55 @@ namespace simgrid { *********/ namespace simgrid { - namespace surf { - - class NetworkCm02Model : public NetworkModel { - public: - NetworkCm02Model(); - explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self)); - virtual ~NetworkCm02Model() = default; - LinkImpl* createLink(const char* name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy) override; - void updateActionsStateLazy(double now, double delta) override; - void updateActionsStateFull(double now, double delta) override; - Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); - - protected: - bool haveGap_ = false; - }; - - /************ - * Resource * - ************/ - - class NetworkCm02Link : public LinkImpl { - public: - NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, - e_surf_link_sharing_policy_t policy, lmm_system_t system); - virtual ~NetworkCm02Link() = default; - void apply_event(tmgr_trace_event_t event, double value) override; - void setBandwidth(double value) override; - void setLatency(double value) override; - virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); - }; - - - /********** - * Action * - **********/ - class NetworkCm02Action : public NetworkAction { - friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); - friend NetworkSmpiModel; - public: - NetworkCm02Action(Model *model, double cost, bool failed) - : NetworkAction(model, cost, failed) {}; - virtual ~NetworkCm02Action() = default; - void updateRemainingLazy(double now) override; - protected: - double senderGap_; - }; - - } +namespace surf { + +class NetworkCm02Model : public NetworkModel { +public: + NetworkCm02Model(); + explicit NetworkCm02Model(void (*solve_fun)(lmm_system_t self)); + virtual ~NetworkCm02Model() = default; + LinkImpl* createLink(const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy) override; + void updateActionsStateLazy(double now, double delta) override; + void updateActionsStateFull(double now, double delta) override; + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); + +protected: + bool haveGap_ = false; +}; + +/************ + * Resource * + ************/ + +class NetworkCm02Link : public LinkImpl { +public: + NetworkCm02Link(NetworkCm02Model* model, const char* name, double bandwidth, double latency, + e_surf_link_sharing_policy_t policy, lmm_system_t system); + virtual ~NetworkCm02Link() = default; + void apply_event(tmgr_trace_event_t event, double value) override; + void setBandwidth(double value) override; + void setLatency(double value) override; + virtual void gapAppend(double size, const LinkImpl* link, NetworkAction* action); +}; + +/********** + * Action * + **********/ +class NetworkCm02Action : public NetworkAction { + friend Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); + friend NetworkSmpiModel; + +public: + NetworkCm02Action(Model* model, double cost, bool failed) : NetworkAction(model, cost, failed){}; + virtual ~NetworkCm02Action() = default; + void updateRemainingLazy(double now) override; + +protected: + double senderGap_; +}; +} } #endif /* SURF_NETWORK_CM02_HPP_ */ -- 2.20.1