From 390cf24639ceee2fe7ef0ed6c83dfc899dc6ed27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Tue, 10 Apr 2018 20:59:50 +0200 Subject: [PATCH] wifi: Use forward declaration as often as possible (part 5) --- src/mesh/bindings/modulegen__gcc_ILP32.py | 25 ----- src/mesh/bindings/modulegen__gcc_LP64.py | 25 ----- src/wave/bindings/callbacks_list.py | 12 +-- src/wave/bindings/modulegen__gcc_ILP32.py | 117 +++++++++------------- src/wave/bindings/modulegen__gcc_LP64.py | 117 +++++++++------------- src/wifi/helper/spectrum-wifi-helper.cc | 5 +- src/wifi/helper/yans-wifi-helper.cc | 7 +- src/wifi/model/interference-helper.cc | 7 +- src/wifi/model/interference-helper.h | 2 +- src/wifi/model/wifi-phy.cc | 1 + 10 files changed, 111 insertions(+), 207 deletions(-) diff --git a/src/mesh/bindings/modulegen__gcc_ILP32.py b/src/mesh/bindings/modulegen__gcc_ILP32.py index ae3b9bf3c..fa53fa5f1 100644 --- a/src/mesh/bindings/modulegen__gcc_ILP32.py +++ b/src/mesh/bindings/modulegen__gcc_ILP32.py @@ -424,8 +424,6 @@ def register_types(module): module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) ## erp-information.h (module 'wifi'): ns3::ErpInformation [class] module.add_class('ErpInformation', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel [class] - module.add_class('ErrorRateModel', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## interference-helper.h (module 'wifi'): ns3::Event [class] module.add_class('Event', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::Event, ns3::empty, ns3::DefaultDeleter >']) ## event-impl.h (module 'core'): ns3::EventImpl [class] @@ -1028,7 +1026,6 @@ def register_methods(root_module): register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue']) register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable']) register_Ns3ErpInformation_methods(root_module, root_module['ns3::ErpInformation']) - register_Ns3ErrorRateModel_methods(root_module, root_module['ns3::ErrorRateModel']) register_Ns3Event_methods(root_module, root_module['ns3::Event']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable']) @@ -11003,28 +11000,6 @@ def register_Ns3ErpInformation_methods(root_module, cls): [param('uint8_t', 'useProtection')]) return -def register_Ns3ErrorRateModel_methods(root_module, cls): - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel() [constructor] - cls.add_constructor([]) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel(ns3::ErrorRateModel const & arg0) [constructor] - cls.add_constructor([param('ns3::ErrorRateModel const &', 'arg0')]) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] - cls.add_method('CalculateSnr', - 'double', - [param('ns3::WifiTxVector', 'txVector'), param('double', 'ber')], - is_const=True) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::GetChunkSuccessRate(ns3::WifiMode mode, ns3::WifiTxVector txVector, double snr, uint64_t nbits) const [member function] - cls.add_method('GetChunkSuccessRate', - 'double', - [param('ns3::WifiMode', 'mode'), param('ns3::WifiTxVector', 'txVector'), param('double', 'snr'), param('uint64_t', 'nbits')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## error-rate-model.h (module 'wifi'): static ns3::TypeId ns3::ErrorRateModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3Event_methods(root_module, cls): ## interference-helper.h (module 'wifi'): ns3::Event::Event(ns3::Event const & arg0) [constructor] cls.add_constructor([param('ns3::Event const &', 'arg0')]) diff --git a/src/mesh/bindings/modulegen__gcc_LP64.py b/src/mesh/bindings/modulegen__gcc_LP64.py index ae3b9bf3c..fa53fa5f1 100644 --- a/src/mesh/bindings/modulegen__gcc_LP64.py +++ b/src/mesh/bindings/modulegen__gcc_LP64.py @@ -424,8 +424,6 @@ def register_types(module): module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) ## erp-information.h (module 'wifi'): ns3::ErpInformation [class] module.add_class('ErpInformation', import_from_module='ns.wifi', parent=root_module['ns3::WifiInformationElement']) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel [class] - module.add_class('ErrorRateModel', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## interference-helper.h (module 'wifi'): ns3::Event [class] module.add_class('Event', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::Event, ns3::empty, ns3::DefaultDeleter >']) ## event-impl.h (module 'core'): ns3::EventImpl [class] @@ -1028,7 +1026,6 @@ def register_methods(root_module): register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue']) register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable']) register_Ns3ErpInformation_methods(root_module, root_module['ns3::ErpInformation']) - register_Ns3ErrorRateModel_methods(root_module, root_module['ns3::ErrorRateModel']) register_Ns3Event_methods(root_module, root_module['ns3::Event']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable']) @@ -11003,28 +11000,6 @@ def register_Ns3ErpInformation_methods(root_module, cls): [param('uint8_t', 'useProtection')]) return -def register_Ns3ErrorRateModel_methods(root_module, cls): - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel() [constructor] - cls.add_constructor([]) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel(ns3::ErrorRateModel const & arg0) [constructor] - cls.add_constructor([param('ns3::ErrorRateModel const &', 'arg0')]) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] - cls.add_method('CalculateSnr', - 'double', - [param('ns3::WifiTxVector', 'txVector'), param('double', 'ber')], - is_const=True) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::GetChunkSuccessRate(ns3::WifiMode mode, ns3::WifiTxVector txVector, double snr, uint64_t nbits) const [member function] - cls.add_method('GetChunkSuccessRate', - 'double', - [param('ns3::WifiMode', 'mode'), param('ns3::WifiTxVector', 'txVector'), param('double', 'snr'), param('uint64_t', 'nbits')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## error-rate-model.h (module 'wifi'): static ns3::TypeId ns3::ErrorRateModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3Event_methods(root_module, cls): ## interference-helper.h (module 'wifi'): ns3::Event::Event(ns3::Event const & arg0) [constructor] cls.add_constructor([param('ns3::Event const &', 'arg0')]) diff --git a/src/wave/bindings/callbacks_list.py b/src/wave/bindings/callbacks_list.py index abe6f070d..529991cbb 100644 --- a/src/wave/bindings/callbacks_list.py +++ b/src/wave/bindings/callbacks_list.py @@ -22,6 +22,12 @@ callback_classes = [ ['void', 'ns3::Mac48Address', 'unsigned char', 'bool', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Mac48Address', 'unsigned char', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'const ns3::WifiMacHeader &', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Time', 'ns3::Time', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['bool', 'ns3::Ptr', 'const ns3::OrganizationIdentifier &', 'ns3::Ptr', 'const ns3::Address &', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['bool', 'ns3::Ptr', 'const ns3::Address &', 'unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'ns3::Address', 'ns3::Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'double', 'ns3::WifiTxVector', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'double', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], @@ -32,10 +38,4 @@ callback_classes = [ ['void', 'ns3::Ptr', 'unsigned short', 'ns3::WifiTxVector', 'ns3::MpduInfo', 'ns3::SignalNoiseDbm', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'unsigned short', 'ns3::WifiTxVector', 'ns3::MpduInfo', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::Ptr', 'const ns3::WifiMacHeader *', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Time', 'ns3::Time', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Ptr', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['bool', 'ns3::Ptr', 'const ns3::OrganizationIdentifier &', 'ns3::Ptr', 'const ns3::Address &', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['bool', 'ns3::Ptr', 'const ns3::Address &', 'unsigned int', 'unsigned int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], - ['void', 'ns3::Address', 'ns3::Address', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff --git a/src/wave/bindings/modulegen__gcc_ILP32.py b/src/wave/bindings/modulegen__gcc_ILP32.py index 4e37d69ef..40d870723 100644 --- a/src/wave/bindings/modulegen__gcc_ILP32.py +++ b/src/wave/bindings/modulegen__gcc_ILP32.py @@ -20,6 +20,8 @@ def module_init(): def register_types(module): root_module = module.get_root() + ## wifi-phy.h (module 'wifi'): ns3::MpduType [enumeration] + module.add_enum('MpduType', ['NORMAL_MPDU', 'MPDU_IN_AGGREGATE', 'LAST_MPDU_IN_AGGREGATE'], import_from_module='ns.wifi') ## channel-scheduler.h (module 'wave'): ns3::ChannelAccess [enumeration] module.add_enum('ChannelAccess', ['ContinuousAccess', 'AlternatingAccess', 'ExtendedAccess', 'DefaultCchAccess', 'NoAccess']) ## vsa-manager.h (module 'wave'): ns3::VsaTransmitInterval [enumeration] @@ -30,8 +32,6 @@ def register_types(module): module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE', 'LOG_PREFIX_LEVEL', 'LOG_PREFIX_ALL'], import_from_module='ns.core') ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration] module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi') - ## wifi-phy.h (module 'wifi'): ns3::MpduType [enumeration] - module.add_enum('MpduType', ['NORMAL_MPDU', 'MPDU_IN_AGGREGATE', 'LAST_MPDU_IN_AGGREGATE'], import_from_module='ns.wifi') ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration] module.add_enum('WifiMacType', ['WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi') ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration] @@ -516,8 +516,6 @@ def register_types(module): module.add_class('EnumValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class] module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel [class] - module.add_class('ErrorRateModel', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## interference-helper.h (module 'wifi'): ns3::Event [class] module.add_class('Event', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::Event, ns3::empty, ns3::DefaultDeleter >']) ## event-impl.h (module 'core'): ns3::EventImpl [class] @@ -746,24 +744,6 @@ def register_types(module): module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map') module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >', u'ns3::EdcaParameters') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >*', u'ns3::EdcaParameters*') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >&', u'ns3::EdcaParameters&') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator', u'ns3::EdcaParametersI') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator*', u'ns3::EdcaParametersI*') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator&', u'ns3::EdcaParametersI&') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::VscCallback') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::VscCallback*') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::VscCallback&') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogNodePrinter') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogNodePrinter*') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogNodePrinter&') - typehandlers.add_type_alias(u'uint8_t', u'ns3::WifiInformationElementId') - typehandlers.add_type_alias(u'uint8_t*', u'ns3::WifiInformationElementId*') - typehandlers.add_type_alias(u'uint8_t&', u'ns3::WifiInformationElementId&') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::RxOkCallback') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::RxOkCallback*') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::RxOkCallback&') @@ -782,6 +762,24 @@ def register_types(module): typehandlers.add_type_alias(u'ns3::Vector3DChecker*', u'ns3::VectorChecker*') typehandlers.add_type_alias(u'ns3::Vector3DChecker&', u'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >', u'ns3::EdcaParameters') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >*', u'ns3::EdcaParameters*') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >&', u'ns3::EdcaParameters&') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator', u'ns3::EdcaParametersI') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator*', u'ns3::EdcaParametersI*') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator&', u'ns3::EdcaParametersI&') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::VscCallback') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::VscCallback*') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::VscCallback&') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogNodePrinter') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogNodePrinter*') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogNodePrinter&') + typehandlers.add_type_alias(u'uint8_t', u'ns3::WifiInformationElementId') + typehandlers.add_type_alias(u'uint8_t*', u'ns3::WifiInformationElementId*') + typehandlers.add_type_alias(u'uint8_t&', u'ns3::WifiInformationElementId&') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', u'ns3::WifiModeList') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', u'ns3::WifiModeList*') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', u'ns3::WifiModeList&') @@ -1086,7 +1084,6 @@ def register_methods(root_module): register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker']) register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue']) register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable']) - register_Ns3ErrorRateModel_methods(root_module, root_module['ns3::ErrorRateModel']) register_Ns3Event_methods(root_module, root_module['ns3::Event']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable']) @@ -10960,13 +10957,38 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): cls.add_method('GetCppTypeid', 'std::string', [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const&']) ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], is_static=True, visibility='protected', template_parameters=[u'ns3::Time']) ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::OrganizationIdentifier const&']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Address']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -11016,31 +11038,6 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): 'std::string', [], is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const*']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const&']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::OrganizationIdentifier const&']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Address']) return def register_Ns3CallbackValue_methods(root_module, cls): @@ -12685,28 +12682,6 @@ def register_Ns3ErlangRandomVariable_methods(root_module, cls): is_virtual=True) return -def register_Ns3ErrorRateModel_methods(root_module, cls): - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel() [constructor] - cls.add_constructor([]) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel(ns3::ErrorRateModel const & arg0) [constructor] - cls.add_constructor([param('ns3::ErrorRateModel const &', 'arg0')]) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] - cls.add_method('CalculateSnr', - 'double', - [param('ns3::WifiTxVector', 'txVector'), param('double', 'ber')], - is_const=True) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::GetChunkSuccessRate(ns3::WifiMode mode, ns3::WifiTxVector txVector, double snr, uint64_t nbits) const [member function] - cls.add_method('GetChunkSuccessRate', - 'double', - [param('ns3::WifiMode', 'mode'), param('ns3::WifiTxVector', 'txVector'), param('double', 'snr'), param('uint64_t', 'nbits')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## error-rate-model.h (module 'wifi'): static ns3::TypeId ns3::ErrorRateModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3Event_methods(root_module, cls): ## interference-helper.h (module 'wifi'): ns3::Event::Event(ns3::Event const & arg0) [constructor] cls.add_constructor([param('ns3::Event const &', 'arg0')]) diff --git a/src/wave/bindings/modulegen__gcc_LP64.py b/src/wave/bindings/modulegen__gcc_LP64.py index 4e37d69ef..40d870723 100644 --- a/src/wave/bindings/modulegen__gcc_LP64.py +++ b/src/wave/bindings/modulegen__gcc_LP64.py @@ -20,6 +20,8 @@ def module_init(): def register_types(module): root_module = module.get_root() + ## wifi-phy.h (module 'wifi'): ns3::MpduType [enumeration] + module.add_enum('MpduType', ['NORMAL_MPDU', 'MPDU_IN_AGGREGATE', 'LAST_MPDU_IN_AGGREGATE'], import_from_module='ns.wifi') ## channel-scheduler.h (module 'wave'): ns3::ChannelAccess [enumeration] module.add_enum('ChannelAccess', ['ContinuousAccess', 'AlternatingAccess', 'ExtendedAccess', 'DefaultCchAccess', 'NoAccess']) ## vsa-manager.h (module 'wave'): ns3::VsaTransmitInterval [enumeration] @@ -30,8 +32,6 @@ def register_types(module): module.add_enum('LogLevel', ['LOG_NONE', 'LOG_ERROR', 'LOG_LEVEL_ERROR', 'LOG_WARN', 'LOG_LEVEL_WARN', 'LOG_DEBUG', 'LOG_LEVEL_DEBUG', 'LOG_INFO', 'LOG_LEVEL_INFO', 'LOG_FUNCTION', 'LOG_LEVEL_FUNCTION', 'LOG_LOGIC', 'LOG_LEVEL_LOGIC', 'LOG_ALL', 'LOG_LEVEL_ALL', 'LOG_PREFIX_FUNC', 'LOG_PREFIX_TIME', 'LOG_PREFIX_NODE', 'LOG_PREFIX_LEVEL', 'LOG_PREFIX_ALL'], import_from_module='ns.core') ## edca-txop-n.h (module 'wifi'): ns3::TypeOfStation [enumeration] module.add_enum('TypeOfStation', ['STA', 'AP', 'ADHOC_STA', 'MESH', 'HT_STA', 'HT_AP', 'HT_ADHOC_STA', 'OCB'], import_from_module='ns.wifi') - ## wifi-phy.h (module 'wifi'): ns3::MpduType [enumeration] - module.add_enum('MpduType', ['NORMAL_MPDU', 'MPDU_IN_AGGREGATE', 'LAST_MPDU_IN_AGGREGATE'], import_from_module='ns.wifi') ## wifi-mac-header.h (module 'wifi'): ns3::WifiMacType [enumeration] module.add_enum('WifiMacType', ['WIFI_MAC_CTL_CTLWRAPPER', 'WIFI_MAC_CTL_RTS', 'WIFI_MAC_CTL_CTS', 'WIFI_MAC_CTL_ACK', 'WIFI_MAC_CTL_BACKREQ', 'WIFI_MAC_CTL_BACKRESP', 'WIFI_MAC_MGT_BEACON', 'WIFI_MAC_MGT_ASSOCIATION_REQUEST', 'WIFI_MAC_MGT_ASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_DISASSOCIATION', 'WIFI_MAC_MGT_REASSOCIATION_REQUEST', 'WIFI_MAC_MGT_REASSOCIATION_RESPONSE', 'WIFI_MAC_MGT_PROBE_REQUEST', 'WIFI_MAC_MGT_PROBE_RESPONSE', 'WIFI_MAC_MGT_AUTHENTICATION', 'WIFI_MAC_MGT_DEAUTHENTICATION', 'WIFI_MAC_MGT_ACTION', 'WIFI_MAC_MGT_ACTION_NO_ACK', 'WIFI_MAC_MGT_MULTIHOP_ACTION', 'WIFI_MAC_DATA', 'WIFI_MAC_DATA_CFACK', 'WIFI_MAC_DATA_CFPOLL', 'WIFI_MAC_DATA_CFACK_CFPOLL', 'WIFI_MAC_DATA_NULL', 'WIFI_MAC_DATA_NULL_CFACK', 'WIFI_MAC_DATA_NULL_CFPOLL', 'WIFI_MAC_DATA_NULL_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA', 'WIFI_MAC_QOSDATA_CFACK', 'WIFI_MAC_QOSDATA_CFPOLL', 'WIFI_MAC_QOSDATA_CFACK_CFPOLL', 'WIFI_MAC_QOSDATA_NULL', 'WIFI_MAC_QOSDATA_NULL_CFPOLL', 'WIFI_MAC_QOSDATA_NULL_CFACK_CFPOLL'], import_from_module='ns.wifi') ## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration] @@ -516,8 +516,6 @@ def register_types(module): module.add_class('EnumValue', import_from_module='ns.core', parent=root_module['ns3::AttributeValue']) ## random-variable-stream.h (module 'core'): ns3::ErlangRandomVariable [class] module.add_class('ErlangRandomVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariableStream']) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel [class] - module.add_class('ErrorRateModel', import_from_module='ns.wifi', parent=root_module['ns3::Object']) ## interference-helper.h (module 'wifi'): ns3::Event [class] module.add_class('Event', import_from_module='ns.wifi', parent=root_module['ns3::SimpleRefCount< ns3::Event, ns3::empty, ns3::DefaultDeleter >']) ## event-impl.h (module 'core'): ns3::EventImpl [class] @@ -746,24 +744,6 @@ def register_types(module): module.add_container('ns3::MsduAggregator::DeaggregatedMsdus', 'std::pair< ns3::Ptr< ns3::Packet >, ns3::AmsduSubframeHeader >', container_type=u'list') module.add_container('std::map< unsigned int, ns3::Ptr< ns3::OcbWifiMac > >', ('unsigned int', 'ns3::Ptr< ns3::OcbWifiMac >'), container_type=u'map') module.add_container('std::vector< ns3::Ptr< ns3::WifiPhy > >', 'ns3::Ptr< ns3::WifiPhy >', container_type=u'vector') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >', u'ns3::EdcaParameters') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >*', u'ns3::EdcaParameters*') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >&', u'ns3::EdcaParameters&') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator', u'ns3::EdcaParametersI') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator*', u'ns3::EdcaParametersI*') - typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator&', u'ns3::EdcaParametersI&') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::VscCallback') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::VscCallback*') - typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::VscCallback&') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogNodePrinter') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogNodePrinter*') - typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogNodePrinter&') - typehandlers.add_type_alias(u'uint8_t', u'ns3::WifiInformationElementId') - typehandlers.add_type_alias(u'uint8_t*', u'ns3::WifiInformationElementId*') - typehandlers.add_type_alias(u'uint8_t&', u'ns3::WifiInformationElementId&') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::RxOkCallback') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::RxOkCallback*') typehandlers.add_type_alias(u'ns3::Callback< void, ns3::Ptr< ns3::Packet >, double, ns3::WifiTxVector, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::RxOkCallback&') @@ -782,6 +762,24 @@ def register_types(module): typehandlers.add_type_alias(u'ns3::Vector3DChecker*', u'ns3::VectorChecker*') typehandlers.add_type_alias(u'ns3::Vector3DChecker&', u'ns3::VectorChecker&') module.add_typedef(root_module['ns3::Vector3DChecker'], 'VectorChecker') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >', u'ns3::EdcaParameters') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >*', u'ns3::EdcaParameters*') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > >&', u'ns3::EdcaParameters&') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator', u'ns3::EdcaParametersI') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator*', u'ns3::EdcaParametersI*') + typehandlers.add_type_alias(u'std::map< ns3::AcIndex, ns3::EdcaParameter, std::less< ns3::AcIndex >, std::allocator< std::pair< ns3::AcIndex const, ns3::EdcaParameter > > > const_iterator&', u'ns3::EdcaParametersI&') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', u'ns3::VscCallback') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', u'ns3::VscCallback*') + typehandlers.add_type_alias(u'ns3::Callback< bool, ns3::Ptr< ns3::WifiMac >, ns3::OrganizationIdentifier const &, ns3::Ptr< ns3::Packet const >, ns3::Address const &, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', u'ns3::VscCallback&') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogTimePrinter') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogTimePrinter*') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogTimePrinter&') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )', u'ns3::LogNodePrinter') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )*', u'ns3::LogNodePrinter*') + typehandlers.add_type_alias(u'void ( * ) ( std::ostream & )&', u'ns3::LogNodePrinter&') + typehandlers.add_type_alias(u'uint8_t', u'ns3::WifiInformationElementId') + typehandlers.add_type_alias(u'uint8_t*', u'ns3::WifiInformationElementId*') + typehandlers.add_type_alias(u'uint8_t&', u'ns3::WifiInformationElementId&') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >', u'ns3::WifiModeList') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >*', u'ns3::WifiModeList*') typehandlers.add_type_alias(u'std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > >&', u'ns3::WifiModeList&') @@ -1086,7 +1084,6 @@ def register_methods(root_module): register_Ns3EnumChecker_methods(root_module, root_module['ns3::EnumChecker']) register_Ns3EnumValue_methods(root_module, root_module['ns3::EnumValue']) register_Ns3ErlangRandomVariable_methods(root_module, root_module['ns3::ErlangRandomVariable']) - register_Ns3ErrorRateModel_methods(root_module, root_module['ns3::ErrorRateModel']) register_Ns3Event_methods(root_module, root_module['ns3::Event']) register_Ns3EventImpl_methods(root_module, root_module['ns3::EventImpl']) register_Ns3ExponentialRandomVariable_methods(root_module, root_module['ns3::ExponentialRandomVariable']) @@ -10960,13 +10957,38 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): cls.add_method('GetCppTypeid', 'std::string', [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const&']) ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], is_static=True, visibility='protected', template_parameters=[u'ns3::Time']) ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::OrganizationIdentifier const&']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Address']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] + cls.add_method('GetCppTypeid', + 'std::string', + [], + is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) + ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] cls.add_method('GetCppTypeid', 'std::string', [], @@ -11016,31 +11038,6 @@ def register_Ns3CallbackImplBase_methods(root_module, cls): 'std::string', [], is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const*']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::WifiMacHeader const&']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Ptr ']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::OrganizationIdentifier const&']) - ## callback.h (module 'core'): static std::string ns3::CallbackImplBase::GetCppTypeid() [member function] - cls.add_method('GetCppTypeid', - 'std::string', - [], - is_static=True, visibility='protected', template_parameters=[u'ns3::Address']) return def register_Ns3CallbackValue_methods(root_module, cls): @@ -12685,28 +12682,6 @@ def register_Ns3ErlangRandomVariable_methods(root_module, cls): is_virtual=True) return -def register_Ns3ErrorRateModel_methods(root_module, cls): - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel() [constructor] - cls.add_constructor([]) - ## error-rate-model.h (module 'wifi'): ns3::ErrorRateModel::ErrorRateModel(ns3::ErrorRateModel const & arg0) [constructor] - cls.add_constructor([param('ns3::ErrorRateModel const &', 'arg0')]) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::CalculateSnr(ns3::WifiTxVector txVector, double ber) const [member function] - cls.add_method('CalculateSnr', - 'double', - [param('ns3::WifiTxVector', 'txVector'), param('double', 'ber')], - is_const=True) - ## error-rate-model.h (module 'wifi'): double ns3::ErrorRateModel::GetChunkSuccessRate(ns3::WifiMode mode, ns3::WifiTxVector txVector, double snr, uint64_t nbits) const [member function] - cls.add_method('GetChunkSuccessRate', - 'double', - [param('ns3::WifiMode', 'mode'), param('ns3::WifiTxVector', 'txVector'), param('double', 'snr'), param('uint64_t', 'nbits')], - is_pure_virtual=True, is_const=True, is_virtual=True) - ## error-rate-model.h (module 'wifi'): static ns3::TypeId ns3::ErrorRateModel::GetTypeId() [member function] - cls.add_method('GetTypeId', - 'ns3::TypeId', - [], - is_static=True) - return - def register_Ns3Event_methods(root_module, cls): ## interference-helper.h (module 'wifi'): ns3::Event::Event(ns3::Event const & arg0) [constructor] cls.add_constructor([param('ns3::Event const &', 'arg0')]) diff --git a/src/wifi/helper/spectrum-wifi-helper.cc b/src/wifi/helper/spectrum-wifi-helper.cc index 7ad5e94cb..eba95a122 100644 --- a/src/wifi/helper/spectrum-wifi-helper.cc +++ b/src/wifi/helper/spectrum-wifi-helper.cc @@ -19,10 +19,11 @@ * Sébastien Deronne */ +#include "ns3/log.h" +#include "ns3/names.h" #include "spectrum-wifi-helper.h" #include "ns3/spectrum-wifi-phy.h" -#include "ns3/names.h" -#include "ns3/log.h" +#include "ns3/error-rate-model.h" namespace ns3 { diff --git a/src/wifi/helper/yans-wifi-helper.cc b/src/wifi/helper/yans-wifi-helper.cc index e212e0b5f..f342e9654 100644 --- a/src/wifi/helper/yans-wifi-helper.cc +++ b/src/wifi/helper/yans-wifi-helper.cc @@ -19,12 +19,13 @@ * Sébastien Deronne */ -#include "yans-wifi-helper.h" +#include "ns3/log.h" +#include "ns3/names.h" #include "ns3/propagation-loss-model.h" #include "ns3/propagation-delay-model.h" +#include "ns3/error-rate-model.h" #include "ns3/yans-wifi-phy.h" -#include "ns3/names.h" -#include "ns3/log.h" +#include "yans-wifi-helper.h" namespace ns3 { diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index b85f42aa6..17ed8316b 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -19,11 +19,12 @@ * Sébastien Deronne */ -#include "interference-helper.h" -#include "wifi-phy.h" +#include #include "ns3/simulator.h" #include "ns3/log.h" -#include +#include "interference-helper.h" +#include "wifi-phy.h" +#include "error-rate-model.h" namespace ns3 { diff --git a/src/wifi/model/interference-helper.h b/src/wifi/model/interference-helper.h index bb2371929..df8b8c38d 100644 --- a/src/wifi/model/interference-helper.h +++ b/src/wifi/model/interference-helper.h @@ -23,12 +23,12 @@ #include "ns3/nstime.h" #include "wifi-tx-vector.h" -#include "error-rate-model.h" #include namespace ns3 { class Packet; +class ErrorRateModel; /** * \ingroup wifi diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index 69f4133cd..43fe7c4d8 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -31,6 +31,7 @@ #include "wifi-utils.h" #include "frame-capture-model.h" #include "wifi-radio-energy-model.h" +#include "error-rate-model.h" namespace ns3 {