X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc4066f005c4827b8169f71ea0c500b6dc311721..ec3eadc73b969fdfd1226ec673a0d702f82c5b4f:/src/surf/network.hpp

diff --git a/src/surf/network.hpp b/src/surf/network.hpp
index f1b2338759..97700992cd 100644
--- a/src/surf/network.hpp
+++ b/src/surf/network.hpp
@@ -29,14 +29,17 @@ typedef NetworkCm02ActionLmm *NetworkCm02ActionLmmPtr;
  *********/
 extern NetworkCm02ModelPtr surf_network_model;
 
-
+void net_define_callbacks(void);
 
 /*********
  * Model *
  *********/
 class NetworkCm02Model : public Model {
 public:
-  NetworkCm02Model(int i) : Model("network") {};//FIXME: add network clean interface
+  NetworkCm02Model(int i) : Model("network") {
+	f_networkSolve = lmm_solve;
+	m_haveGap = false;
+  };//FIXME: add network clean interface
   NetworkCm02Model(string name);
   NetworkCm02Model();
   //FIXME:NetworkCm02LinkPtr createResource(string name);
@@ -55,11 +58,11 @@ public:
 		                           double size, double rate);
   xbt_dynar_t getRoute(RoutingEdgePtr src, RoutingEdgePtr dst); //FIXME: kill field? That is done by the routing nowadays
   //FIXME: virtual void addTraces() =0;
-  void (*f_networkSolve)(lmm_system_t) = lmm_solve;
-  double latencyFactor(double size);
-  double bandwidthFactor(double size);
-  double bandwidthConstraint(double rate, double bound, double size);
-  bool m_haveGap = false;
+  void (*f_networkSolve)(lmm_system_t);
+  virtual double latencyFactor(double size);
+  virtual double bandwidthFactor(double size);
+  virtual double bandwidthConstraint(double rate, double bound, double size);
+  bool m_haveGap;
 };
 
 /************