Run check-style and polish logs on RR and PF schedulers

src/lte/model/pf-ff-mac-scheduler.h

@@ -39,8 +39,8 @@
 #define HARQ_PROC_NUM 8
 
 namespace ns3 {
-  
-  
+
+
 typedef std::vector < uint8_t > DlHarqProcessesStatus_t;
 typedef std::vector < DlDciListElement_s > DlHarqProcessesDciBuffer_t;
 typedef std::vector < std::vector <struct RlcPduListElement_s> > RlcPduList_t; // vector of the LCs and layers per UE
@@ -53,7 +53,7 @@ typedef std::vector < uint8_t > UlHarqProcessesStatus_t;
 struct pfsFlowPerf_t
 {
   Time flowStart;
-  unsigned long totalBytesTransmitted; 
+  unsigned long totalBytesTransmitted;
   unsigned int lastTtiBytesTrasmitted;
   double lastAveragedThroughput;
 };
@@ -97,7 +97,7 @@ public:
 
   friend class PfSchedulerMemberCschedSapProvider;
   friend class PfSchedulerMemberSchedSapProvider;
-  
+
   void TransmissionModeConfigurationUpdate (uint16_t rnti, uint8_t txMode);
 
 private:
@@ -149,16 +149,16 @@ private:
   int LcActivePerFlow (uint16_t rnti);
 
   double EstimateUlSinr (uint16_t rnti, uint16_t rb);
-  
-  void RefreshDlCqiMaps(void);
-  void RefreshUlCqiMaps(void);
-  
+
+  void RefreshDlCqiMaps (void);
+  void RefreshUlCqiMaps (void);
+
   void UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t size);
   void UpdateUlRlcBufferInfo (uint16_t rnti, uint16_t size);
-  
+
   /**
   * \brief Update and return a new process Id for the RNTI specified
-  * 
+  *
   * \param rnti the RNTI of the UE to be updated
   * \return the process id  value
   */
@@ -171,7 +171,7 @@ private:
   * \return the process id  value
   */
   uint8_t HarqProcessAvailability (uint16_t rnti);
-  
+
   Ptr<LteAmc> m_amc;
 
   /*
@@ -243,11 +243,11 @@ private:
   double m_timeWindow;
 
   uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL
-  
+
   uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid
 
   std::map <uint16_t,uint8_t> m_uesTxMode; // txMode of the UEs
-  
+
   // HARQ attributes
   /**
   * m_harqOn when false inhibit te HARQ mechanisms (by default active)
@@ -261,14 +261,14 @@ private:
   std::map <uint16_t, DlHarqProcessesDciBuffer_t> m_dlHarqProcessesDciBuffer;
   std::map <uint16_t, DlHarqRlcPduListBuffer_t> m_dlHarqProcessesRlcPduListBuffer;
   std::vector <DlInfoListElement_s> m_dlInfoListBuffered; // HARQ retx buffered
-  
+
   std::map <uint16_t, uint8_t> m_ulHarqCurrentProcessId;
   //HARQ status
   // 0: process Id available
   // x>0: process Id equal to `x` trasmission count
   std::map <uint16_t, UlHarqProcessesStatus_t> m_ulHarqProcessesStatus;
   std::map <uint16_t, UlHarqProcessesDciBuffer_t> m_ulHarqProcessesDciBuffer;
-  
+
 };
 
 } // namespace ns3

src/lte/model/rr-ff-mac-scheduler.h

@@ -84,7 +84,7 @@ public:
 
   friend class RrSchedulerMemberCschedSapProvider;
   friend class RrSchedulerMemberSchedSapProvider;
-  
+
   void TransmissionModeConfigurationUpdate (uint16_t rnti, uint8_t txMode);
 
 private:
@@ -132,31 +132,31 @@ private:
 
 
   int GetRbgSize (int dlbandwidth);
-  
+
   static bool SortRlcBufferReq (FfMacSchedSapProvider::SchedDlRlcBufferReqParameters i,FfMacSchedSapProvider::SchedDlRlcBufferReqParameters j);
-  
-  void RefreshDlCqiMaps(void);
-  void RefreshUlCqiMaps(void);
-  
+
+  void RefreshDlCqiMaps (void);
+  void RefreshUlCqiMaps (void);
+
   void UpdateDlRlcBufferInfo (uint16_t rnti, uint8_t lcid, uint16_t size);
   void UpdateUlRlcBufferInfo (uint16_t rnti, uint16_t size);
 
   /**
    * \brief Update and return a new process Id for the RNTI specified
-   * 
+   *
    * \param rnti the RNTI of the UE to be updated
    * \return the process id  value
    */
   uint8_t UpdateHarqProcessId (uint16_t rnti);
 
-    /**
-  * \brief Return the availability of free process for the RNTI specified
-  *
-  * \param rnti the RNTI of the UE to be updated
-  * \return the process id  value
-  */
+  /**
+* \brief Return the availability of free process for the RNTI specified
+*
+* \param rnti the RNTI of the UE to be updated
+* \return the process id  value
+*/
   uint8_t HarqProcessAvailability (uint16_t rnti);
-  
+
   Ptr<LteAmc> m_amc;
 
   /*
@@ -207,9 +207,9 @@ private:
 
   uint16_t m_nextRntiDl; // RNTI of the next user to be served next scheduling in DL
   uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL
-  
+
   uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid
-  
+
   std::map <uint16_t,uint8_t> m_uesTxMode; // txMode of the UEs