# HG changeset patch # User Tom Henderson # Date 1342066061 25200 # Node ID a11fdda061ae71aaf5293218378738aca093d7b9 # Parent b5ef4158fb8fc497ac0dc935fa162b4807a05a5d rescan bindings diff -r b5ef4158fb8f -r a11fdda061ae src/applications/bindings/modulegen__gcc_ILP32.py --- a/src/applications/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/applications/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -150,8 +150,8 @@ module.add_class('Ping6Helper') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -473,6 +473,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -563,7 +567,7 @@ register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -3174,32 +3178,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/applications/bindings/modulegen__gcc_LP64.py --- a/src/applications/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/applications/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -150,8 +150,8 @@ module.add_class('Ping6Helper') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -473,6 +473,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -563,7 +567,7 @@ register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3Ping6Helper_methods(root_module, root_module['ns3::Ping6Helper']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -3174,32 +3178,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/buildings/bindings/modulegen__gcc_ILP32.py --- a/src/buildings/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/buildings/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -68,8 +68,8 @@ module.add_class('ObjectFactory', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -278,6 +278,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -316,7 +320,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) @@ -1326,32 +1330,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/buildings/bindings/modulegen__gcc_LP64.py --- a/src/buildings/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/buildings/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -68,8 +68,8 @@ module.add_class('ObjectFactory', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -278,6 +278,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -316,7 +320,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) @@ -1326,32 +1330,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/core/bindings/callbacks_list.py --- a/src/core/bindings/callbacks_list.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/core/bindings/callbacks_list.py Wed Jul 11 21:07:41 2012 -0700 @@ -1,5 +1,5 @@ callback_classes = [ - ['void', 'unsigned char*', 'int', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], + ['void', 'unsigned char*', 'long', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['void', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ['bool', 'std::string', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty', 'ns3::empty'], ] diff -r b5ef4158fb8f -r a11fdda061ae src/csma-layout/bindings/modulegen__gcc_ILP32.py --- a/src/csma-layout/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/csma-layout/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -1957,6 +1957,8 @@ cls.add_constructor([param('ns3::Ipv6AddressHelper const &', 'arg0')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper() [constructor] cls.add_constructor([]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6InterfaceContainer ns3::Ipv6AddressHelper::Assign(ns3::NetDeviceContainer const & c) [member function] cls.add_method('Assign', 'ns3::Ipv6InterfaceContainer', @@ -1973,10 +1975,23 @@ cls.add_method('NewAddress', 'ns3::Ipv6Address', [param('ns3::Address', 'addr')]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6AddressHelper::NewAddress() [member function] + cls.add_method('NewAddress', + 'ns3::Ipv6Address', + []) ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix) [member function] cls.add_method('NewNetwork', 'void', - [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')]) + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')], + deprecated=True) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork() [member function] + cls.add_method('NewNetwork', + 'void', + []) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::SetBase(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [member function] + cls.add_method('SetBase', + 'void', + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) return def register_Ns3Ipv6InterfaceAddress_methods(root_module, cls): diff -r b5ef4158fb8f -r a11fdda061ae src/csma-layout/bindings/modulegen__gcc_LP64.py --- a/src/csma-layout/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/csma-layout/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -1957,6 +1957,8 @@ cls.add_constructor([param('ns3::Ipv6AddressHelper const &', 'arg0')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper() [constructor] cls.add_constructor([]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6InterfaceContainer ns3::Ipv6AddressHelper::Assign(ns3::NetDeviceContainer const & c) [member function] cls.add_method('Assign', 'ns3::Ipv6InterfaceContainer', @@ -1973,10 +1975,23 @@ cls.add_method('NewAddress', 'ns3::Ipv6Address', [param('ns3::Address', 'addr')]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6AddressHelper::NewAddress() [member function] + cls.add_method('NewAddress', + 'ns3::Ipv6Address', + []) ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix) [member function] cls.add_method('NewNetwork', 'void', - [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')]) + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')], + deprecated=True) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork() [member function] + cls.add_method('NewNetwork', + 'void', + []) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::SetBase(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [member function] + cls.add_method('SetBase', + 'void', + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) return def register_Ns3Ipv6InterfaceAddress_methods(root_module, cls): diff -r b5ef4158fb8f -r a11fdda061ae src/csma/bindings/modulegen__gcc_ILP32.py --- a/src/csma/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/csma/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -110,8 +110,8 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -284,6 +284,10 @@ module.add_class('CsmaNetDevice', parent=root_module['ns3::NetDevice']) ## csma-net-device.h (module 'csma'): ns3::CsmaNetDevice::EncapsulationMode [enumeration] module.add_enum('EncapsulationMode', ['ILLEGAL', 'DIX', 'LLC'], outer_class=root_module['ns3::CsmaNetDevice']) + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') ## Register a nested module for the namespace FatalImpl @@ -334,7 +338,7 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -2180,32 +2184,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/csma/bindings/modulegen__gcc_LP64.py --- a/src/csma/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/csma/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -110,8 +110,8 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -284,6 +284,10 @@ module.add_class('CsmaNetDevice', parent=root_module['ns3::NetDevice']) ## csma-net-device.h (module 'csma'): ns3::CsmaNetDevice::EncapsulationMode [enumeration] module.add_enum('EncapsulationMode', ['ILLEGAL', 'DIX', 'LLC'], outer_class=root_module['ns3::CsmaNetDevice']) + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') ## Register a nested module for the namespace FatalImpl @@ -334,7 +338,7 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -2180,32 +2184,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/internet/bindings/modulegen__gcc_ILP32.py --- a/src/internet/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/internet/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -200,12 +200,12 @@ module.add_class('PcapHelperForIpv6', allow_subclassing=True) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex [class] module.add_class('SPFVertex') ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex::VertexType [enumeration] module.add_enum('VertexType', ['VertexUnknown', 'VertexRouter', 'VertexNetwork'], outer_class=root_module['ns3::SPFVertex']) - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] module.add_class('SequenceNumber32', import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -604,6 +604,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') @@ -689,8 +693,8 @@ register_Ns3PcapHelperForIpv4_methods(root_module, root_module['ns3::PcapHelperForIpv4']) register_Ns3PcapHelperForIpv6_methods(root_module, root_module['ns3::PcapHelperForIpv6']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SPFVertex_methods(root_module, root_module['ns3::SPFVertex']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SequenceNumber32_methods(root_module, root_module['ns3::SequenceNumber32']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) @@ -3981,6 +3985,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3SPFVertex_methods(root_module, cls): ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex::SPFVertex() [constructor] cls.add_constructor([]) @@ -4095,38 +4131,6 @@ []) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SequenceNumber32_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_numeric_operator('+', root_module['ns3::SequenceNumber32'], root_module['ns3::SequenceNumber32'], param('ns3::SequenceNumber< unsigned int, int > const &', 'right')) diff -r b5ef4158fb8f -r a11fdda061ae src/internet/bindings/modulegen__gcc_LP64.py --- a/src/internet/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/internet/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -200,12 +200,12 @@ module.add_class('PcapHelperForIpv6', allow_subclassing=True) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex [class] module.add_class('SPFVertex') ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex::VertexType [enumeration] module.add_enum('VertexType', ['VertexUnknown', 'VertexRouter', 'VertexNetwork'], outer_class=root_module['ns3::SPFVertex']) - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] module.add_class('SequenceNumber32', import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -604,6 +604,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >', 'ns3::SequenceNumber16') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >*', 'ns3::SequenceNumber16*') typehandlers.add_type_alias('ns3::SequenceNumber< short unsigned int, short int >&', 'ns3::SequenceNumber16&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') @@ -689,8 +693,8 @@ register_Ns3PcapHelperForIpv4_methods(root_module, root_module['ns3::PcapHelperForIpv4']) register_Ns3PcapHelperForIpv6_methods(root_module, root_module['ns3::PcapHelperForIpv6']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SPFVertex_methods(root_module, root_module['ns3::SPFVertex']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SequenceNumber32_methods(root_module, root_module['ns3::SequenceNumber32']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) @@ -3981,6 +3985,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3SPFVertex_methods(root_module, cls): ## global-route-manager-impl.h (module 'internet'): ns3::SPFVertex::SPFVertex() [constructor] cls.add_constructor([]) @@ -4095,38 +4131,6 @@ []) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SequenceNumber32_methods(root_module, cls): cls.add_binary_comparison_operator('!=') cls.add_binary_numeric_operator('+', root_module['ns3::SequenceNumber32'], root_module['ns3::SequenceNumber32'], param('ns3::SequenceNumber< unsigned int, int > const &', 'right')) diff -r b5ef4158fb8f -r a11fdda061ae src/lte/bindings/modulegen__gcc_ILP32.py --- a/src/lte/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/lte/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -276,8 +276,8 @@ module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## lte-rlc-sequence-number.h (module 'lte'): ns3::SequenceNumber10 [class] module.add_class('SequenceNumber10') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -743,6 +743,10 @@ typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -934,7 +938,7 @@ register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequenceNumber10_methods(root_module, root_module['ns3::SequenceNumber10']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) @@ -4145,32 +4149,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], @@ -7066,10 +7070,11 @@ cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')]) ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor] cls.add_constructor([]) - ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::CreateFadingChannelRealization(ns3::Ptr enbMobility, ns3::Ptr ueMobility) [member function] - cls.add_method('CreateFadingChannelRealization', - 'void', - [param('ns3::Ptr< ns3::MobilityModel const >', 'enbMobility'), param('ns3::Ptr< ns3::MobilityModel const >', 'ueMobility')]) + ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::DoStart() [member function] + cls.add_method('DoStart', + 'void', + [], + is_virtual=True) ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff -r b5ef4158fb8f -r a11fdda061ae src/lte/bindings/modulegen__gcc_LP64.py --- a/src/lte/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/lte/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -276,8 +276,8 @@ module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## lte-rlc-sequence-number.h (module 'lte'): ns3::SequenceNumber10 [class] module.add_class('SequenceNumber10') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -743,6 +743,10 @@ typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyTxEndCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyTxEndCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::Ptr< ns3::Packet const >, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyTxEndCallback&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -934,7 +938,7 @@ register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequenceNumber10_methods(root_module, root_module['ns3::SequenceNumber10']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) @@ -4145,32 +4149,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], @@ -7066,10 +7070,11 @@ cls.add_constructor([param('ns3::TraceFadingLossModel const &', 'arg0')]) ## trace-fading-loss-model.h (module 'lte'): ns3::TraceFadingLossModel::TraceFadingLossModel() [constructor] cls.add_constructor([]) - ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::CreateFadingChannelRealization(ns3::Ptr enbMobility, ns3::Ptr ueMobility) [member function] - cls.add_method('CreateFadingChannelRealization', - 'void', - [param('ns3::Ptr< ns3::MobilityModel const >', 'enbMobility'), param('ns3::Ptr< ns3::MobilityModel const >', 'ueMobility')]) + ## trace-fading-loss-model.h (module 'lte'): void ns3::TraceFadingLossModel::DoStart() [member function] + cls.add_method('DoStart', + 'void', + [], + is_virtual=True) ## trace-fading-loss-model.h (module 'lte'): static ns3::TypeId ns3::TraceFadingLossModel::GetTypeId() [member function] cls.add_method('GetTypeId', 'ns3::TypeId', diff -r b5ef4158fb8f -r a11fdda061ae src/mobility/bindings/modulegen__gcc_ILP32.py --- a/src/mobility/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/mobility/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -68,8 +68,8 @@ module.add_class('Rectangle') ## rectangle.h (module 'mobility'): ns3::Rectangle::Side [enumeration] module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle']) - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -270,6 +270,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -309,7 +313,7 @@ register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) @@ -1375,32 +1379,32 @@ cls.add_instance_attribute('yMin', 'double', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/mobility/bindings/modulegen__gcc_LP64.py --- a/src/mobility/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/mobility/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -68,8 +68,8 @@ module.add_class('Rectangle') ## rectangle.h (module 'mobility'): ns3::Rectangle::Side [enumeration] module.add_enum('Side', ['RIGHT', 'LEFT', 'TOP', 'BOTTOM'], outer_class=root_module['ns3::Rectangle']) - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -270,6 +270,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -309,7 +313,7 @@ register_Ns3ObjectFactory_methods(root_module, root_module['ns3::ObjectFactory']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) register_Ns3Rectangle_methods(root_module, root_module['ns3::Rectangle']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TagBuffer_methods(root_module, root_module['ns3::TagBuffer']) @@ -1375,32 +1379,32 @@ cls.add_instance_attribute('yMin', 'double', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/network/bindings/modulegen__gcc_ILP32.py --- a/src/network/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/network/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -136,8 +136,8 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] module.add_class('SequenceNumber32') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] @@ -411,6 +411,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -491,7 +495,7 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequenceNumber32_methods(root_module, root_module['ns3::SequenceNumber32']) register_Ns3SequenceNumber16_methods(root_module, root_module['ns3::SequenceNumber16']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) @@ -2842,32 +2846,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/network/bindings/modulegen__gcc_LP64.py --- a/src/network/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/network/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -136,8 +136,8 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] module.add_class('SequenceNumber32') ## sequence-number.h (module 'network'): ns3::SequenceNumber [class] @@ -411,6 +411,10 @@ typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >', 'ns3::SequenceNumber32') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >*', 'ns3::SequenceNumber32*') typehandlers.add_type_alias('ns3::SequenceNumber< unsigned int, int >&', 'ns3::SequenceNumber32&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >', 'ns3::GenericPhyRxStartCallback') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >*', 'ns3::GenericPhyRxStartCallback*') typehandlers.add_type_alias('ns3::Callback< void, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty, ns3::empty >&', 'ns3::GenericPhyRxStartCallback&') @@ -491,7 +495,7 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequenceNumber32_methods(root_module, root_module['ns3::SequenceNumber32']) register_Ns3SequenceNumber16_methods(root_module, root_module['ns3::SequenceNumber16']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) @@ -2842,32 +2846,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -1779,6 +1779,8 @@ cls.add_constructor([param('ns3::Ipv6AddressHelper const &', 'arg0')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper() [constructor] cls.add_constructor([]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6InterfaceContainer ns3::Ipv6AddressHelper::Assign(ns3::NetDeviceContainer const & c) [member function] cls.add_method('Assign', 'ns3::Ipv6InterfaceContainer', @@ -1795,10 +1797,23 @@ cls.add_method('NewAddress', 'ns3::Ipv6Address', [param('ns3::Address', 'addr')]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6AddressHelper::NewAddress() [member function] + cls.add_method('NewAddress', + 'ns3::Ipv6Address', + []) ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix) [member function] cls.add_method('NewNetwork', 'void', - [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')]) + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')], + deprecated=True) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork() [member function] + cls.add_method('NewNetwork', + 'void', + []) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::SetBase(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [member function] + cls.add_method('SetBase', + 'void', + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) return def register_Ns3Ipv6InterfaceAddress_methods(root_module, cls): diff -r b5ef4158fb8f -r a11fdda061ae src/point-to-point-layout/bindings/modulegen__gcc_LP64.py --- a/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/point-to-point-layout/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -1779,6 +1779,8 @@ cls.add_constructor([param('ns3::Ipv6AddressHelper const &', 'arg0')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper() [constructor] cls.add_constructor([]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6AddressHelper::Ipv6AddressHelper(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [constructor] + cls.add_constructor([param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6InterfaceContainer ns3::Ipv6AddressHelper::Assign(ns3::NetDeviceContainer const & c) [member function] cls.add_method('Assign', 'ns3::Ipv6InterfaceContainer', @@ -1795,10 +1797,23 @@ cls.add_method('NewAddress', 'ns3::Ipv6Address', [param('ns3::Address', 'addr')]) + ## ipv6-address-helper.h (module 'internet'): ns3::Ipv6Address ns3::Ipv6AddressHelper::NewAddress() [member function] + cls.add_method('NewAddress', + 'ns3::Ipv6Address', + []) ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix) [member function] cls.add_method('NewNetwork', 'void', - [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')]) + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix')], + deprecated=True) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::NewNetwork() [member function] + cls.add_method('NewNetwork', + 'void', + []) + ## ipv6-address-helper.h (module 'internet'): void ns3::Ipv6AddressHelper::SetBase(ns3::Ipv6Address network, ns3::Ipv6Prefix prefix, ns3::Ipv6Address base=ns3::Ipv6Address(((const char*)"::1"))) [member function] + cls.add_method('SetBase', + 'void', + [param('ns3::Ipv6Address', 'network'), param('ns3::Ipv6Prefix', 'prefix'), param('ns3::Ipv6Address', 'base', default_value='ns3::Ipv6Address(((const char*)"::1"))')]) return def register_Ns3Ipv6InterfaceAddress_methods(root_module, cls): diff -r b5ef4158fb8f -r a11fdda061ae src/point-to-point/bindings/modulegen__gcc_ILP32.py --- a/src/point-to-point/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/point-to-point/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -106,8 +106,8 @@ module.add_class('PointToPointHelper', parent=[root_module['ns3::PcapHelperForDevice'], root_module['ns3::AsciiTraceHelperForDevice']]) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -295,6 +295,10 @@ ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') ## Register a nested module for the namespace FatalImpl @@ -344,7 +348,7 @@ register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -2193,32 +2197,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/point-to-point/bindings/modulegen__gcc_LP64.py --- a/src/point-to-point/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/point-to-point/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -106,8 +106,8 @@ module.add_class('PointToPointHelper', parent=[root_module['ns3::PcapHelperForDevice'], root_module['ns3::AsciiTraceHelperForDevice']]) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -295,6 +295,10 @@ ## address.h (module 'network'): ns3::AddressValue [class] module.add_class('AddressValue', import_from_module='ns.network', parent=root_module['ns3::AttributeValue']) module.add_container('std::list< unsigned int >', 'unsigned int', container_type='list') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') ## Register a nested module for the namespace FatalImpl @@ -344,7 +348,7 @@ register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3PointToPointHelper_methods(root_module, root_module['ns3::PointToPointHelper']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -2193,32 +2197,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/propagation/bindings/modulegen__gcc_ILP32.py --- a/src/propagation/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/propagation/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -38,8 +38,8 @@ module.add_class('PropagationCache', template_parameters=['ns3::JakesProcess']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -194,6 +194,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -221,7 +225,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3PropagationCache__Ns3JakesProcess_methods(root_module, root_module['ns3::PropagationCache< ns3::JakesProcess >']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) @@ -456,32 +460,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/propagation/bindings/modulegen__gcc_LP64.py --- a/src/propagation/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/propagation/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -38,8 +38,8 @@ module.add_class('PropagationCache', template_parameters=['ns3::JakesProcess']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -194,6 +194,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -221,7 +225,7 @@ register_Ns3ObjectDeleter_methods(root_module, root_module['ns3::ObjectDeleter']) register_Ns3PropagationCache__Ns3JakesProcess_methods(root_module, root_module['ns3::PropagationCache< ns3::JakesProcess >']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3TriangularVariable_methods(root_module, root_module['ns3::TriangularVariable']) @@ -456,32 +460,32 @@ is_const=True) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', [], is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], + [param('uint64_t', 'run')], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/spectrum/bindings/modulegen__gcc_ILP32.py --- a/src/spectrum/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/spectrum/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -98,10 +98,10 @@ module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo [class] module.add_class('RxSpectrumModelInfo') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -387,6 +387,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -478,8 +482,8 @@ register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3RxSpectrumModelInfo_methods(root_module, root_module['ns3::RxSpectrumModelInfo']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3SpectrumAnalyzerHelper_methods(root_module, root_module['ns3::SpectrumAnalyzerHelper']) @@ -2138,6 +2142,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3RxSpectrumModelInfo_methods(root_module, cls): ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo::RxSpectrumModelInfo(ns3::RxSpectrumModelInfo const & arg0) [copy constructor] cls.add_constructor([param('ns3::RxSpectrumModelInfo const &', 'arg0')]) @@ -2149,38 +2185,6 @@ cls.add_instance_attribute('m_rxSpectrumModel', 'ns3::Ptr< ns3::SpectrumModel const >', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SequentialVariable_methods(root_module, cls): ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(ns3::SequentialVariable const & arg0) [copy constructor] cls.add_constructor([param('ns3::SequentialVariable const &', 'arg0')]) diff -r b5ef4158fb8f -r a11fdda061ae src/spectrum/bindings/modulegen__gcc_LP64.py --- a/src/spectrum/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/spectrum/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -98,10 +98,10 @@ module.add_class('TagData', import_from_module='ns.network', outer_class=root_module['ns3::PacketTagList']) ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo [class] module.add_class('RxSpectrumModelInfo') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -387,6 +387,10 @@ typehandlers.add_type_alias('ns3::Vector3DValue*', 'ns3::VectorValue*') typehandlers.add_type_alias('ns3::Vector3DValue&', 'ns3::VectorValue&') module.add_typedef(root_module['ns3::Vector3DValue'], 'VectorValue') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('ns3::Vector3D', 'ns3::Vector') typehandlers.add_type_alias('ns3::Vector3D*', 'ns3::Vector*') typehandlers.add_type_alias('ns3::Vector3D&', 'ns3::Vector&') @@ -478,8 +482,8 @@ register_Ns3PacketTagList_methods(root_module, root_module['ns3::PacketTagList']) register_Ns3PacketTagListTagData_methods(root_module, root_module['ns3::PacketTagList::TagData']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3RxSpectrumModelInfo_methods(root_module, root_module['ns3::RxSpectrumModelInfo']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3SpectrumAnalyzerHelper_methods(root_module, root_module['ns3::SpectrumAnalyzerHelper']) @@ -2138,6 +2142,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3RxSpectrumModelInfo_methods(root_module, cls): ## multi-model-spectrum-channel.h (module 'spectrum'): ns3::RxSpectrumModelInfo::RxSpectrumModelInfo(ns3::RxSpectrumModelInfo const & arg0) [copy constructor] cls.add_constructor([param('ns3::RxSpectrumModelInfo const &', 'arg0')]) @@ -2149,38 +2185,6 @@ cls.add_instance_attribute('m_rxSpectrumModel', 'ns3::Ptr< ns3::SpectrumModel const >', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SequentialVariable_methods(root_module, cls): ## random-variable.h (module 'core'): ns3::SequentialVariable::SequentialVariable(ns3::SequentialVariable const & arg0) [copy constructor] cls.add_constructor([param('ns3::SequentialVariable const &', 'arg0')]) diff -r b5ef4158fb8f -r a11fdda061ae src/uan/bindings/modulegen__gcc_ILP32.py --- a/src/uan/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/uan/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -4268,11 +4268,35 @@ 'void', [], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxBegin(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxBegin', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxDrop(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxDrop', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxEnd(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTransStartTx(ns3::Ptr packet, double txPowerDb, ns3::UanTxMode txMode) [member function] cls.add_method('NotifyTransStartTx', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'txPowerDb'), param('ns3::UanTxMode', 'txMode')], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxBegin(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxBegin', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxDrop(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxDrop', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxEnd(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) ## uan-phy.h (module 'uan'): void ns3::UanPhy::RegisterListener(ns3::UanPhyListener * listener) [member function] cls.add_method('RegisterListener', 'void', diff -r b5ef4158fb8f -r a11fdda061ae src/uan/bindings/modulegen__gcc_LP64.py --- a/src/uan/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/uan/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -4268,11 +4268,35 @@ 'void', [], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxBegin(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxBegin', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxDrop(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxDrop', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyRxEnd(ns3::Ptr packet) [member function] + cls.add_method('NotifyRxEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTransStartTx(ns3::Ptr packet, double txPowerDb, ns3::UanTxMode txMode) [member function] cls.add_method('NotifyTransStartTx', 'void', [param('ns3::Ptr< ns3::Packet >', 'packet'), param('double', 'txPowerDb'), param('ns3::UanTxMode', 'txMode')], is_pure_virtual=True, is_virtual=True) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxBegin(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxBegin', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxDrop(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxDrop', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) + ## uan-phy.h (module 'uan'): void ns3::UanPhy::NotifyTxEnd(ns3::Ptr packet) [member function] + cls.add_method('NotifyTxEnd', + 'void', + [param('ns3::Ptr< ns3::Packet const >', 'packet')]) ## uan-phy.h (module 'uan'): void ns3::UanPhy::RegisterListener(ns3::UanPhyListener * listener) [member function] cls.add_method('RegisterListener', 'void', diff -r b5ef4158fb8f -r a11fdda061ae src/visualizer/bindings/modulegen__gcc_ILP32.py --- a/src/visualizer/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/visualizer/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -2160,11 +2160,6 @@ 'bool', [], is_static=True) - ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] - cls.add_method('Next', - 'ns3::Time', - [], - is_static=True, deprecated=True) ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] cls.add_method('Now', 'ns3::Time', @@ -2175,11 +2170,6 @@ 'void', [param('ns3::EventId const &', 'id')], is_static=True) - ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] - cls.add_method('RunOneEvent', - 'void', - [], - is_static=True, deprecated=True) ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] cls.add_method('SetImplementation', 'void', @@ -3273,6 +3263,16 @@ 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## socket.h (module 'network'): static ns3::TypeId ns3::Socket::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## socket.h (module 'network'): bool ns3::Socket::IsRecvPktInfo() const [member function] + cls.add_method('IsRecvPktInfo', + 'bool', + [], + is_const=True) ## socket.h (module 'network'): int ns3::Socket::Listen() [member function] cls.add_method('Listen', 'int', diff -r b5ef4158fb8f -r a11fdda061ae src/visualizer/bindings/modulegen__gcc_LP64.py --- a/src/visualizer/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/visualizer/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -2160,11 +2160,6 @@ 'bool', [], is_static=True) - ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Next() [member function] - cls.add_method('Next', - 'ns3::Time', - [], - is_static=True, deprecated=True) ## simulator.h (module 'core'): static ns3::Time ns3::Simulator::Now() [member function] cls.add_method('Now', 'ns3::Time', @@ -2175,11 +2170,6 @@ 'void', [param('ns3::EventId const &', 'id')], is_static=True) - ## simulator.h (module 'core'): static void ns3::Simulator::RunOneEvent() [member function] - cls.add_method('RunOneEvent', - 'void', - [], - is_static=True, deprecated=True) ## simulator.h (module 'core'): static void ns3::Simulator::SetImplementation(ns3::Ptr impl) [member function] cls.add_method('SetImplementation', 'void', @@ -3273,6 +3263,16 @@ 'uint32_t', [], is_pure_virtual=True, is_const=True, is_virtual=True) + ## socket.h (module 'network'): static ns3::TypeId ns3::Socket::GetTypeId() [member function] + cls.add_method('GetTypeId', + 'ns3::TypeId', + [], + is_static=True) + ## socket.h (module 'network'): bool ns3::Socket::IsRecvPktInfo() const [member function] + cls.add_method('IsRecvPktInfo', + 'bool', + [], + is_const=True) ## socket.h (module 'network'): int ns3::Socket::Listen() [member function] cls.add_method('Listen', 'int', diff -r b5ef4158fb8f -r a11fdda061ae src/wifi/bindings/modulegen__gcc_ILP32.py --- a/src/wifi/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/wifi/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -164,8 +164,8 @@ module.add_class('RandomVariable', import_from_module='ns.core') ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo [struct] module.add_class('RateInfo') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -557,6 +557,10 @@ typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') @@ -657,7 +661,7 @@ register_Ns3PropagationCache__Ns3JakesProcess_methods(root_module, root_module['ns3::PropagationCache< ns3::JakesProcess >']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) register_Ns3RateInfo_methods(root_module, root_module['ns3::RateInfo']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -3391,32 +3395,32 @@ cls.add_instance_attribute('throughput', 'uint32_t', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/wifi/bindings/modulegen__gcc_LP64.py --- a/src/wifi/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/wifi/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -164,8 +164,8 @@ module.add_class('RandomVariable', import_from_module='ns.core') ## minstrel-wifi-manager.h (module 'wifi'): ns3::RateInfo [struct] module.add_class('RateInfo') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] module.add_class('SequentialVariable', import_from_module='ns.core', parent=root_module['ns3::RandomVariable']) ## simple-ref-count.h (module 'core'): ns3::SimpleRefCount [class] @@ -557,6 +557,10 @@ typehandlers.add_type_alias('uint8_t', 'ns3::WifiInformationElementId') typehandlers.add_type_alias('uint8_t*', 'ns3::WifiInformationElementId*') typehandlers.add_type_alias('uint8_t&', 'ns3::WifiInformationElementId&') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >', 'ns3::WifiModeListIterator') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >*', 'ns3::WifiModeListIterator*') typehandlers.add_type_alias('__gnu_cxx::__normal_iterator< ns3::WifiMode const *, std::vector< ns3::WifiMode, std::allocator< ns3::WifiMode > > >&', 'ns3::WifiModeListIterator&') @@ -657,7 +661,7 @@ register_Ns3PropagationCache__Ns3JakesProcess_methods(root_module, root_module['ns3::PropagationCache< ns3::JakesProcess >']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) register_Ns3RateInfo_methods(root_module, root_module['ns3::RateInfo']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3SimpleRefCount__Ns3Object_Ns3ObjectBase_Ns3ObjectDeleter_methods(root_module, root_module['ns3::SimpleRefCount< ns3::Object, ns3::ObjectBase, ns3::ObjectDeleter >']) register_Ns3Simulator_methods(root_module, root_module['ns3::Simulator']) @@ -3391,32 +3395,32 @@ cls.add_instance_attribute('throughput', 'uint32_t', is_const=False) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] cls.add_method('GetSeed', 'uint32_t', [], is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] cls.add_method('SetRun', 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] cls.add_method('SetSeed', 'void', [param('uint32_t', 'seed')], diff -r b5ef4158fb8f -r a11fdda061ae src/wimax/bindings/modulegen__gcc_ILP32.py --- a/src/wimax/bindings/modulegen__gcc_ILP32.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/wimax/bindings/modulegen__gcc_ILP32.py Wed Jul 11 21:07:41 2012 -0700 @@ -138,14 +138,14 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## snr-to-block-error-rate-manager.h (module 'wimax'): ns3::SNRToBlockErrorRateManager [class] module.add_class('SNRToBlockErrorRateManager') ## snr-to-block-error-rate-record.h (module 'wimax'): ns3::SNRToBlockErrorRateRecord [class] module.add_class('SNRToBlockErrorRateRecord') ## ss-record.h (module 'wimax'): ns3::SSRecord [class] module.add_class('SSRecord') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## send-params.h (module 'wimax'): ns3::SendParams [class] module.add_class('SendParams') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -535,6 +535,10 @@ module.add_container('std::vector< ns3::Ptr< ns3::WimaxConnection > >', 'ns3::Ptr< ns3::WimaxConnection >', container_type='vector') module.add_container('std::vector< ns3::OfdmDlBurstProfile >', 'ns3::OfdmDlBurstProfile', container_type='vector') module.add_container('std::list< ns3::OfdmDlMapIe >', 'ns3::OfdmDlMapIe', container_type='list') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') @@ -613,10 +617,10 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SNRToBlockErrorRateManager_methods(root_module, root_module['ns3::SNRToBlockErrorRateManager']) register_Ns3SNRToBlockErrorRateRecord_methods(root_module, root_module['ns3::SNRToBlockErrorRateRecord']) register_Ns3SSRecord_methods(root_module, root_module['ns3::SSRecord']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SendParams_methods(root_module, root_module['ns3::SendParams']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3ServiceFlow_methods(root_module, root_module['ns3::ServiceFlow']) @@ -3134,6 +3138,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3SNRToBlockErrorRateManager_methods(root_module, cls): ## snr-to-block-error-rate-manager.h (module 'wimax'): ns3::SNRToBlockErrorRateManager::SNRToBlockErrorRateManager(ns3::SNRToBlockErrorRateManager const & arg0) [copy constructor] cls.add_constructor([param('ns3::SNRToBlockErrorRateManager const &', 'arg0')]) @@ -3417,38 +3453,6 @@ [param('uint16_t', 'sfTransactionId')]) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SendParams_methods(root_module, cls): ## send-params.h (module 'wimax'): ns3::SendParams::SendParams(ns3::SendParams const & arg0) [copy constructor] cls.add_constructor([param('ns3::SendParams const &', 'arg0')]) diff -r b5ef4158fb8f -r a11fdda061ae src/wimax/bindings/modulegen__gcc_LP64.py --- a/src/wimax/bindings/modulegen__gcc_LP64.py Wed Jul 11 10:26:41 2012 -0700 +++ b/src/wimax/bindings/modulegen__gcc_LP64.py Wed Jul 11 21:07:41 2012 -0700 @@ -138,14 +138,14 @@ module.add_class('PcapHelperForDevice', allow_subclassing=True, import_from_module='ns.network') ## random-variable.h (module 'core'): ns3::RandomVariable [class] module.add_class('RandomVariable', import_from_module='ns.core') + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager [class] + module.add_class('RngSeedManager', import_from_module='ns.core') ## snr-to-block-error-rate-manager.h (module 'wimax'): ns3::SNRToBlockErrorRateManager [class] module.add_class('SNRToBlockErrorRateManager') ## snr-to-block-error-rate-record.h (module 'wimax'): ns3::SNRToBlockErrorRateRecord [class] module.add_class('SNRToBlockErrorRateRecord') ## ss-record.h (module 'wimax'): ns3::SSRecord [class] module.add_class('SSRecord') - ## random-variable.h (module 'core'): ns3::SeedManager [class] - module.add_class('SeedManager', import_from_module='ns.core') ## send-params.h (module 'wimax'): ns3::SendParams [class] module.add_class('SendParams') ## random-variable.h (module 'core'): ns3::SequentialVariable [class] @@ -535,6 +535,10 @@ module.add_container('std::vector< ns3::Ptr< ns3::WimaxConnection > >', 'ns3::Ptr< ns3::WimaxConnection >', container_type='vector') module.add_container('std::vector< ns3::OfdmDlBurstProfile >', 'ns3::OfdmDlBurstProfile', container_type='vector') module.add_container('std::list< ns3::OfdmDlMapIe >', 'ns3::OfdmDlMapIe', container_type='list') + typehandlers.add_type_alias('ns3::RngSeedManager', 'ns3::SeedManager') + typehandlers.add_type_alias('ns3::RngSeedManager*', 'ns3::SeedManager*') + typehandlers.add_type_alias('ns3::RngSeedManager&', 'ns3::SeedManager&') + module.add_typedef(root_module['ns3::RngSeedManager'], 'SeedManager') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *', 'ns3::LogNodePrinter') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) **', 'ns3::LogNodePrinter*') typehandlers.add_type_alias('void ( * ) ( std::ostream & ) *&', 'ns3::LogNodePrinter&') @@ -613,10 +617,10 @@ register_Ns3PcapHelper_methods(root_module, root_module['ns3::PcapHelper']) register_Ns3PcapHelperForDevice_methods(root_module, root_module['ns3::PcapHelperForDevice']) register_Ns3RandomVariable_methods(root_module, root_module['ns3::RandomVariable']) + register_Ns3RngSeedManager_methods(root_module, root_module['ns3::RngSeedManager']) register_Ns3SNRToBlockErrorRateManager_methods(root_module, root_module['ns3::SNRToBlockErrorRateManager']) register_Ns3SNRToBlockErrorRateRecord_methods(root_module, root_module['ns3::SNRToBlockErrorRateRecord']) register_Ns3SSRecord_methods(root_module, root_module['ns3::SSRecord']) - register_Ns3SeedManager_methods(root_module, root_module['ns3::SeedManager']) register_Ns3SendParams_methods(root_module, root_module['ns3::SendParams']) register_Ns3SequentialVariable_methods(root_module, root_module['ns3::SequentialVariable']) register_Ns3ServiceFlow_methods(root_module, root_module['ns3::ServiceFlow']) @@ -3134,6 +3138,38 @@ is_const=True) return +def register_Ns3RngSeedManager_methods(root_module, cls): + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager() [constructor] + cls.add_constructor([]) + ## rng-seed-manager.h (module 'core'): ns3::RngSeedManager::RngSeedManager(ns3::RngSeedManager const & arg0) [copy constructor] + cls.add_constructor([param('ns3::RngSeedManager const &', 'arg0')]) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetNextStreamIndex() [member function] + cls.add_method('GetNextStreamIndex', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint64_t ns3::RngSeedManager::GetRun() [member function] + cls.add_method('GetRun', + 'uint64_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static uint32_t ns3::RngSeedManager::GetSeed() [member function] + cls.add_method('GetSeed', + 'uint32_t', + [], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetRun(uint64_t run) [member function] + cls.add_method('SetRun', + 'void', + [param('uint64_t', 'run')], + is_static=True) + ## rng-seed-manager.h (module 'core'): static void ns3::RngSeedManager::SetSeed(uint32_t seed) [member function] + cls.add_method('SetSeed', + 'void', + [param('uint32_t', 'seed')], + is_static=True) + return + def register_Ns3SNRToBlockErrorRateManager_methods(root_module, cls): ## snr-to-block-error-rate-manager.h (module 'wimax'): ns3::SNRToBlockErrorRateManager::SNRToBlockErrorRateManager(ns3::SNRToBlockErrorRateManager const & arg0) [copy constructor] cls.add_constructor([param('ns3::SNRToBlockErrorRateManager const &', 'arg0')]) @@ -3417,38 +3453,6 @@ [param('uint16_t', 'sfTransactionId')]) return -def register_Ns3SeedManager_methods(root_module, cls): - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager() [constructor] - cls.add_constructor([]) - ## random-variable.h (module 'core'): ns3::SeedManager::SeedManager(ns3::SeedManager const & arg0) [copy constructor] - cls.add_constructor([param('ns3::SeedManager const &', 'arg0')]) - ## random-variable.h (module 'core'): static bool ns3::SeedManager::CheckSeed(uint32_t seed) [member function] - cls.add_method('CheckSeed', - 'bool', - [param('uint32_t', 'seed')], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetRun() [member function] - cls.add_method('GetRun', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static uint32_t ns3::SeedManager::GetSeed() [member function] - cls.add_method('GetSeed', - 'uint32_t', - [], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetRun(uint32_t run) [member function] - cls.add_method('SetRun', - 'void', - [param('uint32_t', 'run')], - is_static=True) - ## random-variable.h (module 'core'): static void ns3::SeedManager::SetSeed(uint32_t seed) [member function] - cls.add_method('SetSeed', - 'void', - [param('uint32_t', 'seed')], - is_static=True) - return - def register_Ns3SendParams_methods(root_module, cls): ## send-params.h (module 'wimax'): ns3::SendParams::SendParams(ns3::SendParams const & arg0) [copy constructor] cls.add_constructor([param('ns3::SendParams const &', 'arg0')])