diff --git a/src/propagation/model/cost231-propagation-loss-model.cc b/src/propagation/model/cost231-propagation-loss-model.cc index 85f039141..86b692690 100644 --- a/src/propagation/model/cost231-propagation-loss-model.cc +++ b/src/propagation/model/cost231-propagation-loss-model.cc @@ -37,35 +37,29 @@ TypeId Cost231PropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::Cost231PropagationLossModel") - .SetParent () - + .SetGroupName ("Propagation") .AddConstructor () - .AddAttribute ("Lambda", "The wavelength (default is 2.3 GHz at 300 000 km/s).", DoubleValue (300000000.0 / 2.3e9), MakeDoubleAccessor (&Cost231PropagationLossModel::m_lambda), MakeDoubleChecker ()) - .AddAttribute ("Frequency", "The Frequency (default is 2.3 GHz).", DoubleValue (2.3e9), MakeDoubleAccessor (&Cost231PropagationLossModel::m_frequency), MakeDoubleChecker ()) - .AddAttribute ("BSAntennaHeight", "BS Antenna Height (default is 50m).", DoubleValue (50.0), MakeDoubleAccessor (&Cost231PropagationLossModel::m_BSAntennaHeight), MakeDoubleChecker ()) - .AddAttribute ("SSAntennaHeight", "SS Antenna Height (default is 3m).", DoubleValue (3), MakeDoubleAccessor (&Cost231PropagationLossModel::m_SSAntennaHeight), MakeDoubleChecker ()) - .AddAttribute ("MinDistance", "The distance under which the propagation model refuses to give results (m) ", DoubleValue (0.5), diff --git a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc index 42fd508b8..fb3e4ff1c 100644 --- a/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-los-propagation-loss-model.cc @@ -37,10 +37,9 @@ TypeId ItuR1411LosPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::ItuR1411LosPropagationLossModel") - .SetParent () + .SetGroupName ("Propagation") .AddConstructor () - .AddAttribute ("Frequency", "The propagation frequency in Hz", DoubleValue (2160e6), diff --git a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc index 8dd9d54af..0fdfd39d1 100644 --- a/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc +++ b/src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc @@ -38,17 +38,14 @@ TypeId ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::ItuR1411NlosOverRooftopPropagationLossModel") - .SetParent () + .SetGroupName ("Propagation") .AddConstructor () - .AddAttribute ("Frequency", "The Frequency (default is 2.106 GHz).", DoubleValue (2160e6), MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::SetFrequency), MakeDoubleChecker ()) - - .AddAttribute ("Environment", "Environment Scenario", EnumValue (UrbanEnvironment), @@ -56,7 +53,6 @@ ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void) MakeEnumChecker (UrbanEnvironment, "Urban", SubUrbanEnvironment, "SubUrban", OpenAreasEnvironment, "OpenAreas")) - .AddAttribute ("CitySize", "Dimension of the city", EnumValue (LargeCity), @@ -64,31 +60,26 @@ ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void) MakeEnumChecker (SmallCity, "Small", MediumCity, "Medium", LargeCity, "Large")) - .AddAttribute ("RooftopLevel", "The height of the rooftop level in meters", DoubleValue (20.0), MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_rooftopHeight), MakeDoubleChecker (0.0, 90.0)) - .AddAttribute ("StreetsOrientation", "The orientation of streets in degrees [0,90] with respect to the direction of propagation", DoubleValue (45.0), MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_streetsOrientation), MakeDoubleChecker (0.0, 90.0)) - .AddAttribute ("StreetsWidth", "The width of streets", DoubleValue (20.0), MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_streetsWidth), MakeDoubleChecker (0.0, 1000.0)) - .AddAttribute ("BuildingsExtend", "The distance over which the buildings extend", DoubleValue (80.0), MakeDoubleAccessor (&ItuR1411NlosOverRooftopPropagationLossModel::m_buildingsExtend), MakeDoubleChecker ()) - .AddAttribute ("BuildingSeparation", "The separation between buildings", DoubleValue (50.0), diff --git a/src/propagation/model/jakes-process.cc b/src/propagation/model/jakes-process.cc index eda4db441..d66879177 100644 --- a/src/propagation/model/jakes-process.cc +++ b/src/propagation/model/jakes-process.cc @@ -50,6 +50,7 @@ JakesProcess::GetTypeId () { static TypeId tid = TypeId ("ns3::JakesProcess") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("DopplerFrequencyHz", "Corresponding doppler frequency[Hz]", DoubleValue (80), diff --git a/src/propagation/model/jakes-propagation-loss-model.cc b/src/propagation/model/jakes-propagation-loss-model.cc index dd684d0f2..1049f8e50 100644 --- a/src/propagation/model/jakes-propagation-loss-model.cc +++ b/src/propagation/model/jakes-propagation-loss-model.cc @@ -45,6 +45,7 @@ JakesPropagationLossModel::GetTypeId () { static TypeId tid = TypeId ("ns3::JakesPropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () ; return tid; diff --git a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc index 02d0ea1c1..56e7204ea 100644 --- a/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc +++ b/src/propagation/model/kun-2600-mhz-propagation-loss-model.cc @@ -39,6 +39,7 @@ Kun2600MhzPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::Kun2600MhzPropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () ; diff --git a/src/propagation/model/okumura-hata-propagation-loss-model.cc b/src/propagation/model/okumura-hata-propagation-loss-model.cc index ff4aaebef..fa3e3bb38 100644 --- a/src/propagation/model/okumura-hata-propagation-loss-model.cc +++ b/src/propagation/model/okumura-hata-propagation-loss-model.cc @@ -38,16 +38,14 @@ TypeId OkumuraHataPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::OkumuraHataPropagationLossModel") - .SetParent () + .SetGroupName ("Propagation") .AddConstructor () - .AddAttribute ("Frequency", "The propagation frequency in Hz", DoubleValue (2160e6), MakeDoubleAccessor (&OkumuraHataPropagationLossModel::m_frequency), MakeDoubleChecker ()) - .AddAttribute ("Environment", "Environment Scenario", EnumValue (UrbanEnvironment), @@ -55,7 +53,6 @@ OkumuraHataPropagationLossModel::GetTypeId (void) MakeEnumChecker (UrbanEnvironment, "Urban", SubUrbanEnvironment, "SubUrban", OpenAreasEnvironment, "OpenAreas")) - .AddAttribute ("CitySize", "Dimension of the city", EnumValue (LargeCity), @@ -63,7 +60,6 @@ OkumuraHataPropagationLossModel::GetTypeId (void) MakeEnumChecker (SmallCity, "Small", MediumCity, "Medium", LargeCity, "Large")); - return tid; } diff --git a/src/propagation/model/propagation-delay-model.cc b/src/propagation/model/propagation-delay-model.cc index aea0dcc6f..02d27c733 100644 --- a/src/propagation/model/propagation-delay-model.cc +++ b/src/propagation/model/propagation-delay-model.cc @@ -32,6 +32,7 @@ PropagationDelayModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::PropagationDelayModel") .SetParent () + .SetGroupName ("Propagation") ; return tid; } @@ -55,6 +56,7 @@ RandomPropagationDelayModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::RandomPropagationDelayModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Variable", "The random variable which generates random delays (s).", @@ -91,6 +93,7 @@ ConstantSpeedPropagationDelayModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::ConstantSpeedPropagationDelayModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Speed", "The propagation speed (m/s) in the propagation medium being considered. The default value is the propagation speed of light in the vacuum.", DoubleValue (299792458), diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc index 5be75ce1c..4b1735385 100644 --- a/src/propagation/model/propagation-loss-model.cc +++ b/src/propagation/model/propagation-loss-model.cc @@ -145,6 +145,7 @@ FriisPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::FriisPropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Frequency", "The carrier frequency (in Hz) at which propagation occurs (default is 5.15 GHz).", @@ -456,6 +457,7 @@ LogDistancePropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::LogDistancePropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Exponent", "The exponent of the Path Loss propagation model", @@ -645,6 +647,7 @@ NakagamiPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::NakagamiPropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Distance1", "Beginning of the second distance field. Default is 80m.", @@ -759,6 +762,7 @@ FixedRssLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::FixedRssLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("Rss", "The fixed receiver Rss.", DoubleValue (-150.0), @@ -805,6 +809,7 @@ MatrixPropagationLossModel::GetTypeId (void) { static TypeId tid = TypeId ("ns3::MatrixPropagationLossModel") .SetParent () + .SetGroupName ("Propagation") .AddConstructor () .AddAttribute ("DefaultLoss", "The default value for propagation loss, dB.", DoubleValue (std::numeric_limits::max ()),