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

(-)a/src/mobility/model/position-allocator.cc (-1 / +3 lines)
 Lines 36-42    Link Here 
36 
PositionAllocator::GetTypeId (void)
 36 
PositionAllocator::GetTypeId (void)
37 
{
 37 
{
38 
  static TypeId tid = TypeId ("ns3::PositionAllocator")
 38 
  static TypeId tid = TypeId ("ns3::PositionAllocator")
39 
    .SetParent<Object> ();
 39 
    .SetParent<Object> ()
40 
    .SetGroupName ("Mobility");
40 
  return tid;
 41 
  return tid;
41 
}
 42 
}
42 

          43
          

        

  

    

    

       Lines 55-60
       
    
  Link Here 
    

  

        

          55
          
{

          56
          
{

        

        

          56
          
  static TypeId tid = TypeId ("ns3::ListPositionAllocator")

          57
          
  static TypeId tid = TypeId ("ns3::ListPositionAllocator")

        

        

          57
          
    .SetParent<PositionAllocator> ()

          58
          
    .SetParent<PositionAllocator> ()

        

            

              
              
              59
              
    .SetGroupName ("Mobility")

            

        

          58
          
    .AddConstructor<ListPositionAllocator> ()

          60
          
    .AddConstructor<ListPositionAllocator> ()

        

        

          59
          
  ;

          61
          
  ;

        

        

          60
          
  return tid;

          62
          
  return tid;

        



(-)a/src/propagation/model/propagation-loss-model.cc
      (+5 lines)




  

    

    

       Lines 43-48
       
    
  Link Here 
    

  

        

          43
          
{

          43
          
{

        

        

          44
          
  static TypeId tid = TypeId ("ns3::PropagationLossModel")

          44
          
  static TypeId tid = TypeId ("ns3::PropagationLossModel")

        

        

          45
          
    .SetParent<Object> ()

          45
          
    .SetParent<Object> ()

        

            

              
              
              46
              
    .SetGroupName ("Propagation")

            

        

          46
          
  ;

          47
          
  ;

        

        

          47
          
  return tid;

          48
          
  return tid;

        

        

          48
          
}

          49
          
}

        

  

    

    

       Lines 102-107
       
    
  Link Here 
    

  

        

          102
          
{

          103
          
{

        

        

          103
          
  static TypeId tid = TypeId ("ns3::RandomPropagationLossModel")

          104
          
  static TypeId tid = TypeId ("ns3::RandomPropagationLossModel")

        

        

          104
          
    .SetParent<PropagationLossModel> ()

          105
          
    .SetParent<PropagationLossModel> ()

        

            

              
              
              106
              
    .SetGroupName ("Propagation")

            

        

          105
          
    .AddConstructor<RandomPropagationLossModel> ()

          107
          
    .AddConstructor<RandomPropagationLossModel> ()

        

        

          106
          
    .AddAttribute ("Variable", "The random variable used to pick a loss everytime CalcRxPower is invoked.",

          108
          
    .AddAttribute ("Variable", "The random variable used to pick a loss everytime CalcRxPower is invoked.",

        

        

          107
          
                   StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"),

          109
          
                   StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"),

        

  

    

    

       Lines 285-290
       
    
  Link Here 
    

  

        

          285
          
{

          287
          
{

        

        

          286
          
  static TypeId tid = TypeId ("ns3::TwoRayGroundPropagationLossModel")

          288
          
  static TypeId tid = TypeId ("ns3::TwoRayGroundPropagationLossModel")

        

        

          287
          
    .SetParent<PropagationLossModel> ()

          289
          
    .SetParent<PropagationLossModel> ()

        

            

              
              
              290
              
    .SetGroupName ("Propagation")

            

        

          288
          
    .AddConstructor<TwoRayGroundPropagationLossModel> ()

          291
          
    .AddConstructor<TwoRayGroundPropagationLossModel> ()

        

        

          289
          
    .AddAttribute ("Frequency", 

          292
          
    .AddAttribute ("Frequency", 

        

        

          290
          
                   "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",

          293
          
                   "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",

        

  

    

    

       Lines 546-551
       
    
  Link Here 
    

  

        

          546
          
{

          549
          
{

        

        

          547
          
  static TypeId tid = TypeId ("ns3::ThreeLogDistancePropagationLossModel")

          550
          
  static TypeId tid = TypeId ("ns3::ThreeLogDistancePropagationLossModel")

        

        

          548
          
    .SetParent<PropagationLossModel> ()

          551
          
    .SetParent<PropagationLossModel> ()

        

            

              
              
              552
              
    .SetGroupName ("Propagation")

            

        

          549
          
    .AddConstructor<ThreeLogDistancePropagationLossModel> ()

          553
          
    .AddConstructor<ThreeLogDistancePropagationLossModel> ()

        

        

          550
          
    .AddAttribute ("Distance0",

          554
          
    .AddAttribute ("Distance0",

        

        

          551
          
                   "Beginning of the first (near) distance field",

          555
          
                   "Beginning of the first (near) distance field",

        

  

    

    

       Lines 889-894
       
    
  Link Here 
    

  

        

          889
          
{

          893
          
{

        

        

          890
          
  static TypeId tid = TypeId ("ns3::RangePropagationLossModel")

          894
          
  static TypeId tid = TypeId ("ns3::RangePropagationLossModel")

        

        

          891
          
    .SetParent<PropagationLossModel> ()

          895
          
    .SetParent<PropagationLossModel> ()

        

            

              
              
              896
              
    .SetGroupName ("Propagation")

            

        

          892
          
    .AddConstructor<RangePropagationLossModel> ()

          897
          
    .AddConstructor<RangePropagationLossModel> ()

        

        

          893
          
    .AddAttribute ("MaxRange",

          898
          
    .AddAttribute ("MaxRange",

        

        

          894
          
                   "Maximum Transmission Range (meters)",

          899
          
                   "Maximum Transmission Range (meters)",

        



(-)a/src/spectrum/model/half-duplex-ideal-phy.cc
      (+1 lines)




  

    

    

       Lines 103-108
       
    
  Link Here 
    

  

        

          103
          
{

          103
          
{

        

        

          104
          
  static TypeId tid = TypeId ("ns3::HalfDuplexIdealPhy")

          104
          
  static TypeId tid = TypeId ("ns3::HalfDuplexIdealPhy")

        

        

          105
          
    .SetParent<SpectrumPhy> ()

          105
          
    .SetParent<SpectrumPhy> ()

        

            

              
              
              106
              
    .SetGroupName ("Spectrum")

            

        

          106
          
    .AddConstructor<HalfDuplexIdealPhy> ()

          107
          
    .AddConstructor<HalfDuplexIdealPhy> ()

        

        

          107
          
    .AddAttribute ("Rate",

          108
          
    .AddAttribute ("Rate",

        

        

          108
          
                   "The PHY rate used by this device",

          109
          
                   "The PHY rate used by this device",

        



(-)a/src/traffic-control/model/packet-filter.cc
      (+1 lines)




  

    

    

       Lines 32-37
       
    
  Link Here 
    

  

        

          32
          
{

          32
          
{

        

        

          33
          
  static TypeId tid = TypeId ("ns3::PacketFilter")

          33
          
  static TypeId tid = TypeId ("ns3::PacketFilter")

        

        

          34
          
    .SetParent<Object> ()

          34
          
    .SetParent<Object> ()

        

            

              
              
              35
              
    .SetGroupName ("TrafficControl")

            

        

          35
          
  ;

          36
          
  ;

        

        

          36
          
  return tid;

          37
          
  return tid;

        

        

          37
          
}

          38
          
}

        



(-)a/src/wifi/model/dcf.cc
      (+1 lines)




  

    

    

       Lines 33-38
       
    
  Link Here 
    

  

        

          33
          
{

          33
          
{

        

        

          34
          
  static TypeId tid = TypeId ("ns3::Dcf")

          34
          
  static TypeId tid = TypeId ("ns3::Dcf")

        

        

          35
          
    .SetParent<Object> ()

          35
          
    .SetParent<Object> ()

        

            

              
              
              36
              
    .SetGroupName ("Wifi")

            

        

          36
          
    .AddAttribute ("MinCw", "The minimum value of the contention window.",

          37
          
    .AddAttribute ("MinCw", "The minimum value of the contention window.",

        

        

          37
          
                   UintegerValue (15),

          38
          
                   UintegerValue (15),

        

        

          38
          
                   MakeUintegerAccessor (&Dcf::SetMinCw,

          39
          
                   MakeUintegerAccessor (&Dcf::SetMinCw,

        



(-)a/src/wifi/model/wifi-spectrum-phy-interface.cc
      (-1 / +2 lines)




  

    

    

       Lines 42-48
       
    
  Link Here 
    

  

        

          42
          
WifiSpectrumPhyInterface::GetTypeId (void)

          42
          
WifiSpectrumPhyInterface::GetTypeId (void)

        

        

          43
          
{

          43
          
{

        

        

          44
          
  static TypeId tid = TypeId ("ns3::WifiSpectrumPhyInterface")

          44
          
  static TypeId tid = TypeId ("ns3::WifiSpectrumPhyInterface")

        

          
            

              45
              
    .SetParent<SpectrumPhy> ();


              45
              
    .SetParent<SpectrumPhy> ()

            

            

              
              

              46
              
    .SetGroupName ("Wifi");

            

        

          46
          
  return tid;

          47
          
  return tid;

        

        

          47
          
}

          48
          
}

        

        

          48
          

          49
          

        



(-)a/src/wifi/model/wifi-tx-current-model.cc
      (-1 / +2 lines)




  

    

    

       Lines 39-45
       
    
  Link Here 
    

  

        

          39
          
{

          39
          
{

        

        

          40
          
  static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")

          40
          
  static TypeId tid = TypeId ("ns3::WifiTxCurrentModel")

        

        

          41
          
    .SetParent<Object> ()

          41
          
    .SetParent<Object> ()

        

          
            

              42
              
    .SetGroupName ("Energy")


              42
              
    .SetGroupName ("Wifi")

            

        

          43
          
  ;

          43
          
  ;

        

        

          44
          
  return tid;

          44
          
  return tid;

        

        

          45
          
}

          45
          
}

        

  

    

    

       Lines 68-73
       
    
  Link Here 
    

  

        

          68
          
{

          68
          
{

        

        

          69
          
  static TypeId tid = TypeId ("ns3::LinearWifiTxCurrentModel")

          69
          
  static TypeId tid = TypeId ("ns3::LinearWifiTxCurrentModel")

        

        

          70
          
    .SetParent<WifiTxCurrentModel> ()

          70
          
    .SetParent<WifiTxCurrentModel> ()

        

            

              
              
              71
              
    .SetGroupName ("Wifi")

            

        

          71
          
    .AddConstructor<LinearWifiTxCurrentModel> ()

          72
          
    .AddConstructor<LinearWifiTxCurrentModel> ()

        

        

          72
          
    .AddAttribute ("Eta", "The efficiency of the power amplifier.",

          73
          
    .AddAttribute ("Eta", "The efficiency of the power amplifier.",

        

        

          73
          
                   DoubleValue (0.10),

          74
          
                   DoubleValue (0.10),

        






  

  Return to bug 2481