X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/55a08c7439db5b0335a5b26e40b3a46e1e03d3e8..72055aaf2beec9ff1d8f3317ca41094596ffebf8:/src/surf/network_ib.hpp

diff --git a/src/surf/network_ib.hpp b/src/surf/network_ib.hpp
index 72eecd3af8..ad0185d4e3 100644
--- a/src/surf/network_ib.hpp
+++ b/src/surf/network_ib.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014-2020. The SimGrid Team.
+/* Copyright (c) 2014-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -27,30 +27,28 @@ struct XBT_PRIVATE ActiveComm {
 
 class IBNode {
 public:
-  int id;
+  int id_;
   // store related links, to ease computation of the penalties
-  std::vector<ActiveComm*> ActiveCommsUp;
+  std::vector<ActiveComm*> active_comms_up_;
   // store the number of comms received from each node
-  std::map<IBNode*, int> ActiveCommsDown;
+  std::map<IBNode*, int> active_comms_down_;
   // number of comms the node is receiving
-  int nbActiveCommsDown = 0;
-  explicit IBNode(int id) : id(id){};
-  virtual ~IBNode() = default;
+  int nb_active_comms_down_ = 0;
+  explicit IBNode(int id) : id_(id){};
 };
 
 class XBT_PRIVATE NetworkIBModel : public NetworkSmpiModel {
-  double Bs;
-  double Be;
-  double ys;
-  void updateIBfactors_rec(IBNode* root, std::vector<bool>& updatedlist) const;
-  void computeIBfactors(IBNode* root) const;
+  double Bs_;
+  double Be_;
+  double ys_;
+  void update_IB_factors_rec(IBNode* root, std::vector<bool>& updatedlist) const;
+  void compute_IB_factors(IBNode* root) const;
 
 public:
-  NetworkIBModel();
-  explicit NetworkIBModel(const char* name);
+  explicit NetworkIBModel(const std::string& name);
   NetworkIBModel(const NetworkIBModel&) = delete;
   NetworkIBModel& operator=(const NetworkIBModel&) = delete;
-  void updateIBfactors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const;
+  void update_IB_factors(NetworkAction* action, IBNode* from, IBNode* to, int remove) const;
 
   std::unordered_map<std::string, IBNode> active_nodes;
   std::unordered_map<NetworkAction*, std::pair<IBNode*, IBNode*>> active_comms;