X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec4e2d87d99b8ad76c9096033eb858e9052b09fa..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 8d7e33a266..a7f479e26e 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -43,10 +43,7 @@ namespace simgrid {
 namespace surf {
 
 class NetworkCm02Model : public NetworkModel {
-private:
-  void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {};
   NetworkCm02Model();
   ~NetworkCm02Model() { }
   Link* createLink(const char *name,
@@ -54,17 +51,18 @@ public:
 		  tmgr_trace_t bw_trace,
 		  double lat_initial,
 		  tmgr_trace_t lat_trace,
-		  e_surf_resource_state_t state_initial,
+		  int initiallyOn,
 		  tmgr_trace_t state_trace,
 		  e_surf_link_sharing_policy_t policy,
 		  xbt_dict_t properties) override;
-  void addTraces();
-  void updateActionsStateLazy(double now, double delta);
-  void updateActionsStateFull(double now, double delta);
+  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);
-  bool shareResourcesIsIdempotent() {return true;}
+		                           double size, double rate) override;
+  bool shareResourcesIsIdempotent() override {return true;}
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};
+protected:
   bool m_haveGap = false;
 };
 
@@ -77,17 +75,17 @@ public:
   NetworkCm02Link(NetworkCm02Model *model, const char *name, xbt_dict_t props,
 	                           lmm_system_t system,
 	                           double constraint_value,
-	                           tmgr_history_t history,
-	                           e_surf_resource_state_t state_init,
+	                           sg_future_evt_set_t fes,
+	                           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 updateState(tmgr_trace_event_t event_type, double value, double date);
-  void updateBandwidth(double value, double date=surf_get_clock());
-  void updateLatency(double value, double date=surf_get_clock());
+  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
+  void updateBandwidth(double value, double date=surf_get_clock()) override;
+  void updateLatency(double value, double date=surf_get_clock()) override;
   virtual void gapAppend(double /*size*/, const Link* /*link*/, NetworkAction * /*action*/) {};