X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0d9dcbe52b4b8a3cb6125c07c2acd7af1e2f382..31717acca9960c34597be9aae60d9ddf076c7f9c:/src/surf/network_constant.hpp

diff --git a/src/surf/network_constant.hpp b/src/surf/network_constant.hpp
index a80825afcf..f428c3a01e 100644
--- a/src/surf/network_constant.hpp
+++ b/src/surf/network_constant.hpp
@@ -30,21 +30,17 @@ public:
   ~NetworkConstantModel() { }
 
   Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
-  double shareResources(double now) override;
+  double next_occuring_event(double now) override;
+  bool next_occuring_event_isIdempotent() override {return true;}
   void updateActionsState(double now, double delta) override;
-  bool shareResourcesIsIdempotent() override {return true;}
 
   Link*
   createLink(const char *name,
-      double bw_initial,
-      tmgr_trace_t bw_trace,
-      double lat_initial,
-      tmgr_trace_t lat_trace,
-      e_surf_resource_state_t state_initial,
-      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 { DIE_IMPOSSIBLE; }
-  void addTraces()                    override { DIE_IMPOSSIBLE; }
 };
 
 /**********
@@ -56,12 +52,12 @@ public:
   : NetworkAction(model_, size, false)
   , m_latInit(latency)
   {
-	m_latency = latency;
-	if (m_latency <= 0.0) {
-	  p_stateSet = getModel()->getDoneActionSet();
-	  p_stateSet->push_back(*this);
-	}
-	p_variable = NULL;
+  m_latency = latency;
+  if (m_latency <= 0.0) {
+    p_stateSet = getModel()->getDoneActionSet();
+    p_stateSet->push_back(*this);
+  }
+  p_variable = NULL;
   };
   int unref() override;
   void cancel() override;