Remove 'using namespace foo;' in headers

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 3c860f1..0196d91 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -29,7 +29,7 @@ struct tiTag;
  *********/
 class CpuTiTrace {
 public:
-  CpuTiTrace(tmgr_trace_t powerTrace);
+  CpuTiTrace(tmgr_trace_t speedTrace);
   ~CpuTiTrace();
 
   double integrateSimple(double a, double b);
@@ -47,13 +47,13 @@ private:
 enum trace_type {
 
   TRACE_FIXED,                /*< Trace fixed, no availability file */
-  TRACE_DYNAMIC               /*< Dynamic, availability file disponible */
+  TRACE_DYNAMIC               /*< Dynamic, have an availability file */
 };
 
 class CpuTiTgmr {
 public:
   CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){};
-  CpuTiTgmr(tmgr_trace_t power_trace, double value);
+  CpuTiTgmr(tmgr_trace_t speedTrace, double value);
   ~CpuTiTgmr();
 
   double integrate(double a, double b);
@@ -62,10 +62,10 @@ public:
   double getPowerScale(double a);
 
   trace_type m_type;
-  double m_value;                 /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */
+  double m_value;                 /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
 
   /* Dynamic */
-  double m_lastTime;             /*< Integral interval last point (discret time) */
+  double m_lastTime;             /*< Integral interval last point (discrete time) */
   double m_total;                 /*< Integral total between 0 and last_pointn */
 
   CpuTiTrace *p_trace;
@@ -78,10 +78,6 @@ public:
 
 class CpuTiAction: public CpuAction {
   friend class CpuTi;
-  // friend CpuAction *CpuTi::execute(double size);
-  // friend CpuAction *CpuTi::sleep(double duration);
-  // friend void CpuTi::updateActionsFinishTime(double now);//FIXME
-  // friend void CpuTi::updateRemainingAmount(double now);//FIXME
 public:
   CpuTiAction(CpuTiModel *model, double cost, bool failed,
                    CpuTi *cpu);