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

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index f9d418ab69..f384e5f3de 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -1,16 +1,16 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
+#ifndef SURF_NETWORK_CM02_HPP_
+#define SURF_NETWORK_CM02_HPP_
+
 #include "network_interface.hpp"
 #include "xbt/fifo.h"
 #include "xbt/graph.h"
 
-#ifndef SURF_NETWORK_CM02_HPP_
-#define SURF_NETWORK_CM02_HPP_
-
 /***********
  * Classes *
  ***********/
@@ -30,16 +30,8 @@ class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel("network") {
-	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(int /*i*/) : NetworkModel() {};
+  NetworkCm02Model();
   ~NetworkCm02Model() {
   }
   Link* createLink(const char *name,
@@ -50,12 +42,13 @@ public:
 		  e_surf_resource_state_t state_initial,
 		  tmgr_trace_t state_trace,
 		  e_surf_link_sharing_policy_t policy,
-		  xbt_dict_t properties);
+		  xbt_dict_t properties) override;
   void addTraces();
   void updateActionsStateLazy(double now, double delta);
   void updateActionsStateFull(double now, double delta);
   Action *communicate(RoutingEdge *src, RoutingEdge *dst,
 		                           double size, double rate);
+  bool shareResourcesIsIdempotent() {return true;}
 };
 
 /************
@@ -90,9 +83,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_ */