cleanups in the model initialization

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

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 585e0a8..e1aa4bb 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -51,7 +51,7 @@ public:
   ~CpuL07Model();
 
   Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
-  HostL07Model *p_hostModel;
+  HostL07Model *hostModel_;
 };
 
 class NetworkL07Model : public NetworkModel {
@@ -62,10 +62,9 @@ public:
       e_surf_link_sharing_policy_t policy,
       xbt_dict_t properties) override;
 
-  Action *communicate(kernel::routing::NetCard *src, kernel::routing::NetCard *dst, double size, double rate) override;
-  bool next_occuring_event_isIdempotent() override {return true;}
+  Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
 
-  HostL07Model *p_hostModel;
+  HostL07Model *hostModel_;
 };
 
 /************
@@ -111,11 +110,11 @@ public:
 
   int unref() override;
 
-  std::vector<kernel::routing::NetCard*> * p_netcardList = new std::vector<kernel::routing::NetCard*>();
-  double *p_computationAmount;
-  double *p_communicationAmount;
-  double m_latency;
-  double m_rate;
+  std::vector<kernel::routing::NetCard*> * netcardList_ = new std::vector<kernel::routing::NetCard*>();
+  double *computationAmount_;
+  double *communicationAmount_;
+  double latency_;
+  double rate_;
 };
 
 }