rescan python
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 19 May 2009 15:35:05 +0200
changeset 4449c11b6d768ab3
parent 4448 641b88d1e131
child 4450 0ca9b9b410a0
rescan python
bindings/python/ns3_module_bridge.py
bindings/python/ns3_module_common.py
bindings/python/ns3_module_contrib.py
bindings/python/ns3_module_core.py
bindings/python/ns3_module_csma.py
bindings/python/ns3_module_emu.py
bindings/python/ns3_module_global_routing.py
bindings/python/ns3_module_helper.py
bindings/python/ns3_module_internet_stack.py
bindings/python/ns3_module_mobility.py
bindings/python/ns3_module_node.py
bindings/python/ns3_module_olsr.py
bindings/python/ns3_module_onoff.py
bindings/python/ns3_module_packet_sink.py
bindings/python/ns3_module_point_to_point.py
bindings/python/ns3_module_simulator.py
bindings/python/ns3_module_stats.py
bindings/python/ns3_module_tap_bridge.py
bindings/python/ns3_module_udp_echo.py
bindings/python/ns3_module_v4ping.py
bindings/python/ns3_module_wifi.py
bindings/python/ns3modulegen_generated.py
     1.1 --- a/bindings/python/ns3_module_bridge.py	Tue May 19 15:34:20 2009 +0200
     1.2 +++ b/bindings/python/ns3_module_bridge.py	Tue May 19 15:35:05 2009 +0200
     1.3 @@ -1,4 +1,4 @@
     1.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     1.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     1.6  
     1.7  def register_types(module):
     1.8      root_module = module.get_root()
     2.1 --- a/bindings/python/ns3_module_common.py	Tue May 19 15:34:20 2009 +0200
     2.2 +++ b/bindings/python/ns3_module_common.py	Tue May 19 15:35:05 2009 +0200
     2.3 @@ -1,4 +1,4 @@
     2.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     2.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     2.6  
     2.7  def register_types(module):
     2.8      root_module = module.get_root()
     2.9 @@ -424,11 +424,6 @@
    2.10                     'void', 
    2.11                     [], 
    2.12                     is_static=True)
    2.13 -    ## packet.h: static void ns3::Packet::EnableMetadata() [member function]
    2.14 -    cls.add_method('EnableMetadata', 
    2.15 -                   'void', 
    2.16 -                   [], 
    2.17 -                   is_static=True, deprecated=True)
    2.18      ## packet.h: static void ns3::Packet::EnablePrinting() [member function]
    2.19      cls.add_method('EnablePrinting', 
    2.20                     'void', 
     3.1 --- a/bindings/python/ns3_module_contrib.py	Tue May 19 15:34:20 2009 +0200
     3.2 +++ b/bindings/python/ns3_module_contrib.py	Tue May 19 15:35:05 2009 +0200
     3.3 @@ -1,4 +1,4 @@
     3.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     3.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     3.6  
     3.7  def register_types(module):
     3.8      root_module = module.get_root()
     4.1 --- a/bindings/python/ns3_module_core.py	Tue May 19 15:34:20 2009 +0200
     4.2 +++ b/bindings/python/ns3_module_core.py	Tue May 19 15:35:05 2009 +0200
     4.3 @@ -1,4 +1,4 @@
     4.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     4.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     4.6  
     4.7  def register_types(module):
     4.8      root_module = module.get_root()
     5.1 --- a/bindings/python/ns3_module_csma.py	Tue May 19 15:34:20 2009 +0200
     5.2 +++ b/bindings/python/ns3_module_csma.py	Tue May 19 15:35:05 2009 +0200
     5.3 @@ -1,4 +1,4 @@
     5.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     5.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     5.6  
     5.7  def register_types(module):
     5.8      root_module = module.get_root()
     6.1 --- a/bindings/python/ns3_module_emu.py	Tue May 19 15:34:20 2009 +0200
     6.2 +++ b/bindings/python/ns3_module_emu.py	Tue May 19 15:35:05 2009 +0200
     6.3 @@ -1,4 +1,4 @@
     6.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     6.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     6.6  
     6.7  def register_types(module):
     6.8      root_module = module.get_root()
     7.1 --- a/bindings/python/ns3_module_global_routing.py	Tue May 19 15:34:20 2009 +0200
     7.2 +++ b/bindings/python/ns3_module_global_routing.py	Tue May 19 15:35:05 2009 +0200
     7.3 @@ -1,4 +1,4 @@
     7.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     7.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     7.6  
     7.7  def register_types(module):
     7.8      root_module = module.get_root()
     8.1 --- a/bindings/python/ns3_module_helper.py	Tue May 19 15:34:20 2009 +0200
     8.2 +++ b/bindings/python/ns3_module_helper.py	Tue May 19 15:35:05 2009 +0200
     8.3 @@ -1,4 +1,4 @@
     8.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     8.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     8.6  
     8.7  def register_types(module):
     8.8      root_module = module.get_root()
     8.9 @@ -218,16 +218,6 @@
    8.10      cls.add_method('SetChannelAttribute', 
    8.11                     'void', 
    8.12                     [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
    8.13 -    ## csma-helper.h: void ns3::CsmaHelper::SetDeviceParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
    8.14 -    cls.add_method('SetDeviceParameter', 
    8.15 -                   'void', 
    8.16 -                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')], 
    8.17 -                   deprecated=True)
    8.18 -    ## csma-helper.h: void ns3::CsmaHelper::SetChannelParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
    8.19 -    cls.add_method('SetChannelParameter', 
    8.20 -                   'void', 
    8.21 -                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')], 
    8.22 -                   deprecated=True)
    8.23      ## csma-helper.h: static void ns3::CsmaHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid, bool promiscuous) [member function]
    8.24      cls.add_method('EnablePcap', 
    8.25                     'void', 
    8.26 @@ -815,16 +805,6 @@
    8.27      cls.add_method('SetChannelAttribute', 
    8.28                     'void', 
    8.29                     [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
    8.30 -    ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceParameter(std::string name, ns3::AttributeValue const & value) [member function]
    8.31 -    cls.add_method('SetDeviceParameter', 
    8.32 -                   'void', 
    8.33 -                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')], 
    8.34 -                   deprecated=True)
    8.35 -    ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelParameter(std::string name, ns3::AttributeValue const & value) [member function]
    8.36 -    cls.add_method('SetChannelParameter', 
    8.37 -                   'void', 
    8.38 -                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')], 
    8.39 -                   deprecated=True)
    8.40      ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid) [member function]
    8.41      cls.add_method('EnablePcap', 
    8.42                     'void', 
     9.1 --- a/bindings/python/ns3_module_internet_stack.py	Tue May 19 15:34:20 2009 +0200
     9.2 +++ b/bindings/python/ns3_module_internet_stack.py	Tue May 19 15:35:05 2009 +0200
     9.3 @@ -1,4 +1,4 @@
     9.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
     9.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
     9.6  
     9.7  def register_types(module):
     9.8      root_module = module.get_root()
    10.1 --- a/bindings/python/ns3_module_mobility.py	Tue May 19 15:34:20 2009 +0200
    10.2 +++ b/bindings/python/ns3_module_mobility.py	Tue May 19 15:35:05 2009 +0200
    10.3 @@ -1,4 +1,4 @@
    10.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    10.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    10.6  
    10.7  def register_types(module):
    10.8      root_module = module.get_root()
    11.1 --- a/bindings/python/ns3_module_node.py	Tue May 19 15:34:20 2009 +0200
    11.2 +++ b/bindings/python/ns3_module_node.py	Tue May 19 15:35:05 2009 +0200
    11.3 @@ -1,4 +1,4 @@
    11.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    11.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    11.6  
    11.7  def register_types(module):
    11.8      root_module = module.get_root()
    12.1 --- a/bindings/python/ns3_module_olsr.py	Tue May 19 15:34:20 2009 +0200
    12.2 +++ b/bindings/python/ns3_module_olsr.py	Tue May 19 15:35:05 2009 +0200
    12.3 @@ -1,4 +1,4 @@
    12.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    12.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    12.6  
    12.7  def register_types(module):
    12.8      root_module = module.get_root()
    12.9 @@ -91,6 +91,15 @@
   12.10      module.add_class('TwoHopNeighborTuple')
   12.11      module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
   12.12      module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
   12.13 +    typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
   12.14 +    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
   12.15 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
   12.16 +    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
   12.17 +    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
   12.18 +    typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
   12.19 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
   12.20 +    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
   12.21 +    typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
   12.22  
   12.23  def register_methods(root_module):
   12.24      register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])
    13.1 --- a/bindings/python/ns3_module_onoff.py	Tue May 19 15:34:20 2009 +0200
    13.2 +++ b/bindings/python/ns3_module_onoff.py	Tue May 19 15:35:05 2009 +0200
    13.3 @@ -1,4 +1,4 @@
    13.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    13.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    13.6  
    13.7  def register_types(module):
    13.8      root_module = module.get_root()
    14.1 --- a/bindings/python/ns3_module_packet_sink.py	Tue May 19 15:34:20 2009 +0200
    14.2 +++ b/bindings/python/ns3_module_packet_sink.py	Tue May 19 15:35:05 2009 +0200
    14.3 @@ -1,4 +1,4 @@
    14.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    14.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    14.6  
    14.7  def register_types(module):
    14.8      root_module = module.get_root()
    15.1 --- a/bindings/python/ns3_module_point_to_point.py	Tue May 19 15:34:20 2009 +0200
    15.2 +++ b/bindings/python/ns3_module_point_to_point.py	Tue May 19 15:35:05 2009 +0200
    15.3 @@ -1,4 +1,4 @@
    15.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    15.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    15.6  
    15.7  def register_types(module):
    15.8      root_module = module.get_root()
    16.1 --- a/bindings/python/ns3_module_simulator.py	Tue May 19 15:34:20 2009 +0200
    16.2 +++ b/bindings/python/ns3_module_simulator.py	Tue May 19 15:35:05 2009 +0200
    16.3 @@ -1,4 +1,4 @@
    16.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    16.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    16.6  
    16.7  def register_types(module):
    16.8      root_module = module.get_root()
    16.9 @@ -61,6 +61,10 @@
   16.10      module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
   16.11      ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration]
   16.12      module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl'])
   16.13 +    typehandlers.add_type_alias('ns3::TimeUnit< 2 >', 'ns3::TimeSquare')
   16.14 +    typehandlers.add_type_alias('ns3::TimeUnit< - 1 >', 'ns3::TimeInvert')
   16.15 +    typehandlers.add_type_alias('ns3::TimeUnit< 0 >', 'ns3::Scalar')
   16.16 +    typehandlers.add_type_alias('ns3::TimeUnit< 1 >', 'ns3::Time')
   16.17      
   16.18      ## Register a nested module for the namespace Config
   16.19      
   16.20 @@ -277,11 +281,6 @@
   16.21                     'void', 
   16.22                     [param('ns3::Ptr< ns3::Scheduler >', 'scheduler')], 
   16.23                     is_static=True)
   16.24 -    ## simulator.h: static void ns3::Simulator::EnableLogTo(char const * filename) [member function]
   16.25 -    cls.add_method('EnableLogTo', 
   16.26 -                   'void', 
   16.27 -                   [param('char const *', 'filename')], 
   16.28 -                   is_static=True, deprecated=True)
   16.29      ## simulator.h: static void ns3::Simulator::Destroy() [member function]
   16.30      cls.add_method('Destroy', 
   16.31                     'void', 
    17.1 --- a/bindings/python/ns3_module_stats.py	Tue May 19 15:34:20 2009 +0200
    17.2 +++ b/bindings/python/ns3_module_stats.py	Tue May 19 15:35:05 2009 +0200
    17.3 @@ -1,4 +1,4 @@
    17.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    17.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    17.6  
    17.7  def register_types(module):
    17.8      root_module = module.get_root()
    17.9 @@ -25,6 +25,8 @@
   17.10      module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
   17.11      ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
   17.12      module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
   17.13 +    typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
   17.14 +    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
   17.15      
   17.16      ## Register a nested module for the namespace Config
   17.17      
    18.1 --- a/bindings/python/ns3_module_tap_bridge.py	Tue May 19 15:34:20 2009 +0200
    18.2 +++ b/bindings/python/ns3_module_tap_bridge.py	Tue May 19 15:35:05 2009 +0200
    18.3 @@ -1,4 +1,4 @@
    18.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    18.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    18.6  
    18.7  def register_types(module):
    18.8      root_module = module.get_root()
    19.1 --- a/bindings/python/ns3_module_udp_echo.py	Tue May 19 15:34:20 2009 +0200
    19.2 +++ b/bindings/python/ns3_module_udp_echo.py	Tue May 19 15:35:05 2009 +0200
    19.3 @@ -1,4 +1,4 @@
    19.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    19.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    19.6  
    19.7  def register_types(module):
    19.8      root_module = module.get_root()
    20.1 --- a/bindings/python/ns3_module_v4ping.py	Tue May 19 15:34:20 2009 +0200
    20.2 +++ b/bindings/python/ns3_module_v4ping.py	Tue May 19 15:35:05 2009 +0200
    20.3 @@ -1,4 +1,4 @@
    20.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    20.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    20.6  
    20.7  def register_types(module):
    20.8      root_module = module.get_root()
    21.1 --- a/bindings/python/ns3_module_wifi.py	Tue May 19 15:34:20 2009 +0200
    21.2 +++ b/bindings/python/ns3_module_wifi.py	Tue May 19 15:35:05 2009 +0200
    21.3 @@ -1,4 +1,4 @@
    21.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    21.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    21.6  
    21.7  def register_types(module):
    21.8      root_module = module.get_root()
    21.9 @@ -135,6 +135,7 @@
   21.10      module.add_class('YansWifiChannel', parent=root_module['ns3::WifiChannel'])
   21.11      ## aarf-wifi-manager.h: ns3::AarfWifiManager [class]
   21.12      module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager'])
   21.13 +    typehandlers.add_type_alias('std::vector< ns3::ThresholdsItem, std::allocator< ns3::ThresholdsItem > >', 'ns3::Thresholds')
   21.14      
   21.15      ## Register a nested module for the namespace Config
   21.16      
    22.1 --- a/bindings/python/ns3modulegen_generated.py	Tue May 19 15:34:20 2009 +0200
    22.2 +++ b/bindings/python/ns3modulegen_generated.py	Tue May 19 15:35:05 2009 +0200
    22.3 @@ -1,4 +1,4 @@
    22.4 -from pybindgen import Module, FileCodeSink, param, retval, cppclass
    22.5 +from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
    22.6  
    22.7  
    22.8  import pybindgen.settings