[CR] Minor improvement.

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 0cf669d..c962616 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -38,12 +38,13 @@ class NetworkCm02Model : public NetworkModel {
   NetworkCm02Action* comm_action_create(s4u::Host* src, s4u::Host* dst, double size,
                                         const std::vector<LinkImpl*>& route, bool failed);
   /** @brief Expand link contraint considering this new communication action */
-  void comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, NetworkCm02Action* action,
-                                      const std::vector<LinkImpl*>& route, const std::vector<LinkImpl*>& back_route);
+  void comm_action_expand_constraints(const s4u::Host* src, const s4u::Host* dst, const NetworkCm02Action* action,
+                                      const std::vector<LinkImpl*>& route,
+                                      const std::vector<LinkImpl*>& back_route) const;
   /** @brief Set communication bounds for latency and bandwidth */
   void comm_action_set_bounds(const s4u::Host* src, const s4u::Host* dst, double size, NetworkCm02Action* action,
                               const std::vector<LinkImpl*>& route,
-                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones);
+                              const std::unordered_set<kernel::routing::NetZoneImpl*>& netzones, double rate);
   /** @brief Create maxmin variable in communication action */
   void comm_action_set_variable(NetworkCm02Action* action, const std::vector<LinkImpl*>& route,
                                 const std::vector<LinkImpl*>& back_route);
@@ -61,6 +62,8 @@ public:
 protected:
   virtual void check_lat_factor_cb();
   virtual void check_bw_factor_cb();
+
+private:
   std::function<NetworkFactorCb> lat_factor_cb_;
   std::function<NetworkFactorCb> bw_factor_cb_;
 };
@@ -74,7 +77,7 @@ public:
   NetworkCm02Link(const std::string& name, double bandwidth, lmm::System* system);
   void apply_event(kernel::profile::Event* event, double value) override;
   void set_bandwidth(double value) override;
-  LinkImpl* set_latency(double value) override;
+  void set_latency(double value) override;
 };
 
 /**********