X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c39f643b5bfb0e99887c209a94e49f841a2daae4..eca09d65271990fdae84e1d7da71916740a9c50b:/src/surf/workstation_clm03.hpp

diff --git a/src/surf/workstation_clm03.hpp b/src/surf/workstation_clm03.hpp
index 56534fffae..88b485435a 100644
--- a/src/surf/workstation_clm03.hpp
+++ b/src/surf/workstation_clm03.hpp
@@ -1,3 +1,9 @@
+/* Copyright (c) 2013-2014. 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. */
+
 #include "workstation_interface.hpp"
 #include "storage_interface.hpp"
 #include "cpu_interface.hpp"
@@ -23,13 +29,11 @@ typedef WorkstationCLM03Action *WorkstationCLM03ActionPtr;
  * Model *
  *********/
 
-class WorkstationCLM03Model : virtual public WorkstationModel {
+class WorkstationCLM03Model : public WorkstationModel {
 public:
-  WorkstationCLM03Model(const char *name);
   WorkstationCLM03Model();
   ~WorkstationCLM03Model();
-  void parseInit(sg_platf_host_cbarg_t host);
-  WorkstationPtr createResource(const char *name);
+  WorkstationPtr createWorkstation(const char *name);
   double shareResources(double now);
 
   void updateActionsState(double now, double delta);
@@ -39,7 +43,6 @@ public:
                                         double *computation_amount,
                                         double *communication_amount,
                                         double rate);
- xbt_dynar_t getRoute(WorkstationPtr src, WorkstationPtr dst);
  ActionPtr communicate(WorkstationPtr src, WorkstationPtr dst, double size, double rate);
 };
 
@@ -71,11 +74,6 @@ public:
  * Action *
  **********/
 
-class WorkstationCLM03Action : public WorkstationAction {
-public:
-  WorkstationCLM03Action(ModelPtr model, double cost, bool failed)
-  : WorkstationAction(model, cost, failed) {}
-};
 
 
 #endif /* SURF_WORKSTATION_CLM03_HPP_ */