even more cleanups in the routing

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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index c2accc5..1fb97de 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -47,19 +47,14 @@ public:
   NetworkCm02Model();
   ~NetworkCm02Model() { }
   Link* createLink(const char *name,
-      double bw_initial,
-      tmgr_trace_t bw_trace,
-      double lat_initial,
-      tmgr_trace_t lat_trace,
-      int initiallyOn,
-      tmgr_trace_t state_trace,
+      double bw_initial, tmgr_trace_t bw_trace,
+      double lat_initial, tmgr_trace_t lat_trace,
+      int initiallyOn, tmgr_trace_t state_trace,
       e_surf_link_sharing_policy_t policy,
       xbt_dict_t properties) override;
-  void addTraces() override;
   void updateActionsStateLazy(double now, double delta) override;
   void updateActionsStateFull(double now, double delta) override;
-  Action *communicate(NetCard *src, NetCard *dst,
-                               double size, double rate) override;
+  Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
   bool next_occuring_event_isIdempotent() override {return true;}
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
 protected:
@@ -73,21 +68,17 @@ protected:
 class NetworkCm02Link : public Link {
 public:
   NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
-                             lmm_system_t system,
-                             double constraint_value,
-                             int initiallyOn,
-                             tmgr_trace_t state_trace,
-                             double metric_peak,
-                             tmgr_trace_t metric_trace,
-                             double lat_initial,
-                             tmgr_trace_t lat_trace,
-                               e_surf_link_sharing_policy_t policy);
-  void apply_event(tmgr_trace_iterator_t event_type, double value) override;
+      lmm_system_t system,
+      double constraint_value,
+      int initiallyOn, 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);
+
+  void apply_event(tmgr_trace_iterator_t event, double value) override;
   void updateBandwidth(double value) override;
   void updateLatency(double value) override;
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
-
-
 };