Restructure surf++ workstation vmworkstation

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

diff --git a/src/surf/workstation_ptask_L07.hpp b/src/surf/workstation_ptask_L07.hpp
index 19ca986..d999f1d 100644 (file)
--- a/src/surf/workstation_ptask_L07.hpp
+++ b/src/surf/workstation_ptask_L07.hpp
@@ -1,4 +1,4 @@
-#include "workstation.hpp"
+#include "workstation_interface.hpp"
 
 #ifndef WORKSTATION_L07_HPP_
 #define WORKSTATION_L07_HPP_
@@ -53,10 +53,10 @@ public:
                                         double *computation_amount,
                                         double *communication_amount,
                                         double rate);
-  xbt_dynar_t getRoute(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst);
-  ActionPtr communicate(WorkstationCLM03Ptr src, WorkstationCLM03Ptr dst, double size, double rate);
+  xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst);
+  ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
   void addTraces();
-  NetworkL07ModelPtr p_networkModel;
+  NetworkModelPtr p_networkModel;
 };
 
 class CpuL07Model : public CpuModel {
@@ -74,11 +74,11 @@ public:
   WorkstationL07ModelPtr p_workstationModel;
 };
 
-class NetworkL07Model : public NetworkCm02Model {
+class NetworkL07Model : public NetworkModel {
 public:
-  NetworkL07Model() : NetworkCm02Model(0) {};
+  NetworkL07Model() : NetworkModel() {};
   ~NetworkL07Model() {surf_network_model = NULL;};
-  ResourcePtr createResource(const char *name,
+  NetworkLinkPtr createResource(const char *name,
                                                   double bw_initial,
                                                   tmgr_trace_t bw_trace,
                                                   double lat_initial,
@@ -89,7 +89,7 @@ public:
                                                   e_surf_link_sharing_policy_t
                                                   policy, xbt_dict_t properties);
 
-  xbt_dynar_t getRoute(WorkstationCLM03Ptr /*src*/, WorkstationCLM03Ptr /*dst*/) {DIE_IMPOSSIBLE;};
+  xbt_dynar_t getRoute(WorkstationPtr /*src*/, WorkstationPtr /*dst*/) {DIE_IMPOSSIBLE;};
   ActionPtr communicate(RoutingEdgePtr /*src*/, RoutingEdgePtr /*dst*/, double /*size*/, double /*rate*/) {DIE_IMPOSSIBLE;};
   void addTraces() {DIE_IMPOSSIBLE;};
   WorkstationL07ModelPtr p_workstationModel;
@@ -99,7 +99,7 @@ public:
  * Resource *
  ************/
 
-class WorkstationL07 : public WorkstationCLM03Lmm {
+class WorkstationL07 : public WorkstationLmm {
 public:
   WorkstationL07(WorkstationModelPtr model, const char* name, xbt_dict_t props, RoutingEdgePtr netElm, CpuPtr cpu);
   //bool isUsed();
@@ -135,7 +135,7 @@ public:
   double m_powerCurrent;
 };
 
-class LinkL07 : public NetworkCm02LinkLmm {
+class LinkL07 : public NetworkLinkLmm {
 public:
   LinkL07(NetworkL07ModelPtr model, const char* name, xbt_dict_t props);
   ~LinkL07(){
@@ -158,7 +158,7 @@ public:
 class WorkstationL07ActionLmm : public WorkstationActionLmm {
 public:
   WorkstationL07ActionLmm(ModelPtr model, double cost, bool failed)
-  : Action(model, cost, failed), WorkstationActionLmm(model, cost, failed) {};
+  : Action(model, cost, failed), WorkstationActionLmm() {};
  ~WorkstationL07ActionLmm();
 
   void updateBound();
@@ -173,7 +173,7 @@ public:
   double getRemains();
 
   int m_workstationNb;
-  WorkstationCLM03Ptr *p_workstationList;
+  WorkstationPtr *p_workstationList;
   double *p_computationAmount;
   double *p_communicationAmount;
   double m_latency;