Cleanups in the Constant model

[simgrid.git] / src / surf / network_cm02.hpp

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 7edb83f..f384e5f 100644 (file)
--- 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,10 +30,7 @@ class NetworkCm02Model : public NetworkModel {
 private:
   void initialize();
 public:
-  NetworkCm02Model(int /*i*/) : NetworkModel() {
-       f_networkSolve = lmm_solve;
-       m_haveGap = false;
-  };//FIXME: add network clean interface
+  NetworkCm02Model(int /*i*/) : NetworkModel() {};
   NetworkCm02Model();
   ~NetworkCm02Model() {
   }
@@ -45,7 +42,7 @@ 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);
@@ -86,7 +83,7 @@ class NetworkCm02Action : public NetworkAction {
 
 public:
   NetworkCm02Action(Model *model, double cost, bool failed)
- : NetworkAction(model, cost, failed) {};
+     : NetworkAction(model, cost, failed) {};
   void updateRemainingLazy(double now);
 };