Mercurial Mercurial > ns-3.5 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rescan python
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue, 19 May 2009 15:35:05 +0200
changeset 4449 c11b6d768ab3
parent 4448 641b88d1e131
child 4450 0ca9b9b410a0
rescan python
bindings/python/ns3_module_bridge.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_common.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_contrib.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_core.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_csma.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_emu.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_global_routing.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_helper.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_internet_stack.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_mobility.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_node.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_olsr.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_onoff.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_packet_sink.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_point_to_point.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_simulator.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_stats.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_tap_bridge.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_udp_echo.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_v4ping.py file | annotate | diff | comparison | revisions
bindings/python/ns3_module_wifi.py file | annotate | diff | comparison | revisions
bindings/python/ns3modulegen_generated.py file | annotate | diff | comparison | revisions 
--- a/bindings/python/ns3_module_bridge.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_bridge.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_common.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_common.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -424,11 +424,6 @@
                    'void', 
                    [], 
                    is_static=True)
-    ## packet.h: static void ns3::Packet::EnableMetadata() [member function]
-    cls.add_method('EnableMetadata', 
-                   'void', 
-                   [], 
-                   is_static=True, deprecated=True)
     ## packet.h: static void ns3::Packet::EnablePrinting() [member function]
     cls.add_method('EnablePrinting', 
                    'void', 
--- a/bindings/python/ns3_module_contrib.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_contrib.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_core.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_core.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_csma.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_csma.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_emu.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_emu.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_global_routing.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_global_routing.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_helper.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_helper.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -218,16 +218,6 @@
     cls.add_method('SetChannelAttribute', 
                    'void', 
                    [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')])
-    ## csma-helper.h: void ns3::CsmaHelper::SetDeviceParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
-    cls.add_method('SetDeviceParameter', 
-                   'void', 
-                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')], 
-                   deprecated=True)
-    ## csma-helper.h: void ns3::CsmaHelper::SetChannelParameter(std::string n1, ns3::AttributeValue const & v1) [member function]
-    cls.add_method('SetChannelParameter', 
-                   'void', 
-                   [param('std::string', 'n1'), param('ns3::AttributeValue const &', 'v1')], 
-                   deprecated=True)
     ## csma-helper.h: static void ns3::CsmaHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid, bool promiscuous) [member function]
     cls.add_method('EnablePcap', 
                    'void', 
@@ -815,16 +805,6 @@
     cls.add_method('SetChannelAttribute', 
                    'void', 
                    [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')])
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::SetDeviceParameter(std::string name, ns3::AttributeValue const & value) [member function]
-    cls.add_method('SetDeviceParameter', 
-                   'void', 
-                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')], 
-                   deprecated=True)
-    ## point-to-point-helper.h: void ns3::PointToPointHelper::SetChannelParameter(std::string name, ns3::AttributeValue const & value) [member function]
-    cls.add_method('SetChannelParameter', 
-                   'void', 
-                   [param('std::string', 'name'), param('ns3::AttributeValue const &', 'value')], 
-                   deprecated=True)
     ## point-to-point-helper.h: static void ns3::PointToPointHelper::EnablePcap(std::string filename, uint32_t nodeid, uint32_t deviceid) [member function]
     cls.add_method('EnablePcap', 
                    'void', 
--- a/bindings/python/ns3_module_internet_stack.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_internet_stack.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_mobility.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_mobility.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_node.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_node.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_olsr.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_olsr.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -91,6 +91,15 @@
     module.add_class('TwoHopNeighborTuple')
     module.add_container('std::vector< ns3::olsr::MessageHeader::Hello::LinkMessage >', 'ns3::olsr::MessageHeader::Hello::LinkMessage', container_type='vector')
     module.add_container('std::vector< ns3::olsr::MessageHeader::Hna::Association >', 'ns3::olsr::MessageHeader::Hna::Association', container_type='vector')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::DuplicateTuple, std::allocator< ns3::olsr::DuplicateTuple > >', 'ns3::olsr::DuplicateSet')
+    typehandlers.add_type_alias('std::set< ns3::Ipv4Address, std::less< ns3::Ipv4Address >, std::allocator< ns3::Ipv4Address > >', 'ns3::olsr::MprSet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::MprSelectorTuple, std::allocator< ns3::olsr::MprSelectorTuple > >', 'ns3::olsr::MprSelectorSet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::MessageHeader, std::allocator< ns3::olsr::MessageHeader > >', 'ns3::olsr::MessageList')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::IfaceAssocTuple, std::allocator< ns3::olsr::IfaceAssocTuple > >', 'ns3::olsr::IfaceAssocSet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::NeighborTuple, std::allocator< ns3::olsr::NeighborTuple > >', 'ns3::olsr::NeighborSet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::TwoHopNeighborTuple, std::allocator< ns3::olsr::TwoHopNeighborTuple > >', 'ns3::olsr::TwoHopNeighborSet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::TopologyTuple, std::allocator< ns3::olsr::TopologyTuple > >', 'ns3::olsr::TopologySet')
+    typehandlers.add_type_alias('std::vector< ns3::olsr::LinkTuple, std::allocator< ns3::olsr::LinkTuple > >', 'ns3::olsr::LinkSet')
 
 def register_methods(root_module):
     register_Ns3OlsrState_methods(root_module, root_module['ns3::OlsrState'])
--- a/bindings/python/ns3_module_onoff.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_onoff.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_packet_sink.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_packet_sink.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_point_to_point.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_point_to_point.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_simulator.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_simulator.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -61,6 +61,10 @@
     module.add_class('RealtimeSimulatorImpl', parent=root_module['ns3::SimulatorImpl'])
     ## realtime-simulator-impl.h: ns3::RealtimeSimulatorImpl::SynchronizationMode [enumeration]
     module.add_enum('SynchronizationMode', ['SYNC_BEST_EFFORT', 'SYNC_HARD_LIMIT'], outer_class=root_module['ns3::RealtimeSimulatorImpl'])
+    typehandlers.add_type_alias('ns3::TimeUnit< 2 >', 'ns3::TimeSquare')
+    typehandlers.add_type_alias('ns3::TimeUnit< - 1 >', 'ns3::TimeInvert')
+    typehandlers.add_type_alias('ns3::TimeUnit< 0 >', 'ns3::Scalar')
+    typehandlers.add_type_alias('ns3::TimeUnit< 1 >', 'ns3::Time')
     
     ## Register a nested module for the namespace Config
     
@@ -277,11 +281,6 @@
                    'void', 
                    [param('ns3::Ptr< ns3::Scheduler >', 'scheduler')], 
                    is_static=True)
-    ## simulator.h: static void ns3::Simulator::EnableLogTo(char const * filename) [member function]
-    cls.add_method('EnableLogTo', 
-                   'void', 
-                   [param('char const *', 'filename')], 
-                   is_static=True, deprecated=True)
     ## simulator.h: static void ns3::Simulator::Destroy() [member function]
     cls.add_method('Destroy', 
                    'void', 
--- a/bindings/python/ns3_module_stats.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_stats.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -25,6 +25,8 @@
     module.add_class('CounterCalculator', template_parameters=['unsigned int'], parent=root_module['ns3::DataCalculator'])
     ## packet-data-calculators.h: ns3::PacketCounterCalculator [class]
     module.add_class('PacketCounterCalculator', parent=root_module['ns3::CounterCalculator< unsigned int >'])
+    typehandlers.add_type_alias('std::list< ns3::Ptr< ns3::DataCalculator >, std::allocator< ns3::Ptr< ns3::DataCalculator > > >', 'ns3::DataCalculatorList')
+    typehandlers.add_type_alias('std::list< std::pair< std::string, std::string >, std::allocator< std::pair< std::string, std::string > > >', 'ns3::MetadataList')
     
     ## Register a nested module for the namespace Config
     
--- a/bindings/python/ns3_module_tap_bridge.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_tap_bridge.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_udp_echo.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_udp_echo.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_v4ping.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_v4ping.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
--- a/bindings/python/ns3_module_wifi.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3_module_wifi.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 def register_types(module):
     root_module = module.get_root()
@@ -135,6 +135,7 @@
     module.add_class('YansWifiChannel', parent=root_module['ns3::WifiChannel'])
     ## aarf-wifi-manager.h: ns3::AarfWifiManager [class]
     module.add_class('AarfWifiManager', parent=root_module['ns3::ArfWifiManager'])
+    typehandlers.add_type_alias('std::vector< ns3::ThresholdsItem, std::allocator< ns3::ThresholdsItem > >', 'ns3::Thresholds')
     
     ## Register a nested module for the namespace Config
     
--- a/bindings/python/ns3modulegen_generated.py	Tue May 19 15:34:20 2009 +0200
+++ b/bindings/python/ns3modulegen_generated.py	Tue May 19 15:35:05 2009 +0200
@@ -1,4 +1,4 @@
-from pybindgen import Module, FileCodeSink, param, retval, cppclass
+from pybindgen import Module, FileCodeSink, param, retval, cppclass, typehandlers
 
 
 import pybindgen.settings
ns-3.5