X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b5f37dd9e482e2303c9437870784fcb923e8c9f1..a9d46ef793944afed370e7612e5b38e43be9ecc5:/src/surf/network_cm02.hpp?ds=sidebyside

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 669829572f..cf97be463f 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -40,11 +40,7 @@ namespace simgrid {
     public:
       NetworkCm02Model();
       ~NetworkCm02Model() { }
-      Link* createLink(const char *name,
-          double bw_initial, tmgr_trace_t bw_trace,
-          double lat_initial, tmgr_trace_t lat_trace,
-          tmgr_trace_t state_trace,
-          e_surf_link_sharing_policy_t policy,
+      Link* createLink(const char *name, double bandwidth,  double latency, e_surf_link_sharing_policy_t policy,
           xbt_dict_t properties) override;
       void updateActionsStateLazy(double now, double delta) override;
       void updateActionsStateFull(double now, double delta) override;
@@ -52,7 +48,7 @@ namespace simgrid {
       bool next_occuring_event_isIdempotent() override {return true;}
       virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
     protected:
-      bool m_haveGap = false;
+      bool haveGap_ = false;
     };
 
     /************
@@ -62,12 +58,8 @@ namespace simgrid {
     class NetworkCm02Link : public Link {
     public:
       NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-          lmm_system_t system,
-          double constraint_value,
-          tmgr_trace_t state_trace,
-          double bw_peak, tmgr_trace_t bw_trace,
-          double lat_initial, tmgr_trace_t lat_trace,
-          e_surf_link_sharing_policy_t policy);
+          double bandwidth, double latency, e_surf_link_sharing_policy_t policy,
+          lmm_system_t system);
 
       void apply_event(tmgr_trace_iterator_t event, double value) override;
       void updateBandwidth(double value) override;
@@ -88,7 +80,7 @@ namespace simgrid {
     : NetworkAction(model, cost, failed) {};
       void updateRemainingLazy(double now);
     protected:
-      double m_senderGap;
+      double senderGap_;
     };
 
   }