View | Details | Raw Unified | Return to bug 2366
Collapse All | Expand All

(-)a/src/spectrum/model/multi-model-spectrum-channel.cc (-2 / +9 lines)
 Lines 431-444    Link Here 
431 
MultiModelSpectrumChannel::AddPropagationLossModel (Ptr<PropagationLossModel> loss)
 431 
MultiModelSpectrumChannel::AddPropagationLossModel (Ptr<PropagationLossModel> loss)
432 
{
 432 
{
433 
  NS_LOG_FUNCTION (this << loss);
 433 
  NS_LOG_FUNCTION (this << loss);
434 
  NS_ASSERT (m_propagationLoss == 0);
 434 
  if (m_propagationLoss)
435 
    {
436 
      loss->SetNext (m_propagationLoss);
437 
    }
435 
  m_propagationLoss = loss;
 438 
  m_propagationLoss = loss;
436 
}
 439 
}
437 

          440
          

        

        

          438
          
void

          441
          
void

        

        

          439
          
MultiModelSpectrumChannel::AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss)

          442
          
MultiModelSpectrumChannel::AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss)

        

        

          440
          
{

          443
          
{

        

          
            

              441
              
  NS_ASSERT (m_spectrumPropagationLoss == 0);


              444
              
  NS_LOG_FUNCTION (this << loss);

            

            

              
              

              445
              
  if (m_spectrumPropagationLoss)

            

            


              446
              
    {

            

            


              447
              
      loss->SetNext (m_spectrumPropagationLoss);

            

            


              448
              
    }

            

        

          442
          
  m_spectrumPropagationLoss = loss;

          449
          
  m_spectrumPropagationLoss = loss;

        

        

          443
          
}

          450
          
}

        

        

          444
          

          451
          

        



(-)a/src/spectrum/model/single-model-spectrum-channel.cc
      (-2 / +8 lines)




  

    

    

       Lines 239-245
       
    
  Link Here 
    

  

        

          239
          
SingleModelSpectrumChannel::AddPropagationLossModel (Ptr<PropagationLossModel> loss)

          239
          
SingleModelSpectrumChannel::AddPropagationLossModel (Ptr<PropagationLossModel> loss)

        

        

          240
          
{

          240
          
{

        

        

          241
          
  NS_LOG_FUNCTION (this << loss);

          241
          
  NS_LOG_FUNCTION (this << loss);

        

          
            

              242
              
  NS_ASSERT (m_propagationLoss == 0);


              242
              
  if (m_propagationLoss)

            

            

              
              

              243
              
    {

            

            


              244
              
      loss->SetNext (m_propagationLoss);

            

            


              245
              
    }

            

        

          243
          
  m_propagationLoss = loss;

          246
          
  m_propagationLoss = loss;

        

        

          244
          
}

          247
          
}

        

        

          245
          

          248
          

        

  

    

    

       Lines 248-254
       
    
  Link Here 
    

  

        

          248
          
SingleModelSpectrumChannel::AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss)

          251
          
SingleModelSpectrumChannel::AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss)

        

        

          249
          
{

          252
          
{

        

        

          250
          
  NS_LOG_FUNCTION (this << loss);

          253
          
  NS_LOG_FUNCTION (this << loss);

        

          
            

              251
              
  NS_ASSERT (m_spectrumPropagationLoss == 0);


              254
              
  if (m_spectrumPropagationLoss)

            

            

              
              

              255
              
    {

            

            


              256
              
      loss->SetNext (m_spectrumPropagationLoss);

            

            


              257
              
    }

            

        

          252
          
  m_spectrumPropagationLoss = loss;

          258
          
  m_spectrumPropagationLoss = loss;

        

        

          253
          
}

          259
          
}

        

        

          254
          

          260
          

        



(-)a/src/spectrum/model/spectrum-channel.h
      (-3 / +3 lines)




  

    

    

       Lines 55-61
       
    
  Link Here 
    

  

        

          55
          
  static TypeId GetTypeId (void);

          55
          
  static TypeId GetTypeId (void);

        

        

          56
          

          56
          

        

        

          57
          
  /**

          57
          
  /**

        

          
            

              58
              
   * Set the single-frequency propagation loss model to be used


              58
              
   * Add the single-frequency propagation loss model to be used

            

        

          59
          
   * \warning only models that do not depend on the TX power should be used.

          59
          
   * \warning only models that do not depend on the TX power should be used.

        

        

          60
          
   *

          60
          
   *

        

        

          61
          
   * \param loss a pointer to the propagation loss model to be used.

          61
          
   * \param loss a pointer to the propagation loss model to be used.

        

  

    

    

       Lines 63-75
       
    
  Link Here 
    

  

        

          63
          
  virtual void AddPropagationLossModel (Ptr<PropagationLossModel> loss) = 0;

          63
          
  virtual void AddPropagationLossModel (Ptr<PropagationLossModel> loss) = 0;

        

        

          64
          

          64
          

        

        

          65
          
  /**

          65
          
  /**

        

          
            

              66
              
   * Set the frequency-dependent propagation loss model to be used


              66
              
   * Add the frequency-dependent propagation loss model to be used

            

        

          67
          
   * \param loss a pointer to the propagation loss model to be used.

          67
          
   * \param loss a pointer to the propagation loss model to be used.

        

        

          68
          
   */

          68
          
   */

        

        

          69
          
  virtual void AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss) = 0;

          69
          
  virtual void AddSpectrumPropagationLossModel (Ptr<SpectrumPropagationLossModel> loss) = 0;

        

        

          70
          

          70
          

        

        

          71
          
  /**

          71
          
  /**

        

          
            

              72
              
   * Set the  propagation delay model to be used


              72
              
   * Set the propagation delay model to be used

            

        

          73
          
   * \param delay Ptr to the propagation delay model to be used.

          73
          
   * \param delay Ptr to the propagation delay model to be used.

        

        

          74
          
   */

          74
          
   */

        

        

          75
          
  virtual void SetPropagationDelayModel (Ptr<PropagationDelayModel> delay) = 0;

          75
          
  virtual void SetPropagationDelayModel (Ptr<PropagationDelayModel> delay) = 0;

        






  

  Return to bug 2366