X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54e35ebda7e4ffacd769653b8ebb8ba93c7298bf..e36ab8605881c80995e3df732c33bd44bd4eda86:/src/surf/network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f9d418ab69..ff805e4a22 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -30,16 +30,11 @@ class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel("network") {
+  NetworkCm02Model(int /*i*/) : NetworkModel() {
 	f_networkSolve = lmm_solve;
 	m_haveGap = false;
   };//FIXME: add network clean interface
-  NetworkCm02Model(const char *name) : NetworkModel(name) {
-    this->initialize();
-  }
-  NetworkCm02Model() : NetworkModel("network") {
-    this->initialize();
-  }
+  NetworkCm02Model();
   ~NetworkCm02Model() {
   }
   Link* createLink(const char *name,
@@ -56,6 +51,7 @@ public:
   void updateActionsStateFull(double now, double delta);
   Action *communicate(RoutingEdge *src, RoutingEdge *dst,
 		                           double size, double rate);
+  bool shareResourcesIsIdempotent() {return true;}
 };
 
 /************
@@ -90,9 +86,8 @@ class NetworkCm02Action : public NetworkAction {
 
 public:
   NetworkCm02Action(Model *model, double cost, bool failed)
- : NetworkAction(model, cost, failed) {};
+     : NetworkAction(model, cost, failed) {};
   void updateRemainingLazy(double now);
-  void recycle();
 };
 
 #endif /* SURF_NETWORK_CM02_HPP_ */