removed useless LtePhy::{Get,Set}{Up,down}linkSubChannels

src/lte/model/lte-enb-phy.cc

@@ -324,13 +324,20 @@ LteEnbPhy::PhyPduReceived (Ptr<Packet> p)
 }
 
 void
-LteEnbPhy::DoSetDownlinkSubChannels ()
+LteEnbPhy::SetDownlinkSubChannels (std::vector<int> mask)
 {
   NS_LOG_FUNCTION (this);
+  m_listOfDownlinkSubchannel = mask;
   Ptr<SpectrumValue> txPsd = CreateTxPowerSpectralDensity ();
   m_downlinkSpectrumPhy->SetTxPowerSpectralDensity (txPsd);
 }
 
+std::vector<int>
+LteEnbPhy::GetDownlinkSubChannels (void)
+{
+  NS_LOG_FUNCTION (this);
+  return m_listOfDownlinkSubchannel;
+}
 
 Ptr<SpectrumValue>
 LteEnbPhy::CreateTxPowerSpectralDensity ()

src/lte/model/lte-enb-phy.h

@@ -118,8 +118,23 @@ public:
     
   virtual uint8_t DoGetMacChTtiDelay ();
 
+  /**
+   * \brief set the resource blocks (a.k.a. sub channels) to be used in the downlink for transmission
+   * 
+   * \param mask a bitmask implemented as a vector. If the i-th value
+   * of mask is equal to 1 (0) it means that the i-th resource block
+   * is used (not used) for transmission in the downlink.
+   */
+  void SetDownlinkSubChannels (std::vector<int> mask );
 
-  void DoSetDownlinkSubChannels ();
+
+  /**
+   * 
+   * \return a bitmask implemented as a vector. If the i-th value
+   * of mask is equal to 1 (0) it means that the i-th resource block
+   * is used (not used) for transmission in the downlink.
+   */
+  std::vector<int> GetDownlinkSubChannels (void);
 
   /**
    * \brief Create the PSD for TX
@@ -218,6 +233,8 @@ public:
 private:
   std::map <uint16_t, Ptr<LteUePhy> > m_ueAttached;
   
+  std::vector <int> m_listOfDownlinkSubchannel;
+  
   std::vector <int> m_dlDataRbMap;
   
   std::vector< std::list<UlDciLteControlMessage> > m_ulDciQueue; // for storing info on future receptions

src/lte/model/lte-phy.cc

@@ -127,53 +127,6 @@ LtePhy::SetUplinkChannel (Ptr<SpectrumChannel> c)
   m_uplinkSpectrumPhy->SetChannel (c);
 }
 
-void
-LtePhy::SetDownlinkSubChannels (std::vector<int> mask )
-{
-  NS_LOG_FUNCTION (this);
-  m_listOfDownlinkSubchannel = mask;
-  DoSetDownlinkSubChannels ();
-}
-
-
-void
-LtePhy::DoSetDownlinkSubChannels ()
-{
-  NS_LOG_FUNCTION (this);
-}
-
-
-void
-LtePhy::SetUplinkSubChannels (std::vector<int> mask )
-{
-  NS_LOG_FUNCTION (this);
-  m_listOfUplinkSubchannel = mask;
-  DoSetUplinkSubChannels ();
-}
-
-
-void
-LtePhy::DoSetUplinkSubChannels ()
-{
-  NS_LOG_FUNCTION (this);
-}
-
-
-std::vector<int>
-LtePhy::GetDownlinkSubChannels (void)
-{
-  NS_LOG_FUNCTION (this);
-  return m_listOfDownlinkSubchannel;
-}
-
-
-std::vector<int>
-LtePhy::GetUplinkSubChannels (void)
-{
-  NS_LOG_FUNCTION (this);
-  return m_listOfUplinkSubchannel;
-}
-
 void
 LtePhy::SetTti (double tti)
 {

src/lte/model/lte-phy.h

@@ -111,41 +111,6 @@ public:
    */
   void SetUplinkChannel (Ptr<SpectrumChannel> c);
 
-  /**
-   * \brief set a list of sub channel to use in the downlink.
-   * A sub channel is composed by a couple of resource bloks (180KHz x 1 ms)
-   * \param mask a vector of intefer values. Each elements of this vector carries information about
-   * the corresponding DL sub channel. If the i-th value of mask is equal to 1 (0) it means that the corresponding sub channel is used (not used) for the downlink.
-   */
-  void SetDownlinkSubChannels (std::vector<int> mask );
-  /**
-   * \brief do some operation after the set of a list of DL sub channels
-   */
-  virtual void DoSetDownlinkSubChannels ();
-
-  /**
-   * \brief set a list of sub channel to use in the uplink.
-   * A sub channel is composed by a couple of resource bloks (180KHz x 1 ms)
-   * \param mask a vector of intefer values. Each elements of this vector carries information about
-   * the corresponding UL sub channel. If the i-th value of mask is equal to 1 (0) it means that the corresponding sub channel is used (not used) for the uplink.
-   */
-  void SetUplinkSubChannels (std::vector<int> mask);
-  /**
-   * \brief do some operation after the set of a list of UL sub channels
-   */
-  virtual void DoSetUplinkSubChannels ();
-
-  /**
-   * \brief get a list of sub channel to use in the downlink
-   * \return
-   */
-  std::vector<int> GetDownlinkSubChannels (void);
-  /**
-   * \brief get a list of sub channel to use in the downlink
-   * \return
-   */
-  std::vector<int> GetUplinkSubChannels (void);
-
 
   /**
    * \brief Compute the TX Power Spectral Density
@@ -254,9 +219,6 @@ protected:
   Ptr<LteSpectrumPhy> m_downlinkSpectrumPhy;
   Ptr<LteSpectrumPhy> m_uplinkSpectrumPhy;
 
-  std::vector <int> m_listOfDownlinkSubchannel;
-  std::vector <int> m_listOfUplinkSubchannel;
-
   double m_txPower;
   double m_noiseFigure;
 

src/lte/model/lte-ue-phy.cc

@@ -290,19 +290,6 @@ LteUePhy::PhyPduReceived (Ptr<Packet> p)
   m_uePhySapUser->ReceivePhyPdu (p);
 }
 
-void
-LteUePhy::DoSetUplinkSubChannels ()
-{
-  NS_LOG_FUNCTION (this);
-
-  /*
-   *  XXX: the uplink scheduler is not implemented yet!
-   *  Now, all uplink sub channels can be used for uplink transmission
-   */
-  SetSubChannelsForTransmission (GetUplinkSubChannels ());
-}
-
-
 void
 LteUePhy::SetSubChannelsForTransmission (std::vector <int> mask)
 {

src/lte/model/lte-ue-phy.h

@@ -118,11 +118,6 @@ public:
    */
   virtual Ptr<SpectrumValue> CreateTxPowerSpectralDensity ();
 
-  /**
-   * \brief Update available channel for TX
-   */
-  virtual void DoSetUplinkSubChannels ();
-
   /**
    * \brief Set a list of sub channels to use in TX
    * \param mask a list of sub channels