F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 1877 - constructor missing for <something>PropagationLossModels

Browse Source
This commit is contained in:
Scott Carpenter
2014-03-29 18:16:59 +01:00
parent afb50f1c25
commit de004b4c7d
11 changed files with 78 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RELEASE_NOTES
View File

@@ -173,6 +173,7 @@ Bugs fixed
- Bug 1814 - IPv6 Packet with length not multiple of 8 bytes are fragmented incorrectly.
- Bug 1815 - Python bindings compilation with clang compiler toolchain
- Bug 1816 - IPv4 fragmentation loses Packet tags
- Bug 1877 - constructor missing for <something>PropagationLossModels
Release 3.18.2
==============

24
src/propagation/bindings/modulegen__gcc_ILP32.py
View File

@@ -186,14 +186,14 @@ def register_types(module):
module.add_class('Vector3DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
## vector.h (module 'core'): ns3::Vector3DValue [class]
module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
typehandlers.add_type_alias(u'ns3::Vector3DValue', u'ns3::VectorValue')
typehandlers.add_type_alias(u'ns3::Vector3DValue*', u'ns3::VectorValue*')
typehandlers.add_type_alias(u'ns3::Vector3DValue&', u'ns3::VectorValue&')
module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue')
typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
typehandlers.add_type_alias(u'ns3::Vector3DChecker', u'ns3::VectorChecker')
typehandlers.add_type_alias(u'ns3::Vector3DChecker*', u'ns3::VectorChecker*')
typehandlers.add_type_alias(u'ns3::Vector3DChecker&', u'ns3::VectorChecker&')
@@ -2192,13 +2192,13 @@ def register_Ns3GammaRandomVariable_methods(root_module, cls):
return
def register_Ns3ItuR1411LosPropagationLossModel_methods(root_module, cls):
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411LosPropagationLossModel::ItuR1411LosPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ItuR1411LosPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411LosPropagationLossModel::ItuR1411LosPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): void ns3::ItuR1411LosPropagationLossModel::SetFrequency(double freq) [member function]
cls.add_method('SetFrequency',
'void',
@@ -2221,13 +2221,13 @@ def register_Ns3ItuR1411LosPropagationLossModel_methods(root_module, cls):
return
def register_Ns3ItuR1411NlosOverRooftopPropagationLossModel_methods(root_module, cls):
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411NlosOverRooftopPropagationLossModel::ItuR1411NlosOverRooftopPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411NlosOverRooftopPropagationLossModel::ItuR1411NlosOverRooftopPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): void ns3::ItuR1411NlosOverRooftopPropagationLossModel::SetFrequency(double freq) [member function]
cls.add_method('SetFrequency',
'void',
@@ -2303,13 +2303,13 @@ def register_Ns3JakesPropagationLossModel_methods(root_module, cls):
return
def register_Ns3Kun2600MhzPropagationLossModel_methods(root_module, cls):
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): ns3::Kun2600MhzPropagationLossModel::Kun2600MhzPropagationLossModel() [constructor]
cls.add_constructor([])
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::Kun2600MhzPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): ns3::Kun2600MhzPropagationLossModel::Kun2600MhzPropagationLossModel() [constructor]
cls.add_constructor([])
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): double ns3::Kun2600MhzPropagationLossModel::GetLoss(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
cls.add_method('GetLoss',
'double',
@@ -2557,13 +2557,13 @@ def register_Ns3NormalRandomVariable_methods(root_module, cls):
return
def register_Ns3OkumuraHataPropagationLossModel_methods(root_module, cls):
## okumura-hata-propagation-loss-model.h (module 'propagation'): ns3::OkumuraHataPropagationLossModel::OkumuraHataPropagationLossModel() [constructor]
cls.add_constructor([])
## okumura-hata-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::OkumuraHataPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## okumura-hata-propagation-loss-model.h (module 'propagation'): ns3::OkumuraHataPropagationLossModel::OkumuraHataPropagationLossModel() [constructor]
cls.add_constructor([])
## okumura-hata-propagation-loss-model.h (module 'propagation'): double ns3::OkumuraHataPropagationLossModel::GetLoss(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
cls.add_method('GetLoss',
'double',

24
src/propagation/bindings/modulegen__gcc_LP64.py
View File

@@ -186,14 +186,14 @@ def register_types(module):
module.add_class('Vector3DChecker', import_from_module='ns.core', parent=root_module['ns3::AttributeChecker'])
## vector.h (module 'core'): ns3::Vector3DValue [class]
module.add_class('Vector3DValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue'])
typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
typehandlers.add_type_alias(u'ns3::Vector3DValue', u'ns3::VectorValue')
typehandlers.add_type_alias(u'ns3::Vector3DValue*', u'ns3::VectorValue*')
typehandlers.add_type_alias(u'ns3::Vector3DValue&', u'ns3::VectorValue&')
module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue')
typehandlers.add_type_alias(u'ns3::Vector3D', u'ns3::Vector')
typehandlers.add_type_alias(u'ns3::Vector3D*', u'ns3::Vector*')
typehandlers.add_type_alias(u'ns3::Vector3D&', u'ns3::Vector&')
module.add_typedef(root_module['ns3::Vector3D'], 'Vector')
typehandlers.add_type_alias(u'ns3::Vector3DChecker', u'ns3::VectorChecker')
typehandlers.add_type_alias(u'ns3::Vector3DChecker*', u'ns3::VectorChecker*')
typehandlers.add_type_alias(u'ns3::Vector3DChecker&', u'ns3::VectorChecker&')
@@ -2192,13 +2192,13 @@ def register_Ns3GammaRandomVariable_methods(root_module, cls):
return
def register_Ns3ItuR1411LosPropagationLossModel_methods(root_module, cls):
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411LosPropagationLossModel::ItuR1411LosPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ItuR1411LosPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411LosPropagationLossModel::ItuR1411LosPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-los-propagation-loss-model.h (module 'propagation'): void ns3::ItuR1411LosPropagationLossModel::SetFrequency(double freq) [member function]
cls.add_method('SetFrequency',
'void',
@@ -2221,13 +2221,13 @@ def register_Ns3ItuR1411LosPropagationLossModel_methods(root_module, cls):
return
def register_Ns3ItuR1411NlosOverRooftopPropagationLossModel_methods(root_module, cls):
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411NlosOverRooftopPropagationLossModel::ItuR1411NlosOverRooftopPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): ns3::ItuR1411NlosOverRooftopPropagationLossModel::ItuR1411NlosOverRooftopPropagationLossModel() [constructor]
cls.add_constructor([])
## itu-r-1411-nlos-over-rooftop-propagation-loss-model.h (module 'propagation'): void ns3::ItuR1411NlosOverRooftopPropagationLossModel::SetFrequency(double freq) [member function]
cls.add_method('SetFrequency',
'void',
@@ -2303,13 +2303,13 @@ def register_Ns3JakesPropagationLossModel_methods(root_module, cls):
return
def register_Ns3Kun2600MhzPropagationLossModel_methods(root_module, cls):
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): ns3::Kun2600MhzPropagationLossModel::Kun2600MhzPropagationLossModel() [constructor]
cls.add_constructor([])
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::Kun2600MhzPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): ns3::Kun2600MhzPropagationLossModel::Kun2600MhzPropagationLossModel() [constructor]
cls.add_constructor([])
## kun-2600-mhz-propagation-loss-model.h (module 'propagation'): double ns3::Kun2600MhzPropagationLossModel::GetLoss(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
cls.add_method('GetLoss',
'double',
@@ -2557,13 +2557,13 @@ def register_Ns3NormalRandomVariable_methods(root_module, cls):
return
def register_Ns3OkumuraHataPropagationLossModel_methods(root_module, cls):
## okumura-hata-propagation-loss-model.h (module 'propagation'): ns3::OkumuraHataPropagationLossModel::OkumuraHataPropagationLossModel() [constructor]
cls.add_constructor([])
## okumura-hata-propagation-loss-model.h (module 'propagation'): static ns3::TypeId ns3::OkumuraHataPropagationLossModel::GetTypeId() [member function]
cls.add_method('GetTypeId',
'ns3::TypeId',
[],
is_static=True)
## okumura-hata-propagation-loss-model.h (module 'propagation'): ns3::OkumuraHataPropagationLossModel::OkumuraHataPropagationLossModel() [constructor]
cls.add_constructor([])
## okumura-hata-propagation-loss-model.h (module 'propagation'): double ns3::OkumuraHataPropagationLossModel::GetLoss(ns3::Ptr<ns3::MobilityModel> a, ns3::Ptr<ns3::MobilityModel> b) const [member function]
cls.add_method('GetLoss',
'double',

10
src/propagation/model/itu-r-1411-los-propagation-loss-model.cc
View File

@@ -39,6 +39,7 @@ ItuR1411LosPropagationLossModel::GetTypeId (void)
static TypeId tid = TypeId ("ns3::ItuR1411LosPropagationLossModel")
.SetParent<PropagationLossModel> ()
.AddConstructor<ItuR1411LosPropagationLossModel> ()
.AddAttribute ("Frequency",
"The propagation frequency in Hz",
@@ -49,6 +50,15 @@ ItuR1411LosPropagationLossModel::GetTypeId (void)
return tid;
}
ItuR1411LosPropagationLossModel::ItuR1411LosPropagationLossModel ()
: PropagationLossModel ()
{
}
ItuR1411LosPropagationLossModel::~ItuR1411LosPropagationLossModel ()
{
}
double
ItuR1411LosPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
{

3
src/propagation/model/itu-r-1411-los-propagation-loss-model.h
View File

@@ -47,6 +47,9 @@ public:
// inherited from Object
static TypeId GetTypeId (void);
ItuR1411LosPropagationLossModel ();
virtual ~ItuR1411LosPropagationLossModel ();
/**
* Set the operating frequency
*

9
src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.cc
View File

@@ -40,6 +40,7 @@ ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void)
static TypeId tid = TypeId ("ns3::ItuR1411NlosOverRooftopPropagationLossModel")
.SetParent<PropagationLossModel> ()
.AddConstructor<ItuR1411NlosOverRooftopPropagationLossModel> ()
.AddAttribute ("Frequency",
"The Frequency (default is 2.106 GHz).",
@@ -97,6 +98,14 @@ ItuR1411NlosOverRooftopPropagationLossModel::GetTypeId (void)
return tid;
}
ItuR1411NlosOverRooftopPropagationLossModel::ItuR1411NlosOverRooftopPropagationLossModel ()
: PropagationLossModel ()
{
}
ItuR1411NlosOverRooftopPropagationLossModel::~ItuR1411NlosOverRooftopPropagationLossModel ()
{
}
double
ItuR1411NlosOverRooftopPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const

3
src/propagation/model/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h
View File

@@ -47,6 +47,9 @@ public:
// inherited from Object
static TypeId GetTypeId (void);
ItuR1411NlosOverRooftopPropagationLossModel ();
virtual ~ItuR1411NlosOverRooftopPropagationLossModel ();
/**
* Set the operating frequency
*

13
src/propagation/model/kun-2600-mhz-propagation-loss-model.cc
View File

@@ -38,11 +38,22 @@ TypeId
Kun2600MhzPropagationLossModel::GetTypeId (void)
{
static TypeId tid = TypeId ("ns3::Kun2600MhzPropagationLossModel")
.SetParent<PropagationLossModel> ();
.SetParent<PropagationLossModel> ()
.AddConstructor<Kun2600MhzPropagationLossModel> ()
;
return tid;
}
Kun2600MhzPropagationLossModel::Kun2600MhzPropagationLossModel ()
: PropagationLossModel ()
{
}
Kun2600MhzPropagationLossModel::~Kun2600MhzPropagationLossModel ()
{
}
double
Kun2600MhzPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
{

3
src/propagation/model/kun-2600-mhz-propagation-loss-model.h
View File

@@ -46,6 +46,9 @@ public:
// inherited from Object
static TypeId GetTypeId (void);
Kun2600MhzPropagationLossModel ();
virtual ~Kun2600MhzPropagationLossModel ();
/**
* \param a the first mobility model
* \param b the second mobility model

10
src/propagation/model/okumura-hata-propagation-loss-model.cc
View File

@@ -40,6 +40,7 @@ OkumuraHataPropagationLossModel::GetTypeId (void)
static TypeId tid = TypeId ("ns3::OkumuraHataPropagationLossModel")
.SetParent<PropagationLossModel> ()
.AddConstructor<OkumuraHataPropagationLossModel> ()
.AddAttribute ("Frequency",
"The propagation frequency in Hz",
@@ -66,6 +67,15 @@ OkumuraHataPropagationLossModel::GetTypeId (void)
return tid;
}
OkumuraHataPropagationLossModel::OkumuraHataPropagationLossModel ()
: PropagationLossModel ()
{
}
OkumuraHataPropagationLossModel::~OkumuraHataPropagationLossModel ()
{
}
double
OkumuraHataPropagationLossModel::GetLoss (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
{

3
src/propagation/model/okumura-hata-propagation-loss-model.h
View File

@@ -48,6 +48,9 @@ public:
// inherited from Object
static TypeId GetTypeId (void);
OkumuraHataPropagationLossModel ();
virtual ~OkumuraHataPropagationLossModel ();
/**
* \param a the first mobility model
* \param b the second mobility model