diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 738d1da3ecc73ef2d5101607cfe1c12cef42847e..73ef2c0d34f72c2e083795292c8e212314875557 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -78,13 +78,13 @@ if(BORNAGAIN_PYTHON) add_custom_command ( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.cxx COMMAND ${SWIG_EXECUTABLE} ${SWIG_FLAGS} ${bornagain_swig_dir}/libBornAgainCore.i - COMMAND mv ${bornagain_swig_dir}/libBornAgainCore.py ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py - COMMAND mv ${bornagain_swig_dir}/libBornAgainCore_wrap.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.cxx - COMMAND mv ${bornagain_swig_dir}/libBornAgainCore_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.h - COMMAND sed -i "'s/_libBornAgainCore.ICloneable_transferToCPP(self)/self.__disown__()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinCenters(self)/self.getBinCentersNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinErrors(self)/self.getBinErrorsNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinValues(self)/self.getBinValuesNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py + COMMAND ${PYTHON_EXECUTABLE} ${bornagain_swig_dir}/tweaks.py ${bornagain_swig_dir}/libBornAgainCore.py ${bornagain_swig_dir}/libBornAgainCore.py + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainCore.py ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore.py + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainCore_wrap.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainCore_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainCore_wrap.h + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainCore.py + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainCore_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainCore_wrap.h DEPENDS ${swig_dependencies} ) diff --git a/Core/PythonAPI/libBornAgainCore.py b/Core/PythonAPI/libBornAgainCore.py index ab86600c7739204233c0f9e4e171012904c9e2f3..44439a2be7f2c2a7fd09a1d29c968c8deb4ce41f 100644 --- a/Core/PythonAPI/libBornAgainCore.py +++ b/Core/PythonAPI/libBornAgainCore.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.7 +# Version 3.0.8 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. @@ -77,7 +77,7 @@ def _swig_getattr(self, class_type, name): def _swig_repr(self): try: strthis = "proxy of " + self.this.__repr__() - except: + except Exception: strthis = "" return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) @@ -93,12 +93,13 @@ except AttributeError: try: import weakref weakref_proxy = weakref.proxy -except: +except Exception: weakref_proxy = lambda x: x class SwigPyIterator(_object): - """Proxy of C++ swig::SwigPyIterator class""" + """Proxy of C++ swig::SwigPyIterator class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, SwigPyIterator, name, value) __swig_getmethods__ = {} @@ -207,7 +208,8 @@ SwigPyIterator_swigregister(SwigPyIterator) _libBornAgainCore.SHARED_PTR_DISOWN_swigconstant(_libBornAgainCore) SHARED_PTR_DISOWN = _libBornAgainCore.SHARED_PTR_DISOWN class vdouble1d_t(_object): - """Proxy of C++ std::vector<(double)> class""" + """Proxy of C++ std::vector<(double)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble1d_t, name, value) __swig_getmethods__ = {} @@ -236,11 +238,6 @@ class vdouble1d_t(_object): return _libBornAgainCore.vdouble1d_t___len__(self) - def pop(self): - """pop(vdouble1d_t self) -> std::vector< double >::value_type""" - return _libBornAgainCore.vdouble1d_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t""" return _libBornAgainCore.vdouble1d_t___getslice__(self, i, j) @@ -248,8 +245,8 @@ class vdouble1d_t(_object): def __setslice__(self, *args): """ - __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v) __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) + __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v) """ return _libBornAgainCore.vdouble1d_t___setslice__(self, *args) @@ -284,6 +281,11 @@ class vdouble1d_t(_object): return _libBornAgainCore.vdouble1d_t___setitem__(self, *args) + def pop(self): + """pop(vdouble1d_t self) -> std::vector< double >::value_type""" + return _libBornAgainCore.vdouble1d_t_pop(self) + + def append(self, x): """append(vdouble1d_t self, std::vector< double >::value_type const & x)""" return _libBornAgainCore.vdouble1d_t_append(self, x) @@ -299,21 +301,11 @@ class vdouble1d_t(_object): return _libBornAgainCore.vdouble1d_t_size(self) - def clear(self): - """clear(vdouble1d_t self)""" - return _libBornAgainCore.vdouble1d_t_clear(self) - - def swap(self, v): """swap(vdouble1d_t self, vdouble1d_t v)""" return _libBornAgainCore.vdouble1d_t_swap(self, v) - def get_allocator(self): - """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type""" - return _libBornAgainCore.vdouble1d_t_get_allocator(self) - - def begin(self): """begin(vdouble1d_t self) -> std::vector< double >::iterator""" return _libBornAgainCore.vdouble1d_t_begin(self) @@ -334,6 +326,16 @@ class vdouble1d_t(_object): return _libBornAgainCore.vdouble1d_t_rend(self) + def clear(self): + """clear(vdouble1d_t self)""" + return _libBornAgainCore.vdouble1d_t_clear(self) + + + def get_allocator(self): + """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type""" + return _libBornAgainCore.vdouble1d_t_get_allocator(self) + + def pop_back(self): """pop_back(vdouble1d_t self)""" return _libBornAgainCore.vdouble1d_t_pop_back(self) @@ -357,7 +359,7 @@ class vdouble1d_t(_object): this = _libBornAgainCore.new_vdouble1d_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -411,7 +413,8 @@ vdouble1d_t_swigregister = _libBornAgainCore.vdouble1d_t_swigregister vdouble1d_t_swigregister(vdouble1d_t) class vdouble2d_t(_object): - """Proxy of C++ std::vector<(std::vector<(double)>)> class""" + """Proxy of C++ std::vector<(std::vector<(double)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble2d_t, name, value) __swig_getmethods__ = {} @@ -440,11 +443,6 @@ class vdouble2d_t(_object): return _libBornAgainCore.vdouble2d_t___len__(self) - def pop(self): - """pop(vdouble2d_t self) -> vdouble1d_t""" - return _libBornAgainCore.vdouble2d_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t""" return _libBornAgainCore.vdouble2d_t___getslice__(self, i, j) @@ -452,8 +450,8 @@ class vdouble2d_t(_object): def __setslice__(self, *args): """ - __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v) __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) + __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v) """ return _libBornAgainCore.vdouble2d_t___setslice__(self, *args) @@ -488,6 +486,11 @@ class vdouble2d_t(_object): return _libBornAgainCore.vdouble2d_t___setitem__(self, *args) + def pop(self): + """pop(vdouble2d_t self) -> vdouble1d_t""" + return _libBornAgainCore.vdouble2d_t_pop(self) + + def append(self, x): """append(vdouble2d_t self, vdouble1d_t x)""" return _libBornAgainCore.vdouble2d_t_append(self, x) @@ -503,21 +506,11 @@ class vdouble2d_t(_object): return _libBornAgainCore.vdouble2d_t_size(self) - def clear(self): - """clear(vdouble2d_t self)""" - return _libBornAgainCore.vdouble2d_t_clear(self) - - def swap(self, v): """swap(vdouble2d_t self, vdouble2d_t v)""" return _libBornAgainCore.vdouble2d_t_swap(self, v) - def get_allocator(self): - """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type""" - return _libBornAgainCore.vdouble2d_t_get_allocator(self) - - def begin(self): """begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator""" return _libBornAgainCore.vdouble2d_t_begin(self) @@ -538,6 +531,16 @@ class vdouble2d_t(_object): return _libBornAgainCore.vdouble2d_t_rend(self) + def clear(self): + """clear(vdouble2d_t self)""" + return _libBornAgainCore.vdouble2d_t_clear(self) + + + def get_allocator(self): + """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type""" + return _libBornAgainCore.vdouble2d_t_get_allocator(self) + + def pop_back(self): """pop_back(vdouble2d_t self)""" return _libBornAgainCore.vdouble2d_t_pop_back(self) @@ -561,7 +564,7 @@ class vdouble2d_t(_object): this = _libBornAgainCore.new_vdouble2d_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -615,7 +618,8 @@ vdouble2d_t_swigregister = _libBornAgainCore.vdouble2d_t_swigregister vdouble2d_t_swigregister(vdouble2d_t) class vector_integer_t(_object): - """Proxy of C++ std::vector<(int)> class""" + """Proxy of C++ std::vector<(int)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_integer_t, name, value) __swig_getmethods__ = {} @@ -644,11 +648,6 @@ class vector_integer_t(_object): return _libBornAgainCore.vector_integer_t___len__(self) - def pop(self): - """pop(vector_integer_t self) -> std::vector< int >::value_type""" - return _libBornAgainCore.vector_integer_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t""" return _libBornAgainCore.vector_integer_t___getslice__(self, i, j) @@ -656,8 +655,8 @@ class vector_integer_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v) __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) + __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v) """ return _libBornAgainCore.vector_integer_t___setslice__(self, *args) @@ -692,6 +691,11 @@ class vector_integer_t(_object): return _libBornAgainCore.vector_integer_t___setitem__(self, *args) + def pop(self): + """pop(vector_integer_t self) -> std::vector< int >::value_type""" + return _libBornAgainCore.vector_integer_t_pop(self) + + def append(self, x): """append(vector_integer_t self, std::vector< int >::value_type const & x)""" return _libBornAgainCore.vector_integer_t_append(self, x) @@ -707,21 +711,11 @@ class vector_integer_t(_object): return _libBornAgainCore.vector_integer_t_size(self) - def clear(self): - """clear(vector_integer_t self)""" - return _libBornAgainCore.vector_integer_t_clear(self) - - def swap(self, v): """swap(vector_integer_t self, vector_integer_t v)""" return _libBornAgainCore.vector_integer_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type""" - return _libBornAgainCore.vector_integer_t_get_allocator(self) - - def begin(self): """begin(vector_integer_t self) -> std::vector< int >::iterator""" return _libBornAgainCore.vector_integer_t_begin(self) @@ -742,6 +736,16 @@ class vector_integer_t(_object): return _libBornAgainCore.vector_integer_t_rend(self) + def clear(self): + """clear(vector_integer_t self)""" + return _libBornAgainCore.vector_integer_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type""" + return _libBornAgainCore.vector_integer_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_integer_t self)""" return _libBornAgainCore.vector_integer_t_pop_back(self) @@ -765,7 +769,7 @@ class vector_integer_t(_object): this = _libBornAgainCore.new_vector_integer_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -819,7 +823,8 @@ vector_integer_t_swigregister = _libBornAgainCore.vector_integer_t_swigregister vector_integer_t_swigregister(vector_integer_t) class vector_longinteger_t(_object): - """Proxy of C++ std::vector<(unsigned long)> class""" + """Proxy of C++ std::vector<(unsigned long)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_longinteger_t, name, value) __swig_getmethods__ = {} @@ -848,11 +853,6 @@ class vector_longinteger_t(_object): return _libBornAgainCore.vector_longinteger_t___len__(self) - def pop(self): - """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type""" - return _libBornAgainCore.vector_longinteger_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t""" return _libBornAgainCore.vector_longinteger_t___getslice__(self, i, j) @@ -860,8 +860,8 @@ class vector_longinteger_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v) __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) + __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v) """ return _libBornAgainCore.vector_longinteger_t___setslice__(self, *args) @@ -896,6 +896,11 @@ class vector_longinteger_t(_object): return _libBornAgainCore.vector_longinteger_t___setitem__(self, *args) + def pop(self): + """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type""" + return _libBornAgainCore.vector_longinteger_t_pop(self) + + def append(self, x): """append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)""" return _libBornAgainCore.vector_longinteger_t_append(self, x) @@ -911,21 +916,11 @@ class vector_longinteger_t(_object): return _libBornAgainCore.vector_longinteger_t_size(self) - def clear(self): - """clear(vector_longinteger_t self)""" - return _libBornAgainCore.vector_longinteger_t_clear(self) - - def swap(self, v): """swap(vector_longinteger_t self, vector_longinteger_t v)""" return _libBornAgainCore.vector_longinteger_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type""" - return _libBornAgainCore.vector_longinteger_t_get_allocator(self) - - def begin(self): """begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator""" return _libBornAgainCore.vector_longinteger_t_begin(self) @@ -946,6 +941,16 @@ class vector_longinteger_t(_object): return _libBornAgainCore.vector_longinteger_t_rend(self) + def clear(self): + """clear(vector_longinteger_t self)""" + return _libBornAgainCore.vector_longinteger_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type""" + return _libBornAgainCore.vector_longinteger_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_longinteger_t self)""" return _libBornAgainCore.vector_longinteger_t_pop_back(self) @@ -969,7 +974,7 @@ class vector_longinteger_t(_object): this = _libBornAgainCore.new_vector_longinteger_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1023,7 +1028,8 @@ vector_longinteger_t_swigregister = _libBornAgainCore.vector_longinteger_t_swigr vector_longinteger_t_swigregister(vector_longinteger_t) class vector_complex_t(_object): - """Proxy of C++ std::vector<(std::complex<(double)>)> class""" + """Proxy of C++ std::vector<(std::complex<(double)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_complex_t, name, value) __swig_getmethods__ = {} @@ -1052,11 +1058,6 @@ class vector_complex_t(_object): return _libBornAgainCore.vector_complex_t___len__(self) - def pop(self): - """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type""" - return _libBornAgainCore.vector_complex_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t""" return _libBornAgainCore.vector_complex_t___getslice__(self, i, j) @@ -1064,8 +1065,8 @@ class vector_complex_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v) __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) + __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v) """ return _libBornAgainCore.vector_complex_t___setslice__(self, *args) @@ -1100,6 +1101,11 @@ class vector_complex_t(_object): return _libBornAgainCore.vector_complex_t___setitem__(self, *args) + def pop(self): + """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type""" + return _libBornAgainCore.vector_complex_t_pop(self) + + def append(self, x): """append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)""" return _libBornAgainCore.vector_complex_t_append(self, x) @@ -1115,21 +1121,11 @@ class vector_complex_t(_object): return _libBornAgainCore.vector_complex_t_size(self) - def clear(self): - """clear(vector_complex_t self)""" - return _libBornAgainCore.vector_complex_t_clear(self) - - def swap(self, v): """swap(vector_complex_t self, vector_complex_t v)""" return _libBornAgainCore.vector_complex_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type""" - return _libBornAgainCore.vector_complex_t_get_allocator(self) - - def begin(self): """begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator""" return _libBornAgainCore.vector_complex_t_begin(self) @@ -1150,6 +1146,16 @@ class vector_complex_t(_object): return _libBornAgainCore.vector_complex_t_rend(self) + def clear(self): + """clear(vector_complex_t self)""" + return _libBornAgainCore.vector_complex_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type""" + return _libBornAgainCore.vector_complex_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_complex_t self)""" return _libBornAgainCore.vector_complex_t_pop_back(self) @@ -1173,7 +1179,7 @@ class vector_complex_t(_object): this = _libBornAgainCore.new_vector_complex_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1227,7 +1233,8 @@ vector_complex_t_swigregister = _libBornAgainCore.vector_complex_t_swigregister vector_complex_t_swigregister(vector_complex_t) class vector_string_t(_object): - """Proxy of C++ std::vector<(std::string)> class""" + """Proxy of C++ std::vector<(std::string)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_string_t, name, value) __swig_getmethods__ = {} @@ -1256,11 +1263,6 @@ class vector_string_t(_object): return _libBornAgainCore.vector_string_t___len__(self) - def pop(self): - """pop(vector_string_t self) -> std::vector< std::string >::value_type""" - return _libBornAgainCore.vector_string_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t""" return _libBornAgainCore.vector_string_t___getslice__(self, i, j) @@ -1268,8 +1270,8 @@ class vector_string_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v) __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) + __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v) """ return _libBornAgainCore.vector_string_t___setslice__(self, *args) @@ -1304,6 +1306,11 @@ class vector_string_t(_object): return _libBornAgainCore.vector_string_t___setitem__(self, *args) + def pop(self): + """pop(vector_string_t self) -> std::vector< std::string >::value_type""" + return _libBornAgainCore.vector_string_t_pop(self) + + def append(self, x): """append(vector_string_t self, std::vector< std::string >::value_type const & x)""" return _libBornAgainCore.vector_string_t_append(self, x) @@ -1319,21 +1326,11 @@ class vector_string_t(_object): return _libBornAgainCore.vector_string_t_size(self) - def clear(self): - """clear(vector_string_t self)""" - return _libBornAgainCore.vector_string_t_clear(self) - - def swap(self, v): """swap(vector_string_t self, vector_string_t v)""" return _libBornAgainCore.vector_string_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type""" - return _libBornAgainCore.vector_string_t_get_allocator(self) - - def begin(self): """begin(vector_string_t self) -> std::vector< std::string >::iterator""" return _libBornAgainCore.vector_string_t_begin(self) @@ -1354,6 +1351,16 @@ class vector_string_t(_object): return _libBornAgainCore.vector_string_t_rend(self) + def clear(self): + """clear(vector_string_t self)""" + return _libBornAgainCore.vector_string_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type""" + return _libBornAgainCore.vector_string_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_string_t self)""" return _libBornAgainCore.vector_string_t_pop_back(self) @@ -1377,7 +1384,7 @@ class vector_string_t(_object): this = _libBornAgainCore.new_vector_string_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1442,6 +1449,7 @@ class AttLimits(_object): C++ includes: AttLimits.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, AttLimits, name, value) __swig_getmethods__ = {} @@ -1458,7 +1466,7 @@ class AttLimits(_object): this = _libBornAgainCore.new_AttLimits() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_AttLimits __del__ = lambda self: None @@ -1738,6 +1746,7 @@ class ICloneable(_object): C++ includes: ICloneable.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ICloneable, name, value) __swig_getmethods__ = {} @@ -1782,6 +1791,7 @@ class INamed(_object): C++ includes: INamed.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, INamed, name, value) __swig_getmethods__ = {} @@ -1807,7 +1817,7 @@ class INamed(_object): this = _libBornAgainCore.new_INamed(_self, *args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_INamed __del__ = lambda self: None @@ -1832,6 +1842,7 @@ class IParameterized(INamed): C++ includes: IParameterized.h """ + __swig_setmethods__ = {} for _s in [INamed]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1862,7 +1873,7 @@ class IParameterized(INamed): this = _libBornAgainCore.new_IParameterized(_self, *args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IParameterized __del__ = lambda self: None @@ -1906,8 +1917,8 @@ class IParameterized(INamed): """ registerParameter(IParameterized self, std::string const & name, double * parpointer, AttLimits limits) registerParameter(IParameterized self, std::string const & name, double * parpointer) - registerParameter(IParameterized self, std::string const & name, long parpointer, AttLimits limits) - registerParameter(IParameterized self, std::string const & name, long parpointer) + registerParameter(IParameterized self, std::string const & name, int64_t parpointer, AttLimits limits) + registerParameter(IParameterized self, std::string const & name, int64_t parpointer) """ return _libBornAgainCore.IParameterized_registerParameter(self, *args) @@ -1927,6 +1938,7 @@ class ParameterPattern(_object): C++ includes: IParameterized.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ParameterPattern, name, value) __swig_getmethods__ = {} @@ -1944,7 +1956,7 @@ class ParameterPattern(_object): this = _libBornAgainCore.new_ParameterPattern(*args) try: self.this.append(this) - except: + except Exception: self.this = this def beginsWith(self, start_type): @@ -2058,6 +2070,7 @@ class kvector_t(_object): C++ includes: BasicVector3D.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, kvector_t, name, value) __swig_getmethods__ = {} @@ -2077,7 +2090,7 @@ class kvector_t(_object): this = _libBornAgainCore.new_kvector_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def x(self): @@ -2387,7 +2400,8 @@ patch_version_number = cvar.patch_version_number PI2 = cvar.PI2 class vector_kvector_t(_object): - """Proxy of C++ std::vector<(Geometry::BasicVector3D<(double)>)> class""" + """Proxy of C++ std::vector<(Geometry::BasicVector3D<(double)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_kvector_t, name, value) __swig_getmethods__ = {} @@ -2416,11 +2430,6 @@ class vector_kvector_t(_object): return _libBornAgainCore.vector_kvector_t___len__(self) - def pop(self): - """pop(vector_kvector_t self) -> kvector_t""" - return _libBornAgainCore.vector_kvector_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j) -> vector_kvector_t""" return _libBornAgainCore.vector_kvector_t___getslice__(self, i, j) @@ -2428,8 +2437,8 @@ class vector_kvector_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j, vector_kvector_t v) __setslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j) + __setslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j, vector_kvector_t v) """ return _libBornAgainCore.vector_kvector_t___setslice__(self, *args) @@ -2464,6 +2473,11 @@ class vector_kvector_t(_object): return _libBornAgainCore.vector_kvector_t___setitem__(self, *args) + def pop(self): + """pop(vector_kvector_t self) -> kvector_t""" + return _libBornAgainCore.vector_kvector_t_pop(self) + + def append(self, x): """append(vector_kvector_t self, kvector_t x)""" return _libBornAgainCore.vector_kvector_t_append(self, x) @@ -2479,21 +2493,11 @@ class vector_kvector_t(_object): return _libBornAgainCore.vector_kvector_t_size(self) - def clear(self): - """clear(vector_kvector_t self)""" - return _libBornAgainCore.vector_kvector_t_clear(self) - - def swap(self, v): """swap(vector_kvector_t self, vector_kvector_t v)""" return _libBornAgainCore.vector_kvector_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::allocator_type""" - return _libBornAgainCore.vector_kvector_t_get_allocator(self) - - def begin(self): """begin(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::iterator""" return _libBornAgainCore.vector_kvector_t_begin(self) @@ -2514,6 +2518,16 @@ class vector_kvector_t(_object): return _libBornAgainCore.vector_kvector_t_rend(self) + def clear(self): + """clear(vector_kvector_t self)""" + return _libBornAgainCore.vector_kvector_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::allocator_type""" + return _libBornAgainCore.vector_kvector_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_kvector_t self)""" return _libBornAgainCore.vector_kvector_t_pop_back(self) @@ -2537,7 +2551,7 @@ class vector_kvector_t(_object): this = _libBornAgainCore.new_vector_kvector_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -2599,6 +2613,7 @@ class cvector_t(_object): C++ includes: BasicVector3D.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, cvector_t, name, value) __swig_getmethods__ = {} @@ -2618,7 +2633,7 @@ class cvector_t(_object): this = _libBornAgainCore.new_cvector_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def x(self): @@ -2824,7 +2839,8 @@ cvector_t_swigregister = _libBornAgainCore.cvector_t_swigregister cvector_t_swigregister(cvector_t) class vector_cvector_t(_object): - """Proxy of C++ std::vector<(Geometry::BasicVector3D<(std::complex<(double)>)>)> class""" + """Proxy of C++ std::vector<(Geometry::BasicVector3D<(std::complex<(double)>)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_cvector_t, name, value) __swig_getmethods__ = {} @@ -2853,11 +2869,6 @@ class vector_cvector_t(_object): return _libBornAgainCore.vector_cvector_t___len__(self) - def pop(self): - """pop(vector_cvector_t self) -> cvector_t""" - return _libBornAgainCore.vector_cvector_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t""" return _libBornAgainCore.vector_cvector_t___getslice__(self, i, j) @@ -2865,8 +2876,8 @@ class vector_cvector_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v) __setslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j) + __setslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v) """ return _libBornAgainCore.vector_cvector_t___setslice__(self, *args) @@ -2901,6 +2912,11 @@ class vector_cvector_t(_object): return _libBornAgainCore.vector_cvector_t___setitem__(self, *args) + def pop(self): + """pop(vector_cvector_t self) -> cvector_t""" + return _libBornAgainCore.vector_cvector_t_pop(self) + + def append(self, x): """append(vector_cvector_t self, cvector_t x)""" return _libBornAgainCore.vector_cvector_t_append(self, x) @@ -2916,21 +2932,11 @@ class vector_cvector_t(_object): return _libBornAgainCore.vector_cvector_t_size(self) - def clear(self): - """clear(vector_cvector_t self)""" - return _libBornAgainCore.vector_cvector_t_clear(self) - - def swap(self, v): """swap(vector_cvector_t self, vector_cvector_t v)""" return _libBornAgainCore.vector_cvector_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type""" - return _libBornAgainCore.vector_cvector_t_get_allocator(self) - - def begin(self): """begin(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::iterator""" return _libBornAgainCore.vector_cvector_t_begin(self) @@ -2946,9 +2952,19 @@ class vector_cvector_t(_object): return _libBornAgainCore.vector_cvector_t_rbegin(self) - def rend(self): - """rend(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::reverse_iterator""" - return _libBornAgainCore.vector_cvector_t_rend(self) + def rend(self): + """rend(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::reverse_iterator""" + return _libBornAgainCore.vector_cvector_t_rend(self) + + + def clear(self): + """clear(vector_cvector_t self)""" + return _libBornAgainCore.vector_cvector_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type""" + return _libBornAgainCore.vector_cvector_t_get_allocator(self) def pop_back(self): @@ -2974,7 +2990,7 @@ class vector_cvector_t(_object): this = _libBornAgainCore.new_vector_cvector_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -3054,6 +3070,7 @@ class WavevectorInfo(_object): C++ includes: WavevectorInfo.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, WavevectorInfo, name, value) __swig_getmethods__ = {} @@ -3071,7 +3088,7 @@ class WavevectorInfo(_object): this = _libBornAgainCore.new_WavevectorInfo(*args) try: self.this.append(this) - except: + except Exception: self.this = this def getKi(self): @@ -3147,6 +3164,7 @@ class Beam(IParameterized): C++ includes: Beam.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -3168,7 +3186,7 @@ class Beam(IParameterized): this = _libBornAgainCore.new_Beam(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Beam __del__ = lambda self: None @@ -3274,6 +3292,7 @@ class Bin1D(_object): C++ includes: Bin.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1D, name, value) __swig_getmethods__ = {} @@ -3291,7 +3310,7 @@ class Bin1D(_object): this = _libBornAgainCore.new_Bin1D(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_setmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_set __swig_getmethods__["m_lower"] = _libBornAgainCore.Bin1D_m_lower_get @@ -3335,6 +3354,7 @@ class Bin1DKVector(_object): C++ includes: Bin.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1DKVector, name, value) __swig_getmethods__ = {} @@ -3355,7 +3375,7 @@ class Bin1DKVector(_object): this = _libBornAgainCore.new_Bin1DKVector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def getMidPoint(self): @@ -3399,6 +3419,7 @@ class Bin1DCVector(_object): C++ includes: Bin.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Bin1DCVector, name, value) __swig_getmethods__ = {} @@ -3419,7 +3440,7 @@ class Bin1DCVector(_object): this = _libBornAgainCore.new_Bin1DCVector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def getMidPoint(self): @@ -3463,6 +3484,7 @@ class IAxis(_object): C++ includes: IAxis.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IAxis, name, value) __swig_getmethods__ = {} @@ -3663,6 +3685,7 @@ class VariableBinAxis(IAxis): C++ includes: VariableBinAxis.h """ + __swig_setmethods__ = {} for _s in [IAxis]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -3697,7 +3720,7 @@ class VariableBinAxis(IAxis): this = _libBornAgainCore.new_VariableBinAxis(name, nbins, bin_boundaries) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_VariableBinAxis __del__ = lambda self: None @@ -3832,6 +3855,7 @@ class ConstKBinAxis(VariableBinAxis): C++ includes: ConstKBinAxis.h """ + __swig_setmethods__ = {} for _s in [VariableBinAxis]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -3869,7 +3893,7 @@ class ConstKBinAxis(VariableBinAxis): this = _libBornAgainCore.new_ConstKBinAxis(name, nbins, start, end) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ConstKBinAxis __del__ = lambda self: None @@ -3909,6 +3933,7 @@ class CustomBinAxis(VariableBinAxis): C++ includes: CustomBinAxis.h """ + __swig_setmethods__ = {} for _s in [VariableBinAxis]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -3946,7 +3971,7 @@ class CustomBinAxis(VariableBinAxis): this = _libBornAgainCore.new_CustomBinAxis(name, nbins, start, end) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_CustomBinAxis __del__ = lambda self: None @@ -4008,6 +4033,7 @@ class IShape2D(ICloneable): C++ includes: IShape2D.h """ + __swig_setmethods__ = {} for _s in [ICloneable]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -4057,6 +4083,7 @@ class ISample(ICloneable, IParameterized): C++ includes: ISample.h """ + __swig_setmethods__ = {} for _s in [ICloneable, IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -4181,7 +4208,7 @@ class ISample(ICloneable, IParameterized): this = _libBornAgainCore.new_ISample(_self, ) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ISample __del__ = lambda self: None @@ -4203,7 +4230,8 @@ ISample_swigregister = _libBornAgainCore.ISample_swigregister ISample_swigregister(ISample) class swig_dummy_type_isample_vector(_object): - """Proxy of C++ std::vector<(p.ISample)> class""" + """Proxy of C++ std::vector<(p.ISample)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, swig_dummy_type_isample_vector, name, value) __swig_getmethods__ = {} @@ -4232,11 +4260,6 @@ class swig_dummy_type_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_isample_vector___len__(self) - def pop(self): - """pop(swig_dummy_type_isample_vector self) -> ISample""" - return _libBornAgainCore.swig_dummy_type_isample_vector_pop(self) - - def __getslice__(self, i, j): """__getslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j) -> swig_dummy_type_isample_vector""" return _libBornAgainCore.swig_dummy_type_isample_vector___getslice__(self, i, j) @@ -4244,8 +4267,8 @@ class swig_dummy_type_isample_vector(_object): def __setslice__(self, *args): """ - __setslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j, swig_dummy_type_isample_vector v) __setslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j) + __setslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j, swig_dummy_type_isample_vector v) """ return _libBornAgainCore.swig_dummy_type_isample_vector___setslice__(self, *args) @@ -4280,6 +4303,11 @@ class swig_dummy_type_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_isample_vector___setitem__(self, *args) + def pop(self): + """pop(swig_dummy_type_isample_vector self) -> ISample""" + return _libBornAgainCore.swig_dummy_type_isample_vector_pop(self) + + def append(self, x): """append(swig_dummy_type_isample_vector self, ISample x)""" return _libBornAgainCore.swig_dummy_type_isample_vector_append(self, x) @@ -4295,21 +4323,11 @@ class swig_dummy_type_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_isample_vector_size(self) - def clear(self): - """clear(swig_dummy_type_isample_vector self)""" - return _libBornAgainCore.swig_dummy_type_isample_vector_clear(self) - - def swap(self, v): """swap(swig_dummy_type_isample_vector self, swig_dummy_type_isample_vector v)""" return _libBornAgainCore.swig_dummy_type_isample_vector_swap(self, v) - def get_allocator(self): - """get_allocator(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::allocator_type""" - return _libBornAgainCore.swig_dummy_type_isample_vector_get_allocator(self) - - def begin(self): """begin(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::iterator""" return _libBornAgainCore.swig_dummy_type_isample_vector_begin(self) @@ -4330,6 +4348,16 @@ class swig_dummy_type_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_isample_vector_rend(self) + def clear(self): + """clear(swig_dummy_type_isample_vector self)""" + return _libBornAgainCore.swig_dummy_type_isample_vector_clear(self) + + + def get_allocator(self): + """get_allocator(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::allocator_type""" + return _libBornAgainCore.swig_dummy_type_isample_vector_get_allocator(self) + + def pop_back(self): """pop_back(swig_dummy_type_isample_vector self)""" return _libBornAgainCore.swig_dummy_type_isample_vector_pop_back(self) @@ -4353,7 +4381,7 @@ class swig_dummy_type_isample_vector(_object): this = _libBornAgainCore.new_swig_dummy_type_isample_vector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -4407,7 +4435,8 @@ swig_dummy_type_isample_vector_swigregister = _libBornAgainCore.swig_dummy_type_ swig_dummy_type_isample_vector_swigregister(swig_dummy_type_isample_vector) class swig_dummy_type_const_isample_vector(_object): - """Proxy of C++ std::vector<(p.q(const).ISample)> class""" + """Proxy of C++ std::vector<(p.q(const).ISample)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, swig_dummy_type_const_isample_vector, name, value) __swig_getmethods__ = {} @@ -4436,11 +4465,6 @@ class swig_dummy_type_const_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_const_isample_vector___len__(self) - def pop(self): - """pop(swig_dummy_type_const_isample_vector self) -> ISample""" - return _libBornAgainCore.swig_dummy_type_const_isample_vector_pop(self) - - def __getslice__(self, i, j): """__getslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j) -> swig_dummy_type_const_isample_vector""" return _libBornAgainCore.swig_dummy_type_const_isample_vector___getslice__(self, i, j) @@ -4448,8 +4472,8 @@ class swig_dummy_type_const_isample_vector(_object): def __setslice__(self, *args): """ - __setslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j, swig_dummy_type_const_isample_vector v) __setslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j) + __setslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j, swig_dummy_type_const_isample_vector v) """ return _libBornAgainCore.swig_dummy_type_const_isample_vector___setslice__(self, *args) @@ -4484,6 +4508,11 @@ class swig_dummy_type_const_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_const_isample_vector___setitem__(self, *args) + def pop(self): + """pop(swig_dummy_type_const_isample_vector self) -> ISample""" + return _libBornAgainCore.swig_dummy_type_const_isample_vector_pop(self) + + def append(self, x): """append(swig_dummy_type_const_isample_vector self, ISample x)""" return _libBornAgainCore.swig_dummy_type_const_isample_vector_append(self, x) @@ -4499,21 +4528,11 @@ class swig_dummy_type_const_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_const_isample_vector_size(self) - def clear(self): - """clear(swig_dummy_type_const_isample_vector self)""" - return _libBornAgainCore.swig_dummy_type_const_isample_vector_clear(self) - - def swap(self, v): """swap(swig_dummy_type_const_isample_vector self, swig_dummy_type_const_isample_vector v)""" return _libBornAgainCore.swig_dummy_type_const_isample_vector_swap(self, v) - def get_allocator(self): - """get_allocator(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::allocator_type""" - return _libBornAgainCore.swig_dummy_type_const_isample_vector_get_allocator(self) - - def begin(self): """begin(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::iterator""" return _libBornAgainCore.swig_dummy_type_const_isample_vector_begin(self) @@ -4534,6 +4553,16 @@ class swig_dummy_type_const_isample_vector(_object): return _libBornAgainCore.swig_dummy_type_const_isample_vector_rend(self) + def clear(self): + """clear(swig_dummy_type_const_isample_vector self)""" + return _libBornAgainCore.swig_dummy_type_const_isample_vector_clear(self) + + + def get_allocator(self): + """get_allocator(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::allocator_type""" + return _libBornAgainCore.swig_dummy_type_const_isample_vector_get_allocator(self) + + def pop_back(self): """pop_back(swig_dummy_type_const_isample_vector self)""" return _libBornAgainCore.swig_dummy_type_const_isample_vector_pop_back(self) @@ -4557,7 +4586,7 @@ class swig_dummy_type_const_isample_vector(_object): this = _libBornAgainCore.new_swig_dummy_type_const_isample_vector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -4619,6 +4648,7 @@ class ISampleBuilder(IParameterized): C++ includes: ISampleBuilder.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -4643,7 +4673,7 @@ class ISampleBuilder(IParameterized): this = _libBornAgainCore.new_ISampleBuilder(_self, ) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ISampleBuilder __del__ = lambda self: None @@ -4670,8 +4700,8 @@ class ISampleBuilder(IParameterized): def registerParameter(self, *args): """ - registerParameter(ISampleBuilder self, std::string const & name, long parpointer, AttLimits limits) - registerParameter(ISampleBuilder self, std::string const & name, long parpointer) + registerParameter(ISampleBuilder self, std::string const & name, int64_t parpointer, AttLimits limits) + registerParameter(ISampleBuilder self, std::string const & name, int64_t parpointer) """ return _libBornAgainCore.ISampleBuilder_registerParameter(self, *args) @@ -4708,6 +4738,7 @@ class ISampleVisitor(_object): C++ includes: ISampleVisitor.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ISampleVisitor, name, value) __swig_getmethods__ = {} @@ -4724,7 +4755,7 @@ class ISampleVisitor(_object): this = _libBornAgainCore.new_ISampleVisitor() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ISampleVisitor __del__ = lambda self: None @@ -4879,6 +4910,7 @@ class ICompositeSample(ISample): C++ includes: ICompositeSample.h """ + __swig_setmethods__ = {} for _s in [ISample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -4979,6 +5011,7 @@ class IClusteredParticles(ICompositeSample): C++ includes: IClusteredParticles.h """ + __swig_setmethods__ = {} for _s in [ICompositeSample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5094,6 +5127,7 @@ class Crystal(IClusteredParticles): C++ includes: Crystal.h """ + __swig_setmethods__ = {} for _s in [IClusteredParticles]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5114,7 +5148,7 @@ class Crystal(IClusteredParticles): this = _libBornAgainCore.new_Crystal(lattice_basis, lattice) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Crystal __del__ = lambda self: None @@ -5227,6 +5261,7 @@ class IDistribution1D(IParameterized): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5352,6 +5387,7 @@ class DistributionGate(IDistribution1D): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5373,7 +5409,7 @@ class DistributionGate(IDistribution1D): this = _libBornAgainCore.new_DistributionGate(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_DistributionGate __del__ = lambda self: None @@ -5462,6 +5498,7 @@ class DistributionLorentz(IDistribution1D): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5483,7 +5520,7 @@ class DistributionLorentz(IDistribution1D): this = _libBornAgainCore.new_DistributionLorentz(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_DistributionLorentz __del__ = lambda self: None @@ -5560,6 +5597,7 @@ class DistributionGaussian(IDistribution1D): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5581,7 +5619,7 @@ class DistributionGaussian(IDistribution1D): this = _libBornAgainCore.new_DistributionGaussian(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_DistributionGaussian __del__ = lambda self: None @@ -5658,6 +5696,7 @@ class DistributionLogNormal(IDistribution1D): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5679,7 +5718,7 @@ class DistributionLogNormal(IDistribution1D): this = _libBornAgainCore.new_DistributionLogNormal(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_DistributionLogNormal __del__ = lambda self: None @@ -5768,6 +5807,7 @@ class DistributionCosine(IDistribution1D): C++ includes: Distributions.h """ + __swig_setmethods__ = {} for _s in [IDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5789,7 +5829,7 @@ class DistributionCosine(IDistribution1D): this = _libBornAgainCore.new_DistributionCosine(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_DistributionCosine __del__ = lambda self: None @@ -5866,6 +5906,7 @@ class Ellipse(IShape2D): C++ includes: Ellipse.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -5907,7 +5948,7 @@ class Ellipse(IShape2D): this = _libBornAgainCore.new_Ellipse(xcenter, ycenter, xradius, yradius, theta) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -5996,6 +6037,7 @@ class IFTDecayFunction1D(IParameterized): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6062,6 +6104,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6082,7 +6125,7 @@ class FTDecayFunction1DCauchy(IFTDecayFunction1D): this = _libBornAgainCore.new_FTDecayFunction1DCauchy(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DCauchy __del__ = lambda self: None @@ -6118,6 +6161,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6138,7 +6182,7 @@ class FTDecayFunction1DGauss(IFTDecayFunction1D): this = _libBornAgainCore.new_FTDecayFunction1DGauss(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DGauss __del__ = lambda self: None @@ -6174,6 +6218,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6194,7 +6239,7 @@ class FTDecayFunction1DTriangle(IFTDecayFunction1D): this = _libBornAgainCore.new_FTDecayFunction1DTriangle(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DTriangle __del__ = lambda self: None @@ -6230,6 +6275,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6250,7 +6296,7 @@ class FTDecayFunction1DVoigt(IFTDecayFunction1D): this = _libBornAgainCore.new_FTDecayFunction1DVoigt(omega, eta) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction1DVoigt __del__ = lambda self: None @@ -6296,6 +6342,7 @@ class IFTDecayFunction2D(IParameterized): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6416,6 +6463,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6436,7 +6484,7 @@ class FTDecayFunction2DCauchy(IFTDecayFunction2D): this = _libBornAgainCore.new_FTDecayFunction2DCauchy(decay_length_x, decay_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DCauchy __del__ = lambda self: None @@ -6474,6 +6522,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6494,7 +6543,7 @@ class FTDecayFunction2DGauss(IFTDecayFunction2D): this = _libBornAgainCore.new_FTDecayFunction2DGauss(decay_length_x, decay_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DGauss __del__ = lambda self: None @@ -6532,6 +6581,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D): C++ includes: FTDecayFunctions.h """ + __swig_setmethods__ = {} for _s in [IFTDecayFunction2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6552,7 +6602,7 @@ class FTDecayFunction2DVoigt(IFTDecayFunction2D): this = _libBornAgainCore.new_FTDecayFunction2DVoigt(decay_length_x, decay_length_y, eta) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDecayFunction2DVoigt __del__ = lambda self: None @@ -6600,6 +6650,7 @@ class IFTDistribution1D(IParameterized): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6666,6 +6717,7 @@ class FTDistribution1DCauchy(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6686,7 +6738,7 @@ class FTDistribution1DCauchy(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DCauchy(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DCauchy __del__ = lambda self: None @@ -6722,6 +6774,7 @@ class FTDistribution1DGauss(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6742,7 +6795,7 @@ class FTDistribution1DGauss(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DGauss(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DGauss __del__ = lambda self: None @@ -6778,6 +6831,7 @@ class FTDistribution1DGate(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6798,7 +6852,7 @@ class FTDistribution1DGate(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DGate(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DGate __del__ = lambda self: None @@ -6834,6 +6888,7 @@ class FTDistribution1DTriangle(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6854,7 +6909,7 @@ class FTDistribution1DTriangle(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DTriangle(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DTriangle __del__ = lambda self: None @@ -6890,6 +6945,7 @@ class FTDistribution1DCosine(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6910,7 +6966,7 @@ class FTDistribution1DCosine(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DCosine(omega) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DCosine __del__ = lambda self: None @@ -6946,6 +7002,7 @@ class FTDistribution1DVoigt(IFTDistribution1D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution1D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -6966,7 +7023,7 @@ class FTDistribution1DVoigt(IFTDistribution1D): this = _libBornAgainCore.new_FTDistribution1DVoigt(omega, eta) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution1DVoigt __del__ = lambda self: None @@ -7012,6 +7069,7 @@ class IFTDistribution2D(IParameterized): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7110,6 +7168,7 @@ class FTDistribution2DCauchy(IFTDistribution2D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7130,7 +7189,7 @@ class FTDistribution2DCauchy(IFTDistribution2D): this = _libBornAgainCore.new_FTDistribution2DCauchy(coherence_length_x, coherence_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DCauchy __del__ = lambda self: None @@ -7168,6 +7227,7 @@ class FTDistribution2DGauss(IFTDistribution2D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7188,7 +7248,7 @@ class FTDistribution2DGauss(IFTDistribution2D): this = _libBornAgainCore.new_FTDistribution2DGauss(coherence_length_x, coherence_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DGauss __del__ = lambda self: None @@ -7226,6 +7286,7 @@ class FTDistribution2DGate(IFTDistribution2D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7246,7 +7307,7 @@ class FTDistribution2DGate(IFTDistribution2D): this = _libBornAgainCore.new_FTDistribution2DGate(coherence_length_x, coherence_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DGate __del__ = lambda self: None @@ -7284,6 +7345,7 @@ class FTDistribution2DCone(IFTDistribution2D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7304,7 +7366,7 @@ class FTDistribution2DCone(IFTDistribution2D): this = _libBornAgainCore.new_FTDistribution2DCone(coherence_length_x, coherence_length_y) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DCone __del__ = lambda self: None @@ -7342,6 +7404,7 @@ class FTDistribution2DVoigt(IFTDistribution2D): C++ includes: FTDistributions.h """ + __swig_setmethods__ = {} for _s in [IFTDistribution2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7362,7 +7425,7 @@ class FTDistribution2DVoigt(IFTDistribution2D): this = _libBornAgainCore.new_FTDistribution2DVoigt(coherence_length_x, coherence_length_y, eta) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FTDistribution2DVoigt __del__ = lambda self: None @@ -7410,6 +7473,7 @@ class FixedBinAxis(IAxis): C++ includes: FixedBinAxis.h """ + __swig_setmethods__ = {} for _s in [IAxis]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7447,7 +7511,7 @@ class FixedBinAxis(IAxis): this = _libBornAgainCore.new_FixedBinAxis(name, nbins, start, end) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FixedBinAxis __del__ = lambda self: None @@ -7582,6 +7646,7 @@ class IFormFactor(ISample): C++ includes: IFormFactor.h """ + __swig_setmethods__ = {} for _s in [ISample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7606,7 +7671,7 @@ class IFormFactor(ISample): this = _libBornAgainCore.new_IFormFactor(_self, ) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IFormFactor __del__ = lambda self: None @@ -7721,7 +7786,8 @@ IFormFactor_swigregister = _libBornAgainCore.IFormFactor_swigregister IFormFactor_swigregister(IFormFactor) class vector_IFormFactorPtr_t(_object): - """Proxy of C++ std::vector<(p.IFormFactor)> class""" + """Proxy of C++ std::vector<(p.IFormFactor)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_IFormFactorPtr_t, name, value) __swig_getmethods__ = {} @@ -7750,11 +7816,6 @@ class vector_IFormFactorPtr_t(_object): return _libBornAgainCore.vector_IFormFactorPtr_t___len__(self) - def pop(self): - """pop(vector_IFormFactorPtr_t self) -> IFormFactor""" - return _libBornAgainCore.vector_IFormFactorPtr_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t""" return _libBornAgainCore.vector_IFormFactorPtr_t___getslice__(self, i, j) @@ -7762,8 +7823,8 @@ class vector_IFormFactorPtr_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v) __setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) + __setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v) """ return _libBornAgainCore.vector_IFormFactorPtr_t___setslice__(self, *args) @@ -7798,6 +7859,11 @@ class vector_IFormFactorPtr_t(_object): return _libBornAgainCore.vector_IFormFactorPtr_t___setitem__(self, *args) + def pop(self): + """pop(vector_IFormFactorPtr_t self) -> IFormFactor""" + return _libBornAgainCore.vector_IFormFactorPtr_t_pop(self) + + def append(self, x): """append(vector_IFormFactorPtr_t self, IFormFactor x)""" return _libBornAgainCore.vector_IFormFactorPtr_t_append(self, x) @@ -7813,21 +7879,11 @@ class vector_IFormFactorPtr_t(_object): return _libBornAgainCore.vector_IFormFactorPtr_t_size(self) - def clear(self): - """clear(vector_IFormFactorPtr_t self)""" - return _libBornAgainCore.vector_IFormFactorPtr_t_clear(self) - - def swap(self, v): """swap(vector_IFormFactorPtr_t self, vector_IFormFactorPtr_t v)""" return _libBornAgainCore.vector_IFormFactorPtr_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type""" - return _libBornAgainCore.vector_IFormFactorPtr_t_get_allocator(self) - - def begin(self): """begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator""" return _libBornAgainCore.vector_IFormFactorPtr_t_begin(self) @@ -7848,6 +7904,16 @@ class vector_IFormFactorPtr_t(_object): return _libBornAgainCore.vector_IFormFactorPtr_t_rend(self) + def clear(self): + """clear(vector_IFormFactorPtr_t self)""" + return _libBornAgainCore.vector_IFormFactorPtr_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type""" + return _libBornAgainCore.vector_IFormFactorPtr_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_IFormFactorPtr_t self)""" return _libBornAgainCore.vector_IFormFactorPtr_t_pop_back(self) @@ -7871,7 +7937,7 @@ class vector_IFormFactorPtr_t(_object): this = _libBornAgainCore.new_vector_IFormFactorPtr_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -7933,6 +7999,7 @@ class IFormFactorBorn(IFormFactor): C++ includes: IFormFactorBorn.h """ + __swig_setmethods__ = {} for _s in [IFormFactor]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -7957,7 +8024,7 @@ class IFormFactorBorn(IFormFactor): this = _libBornAgainCore.new_IFormFactorBorn(_self, ) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IFormFactorBorn __del__ = lambda self: None @@ -8055,6 +8122,7 @@ class IFormFactorDecorator(IFormFactor): C++ includes: IFormFactorDecorator.h """ + __swig_setmethods__ = {} for _s in [IFormFactor]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8141,6 +8209,7 @@ class FormFactorAnisoPyramid(IFormFactorBorn): C++ includes: FormFactorAnisoPyramid.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8178,7 +8247,7 @@ class FormFactorAnisoPyramid(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorAnisoPyramid(length, width, height, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorAnisoPyramid __del__ = lambda self: None @@ -8290,6 +8359,7 @@ class FormFactorBox(IFormFactorBorn): C++ includes: FormFactorBox.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8324,7 +8394,7 @@ class FormFactorBox(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorBox(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -8430,6 +8500,7 @@ class FormFactorCone(IFormFactorBorn): C++ includes: FormFactorCone.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8464,7 +8535,7 @@ class FormFactorCone(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorCone(radius, height, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone __del__ = lambda self: None @@ -8554,6 +8625,7 @@ class FormFactorCone6(IFormFactorBorn): C++ includes: FormFactorCone6.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8588,7 +8660,7 @@ class FormFactorCone6(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorCone6(radius, height, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorCone6 __del__ = lambda self: None @@ -8672,6 +8744,7 @@ class FormFactorCrystal(IFormFactorBorn): C++ includes: FormFactorCrystal.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8692,7 +8765,7 @@ class FormFactorCrystal(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorCrystal(lattice, basis_form_factor, meso_form_factor) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorCrystal __del__ = lambda self: None @@ -8795,6 +8868,7 @@ class FormFactorCuboctahedron(IFormFactorBorn): C++ includes: FormFactorCuboctahedron.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8832,7 +8906,7 @@ class FormFactorCuboctahedron(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorCuboctahedron(length, height, height_ratio, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorCuboctahedron __del__ = lambda self: None @@ -8942,6 +9016,7 @@ class FormFactorCylinder(IFormFactorBorn): C++ includes: FormFactorCylinder.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -8973,7 +9048,7 @@ class FormFactorCylinder(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorCylinder(radius, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorCylinder __del__ = lambda self: None @@ -9053,6 +9128,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator): C++ includes: FormFactorDecoratorDebyeWaller.h """ + __swig_setmethods__ = {} for _s in [IFormFactorDecorator]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9076,7 +9152,7 @@ class FormFactorDecoratorDebyeWaller(IFormFactorDecorator): this = _libBornAgainCore.new_FormFactorDecoratorDebyeWaller(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorDecoratorDebyeWaller __del__ = lambda self: None @@ -9137,6 +9213,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn): C++ includes: FormFactorEllipsoidalCylinder.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9171,7 +9248,7 @@ class FormFactorEllipsoidalCylinder(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorEllipsoidalCylinder(radius_x, radius_y, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -9271,6 +9348,7 @@ class FormFactorFullSphere(IFormFactorBorn): C++ includes: FormFactorFullSphere.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9299,7 +9377,7 @@ class FormFactorFullSphere(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorFullSphere(radius) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -9369,6 +9447,7 @@ class FormFactorFullSpheroid(IFormFactorBorn): C++ includes: FormFactorFullSpheroid.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9400,7 +9479,7 @@ class FormFactorFullSpheroid(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorFullSpheroid(radius, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorFullSpheroid __del__ = lambda self: None @@ -9480,6 +9559,7 @@ class FormFactorGauss(IFormFactorBorn): C++ includes: FormFactorGauss.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9501,7 +9581,7 @@ class FormFactorGauss(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorGauss(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorGauss __del__ = lambda self: None @@ -9583,6 +9663,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn): C++ includes: FormFactorHemiEllipsoid.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9617,7 +9698,7 @@ class FormFactorHemiEllipsoid(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorHemiEllipsoid(radius_x, radius_y, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorHemiEllipsoid __del__ = lambda self: None @@ -9709,7 +9790,8 @@ FormFactorHemiEllipsoid_swigregister = _libBornAgainCore.FormFactorHemiEllipsoid FormFactorHemiEllipsoid_swigregister(FormFactorHemiEllipsoid) class FormFactorLongBoxGauss(IFormFactorBorn): - """Proxy of C++ FormFactorLongBoxGauss class""" + """Proxy of C++ FormFactorLongBoxGauss class.""" + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9744,7 +9826,7 @@ class FormFactorLongBoxGauss(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongBoxGauss(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -9842,7 +9924,8 @@ FormFactorLongBoxGauss_swigregister = _libBornAgainCore.FormFactorLongBoxGauss_s FormFactorLongBoxGauss_swigregister(FormFactorLongBoxGauss) class FormFactorLongBoxLorentz(IFormFactorBorn): - """Proxy of C++ FormFactorLongBoxLorentz class""" + """Proxy of C++ FormFactorLongBoxLorentz class.""" + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -9877,7 +9960,7 @@ class FormFactorLongBoxLorentz(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongBoxLorentz(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -9983,6 +10066,7 @@ class FormFactorLorentz(IFormFactorBorn): C++ includes: FormFactorLorentz.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10004,7 +10088,7 @@ class FormFactorLorentz(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLorentz(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -10098,6 +10182,7 @@ class FormFactorPrism3(IFormFactorBorn): C++ includes: FormFactorPrism3.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10129,7 +10214,7 @@ class FormFactorPrism3(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorPrism3(length, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -10219,6 +10304,7 @@ class FormFactorPrism6(IFormFactorBorn): C++ includes: FormFactorPrism6.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10250,7 +10336,7 @@ class FormFactorPrism6(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorPrism6(radius, height) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -10330,6 +10416,7 @@ class FormFactorPyramid(IFormFactorBorn): C++ includes: FormFactorPyramid.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10364,7 +10451,7 @@ class FormFactorPyramid(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorPyramid(length, height, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorPyramid __del__ = lambda self: None @@ -10464,6 +10551,7 @@ class FormFactorRipple1(IFormFactorBorn): C++ includes: FormFactorRipple1.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10498,7 +10586,7 @@ class FormFactorRipple1(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorRipple1(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple1 __del__ = lambda self: None @@ -10592,6 +10680,7 @@ class FormFactorRipple2(IFormFactorBorn): C++ includes: FormFactorRipple2.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10629,7 +10718,7 @@ class FormFactorRipple2(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorRipple2(length, width, height, asymetry) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorRipple2 __del__ = lambda self: None @@ -10725,7 +10814,8 @@ FormFactorRipple2_swigregister = _libBornAgainCore.FormFactorRipple2_swigregiste FormFactorRipple2_swigregister(FormFactorRipple2) class FormFactorLongRipple1Gauss(IFormFactorBorn): - """Proxy of C++ FormFactorLongRipple1Gauss class""" + """Proxy of C++ FormFactorLongRipple1Gauss class.""" + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10741,7 +10831,7 @@ class FormFactorLongRipple1Gauss(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongRipple1Gauss(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Gauss __del__ = lambda self: None @@ -10818,7 +10908,8 @@ FormFactorLongRipple1Gauss_swigregister = _libBornAgainCore.FormFactorLongRipple FormFactorLongRipple1Gauss_swigregister(FormFactorLongRipple1Gauss) class FormFactorLongRipple1Lorentz(IFormFactorBorn): - """Proxy of C++ FormFactorLongRipple1Lorentz class""" + """Proxy of C++ FormFactorLongRipple1Lorentz class.""" + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10834,7 +10925,7 @@ class FormFactorLongRipple1Lorentz(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongRipple1Lorentz(length, width, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple1Lorentz __del__ = lambda self: None @@ -10919,6 +11010,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn): C++ includes: FormFactorLongRipple2Gauss.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -10956,7 +11048,7 @@ class FormFactorLongRipple2Gauss(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongRipple2Gauss(length, width, height, asymetry) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Gauss __del__ = lambda self: None @@ -11060,6 +11152,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn): C++ includes: FormFactorLongRipple2Lorentz.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11097,7 +11190,7 @@ class FormFactorLongRipple2Lorentz(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorLongRipple2Lorentz(length, width, height, asymetry) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorLongRipple2Lorentz __del__ = lambda self: None @@ -11201,6 +11294,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn): C++ includes: FormFactorSphereGaussianRadius.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11221,7 +11315,7 @@ class FormFactorSphereGaussianRadius(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorSphereGaussianRadius(mean, sigma) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -11291,6 +11385,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn): C++ includes: FormFactorSphereLogNormalRadius.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11311,7 +11406,7 @@ class FormFactorSphereLogNormalRadius(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorSphereLogNormalRadius(mean, scale_param, n_samples) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -11381,6 +11476,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn): C++ includes: FormFactorSphereUniformRadius.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11401,7 +11497,7 @@ class FormFactorSphereUniformRadius(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorSphereUniformRadius(mean, full_width) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -11471,6 +11567,7 @@ class FormFactorTetrahedron(IFormFactorBorn): C++ includes: FormFactorTetrahedron.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11505,7 +11602,7 @@ class FormFactorTetrahedron(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorTetrahedron(length, height, alpha) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorTetrahedron __del__ = lambda self: None @@ -11597,7 +11694,8 @@ FormFactorTetrahedron_swigregister = _libBornAgainCore.FormFactorTetrahedron_swi FormFactorTetrahedron_swigregister(FormFactorTetrahedron) class FormFactorTrivial(IFormFactorBorn): - """Proxy of C++ FormFactorTrivial class""" + """Proxy of C++ FormFactorTrivial class.""" + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11629,7 +11727,7 @@ class FormFactorTrivial(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorTrivial() try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -11699,6 +11797,7 @@ class FormFactorTruncatedCube(IFormFactorBorn): C++ includes: FormFactorTruncatedCube.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11730,7 +11829,7 @@ class FormFactorTruncatedCube(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorTruncatedCube(length, removed_length) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -11802,6 +11901,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn): C++ includes: FormFactorTruncatedSphere.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11833,7 +11933,7 @@ class FormFactorTruncatedSphere(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorTruncatedSphere(radius, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSphere __del__ = lambda self: None @@ -11895,6 +11995,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn): C++ includes: FormFactorTruncatedSpheroid.h """ + __swig_setmethods__ = {} for _s in [IFormFactorBorn]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -11929,7 +12030,7 @@ class FormFactorTruncatedSpheroid(IFormFactorBorn): this = _libBornAgainCore.new_FormFactorTruncatedSpheroid(radius, height, height_flattening) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorTruncatedSpheroid __del__ = lambda self: None @@ -12019,6 +12120,7 @@ class FormFactorWeighted(IFormFactor): C++ includes: FormFactorWeighted.h """ + __swig_setmethods__ = {} for _s in [IFormFactor]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -12039,7 +12141,7 @@ class FormFactorWeighted(IFormFactor): this = _libBornAgainCore.new_FormFactorWeighted() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_FormFactorWeighted __del__ = lambda self: None @@ -12137,6 +12239,7 @@ class Simulation(ICloneable, IParameterized): C++ includes: GISASSimulation.h """ + __swig_setmethods__ = {} for _s in [ICloneable, IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -12351,7 +12454,8 @@ Simulation_swigregister = _libBornAgainCore.Simulation_swigregister Simulation_swigregister(Simulation) class SimulationParameters(_object): - """Proxy of C++ SimulationParameters class""" + """Proxy of C++ SimulationParameters class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationParameters, name, value) __swig_getmethods__ = {} @@ -12368,7 +12472,7 @@ class SimulationParameters(_object): this = _libBornAgainCore.new_SimulationParameters() try: self.this.append(this) - except: + except Exception: self.this = this __swig_setmethods__["m_mc_integration"] = _libBornAgainCore.SimulationParameters_m_mc_integration_set __swig_getmethods__["m_mc_integration"] = _libBornAgainCore.SimulationParameters_m_mc_integration_get @@ -12384,7 +12488,8 @@ SimulationParameters_swigregister = _libBornAgainCore.SimulationParameters_swigr SimulationParameters_swigregister(SimulationParameters) class GISASSimulation(Simulation): - """Proxy of C++ GISASSimulation class""" + """Proxy of C++ GISASSimulation class.""" + __swig_setmethods__ = {} for _s in [Simulation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -12410,7 +12515,7 @@ class GISASSimulation(Simulation): this = _libBornAgainCore.new_GISASSimulation(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_GISASSimulation __del__ = lambda self: None @@ -12687,6 +12792,7 @@ class IHistogram(_object): C++ includes: IHistogram.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IHistogram, name, value) __swig_getmethods__ = {} @@ -13227,7 +13333,8 @@ def IHistogram_createFrom(filename): return _libBornAgainCore.IHistogram_createFrom(filename) class Histogram1D(IHistogram): - """Proxy of C++ Histogram1D class""" + """Proxy of C++ Histogram1D class.""" + __swig_setmethods__ = {} for _s in [IHistogram]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -13253,7 +13360,7 @@ class Histogram1D(IHistogram): this = _libBornAgainCore.new_Histogram1D(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -13373,7 +13480,8 @@ def Histogram1D_dynamicCast(pHistogram): return _libBornAgainCore.Histogram1D_dynamicCast(pHistogram) class Histogram2D(IHistogram): - """Proxy of C++ Histogram2D class""" + """Proxy of C++ Histogram2D class.""" + __swig_setmethods__ = {} for _s in [IHistogram]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -13399,7 +13507,7 @@ class Histogram2D(IHistogram): this = _libBornAgainCore.new_Histogram2D(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -13522,6 +13630,7 @@ class IMaterial(INamed): C++ includes: IMaterial.h """ + __swig_setmethods__ = {} for _s in [INamed]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -13544,7 +13653,7 @@ class IMaterial(INamed): this = _libBornAgainCore.new_IMaterial(name) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IMaterial __del__ = lambda self: None @@ -13608,6 +13717,7 @@ class HomogeneousMaterial(IMaterial): C++ includes: HomogeneousMaterial.h """ + __swig_setmethods__ = {} for _s in [IMaterial]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -13631,7 +13741,7 @@ class HomogeneousMaterial(IMaterial): this = _libBornAgainCore.new_HomogeneousMaterial(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_HomogeneousMaterial __del__ = lambda self: None @@ -13695,6 +13805,7 @@ class HomogeneousMagneticMaterial(HomogeneousMaterial): C++ includes: HomogeneousMagneticMaterial.h """ + __swig_setmethods__ = {} for _s in [HomogeneousMaterial]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -13718,7 +13829,7 @@ class HomogeneousMagneticMaterial(HomogeneousMaterial): this = _libBornAgainCore.new_HomogeneousMagneticMaterial(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -13786,7 +13897,8 @@ HomogeneousMagneticMaterial_swigregister = _libBornAgainCore.HomogeneousMagnetic HomogeneousMagneticMaterial_swigregister(HomogeneousMagneticMaterial) class IDetector2D(IParameterized): - """Proxy of C++ IDetector2D class""" + """Proxy of C++ IDetector2D class.""" + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14085,6 +14197,7 @@ class IDetectorResolution(ICloneable, IParameterized): C++ includes: IDetectorResolution.h """ + __swig_setmethods__ = {} for _s in [ICloneable, IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14133,6 +14246,7 @@ class IInterferenceFunction(ISample): C++ includes: IInterferenceFunction.h """ + __swig_setmethods__ = {} for _s in [ISample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14219,6 +14333,7 @@ class ILayout(ICompositeSample): C++ includes: ILayout.h """ + __swig_setmethods__ = {} for _s in [ICompositeSample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14403,6 +14518,7 @@ class IObserver(_object): C++ includes: IObserver.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IObserver, name, value) __swig_getmethods__ = {} @@ -14437,7 +14553,7 @@ class IObserver(_object): this = _libBornAgainCore.new_IObserver() try: self.this.append(this) - except: + except Exception: self.this = this IObserver_swigregister = _libBornAgainCore.IObserver_swigregister IObserver_swigregister(IObserver) @@ -14451,6 +14567,7 @@ class IObservable(_object): C++ includes: IObserver.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IObservable, name, value) __swig_getmethods__ = {} @@ -14501,7 +14618,7 @@ class IObservable(_object): this = _libBornAgainCore.new_IObservable(_self, ) try: self.this.append(this) - except: + except Exception: self.this = this def __disown__(self): self.this.disown() @@ -14519,6 +14636,7 @@ class IAbstractParticle(ICompositeSample): C++ includes: IParticle.h """ + __swig_setmethods__ = {} for _s in [ICompositeSample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14629,6 +14747,7 @@ class IParticle(IAbstractParticle): C++ includes: IParticle.h """ + __swig_setmethods__ = {} for _s in [IAbstractParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14788,6 +14907,7 @@ class IResolutionFunction2D(IParameterized): C++ includes: IResolutionFunction2D.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14834,6 +14954,7 @@ class IRotation(ISample): C++ includes: Rotations.h """ + __swig_setmethods__ = {} for _s in [ISample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14945,7 +15066,8 @@ def CreateProduct(left, right): """ return _libBornAgainCore.CreateProduct(left, right) class RotationX(IRotation): - """Proxy of C++ RotationX class""" + """Proxy of C++ RotationX class.""" + __swig_setmethods__ = {} for _s in [IRotation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -14966,7 +15088,7 @@ class RotationX(IRotation): this = _libBornAgainCore.new_RotationX(angle) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -15044,7 +15166,8 @@ RotationX_swigregister = _libBornAgainCore.RotationX_swigregister RotationX_swigregister(RotationX) class RotationY(IRotation): - """Proxy of C++ RotationY class""" + """Proxy of C++ RotationY class.""" + __swig_setmethods__ = {} for _s in [IRotation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15065,7 +15188,7 @@ class RotationY(IRotation): this = _libBornAgainCore.new_RotationY(angle) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -15143,7 +15266,8 @@ RotationY_swigregister = _libBornAgainCore.RotationY_swigregister RotationY_swigregister(RotationY) class RotationZ(IRotation): - """Proxy of C++ RotationZ class""" + """Proxy of C++ RotationZ class.""" + __swig_setmethods__ = {} for _s in [IRotation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15165,7 +15289,7 @@ class RotationZ(IRotation): this = _libBornAgainCore.new_RotationZ(angle) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -15243,7 +15367,8 @@ RotationZ_swigregister = _libBornAgainCore.RotationZ_swigregister RotationZ_swigregister(RotationZ) class RotationEuler(IRotation): - """Proxy of C++ RotationEuler class""" + """Proxy of C++ RotationEuler class.""" + __swig_setmethods__ = {} for _s in [IRotation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15264,7 +15389,7 @@ class RotationEuler(IRotation): this = _libBornAgainCore.new_RotationEuler(alpha, beta, gamma) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -15370,6 +15495,7 @@ class ISelectionRule(_object): C++ includes: ISelectionRule.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ISelectionRule, name, value) __swig_getmethods__ = {} @@ -15412,6 +15538,7 @@ class SimpleSelectionRule(ISelectionRule): C++ includes: ISelectionRule.h """ + __swig_setmethods__ = {} for _s in [ISelectionRule]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15432,7 +15559,7 @@ class SimpleSelectionRule(ISelectionRule): this = _libBornAgainCore.new_SimpleSelectionRule(a, b, c, modulus) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_SimpleSelectionRule __del__ = lambda self: None @@ -15468,6 +15595,7 @@ class Instrument(IParameterized): C++ includes: Instrument.h """ + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15489,7 +15617,7 @@ class Instrument(IParameterized): this = _libBornAgainCore.new_Instrument(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Instrument __del__ = lambda self: None @@ -15720,6 +15848,7 @@ class IntensityDataFunctions(_object): C++ includes: IntensityDataFunctions.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityDataFunctions, name, value) __swig_getmethods__ = {} @@ -15767,7 +15896,7 @@ class IntensityDataFunctions(_object): this = _libBornAgainCore.new_IntensityDataFunctions() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IntensityDataFunctions __del__ = lambda self: None @@ -15800,6 +15929,7 @@ class IntensityDataIOFactory(_object): C++ includes: IntensityDataIOFactory.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityDataIOFactory, name, value) __swig_getmethods__ = {} @@ -15854,7 +15984,7 @@ class IntensityDataIOFactory(_object): this = _libBornAgainCore.new_IntensityDataIOFactory() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IntensityDataIOFactory __del__ = lambda self: None @@ -15886,6 +16016,7 @@ class InterferenceFunction1DLattice(IInterferenceFunction): C++ includes: InterferenceFunction1DLattice.h """ + __swig_setmethods__ = {} for _s in [IInterferenceFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -15920,7 +16051,7 @@ class InterferenceFunction1DLattice(IInterferenceFunction): this = _libBornAgainCore.new_InterferenceFunction1DLattice(length, xi) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction1DLattice __del__ = lambda self: None @@ -16002,6 +16133,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction): C++ includes: InterferenceFunctionRadialParaCrystal.h """ + __swig_setmethods__ = {} for _s in [IInterferenceFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16037,7 +16169,7 @@ class InterferenceFunctionRadialParaCrystal(IInterferenceFunction): this = _libBornAgainCore.new_InterferenceFunctionRadialParaCrystal(peak_distance, damping_length) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunctionRadialParaCrystal __del__ = lambda self: None @@ -16207,6 +16339,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction): C++ includes: InterferenceFunction2DLattice.h """ + __swig_setmethods__ = {} for _s in [IInterferenceFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16245,7 +16378,7 @@ class InterferenceFunction2DLattice(IInterferenceFunction): this = _libBornAgainCore.new_InterferenceFunction2DLattice(length_1, length_2, angle, xi) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DLattice __del__ = lambda self: None @@ -16375,6 +16508,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction): C++ includes: InterferenceFunction2DParaCrystal.h """ + __swig_setmethods__ = {} for _s in [IInterferenceFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16417,7 +16551,7 @@ class InterferenceFunction2DParaCrystal(IInterferenceFunction): this = _libBornAgainCore.new_InterferenceFunction2DParaCrystal(length_1, length_2, alpha_lattice, xi, damping_length) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_InterferenceFunction2DParaCrystal __del__ = lambda self: None @@ -16627,6 +16761,7 @@ class InterferenceFunctionNone(IInterferenceFunction): C++ includes: InterferenceFunctionNone.h """ + __swig_setmethods__ = {} for _s in [IInterferenceFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16647,7 +16782,7 @@ class InterferenceFunctionNone(IInterferenceFunction): this = _libBornAgainCore.new_InterferenceFunctionNone() try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -16699,6 +16834,7 @@ class IPixelMap(_object): C++ includes: IPixelMap.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IPixelMap, name, value) __swig_getmethods__ = {} @@ -16771,6 +16907,7 @@ class SphericalDetector(IDetector2D): C++ includes: SphericalDetector.h """ + __swig_setmethods__ = {} for _s in [IDetector2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16793,7 +16930,7 @@ class SphericalDetector(IDetector2D): this = _libBornAgainCore.new_SphericalDetector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -16847,7 +16984,8 @@ SphericalDetector_swigregister = _libBornAgainCore.SphericalDetector_swigregiste SphericalDetector_swigregister(SphericalDetector) class AngularPixelMap(IPixelMap): - """Proxy of C++ AngularPixelMap class""" + """Proxy of C++ AngularPixelMap class.""" + __swig_setmethods__ = {} for _s in [IPixelMap]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16868,7 +17006,7 @@ class AngularPixelMap(IPixelMap): this = _libBornAgainCore.new_AngularPixelMap(alpha_bin, phi_bin) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_AngularPixelMap __del__ = lambda self: None @@ -16934,6 +17072,7 @@ class IsGISAXSDetector(SphericalDetector): C++ includes: IsGISAXSDetector.h """ + __swig_setmethods__ = {} for _s in [SphericalDetector]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -16956,7 +17095,7 @@ class IsGISAXSDetector(SphericalDetector): this = _libBornAgainCore.new_IsGISAXSDetector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -16982,6 +17121,7 @@ class Lattice(_object): C++ includes: Lattice.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice, name, value) __swig_getmethods__ = {} @@ -17000,7 +17140,7 @@ class Lattice(_object): this = _libBornAgainCore.new_Lattice(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Lattice __del__ = lambda self: None @@ -17182,6 +17322,7 @@ class Lattice1DParameters(_object): C++ includes: Lattice1DParameters.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice1DParameters, name, value) __swig_getmethods__ = {} @@ -17198,7 +17339,7 @@ class Lattice1DParameters(_object): this = _libBornAgainCore.new_Lattice1DParameters() try: self.this.append(this) - except: + except Exception: self.this = this __swig_setmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_set __swig_getmethods__["m_length"] = _libBornAgainCore.Lattice1DParameters_m_length_get @@ -17222,6 +17363,7 @@ class Lattice2DParameters(_object): C++ includes: Lattice2DParameters.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Lattice2DParameters, name, value) __swig_getmethods__ = {} @@ -17238,7 +17380,7 @@ class Lattice2DParameters(_object): this = _libBornAgainCore.new_Lattice2DParameters() try: self.this.append(this) - except: + except Exception: self.this = this __swig_setmethods__["m_length_1"] = _libBornAgainCore.Lattice2DParameters_m_length_1_set __swig_getmethods__["m_length_1"] = _libBornAgainCore.Lattice2DParameters_m_length_1_get @@ -17279,6 +17421,7 @@ class Layer(ICompositeSample): C++ includes: Layer.h """ + __swig_setmethods__ = {} for _s in [ICompositeSample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17303,7 +17446,7 @@ class Layer(ICompositeSample): this = _libBornAgainCore.new_Layer(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Layer __del__ = lambda self: None @@ -17539,6 +17682,7 @@ class IRoughness(ISample): C++ includes: IRoughness.h """ + __swig_setmethods__ = {} for _s in [ISample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17579,6 +17723,7 @@ class LayerRoughness(IRoughness): C++ includes: LayerRoughness.h """ + __swig_setmethods__ = {} for _s in [IRoughness]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17600,7 +17745,7 @@ class LayerRoughness(IRoughness): this = _libBornAgainCore.new_LayerRoughness(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -17740,6 +17885,7 @@ class Line(IShape2D): C++ includes: Line.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17762,7 +17908,7 @@ class Line(IShape2D): this = _libBornAgainCore.new_Line(x1, y1, x2, y2) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -17801,6 +17947,7 @@ class VerticalLine(IShape2D): C++ includes: Line.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17829,7 +17976,7 @@ class VerticalLine(IShape2D): this = _libBornAgainCore.new_VerticalLine(x) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -17878,6 +18025,7 @@ class HorizontalLine(IShape2D): C++ includes: Line.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -17906,7 +18054,7 @@ class HorizontalLine(IShape2D): this = _libBornAgainCore.new_HorizontalLine(y) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -18135,6 +18283,7 @@ class MesoCrystal(IParticle): C++ includes: MesoCrystal.h """ + __swig_setmethods__ = {} for _s in [IParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -18155,7 +18304,7 @@ class MesoCrystal(IParticle): this = _libBornAgainCore.new_MesoCrystal(particle_structure, form_factor) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_MesoCrystal __del__ = lambda self: None @@ -18276,6 +18425,7 @@ class Logger(_object): C++ includes: MessageService.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, Logger, name, value) __swig_getmethods__ = {} @@ -18292,7 +18442,7 @@ class Logger(_object): this = _libBornAgainCore.new_Logger(level) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Logger __del__ = lambda self: None @@ -18372,6 +18522,7 @@ class MultiLayer(ICompositeSample): C++ includes: MultiLayer.h """ + __swig_setmethods__ = {} for _s in [ICompositeSample]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -18392,7 +18543,7 @@ class MultiLayer(ICompositeSample): this = _libBornAgainCore.new_MultiLayer() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_MultiLayer __del__ = lambda self: None @@ -18682,6 +18833,7 @@ class OffSpecSimulation(Simulation): C++ includes: OffSpecSimulation.h """ + __swig_setmethods__ = {} for _s in [Simulation]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -18707,7 +18859,7 @@ class OffSpecSimulation(Simulation): this = _libBornAgainCore.new_OffSpecSimulation(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_OffSpecSimulation __del__ = lambda self: None @@ -18904,6 +19056,7 @@ class IntensityData(_object): C++ includes: OutputData.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IntensityData, name, value) __swig_getmethods__ = {} @@ -18920,7 +19073,7 @@ class IntensityData(_object): this = _libBornAgainCore.new_IntensityData() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_IntensityData __del__ = lambda self: None @@ -19508,7 +19661,8 @@ def applyFunction(data, func): """ return _libBornAgainCore.applyFunction(data, func) class ParameterDistribution(IParameterized): - """Proxy of C++ ParameterDistribution class""" + """Proxy of C++ ParameterDistribution class.""" + __swig_setmethods__ = {} for _s in [IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -19533,7 +19687,7 @@ class ParameterDistribution(IParameterized): this = _libBornAgainCore.new_ParameterDistribution(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ParameterDistribution __del__ = lambda self: None @@ -19659,6 +19813,7 @@ class ParameterPool(ICloneable): C++ includes: ParameterPool.h """ + __swig_setmethods__ = {} for _s in [ICloneable]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -19681,7 +19836,7 @@ class ParameterPool(ICloneable): this = _libBornAgainCore.new_ParameterPool() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ParameterPool __del__ = lambda self: None @@ -19854,6 +20009,7 @@ class Particle(IParticle): C++ includes: Particle.h """ + __swig_setmethods__ = {} for _s in [IParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -19877,7 +20033,7 @@ class Particle(IParticle): this = _libBornAgainCore.new_Particle(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -20025,6 +20181,7 @@ class ParticleComposition(IParticle): C++ includes: ParticleComposition.h """ + __swig_setmethods__ = {} for _s in [IParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20048,7 +20205,7 @@ class ParticleComposition(IParticle): this = _libBornAgainCore.new_ParticleComposition(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ParticleComposition __del__ = lambda self: None @@ -20191,6 +20348,7 @@ class ParticleCoreShell(IParticle): C++ includes: ParticleCoreShell.h """ + __swig_setmethods__ = {} for _s in [IParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20212,7 +20370,7 @@ class ParticleCoreShell(IParticle): this = _libBornAgainCore.new_ParticleCoreShell(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ParticleCoreShell __del__ = lambda self: None @@ -20324,6 +20482,7 @@ class ParticleDistribution(IAbstractParticle): C++ includes: ParticleDistribution.h """ + __swig_setmethods__ = {} for _s in [IAbstractParticle]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20344,7 +20503,7 @@ class ParticleDistribution(IAbstractParticle): this = _libBornAgainCore.new_ParticleDistribution(prototype, par_distr) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -20468,6 +20627,7 @@ class ParticleLayout(ILayout): C++ includes: ParticleLayout.h """ + __swig_setmethods__ = {} for _s in [ILayout]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20490,7 +20650,7 @@ class ParticleLayout(ILayout): this = _libBornAgainCore.new_ParticleLayout(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_ParticleLayout __del__ = lambda self: None @@ -20669,6 +20829,7 @@ class Polygon(IShape2D): C++ includes: Polygon.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20698,7 +20859,7 @@ class Polygon(IShape2D): this = _libBornAgainCore.new_Polygon(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_Polygon __del__ = lambda self: None @@ -20757,6 +20918,7 @@ class RealParameterWrapper(_object): C++ includes: RealParameterWrapper.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, RealParameterWrapper, name, value) __swig_getmethods__ = {} @@ -20775,7 +20937,7 @@ class RealParameterWrapper(_object): this = _libBornAgainCore.new_RealParameterWrapper(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_RealParameterWrapper __del__ = lambda self: None @@ -20859,6 +21021,7 @@ class Rectangle(IShape2D): C++ includes: Rectangle.h """ + __swig_setmethods__ = {} for _s in [IShape2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -20896,7 +21059,7 @@ class Rectangle(IShape2D): this = _libBornAgainCore.new_Rectangle(xlow, ylow, xup, yup) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -20985,6 +21148,7 @@ class RectangularDetector(IDetector2D): C++ includes: RectangularDetector.h """ + __swig_setmethods__ = {} for _s in [IDetector2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -21011,7 +21175,7 @@ class RectangularDetector(IDetector2D): this = _libBornAgainCore.new_RectangularDetector(*args) try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -21250,7 +21414,8 @@ RectangularDetector_swigregister = _libBornAgainCore.RectangularDetector_swigreg RectangularDetector_swigregister(RectangularDetector) class RectPixelMap(IPixelMap): - """Proxy of C++ RectPixelMap class""" + """Proxy of C++ RectPixelMap class.""" + __swig_setmethods__ = {} for _s in [IPixelMap]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -21271,7 +21436,7 @@ class RectPixelMap(IPixelMap): this = _libBornAgainCore.new_RectPixelMap(corner_pos, width, height) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_RectPixelMap __del__ = lambda self: None @@ -21337,6 +21502,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D): C++ includes: ResolutionFunction2DGaussian.h """ + __swig_setmethods__ = {} for _s in [IResolutionFunction2D]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -21357,7 +21523,7 @@ class ResolutionFunction2DGaussian(IResolutionFunction2D): this = _libBornAgainCore.new_ResolutionFunction2DGaussian(sigma_x, sigma_y) try: self.this.append(this) - except: + except Exception: self.this = this def evaluateCDF(self, x, y): @@ -21413,6 +21579,7 @@ class SpecularSimulation(ICloneable, IParameterized): C++ includes: SpecularSimulation.h """ + __swig_setmethods__ = {} for _s in [ICloneable, IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -21435,7 +21602,7 @@ class SpecularSimulation(ICloneable, IParameterized): this = _libBornAgainCore.new_SpecularSimulation(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainCore.delete_SpecularSimulation __del__ = lambda self: None @@ -21613,6 +21780,7 @@ class ThreadInfo(_object): C++ includes: ThreadInfo.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ThreadInfo, name, value) __swig_getmethods__ = {} @@ -21629,7 +21797,7 @@ class ThreadInfo(_object): this = _libBornAgainCore.new_ThreadInfo() try: self.this.append(this) - except: + except Exception: self.this = this __swig_setmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_set __swig_getmethods__["n_threads"] = _libBornAgainCore.ThreadInfo_n_threads_get @@ -21661,6 +21829,7 @@ class SampleBuilderFactory(_object): C++ includes: SampleBuilderFactory.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, SampleBuilderFactory, name, value) __swig_getmethods__ = {} @@ -21677,7 +21846,7 @@ class SampleBuilderFactory(_object): this = _libBornAgainCore.new_SampleBuilderFactory() try: self.this.append(this) - except: + except Exception: self.this = this def createSample(self, name): @@ -21713,6 +21882,7 @@ class SimulationRegistry(_object): C++ includes: SimulationRegistry.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, SimulationRegistry, name, value) __swig_getmethods__ = {} @@ -21729,7 +21899,7 @@ class SimulationRegistry(_object): this = _libBornAgainCore.new_SimulationRegistry() try: self.this.append(this) - except: + except Exception: self.this = this def createSimulation(self, name): diff --git a/Core/PythonAPI/libBornAgainCore_wrap.cxx b/Core/PythonAPI/libBornAgainCore_wrap.cxx index c26cf36c23dd3915215d28f94c1f5f82d0342efb..0440cd6e6ed35ce059c24c9125cb57987cb08b5f 100644 --- a/Core/PythonAPI/libBornAgainCore_wrap.cxx +++ b/Core/PythonAPI/libBornAgainCore_wrap.cxx @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.7 + * Version 3.0.8 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -8,7 +8,11 @@ * interface file instead. * ----------------------------------------------------------------------------- */ + +#ifndef SWIGPYTHON #define SWIGPYTHON +#endif + #define SWIG_DIRECTORS #define SWIG_PYTHON_DIRECTOR_NO_VTABLE @@ -1326,7 +1330,7 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { /* Unpack the argument tuple */ -SWIGINTERN int +SWIGINTERN Py_ssize_t SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs) { if (!args) { @@ -1340,7 +1344,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi } if (!PyTuple_Check(args)) { if (min <= 1 && max >= 1) { - int i; + Py_ssize_t i; objs[0] = args; for (i = 1; i < max; ++i) { objs[i] = 0; @@ -1360,7 +1364,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi name, (min == max ? "" : "at most "), (int)max, (int)l); return 0; } else { - int i; + Py_ssize_t i; for (i = 0; i < l; ++i) { objs[i] = PyTuple_GET_ITEM(args, i); } @@ -1701,16 +1705,32 @@ SwigPyObject_dealloc(PyObject *v) if (destroy) { /* destroy is always a VARARGS method */ PyObject *res; + + /* PyObject_CallFunction() has the potential to silently drop + the active active exception. In cases of unnamed temporary + variable or where we just finished iterating over a generator + StopIteration will be active right now, and this needs to + remain true upon return from SwigPyObject_dealloc. So save + and restore. */ + + PyObject *val = NULL, *type = NULL, *tb = NULL; + PyErr_Fetch(&val, &type, &tb); + if (data->delargs) { - /* we need to create a temporary object to carry the destroy operation */ - PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); - res = SWIG_Python_CallFunctor(destroy, tmp); - Py_DECREF(tmp); + /* we need to create a temporary object to carry the destroy operation */ + PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); + res = SWIG_Python_CallFunctor(destroy, tmp); + Py_DECREF(tmp); } else { - PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); - PyObject *mself = PyCFunction_GET_SELF(destroy); - res = ((*meth)(mself, v)); + PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); + PyObject *mself = PyCFunction_GET_SELF(destroy); + res = ((*meth)(mself, v)); } + if (!res) + PyErr_WriteUnraisable(destroy); + + PyErr_Restore(val, type, tb); + Py_XDECREF(res); } #if !defined(SWIG_PYTHON_SILENT_MEMLEAK) @@ -1734,6 +1754,7 @@ SwigPyObject_append(PyObject* v, PyObject* next) next = tmp; #endif if (!SwigPyObject_Check(next)) { + PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject"); return NULL; } sobj->next = next; @@ -1889,7 +1910,9 @@ SwigPyObject_TypeOnce(void) { (unaryfunc)SwigPyObject_oct, /*nb_oct*/ (unaryfunc)SwigPyObject_hex, /*nb_hex*/ #endif -#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */ +#if PY_VERSION_HEX >= 0x03050000 /* 3.5 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */ +#elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */ #elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */ @@ -1969,10 +1992,19 @@ SwigPyObject_TypeOnce(void) { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; swigpyobject_type = tmp; @@ -2148,10 +2180,19 @@ SwigPyPacked_TypeOnce(void) { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; swigpypacked_type = tmp; @@ -2679,13 +2720,11 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o) { PyObject *dict; if (!PyModule_Check(m)) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs module as first arg"); + PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg"); return SWIG_ERROR; } if (!o) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs non-NULL value"); + PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value"); return SWIG_ERROR; } @@ -3609,52 +3648,59 @@ namespace Swig { #define SWIGTYPE_p_double swig_types[191] #define SWIGTYPE_p_int swig_types[192] #define SWIGTYPE_p_iterator swig_types[193] -#define SWIGTYPE_p_observer_t swig_types[194] -#define SWIGTYPE_p_observerlist_t swig_types[195] -#define SWIGTYPE_p_p__object swig_types[196] -#define SWIGTYPE_p_parameter_t swig_types[197] -#define SWIGTYPE_p_parametermap_t swig_types[198] -#define SWIGTYPE_p_reference swig_types[199] -#define SWIGTYPE_p_size_type swig_types[200] -#define SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_double_t_t swig_types[201] -#define SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t swig_types[202] -#define SWIGTYPE_p_std__allocatorT_IFormFactor_p_t swig_types[203] -#define SWIGTYPE_p_std__allocatorT_ISample_const_p_t swig_types[204] -#define SWIGTYPE_p_std__allocatorT_ISample_p_t swig_types[205] -#define SWIGTYPE_p_std__allocatorT_double_t swig_types[206] -#define SWIGTYPE_p_std__allocatorT_int_t swig_types[207] -#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[208] -#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[209] -#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[210] -#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[211] -#define SWIGTYPE_p_std__complexT_double_t swig_types[212] -#define SWIGTYPE_p_std__invalid_argument swig_types[213] -#define SWIGTYPE_p_std__ostream swig_types[214] -#define SWIGTYPE_p_std__shared_ptrT_IFitObserver_t swig_types[215] -#define SWIGTYPE_p_std__shared_ptrT_ILayerRTCoefficients_const_t swig_types[216] -#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[217] -#define SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t swig_types[218] -#define SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t swig_types[219] -#define SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t swig_types[220] -#define SWIGTYPE_p_std__vectorT_IDetector2D__EAxesUnits_std__allocatorT_IDetector2D__EAxesUnits_t_t swig_types[221] -#define SWIGTYPE_p_std__vectorT_IFTDistribution2D_const_p_std__allocatorT_IFTDistribution2D_const_p_t_t swig_types[222] -#define SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t swig_types[223] -#define SWIGTYPE_p_std__vectorT_IParticle_const_p_std__allocatorT_IParticle_const_p_t_t swig_types[224] -#define SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t swig_types[225] -#define SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t swig_types[226] -#define SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t swig_types[227] -#define SWIGTYPE_p_std__vectorT_RealParameterWrapper_std__allocatorT_RealParameterWrapper_t_t swig_types[228] -#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[229] -#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[230] -#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[231] -#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[232] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[233] -#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[234] -#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[235] -#define SWIGTYPE_p_swig__SwigPyIterator swig_types[236] -#define SWIGTYPE_p_value_type swig_types[237] -static swig_type_info *swig_types[239]; -static swig_module_info swig_module = {swig_types, 238, 0, 0, 0, 0}; +#define SWIGTYPE_p_long_long swig_types[194] +#define SWIGTYPE_p_observer_t swig_types[195] +#define SWIGTYPE_p_observerlist_t swig_types[196] +#define SWIGTYPE_p_p__object swig_types[197] +#define SWIGTYPE_p_parameter_t swig_types[198] +#define SWIGTYPE_p_parametermap_t swig_types[199] +#define SWIGTYPE_p_reference swig_types[200] +#define SWIGTYPE_p_short swig_types[201] +#define SWIGTYPE_p_signed_char swig_types[202] +#define SWIGTYPE_p_size_type swig_types[203] +#define SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_double_t_t swig_types[204] +#define SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t swig_types[205] +#define SWIGTYPE_p_std__allocatorT_IFormFactor_p_t swig_types[206] +#define SWIGTYPE_p_std__allocatorT_ISample_const_p_t swig_types[207] +#define SWIGTYPE_p_std__allocatorT_ISample_p_t swig_types[208] +#define SWIGTYPE_p_std__allocatorT_double_t swig_types[209] +#define SWIGTYPE_p_std__allocatorT_int_t swig_types[210] +#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[211] +#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[212] +#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[213] +#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[214] +#define SWIGTYPE_p_std__complexT_double_t swig_types[215] +#define SWIGTYPE_p_std__invalid_argument swig_types[216] +#define SWIGTYPE_p_std__ostream swig_types[217] +#define SWIGTYPE_p_std__shared_ptrT_IFitObserver_t swig_types[218] +#define SWIGTYPE_p_std__shared_ptrT_ILayerRTCoefficients_const_t swig_types[219] +#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[220] +#define SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t swig_types[221] +#define SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t swig_types[222] +#define SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t swig_types[223] +#define SWIGTYPE_p_std__vectorT_IDetector2D__EAxesUnits_std__allocatorT_IDetector2D__EAxesUnits_t_t swig_types[224] +#define SWIGTYPE_p_std__vectorT_IFTDistribution2D_const_p_std__allocatorT_IFTDistribution2D_const_p_t_t swig_types[225] +#define SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t swig_types[226] +#define SWIGTYPE_p_std__vectorT_IParticle_const_p_std__allocatorT_IParticle_const_p_t_t swig_types[227] +#define SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t swig_types[228] +#define SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t swig_types[229] +#define SWIGTYPE_p_std__vectorT_ParameterSample_std__allocatorT_ParameterSample_t_t swig_types[230] +#define SWIGTYPE_p_std__vectorT_RealParameterWrapper_std__allocatorT_RealParameterWrapper_t_t swig_types[231] +#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[232] +#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[233] +#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[234] +#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[235] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[236] +#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[237] +#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[238] +#define SWIGTYPE_p_swig__SwigPyIterator swig_types[239] +#define SWIGTYPE_p_unsigned_char swig_types[240] +#define SWIGTYPE_p_unsigned_int swig_types[241] +#define SWIGTYPE_p_unsigned_long_long swig_types[242] +#define SWIGTYPE_p_unsigned_short swig_types[243] +#define SWIGTYPE_p_value_type swig_types[244] +static swig_type_info *swig_types[246]; +static swig_module_info swig_module = {swig_types, 245, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3678,7 +3724,7 @@ static swig_module_info swig_module = {swig_types, 238, 0, 0, 0, 0}; #endif #define SWIG_name "_libBornAgainCore" -#define SWIGVERSION 0x030007 +#define SWIGVERSION 0x030008 #define SWIG_VERSION SWIGVERSION @@ -3759,6 +3805,9 @@ namespace swig { } +#include <stdint.h> // Use the C99 official header + + #include <complex> @@ -3921,9 +3970,11 @@ SWIG_AsVal_double (PyObject *obj, double *val) if (PyFloat_Check(obj)) { if (val) *val = PyFloat_AsDouble(obj); return SWIG_OK; +#if PY_VERSION_HEX < 0x03000000 } else if (PyInt_Check(obj)) { if (val) *val = PyInt_AsLong(obj); return SWIG_OK; +#endif } else if (PyLong_Check(obj)) { double v = PyLong_AsDouble(obj); if (!PyErr_Occurred()) { @@ -4015,18 +4066,7 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) return SWIG_OK; } else { PyErr_Clear(); -#if PY_VERSION_HEX >= 0x03000000 - { - long v = PyLong_AsLong(obj); - if (!PyErr_Occurred()) { - if (v < 0) { - return SWIG_OverflowError; - } - } else { - PyErr_Clear(); - } - } -#endif + return SWIG_OverflowError; } } #ifdef SWIG_PYTHON_CAST_MODE @@ -4083,16 +4123,20 @@ SWIGINTERNINLINE PyObject* SWIGINTERN int SWIG_AsVal_long (PyObject *obj, long* val) { +#if PY_VERSION_HEX < 0x03000000 if (PyInt_Check(obj)) { if (val) *val = PyInt_AsLong(obj); return SWIG_OK; - } else if (PyLong_Check(obj)) { + } else +#endif + if (PyLong_Check(obj)) { long v = PyLong_AsLong(obj); if (!PyErr_Occurred()) { if (val) *val = v; return SWIG_OK; } else { PyErr_Clear(); + return SWIG_OverflowError; } } #ifdef SWIG_PYTHON_CAST_MODE @@ -4142,7 +4186,7 @@ SWIGINTERNINLINE PyObject* } -namespace swig { +namespace swig { template <class Type> struct noconst_traits { typedef Type noconst_type; @@ -4156,7 +4200,7 @@ namespace swig { /* type categories */ - struct pointer_category { }; + struct pointer_category { }; struct value_category { }; /* @@ -4169,12 +4213,12 @@ namespace swig { return traits<typename noconst_traits<Type >::noconst_type >::type_name(); } - template <class Type> + template <class Type> struct traits_info { static swig_type_info *type_query(std::string name) { name += " *"; return SWIG_TypeQuery(name.c_str()); - } + } static swig_type_info *type_info() { static swig_type_info *info = type_query(type_name<Type>()); return info; @@ -4195,17 +4239,17 @@ namespace swig { std::string ptrname = name; ptrname += " *"; return ptrname; - } + } static const char* type_name() { static std::string name = make_ptr_name(swig::type_name<Type>()); return name.c_str(); } }; - template <class Type, class Category> + template <class Type, class Category> struct traits_as { }; - - template <class Type, class Category> + + template <class Type, class Category> struct traits_check { }; } @@ -4549,6 +4593,12 @@ namespace swig { return pos; } + template <class Sequence> + inline void + erase(Sequence* seq, const typename Sequence::iterator& position) { + seq->erase(position); + } + template <class Sequence, class Difference> inline Sequence* getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) { @@ -4923,7 +4973,7 @@ namespace swig template <class T> struct SwigPySequence_Ref { - SwigPySequence_Ref(PyObject* seq, int index) + SwigPySequence_Ref(PyObject* seq, Py_ssize_t index) : _seq(seq), _index(index) { } @@ -4935,7 +4985,7 @@ namespace swig return swig::as<T>(item, true); } catch (std::exception& e) { char msg[1024]; - sprintf(msg, "in sequence element %d ", _index); + sprintf(msg, "in sequence element %d ", (int)_index); if (!PyErr_Occurred()) { ::SWIG_Error(SWIG_TypeError, swig::type_name<T>()); } @@ -4953,7 +5003,7 @@ namespace swig private: PyObject* _seq; - int _index; + Py_ssize_t _index; }; template <class T> @@ -4974,13 +5024,13 @@ namespace swig typedef Reference reference; typedef T value_type; typedef T* pointer; - typedef int difference_type; + typedef Py_ssize_t difference_type; SwigPySequence_InputIterator() { } - SwigPySequence_InputIterator(PyObject* seq, int index) + SwigPySequence_InputIterator(PyObject* seq, Py_ssize_t index) : _seq(seq), _index(index) { } @@ -5060,6 +5110,7 @@ namespace swig difference_type _index; }; + // STL container wrapper around a Python sequence template <class T> struct SwigPySequence_Cont { @@ -5067,8 +5118,8 @@ namespace swig typedef const SwigPySequence_Ref<T> const_reference; typedef T value_type; typedef T* pointer; - typedef int difference_type; - typedef int size_type; + typedef Py_ssize_t difference_type; + typedef size_t size_type; typedef const pointer const_pointer; typedef SwigPySequence_InputIterator<T, reference> iterator; typedef SwigPySequence_InputIterator<T, const_reference> const_iterator; @@ -5129,13 +5180,13 @@ namespace swig bool check(bool set_err = true) const { - int s = size(); - for (int i = 0; i < s; ++i) { + Py_ssize_t s = size(); + for (Py_ssize_t i = 0; i < s; ++i) { swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i); if (!swig::check<value_type>(item)) { if (set_err) { char msg[1024]; - sprintf(msg, "in sequence element %d", i); + sprintf(msg, "in sequence element %d", (int)i); SWIG_Error(SWIG_RuntimeError, msg); } return false; @@ -5155,17 +5206,17 @@ namespace swig namespace swig { - template <> struct traits<double > { + template <> struct traits< double > { typedef value_category category; static const char* type_name() { return"double"; } - }; - template <> struct traits_asval<double > { + }; + template <> struct traits_asval< double > { typedef double value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_double (obj, val); } }; - template <> struct traits_from<double > { + template <> struct traits_from< double > { typedef double value_type; static PyObject *from(const value_type& val) { return SWIG_From_double (val); @@ -5239,10 +5290,9 @@ namespace swig { #endif size_type size = seq.size(); if (size <= (size_type)INT_MAX) { - PyObject *obj = PyTuple_New((int)size); - int i = 0; - for (const_iterator it = seq.begin(); - it != seq.end(); ++it, ++i) { + PyObject *obj = PyTuple_New((Py_ssize_t)size); + Py_ssize_t i = 0; + for (const_iterator it = seq.begin(); it != seq.end(); ++it, ++i) { PyTuple_SetItem(obj,i,swig::from<value_type>(*it)); } return obj; @@ -5273,7 +5323,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<double, std::allocator< double > > > { + template <> struct traits<std::vector< double, std::allocator< double > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "double" "," "std::allocator< double >" " >"; @@ -5308,24 +5358,20 @@ SWIG_From_size_t (size_t value) return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); } -SWIGINTERN std::vector< double >::value_type std_vector_Sl_double_Sg__pop(std::vector< double > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<double,std::allocator< double > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j,std::vector< double,std::allocator< double > > const &v=std::vector< double,std::allocator< double > >()){ +SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< double,std::allocator< double > >()); + } +SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_1(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j,std::vector< double,std::allocator< double > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_double_Sg____delslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getitem____SWIG_0(std::vector< double > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5334,8 +5380,8 @@ SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_ return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double > *self,PySliceObject *slice,std::vector< double,std::allocator< double > > const &v){ @@ -5345,8 +5391,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ @@ -5356,8 +5402,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ @@ -5367,8 +5413,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____getitem____SWIG_1(std::vector< double > const *self,std::vector< double >::difference_type i){ @@ -5377,6 +5423,13 @@ SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____g SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_2(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< double >::value_type std_vector_Sl_double_Sg__pop(std::vector< double > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< double,std::allocator< double > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_double_Sg__append(std::vector< double > *self,std::vector< double >::value_type const &x){ self->push_back(x); } @@ -5386,7 +5439,7 @@ SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__insert__SWIG SWIGINTERN void std_vector_Sl_double_Sg__insert__SWIG_1(std::vector< double > *self,std::vector< double >::iterator pos,std::vector< double >::size_type n,std::vector< double >::value_type const &x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<std::vector<std::vector< double,std::allocator< double > >, std::allocator< std::vector< double,std::allocator< double > > > > > { + template <> struct traits<std::vector< std::vector< double,std::allocator< double > >, std::allocator< std::vector< double,std::allocator< double > > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::vector< double,std::allocator< double > >" "," "std::allocator< std::vector< double,std::allocator< double > > >" " >"; @@ -5406,24 +5459,20 @@ SWIGINTERN bool std_vector_Sl_std_vector_Sl_double_Sg__Sg____bool__(std::vector< SWIGINTERN std::vector< std::vector< double > >::size_type std_vector_Sl_std_vector_Sl_double_Sg__Sg____len__(std::vector< std::vector< double > > const *self){ return self->size(); } -SWIGINTERN std::vector< std::vector< double > >::value_type std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(std::vector< std::vector< double > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *std_vector_Sl_std_vector_Sl_double_Sg__Sg____getslice__(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v=std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >()){ +SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >()); + } +SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delslice__(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_0(std::vector< std::vector< double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5432,8 +5481,8 @@ SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allo return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(std::vector< std::vector< double > > *self,PySliceObject *slice,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v){ @@ -5443,8 +5492,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(std::vector< std::vector< double > > *self,PySliceObject *slice){ @@ -5454,8 +5503,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(std::vector< std::vector< double > > *self,PySliceObject *slice){ @@ -5465,8 +5514,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::vector< double > >::value_type const &std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_1(std::vector< std::vector< double > > const *self,std::vector< std::vector< double > >::difference_type i){ @@ -5475,6 +5524,13 @@ SWIGINTERN std::vector< std::vector< double > >::value_type const &std_vector_Sl SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_2(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::vector< double > >::value_type std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(std::vector< std::vector< double > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg__append(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::value_type const &x){ self->push_back(x); } @@ -5510,17 +5566,17 @@ SWIG_AsVal_int (PyObject * obj, int *val) namespace swig { - template <> struct traits<int > { + template <> struct traits< int > { typedef value_category category; static const char* type_name() { return"int"; } - }; - template <> struct traits_asval<int > { + }; + template <> struct traits_asval< int > { typedef int value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_int (obj, val); } }; - template <> struct traits_from<int > { + template <> struct traits_from< int > { typedef int value_type; static PyObject *from(const value_type& val) { return SWIG_From_int (val); @@ -5530,7 +5586,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<int, std::allocator< int > > > { + template <> struct traits<std::vector< int, std::allocator< int > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "int" "," "std::allocator< int >" " >"; @@ -5550,24 +5606,20 @@ SWIGINTERN bool std_vector_Sl_int_Sg____bool__(std::vector< int > const *self){ SWIGINTERN std::vector< int >::size_type std_vector_Sl_int_Sg____len__(std::vector< int > const *self){ return self->size(); } -SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<int,std::allocator< int > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v=std::vector< int,std::allocator< int > >()){ +SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< int,std::allocator< int > >()); + } +SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_1(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getitem____SWIG_0(std::vector< int > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5576,8 +5628,8 @@ SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____get return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *self,PySliceObject *slice,std::vector< int,std::allocator< int > > const &v){ @@ -5587,8 +5639,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ @@ -5598,8 +5650,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ @@ -5609,8 +5661,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem____SWIG_1(std::vector< int > const *self,std::vector< int >::difference_type i){ @@ -5619,6 +5671,13 @@ SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_2(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< int,std::allocator< int > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector< int > *self,std::vector< int >::value_type const &x){ self->push_back(x); } @@ -5628,17 +5687,17 @@ SWIGINTERN std::vector< int >::iterator std_vector_Sl_int_Sg__insert__SWIG_0(std SWIGINTERN void std_vector_Sl_int_Sg__insert__SWIG_1(std::vector< int > *self,std::vector< int >::iterator pos,std::vector< int >::size_type n,std::vector< int >::value_type const &x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<unsigned long > { + template <> struct traits< unsigned long > { typedef value_category category; static const char* type_name() { return"unsigned long"; } - }; - template <> struct traits_asval<unsigned long > { + }; + template <> struct traits_asval< unsigned long > { typedef unsigned long value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_unsigned_SS_long (obj, val); } }; - template <> struct traits_from<unsigned long > { + template <> struct traits_from< unsigned long > { typedef unsigned long value_type; static PyObject *from(const value_type& val) { return SWIG_From_unsigned_SS_long (val); @@ -5648,7 +5707,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<unsigned long, std::allocator< unsigned long > > > { + template <> struct traits<std::vector< unsigned long, std::allocator< unsigned long > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "unsigned long" "," "std::allocator< unsigned long >" " >"; @@ -5668,24 +5727,20 @@ SWIGINTERN bool std_vector_Sl_unsigned_SS_long_Sg____bool__(std::vector< unsigne SWIGINTERN std::vector< unsigned long >::size_type std_vector_Sl_unsigned_SS_long_Sg____len__(std::vector< unsigned long > const *self){ return self->size(); } -SWIGINTERN std::vector< unsigned long >::value_type std_vector_Sl_unsigned_SS_long_Sg__pop(std::vector< unsigned long > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<unsigned long,std::allocator< unsigned long > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vector_Sl_unsigned_SS_long_Sg____getslice__(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j,std::vector< unsigned long,std::allocator< unsigned long > > const &v=std::vector< unsigned long,std::allocator< unsigned long > >()){ +SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< unsigned long,std::allocator< unsigned long > >()); + } +SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j,std::vector< unsigned long,std::allocator< unsigned long > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delslice__(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_0(std::vector< unsigned long > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5694,8 +5749,8 @@ SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vec return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(std::vector< unsigned long > *self,PySliceObject *slice,std::vector< unsigned long,std::allocator< unsigned long > > const &v){ @@ -5705,8 +5760,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(std::vector< unsigned long > *self,PySliceObject *slice){ @@ -5716,8 +5771,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(std::vector< unsigned long > *self,PySliceObject *slice){ @@ -5727,8 +5782,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< unsigned long >::value_type const &std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_1(std::vector< unsigned long > const *self,std::vector< unsigned long >::difference_type i){ @@ -5737,6 +5792,13 @@ SWIGINTERN std::vector< unsigned long >::value_type const &std_vector_Sl_unsigne SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_2(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< unsigned long >::value_type std_vector_Sl_unsigned_SS_long_Sg__pop(std::vector< unsigned long > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< unsigned long,std::allocator< unsigned long > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg__append(std::vector< unsigned long > *self,std::vector< unsigned long >::value_type const &x){ self->push_back(x); } @@ -5764,7 +5826,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val) SWIGINTERNINLINE PyObject* -SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig/3.0.7/typemaps/swigmacros.swg,104,%ifcplusplus@*/ +SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/ const std::complex<double>& @@ -5777,17 +5839,17 @@ const std::complex<double>& namespace swig { - template <> struct traits<std::complex<double> > { + template <> struct traits< std::complex<double> > { typedef value_category category; static const char* type_name() { return"std::complex<double>"; } - }; - template <> struct traits_asval<std::complex<double> > { + }; + template <> struct traits_asval< std::complex<double> > { typedef std::complex<double> value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_std_complex_Sl_double_Sg_ (obj, val); } }; - template <> struct traits_from<std::complex<double> > { + template <> struct traits_from< std::complex<double> > { typedef std::complex<double> value_type; static PyObject *from(const value_type& val) { return SWIG_From_std_complex_Sl_double_Sg_ (val); @@ -5797,7 +5859,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<std::complex< double >, std::allocator< std::complex< double > > > > { + template <> struct traits<std::vector< std::complex< double >, std::allocator< std::complex< double > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::complex< double >" "," "std::allocator< std::complex< double > >" " >"; @@ -5817,24 +5879,20 @@ SWIGINTERN bool std_vector_Sl_std_complex_Sl_double_Sg__Sg____bool__(std::vector SWIGINTERN std::vector< std::complex< double > >::size_type std_vector_Sl_std_complex_Sl_double_Sg__Sg____len__(std::vector< std::complex< double > > const *self){ return self->size(); } -SWIGINTERN std::vector< std::complex< double > >::value_type std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(std::vector< std::complex< double > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< double > > > *std_vector_Sl_std_complex_Sl_double_Sg__Sg____getslice__(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v=std::vector< std::complex< double >,std::allocator< std::complex< double > > >()){ +SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::complex< double >,std::allocator< std::complex< double > > >()); + } +SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delslice__(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< double > > > *std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_0(std::vector< std::complex< double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5843,8 +5901,8 @@ SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< dou return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0(std::vector< std::complex< double > > *self,PySliceObject *slice,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v){ @@ -5854,8 +5912,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1(std::vector< std::complex< double > > *self,PySliceObject *slice){ @@ -5865,8 +5923,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1(std::vector< std::complex< double > > *self,PySliceObject *slice){ @@ -5876,8 +5934,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::complex< double > >::value_type const &std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_1(std::vector< std::complex< double > > const *self,std::vector< std::complex< double > >::difference_type i){ @@ -5886,6 +5944,13 @@ SWIGINTERN std::vector< std::complex< double > >::value_type const &std_vector_S SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_2(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::complex< double > >::value_type std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(std::vector< std::complex< double > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg__append(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::value_type const &x){ self->push_back(x); } @@ -5947,18 +6012,17 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) #else if (*alloc == SWIG_NEWOBJ) #endif - { - *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); - *alloc = SWIG_NEWOBJ; - } - else { + { + *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + *alloc = SWIG_NEWOBJ; + } else { *cptr = cstr; *alloc = SWIG_OLDOBJ; } } else { - #if PY_VERSION_HEX>=0x03000000 - assert(0); /* Should never reach here in Python 3 */ - #endif + #if PY_VERSION_HEX>=0x03000000 + assert(0); /* Should never reach here in Python 3 */ + #endif *cptr = SWIG_Python_str_AsChar(obj); } } @@ -5968,6 +6032,30 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) #endif return SWIG_OK; } else { +#if defined(SWIG_PYTHON_2_UNICODE) +#if PY_VERSION_HEX<0x03000000 + if (PyUnicode_Check(obj)) { + char *cstr; Py_ssize_t len; + if (!alloc && cptr) { + return SWIG_RuntimeError; + } + obj = PyUnicode_AsUTF8String(obj); + if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) { + if (cptr) { + if (alloc) *alloc = SWIG_NEWOBJ; + *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + } + if (psize) *psize = len + 1; + + Py_XDECREF(obj); + return SWIG_OK; + } else { + Py_XDECREF(obj); + } + } +#endif +#endif + swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); if (pchar_descriptor) { void* vptr = 0; @@ -6043,12 +6131,12 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) } else { #if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03010000 - return PyUnicode_DecodeUTF8(carray, static_cast< int >(size), "surrogateescape"); + return PyUnicode_DecodeUTF8(carray, static_cast< Py_ssize_t >(size), "surrogateescape"); #else - return PyUnicode_FromStringAndSize(carray, static_cast< int >(size)); + return PyUnicode_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif #else - return PyString_FromStringAndSize(carray, static_cast< int >(size)); + return PyString_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif } } else { @@ -6065,17 +6153,17 @@ SWIG_From_std_string (const std::string& s) namespace swig { - template <> struct traits<std::string > { + template <> struct traits< std::string > { typedef value_category category; static const char* type_name() { return"std::string"; } - }; - template <> struct traits_asval<std::string > { + }; + template <> struct traits_asval< std::string > { typedef std::string value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_std_string (obj, val); } }; - template <> struct traits_from<std::string > { + template <> struct traits_from< std::string > { typedef std::string value_type; static PyObject *from(const value_type& val) { return SWIG_From_std_string (val); @@ -6085,7 +6173,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<std::string, std::allocator< std::string > > > { + template <> struct traits<std::vector< std::string, std::allocator< std::string > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::string" "," "std::allocator< std::string >" " >"; @@ -6105,24 +6193,20 @@ SWIGINTERN bool std_vector_Sl_std_string_Sg____bool__(std::vector< std::string > SWIGINTERN std::vector< std::string >::size_type std_vector_Sl_std_string_Sg____len__(std::vector< std::string > const *self){ return self->size(); } -SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__pop(std::vector< std::string > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::string,std::allocator< std::string > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_Sl_std_string_Sg____getslice__(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j,std::vector< std::string,std::allocator< std::string > > const &v=std::vector< std::string,std::allocator< std::string > >()){ +SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::string,std::allocator< std::string > >()); + } +SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_1(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j,std::vector< std::string,std::allocator< std::string > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_string_Sg____delslice__(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_Sl_std_string_Sg____getitem____SWIG_0(std::vector< std::string > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6131,8 +6215,8 @@ SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_ return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_0(std::vector< std::string > *self,PySliceObject *slice,std::vector< std::string,std::allocator< std::string > > const &v){ @@ -6142,8 +6226,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_0(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_1(std::vector< std::string > *self,PySliceObject *slice){ @@ -6153,8 +6237,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_1(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_1(std::vector< std::string > *self,PySliceObject *slice){ @@ -6164,8 +6248,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_1(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::string >::value_type const &std_vector_Sl_std_string_Sg____getitem____SWIG_1(std::vector< std::string > const *self,std::vector< std::string >::difference_type i){ @@ -6174,6 +6258,13 @@ SWIGINTERN std::vector< std::string >::value_type const &std_vector_Sl_std_strin SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_2(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__pop(std::vector< std::string > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::string,std::allocator< std::string > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_string_Sg__append(std::vector< std::string > *self,std::vector< std::string >::value_type const &x){ self->push_back(x); } @@ -6344,7 +6435,45 @@ SWIG_AsVal_bool (PyObject *obj, bool *val) return SWIG_OK; } -SWIGINTERN void IParameterized_registerParameter__SWIG_2(IParameterized *self,std::string const &name,long parpointer,AttLimits const &limits=AttLimits::limitless()){ + +SWIGINTERN int +SWIG_AsVal_long_SS_long (PyObject *obj, long long *val) +{ + int res = SWIG_TypeError; + if (PyLong_Check(obj)) { + long long v = PyLong_AsLongLong(obj); + if (!PyErr_Occurred()) { + if (val) *val = v; + return SWIG_OK; + } else { + PyErr_Clear(); + res = SWIG_OverflowError; + } + } else { + long v; + res = SWIG_AsVal_long (obj,&v); + if (SWIG_IsOK(res)) { + if (val) *val = v; + return res; + } + } +#ifdef SWIG_PYTHON_CAST_MODE + { + const double mant_max = 1LL << DBL_MANT_DIG; + const double mant_min = -mant_max; + double d; + res = SWIG_AsVal_double (obj,&d); + if (SWIG_IsOK(res) && SWIG_CanCastAsInteger(&d, mant_min, mant_max)) { + if (val) *val = (long long)(d); + return SWIG_AddCast(res); + } + res = SWIG_TypeError; + } +#endif + return res; +} + +SWIGINTERN void IParameterized_registerParameter__SWIG_2(IParameterized *self,std::string const &name,int64_t parpointer,AttLimits const &limits=AttLimits::limitless()){ return (*(self)).registerParameter(name, (double*)parpointer, limits); } SWIGINTERN Geometry::BasicVector3D< double > Geometry_BasicVector3D_Sl_double_Sg____add__(Geometry::BasicVector3D< double > const *self,Geometry::BasicVector3D< double > const &rhs){ @@ -6358,7 +6487,7 @@ SWIGINTERN Geometry::BasicVector3D< double > Geometry_BasicVector3D_Sl_double_Sg } namespace swig { - template <> struct traits<Geometry::BasicVector3D< double > > { + template <> struct traits< Geometry::BasicVector3D< double > > { typedef pointer_category category; static const char* type_name() { return"Geometry::BasicVector3D< double >"; } }; @@ -6366,7 +6495,7 @@ SWIGINTERN Geometry::BasicVector3D< double > Geometry_BasicVector3D_Sl_double_Sg namespace swig { - template <> struct traits<std::vector<Geometry::BasicVector3D< double >, std::allocator< Geometry::BasicVector3D< double > > > > { + template <> struct traits<std::vector< Geometry::BasicVector3D< double >, std::allocator< Geometry::BasicVector3D< double > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "Geometry::BasicVector3D< double >" "," "std::allocator< Geometry::BasicVector3D< double > >" " >"; @@ -6386,24 +6515,20 @@ SWIGINTERN bool std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____bool__( SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::size_type std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____len__(std::vector< Geometry::BasicVector3D< double > > const *self){ return self->size(); } -SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::value_type std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__pop(std::vector< Geometry::BasicVector3D< double > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____getslice__(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::difference_type j,std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &v=std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >()){ +SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >()); + } +SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_1(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::difference_type j,std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____delslice__(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____delitem____SWIG_0(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____getitem____SWIG_0(std::vector< Geometry::BasicVector3D< double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6412,8 +6537,8 @@ SWIGINTERN std::vector< Geometry::BasicVector3D< double >,std::allocator< Geomet return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_0(std::vector< Geometry::BasicVector3D< double > > *self,PySliceObject *slice,std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &v){ @@ -6423,8 +6548,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setitem return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_1(std::vector< Geometry::BasicVector3D< double > > *self,PySliceObject *slice){ @@ -6434,8 +6559,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setitem return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____delitem____SWIG_1(std::vector< Geometry::BasicVector3D< double > > *self,PySliceObject *slice){ @@ -6445,8 +6570,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____delitem return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::value_type const &std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____getitem____SWIG_1(std::vector< Geometry::BasicVector3D< double > > const *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i){ @@ -6455,6 +6580,13 @@ SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::value_type const &s SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setitem____SWIG_2(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::difference_type i,std::vector< Geometry::BasicVector3D< double > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::value_type std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__pop(std::vector< Geometry::BasicVector3D< double > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__append(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::value_type const &x){ self->push_back(x); } @@ -6464,7 +6596,7 @@ SWIGINTERN std::vector< Geometry::BasicVector3D< double > >::iterator std_vector SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__insert__SWIG_1(std::vector< Geometry::BasicVector3D< double > > *self,std::vector< Geometry::BasicVector3D< double > >::iterator pos,std::vector< Geometry::BasicVector3D< double > >::size_type n,std::vector< Geometry::BasicVector3D< double > >::value_type const &x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<Geometry::BasicVector3D< std::complex< double > > > { + template <> struct traits< Geometry::BasicVector3D< std::complex< double > > > { typedef pointer_category category; static const char* type_name() { return"Geometry::BasicVector3D< std::complex< double > >"; } }; @@ -6472,7 +6604,7 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__insert__S namespace swig { - template <> struct traits<std::vector<Geometry::BasicVector3D< std::complex< double > >, std::allocator< Geometry::BasicVector3D< std::complex< double > > > > > { + template <> struct traits<std::vector< Geometry::BasicVector3D< std::complex< double > >, std::allocator< Geometry::BasicVector3D< std::complex< double > > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "Geometry::BasicVector3D< std::complex< double > >" "," "std::allocator< Geometry::BasicVector3D< std::complex< double > > >" " >"; @@ -6492,24 +6624,20 @@ SWIGINTERN bool std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > > >::size_type std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____len__(std::vector< Geometry::BasicVector3D< std::complex< double > > > const *self){ return self->size(); } -SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__pop(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j,std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &v=std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >()){ +SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >()); + } +SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_1(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j,std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delitem____SWIG_0(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getitem____SWIG_0(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6518,8 +6646,8 @@ SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > >,std::a return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_0(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,PySliceObject *slice,std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &v){ @@ -6529,8 +6657,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_1(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,PySliceObject *slice){ @@ -6540,8 +6668,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____delitem____SWIG_1(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,PySliceObject *slice){ @@ -6551,8 +6679,8 @@ SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type id = i; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type const &std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____getitem____SWIG_1(std::vector< Geometry::BasicVector3D< std::complex< double > > > const *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i){ @@ -6561,6 +6689,13 @@ SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > > >::val SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setitem____SWIG_2(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i,std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__pop(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__append(std::vector< Geometry::BasicVector3D< std::complex< double > > > *self,std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type const &x){ self->push_back(x); } @@ -6592,7 +6727,7 @@ SWIGINTERN double VariableBinAxis___getitem__(VariableBinAxis *self,unsigned int } namespace swig { - template <> struct traits<ISample > { + template <> struct traits< ISample > { typedef pointer_category category; static const char* type_name() { return"ISample"; } }; @@ -6600,7 +6735,7 @@ SWIGINTERN double VariableBinAxis___getitem__(VariableBinAxis *self,unsigned int namespace swig { - template <> struct traits<std::vector<ISample*, std::allocator< ISample * > > > { + template <> struct traits<std::vector< ISample*, std::allocator< ISample * > > > { typedef value_category category; static const char* type_name() { return "std::vector<" "ISample" " *," "std::allocator< ISample * >" " >"; @@ -6620,24 +6755,20 @@ SWIGINTERN bool std_vector_Sl_ISample_Sm__Sg____bool__(std::vector< ISample * > SWIGINTERN std::vector< ISample * >::size_type std_vector_Sl_ISample_Sm__Sg____len__(std::vector< ISample * > const *self){ return self->size(); } -SWIGINTERN std::vector< ISample * >::value_type std_vector_Sl_ISample_Sm__Sg__pop(std::vector< ISample * > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<ISample*,std::allocator< ISample * > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< ISample *,std::allocator< ISample * > > *std_vector_Sl_ISample_Sm__Sg____getslice__(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_0(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::difference_type j,std::vector< ISample *,std::allocator< ISample * > > const &v=std::vector< ISample *,std::allocator< ISample * > >()){ +SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_0(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< ISample*,std::allocator< ISample * > >()); + } +SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_1(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::difference_type j,std::vector< ISample *,std::allocator< ISample * > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____delslice__(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____delitem____SWIG_0(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< ISample *,std::allocator< ISample * > > *std_vector_Sl_ISample_Sm__Sg____getitem____SWIG_0(std::vector< ISample * > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6646,8 +6777,8 @@ SWIGINTERN std::vector< ISample *,std::allocator< ISample * > > *std_vector_Sl_I return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample*,std::allocator< ISample * > >::difference_type id = i; - std::vector<ISample*,std::allocator< ISample * > >::difference_type jd = j; + std::vector< ISample*,std::allocator< ISample * > >::difference_type id = i; + std::vector< ISample*,std::allocator< ISample * > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setitem____SWIG_0(std::vector< ISample * > *self,PySliceObject *slice,std::vector< ISample *,std::allocator< ISample * > > const &v){ @@ -6657,8 +6788,8 @@ SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setitem____SWIG_0(std::vector< I return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample*,std::allocator< ISample * > >::difference_type id = i; - std::vector<ISample*,std::allocator< ISample * > >::difference_type jd = j; + std::vector< ISample*,std::allocator< ISample * > >::difference_type id = i; + std::vector< ISample*,std::allocator< ISample * > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setitem____SWIG_1(std::vector< ISample * > *self,PySliceObject *slice){ @@ -6668,8 +6799,8 @@ SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setitem____SWIG_1(std::vector< I return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample*,std::allocator< ISample * > >::difference_type id = i; - std::vector<ISample*,std::allocator< ISample * > >::difference_type jd = j; + std::vector< ISample*,std::allocator< ISample * > >::difference_type id = i; + std::vector< ISample*,std::allocator< ISample * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____delitem____SWIG_1(std::vector< ISample * > *self,PySliceObject *slice){ @@ -6679,8 +6810,8 @@ SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____delitem____SWIG_1(std::vector< I return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample*,std::allocator< ISample * > >::difference_type id = i; - std::vector<ISample*,std::allocator< ISample * > >::difference_type jd = j; + std::vector< ISample*,std::allocator< ISample * > >::difference_type id = i; + std::vector< ISample*,std::allocator< ISample * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< ISample * >::value_type std_vector_Sl_ISample_Sm__Sg____getitem____SWIG_1(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i){ @@ -6689,6 +6820,13 @@ SWIGINTERN std::vector< ISample * >::value_type std_vector_Sl_ISample_Sm__Sg____ SWIGINTERN void std_vector_Sl_ISample_Sm__Sg____setitem____SWIG_2(std::vector< ISample * > *self,std::vector< ISample * >::difference_type i,std::vector< ISample * >::value_type x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< ISample * >::value_type std_vector_Sl_ISample_Sm__Sg__pop(std::vector< ISample * > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< ISample*,std::allocator< ISample * > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_ISample_Sm__Sg__append(std::vector< ISample * > *self,std::vector< ISample * >::value_type x){ self->push_back(x); } @@ -6698,7 +6836,7 @@ SWIGINTERN std::vector< ISample * >::iterator std_vector_Sl_ISample_Sm__Sg__inse SWIGINTERN void std_vector_Sl_ISample_Sm__Sg__insert__SWIG_1(std::vector< ISample * > *self,std::vector< ISample * >::iterator pos,std::vector< ISample * >::size_type n,std::vector< ISample * >::value_type x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<std::vector<ISample const*, std::allocator< ISample const * > > > { + template <> struct traits<std::vector< ISample const*, std::allocator< ISample const * > > > { typedef value_category category; static const char* type_name() { return "std::vector<" "ISample" " const*," "std::allocator< ISample const * >" " >"; @@ -6718,24 +6856,20 @@ SWIGINTERN bool std_vector_Sl_ISample_SS_const_Sm__Sg____bool__(std::vector< ISa SWIGINTERN std::vector< ISample const * >::size_type std_vector_Sl_ISample_SS_const_Sm__Sg____len__(std::vector< ISample const * > const *self){ return self->size(); } -SWIGINTERN std::vector< ISample const * >::value_type std_vector_Sl_ISample_SS_const_Sm__Sg__pop(std::vector< ISample const * > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<ISample const*,std::allocator< ISample const * > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< ISample const *,std::allocator< ISample const * > > *std_vector_Sl_ISample_SS_const_Sm__Sg____getslice__(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_0(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::difference_type j,std::vector< ISample const *,std::allocator< ISample const * > > const &v=std::vector< ISample const *,std::allocator< ISample const * > >()){ +SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_0(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< ISample const*,std::allocator< ISample const * > >()); + } +SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_1(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::difference_type j,std::vector< ISample const *,std::allocator< ISample const * > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____delslice__(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____delitem____SWIG_0(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< ISample const *,std::allocator< ISample const * > > *std_vector_Sl_ISample_SS_const_Sm__Sg____getitem____SWIG_0(std::vector< ISample const * > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6744,8 +6878,8 @@ SWIGINTERN std::vector< ISample const *,std::allocator< ISample const * > > *std return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type id = i; - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type jd = j; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type id = i; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setitem____SWIG_0(std::vector< ISample const * > *self,PySliceObject *slice,std::vector< ISample const *,std::allocator< ISample const * > > const &v){ @@ -6755,8 +6889,8 @@ SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setitem____SWIG_0(std:: return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type id = i; - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type jd = j; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type id = i; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setitem____SWIG_1(std::vector< ISample const * > *self,PySliceObject *slice){ @@ -6766,8 +6900,8 @@ SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setitem____SWIG_1(std:: return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type id = i; - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type jd = j; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type id = i; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____delitem____SWIG_1(std::vector< ISample const * > *self,PySliceObject *slice){ @@ -6777,8 +6911,8 @@ SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____delitem____SWIG_1(std:: return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type id = i; - std::vector<ISample const*,std::allocator< ISample const * > >::difference_type jd = j; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type id = i; + std::vector< ISample const*,std::allocator< ISample const * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< ISample const * >::value_type std_vector_Sl_ISample_SS_const_Sm__Sg____getitem____SWIG_1(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i){ @@ -6787,6 +6921,13 @@ SWIGINTERN std::vector< ISample const * >::value_type std_vector_Sl_ISample_SS_c SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg____setitem____SWIG_2(std::vector< ISample const * > *self,std::vector< ISample const * >::difference_type i,std::vector< ISample const * >::value_type x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< ISample const * >::value_type std_vector_Sl_ISample_SS_const_Sm__Sg__pop(std::vector< ISample const * > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< ISample const*,std::allocator< ISample const * > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_ISample_SS_const_Sm__Sg__append(std::vector< ISample const * > *self,std::vector< ISample const * >::value_type x){ self->push_back(x); } @@ -6807,8 +6948,10 @@ struct SWIG_null_deleter { #define SWIG_NO_NULL_DELETER_SWIG_BUILTIN_INIT -SWIGINTERN void ISampleBuilder_registerParameter__SWIG_0(ISampleBuilder *self,std::string const &name,long parpointer,AttLimits const &limits=AttLimits::limitless()){ - return (*(self)).registerParameter(name, (double*)parpointer, limits); +SWIGINTERN void ISampleBuilder_registerParameter__SWIG_0(ISampleBuilder *self,std::string const &name,int64_t parpointer,AttLimits const &limits=AttLimits::limitless()){ + std::cout << "value passed to ISampleBuilder::registerParameter: " << (double*)parpointer << std::endl; + std::cout << "current value of the parameters: " << *(double*)parpointer << std::endl; + return (*(self)).registerParameter(name, (double*)parpointer, limits); } SWIGINTERN bool ISampleBuilder_setParameterValue(ISampleBuilder *self,std::string const &name,double value){ return dynamic_cast<IParameterized*>(self)->setParameterValue(name, value); @@ -6818,7 +6961,7 @@ SWIGINTERN double FixedBinAxis___getitem__(FixedBinAxis *self,unsigned int i){ } namespace swig { - template <> struct traits<IFormFactor > { + template <> struct traits< IFormFactor > { typedef pointer_category category; static const char* type_name() { return"IFormFactor"; } }; @@ -6826,7 +6969,7 @@ SWIGINTERN double FixedBinAxis___getitem__(FixedBinAxis *self,unsigned int i){ namespace swig { - template <> struct traits<std::vector<IFormFactor*, std::allocator< IFormFactor * > > > { + template <> struct traits<std::vector< IFormFactor*, std::allocator< IFormFactor * > > > { typedef value_category category; static const char* type_name() { return "std::vector<" "IFormFactor" " *," "std::allocator< IFormFactor * >" " >"; @@ -6846,24 +6989,20 @@ SWIGINTERN bool std_vector_Sl_IFormFactor_Sm__Sg____bool__(std::vector< IFormFac SWIGINTERN std::vector< IFormFactor * >::size_type std_vector_Sl_IFormFactor_Sm__Sg____len__(std::vector< IFormFactor * > const *self){ return self->size(); } -SWIGINTERN std::vector< IFormFactor * >::value_type std_vector_Sl_IFormFactor_Sm__Sg__pop(std::vector< IFormFactor * > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< IFormFactor *,std::allocator< IFormFactor * > > *std_vector_Sl_IFormFactor_Sm__Sg____getslice__(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::difference_type j,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &v=std::vector< IFormFactor *,std::allocator< IFormFactor * > >()){ +SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< IFormFactor*,std::allocator< IFormFactor * > >()); + } +SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_1(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::difference_type j,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____delslice__(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____delitem____SWIG_0(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< IFormFactor *,std::allocator< IFormFactor * > > *std_vector_Sl_IFormFactor_Sm__Sg____getitem____SWIG_0(std::vector< IFormFactor * > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -6872,8 +7011,8 @@ SWIGINTERN std::vector< IFormFactor *,std::allocator< IFormFactor * > > *std_vec return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_0(std::vector< IFormFactor * > *self,PySliceObject *slice,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &v){ @@ -6883,8 +7022,8 @@ SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_0(std::vecto return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_1(std::vector< IFormFactor * > *self,PySliceObject *slice){ @@ -6894,8 +7033,8 @@ SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_1(std::vecto return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____delitem____SWIG_1(std::vector< IFormFactor * > *self,PySliceObject *slice){ @@ -6905,8 +7044,8 @@ SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____delitem____SWIG_1(std::vecto return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; - std::vector<IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type id = i; + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< IFormFactor * >::value_type std_vector_Sl_IFormFactor_Sm__Sg____getitem____SWIG_1(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i){ @@ -6915,6 +7054,13 @@ SWIGINTERN std::vector< IFormFactor * >::value_type std_vector_Sl_IFormFactor_Sm SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg____setitem____SWIG_2(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::difference_type i,std::vector< IFormFactor * >::value_type x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< IFormFactor * >::value_type std_vector_Sl_IFormFactor_Sm__Sg__pop(std::vector< IFormFactor * > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< IFormFactor*,std::allocator< IFormFactor * > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_IFormFactor_Sm__Sg__append(std::vector< IFormFactor * > *self,std::vector< IFormFactor * >::value_type x){ self->push_back(x); } @@ -7748,7 +7894,7 @@ std::vector< ISample const *,std::allocator< ISample const * > > SwigDirector_IF Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactor.getChildren'"); } } - std::vector<ISample const*,std::allocator< ISample const * > > *swig_optr = 0; + std::vector< ISample const*,std::allocator< ISample const * > > *swig_optr = 0; int swig_ores = swig::asptr(result, &swig_optr); if (!SWIG_IsOK(swig_ores) || !swig_optr) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::vector< ISample const *,std::allocator< ISample const * > >""'"); @@ -8200,7 +8346,7 @@ std::vector< ISample const *,std::allocator< ISample const * > > SwigDirector_IF Swig::DirectorMethodException::raise("Error detected when calling 'IFormFactorBorn.getChildren'"); } } - std::vector<ISample const*,std::allocator< ISample const * > > *swig_optr = 0; + std::vector< ISample const*,std::allocator< ISample const * > > *swig_optr = 0; int swig_ores = swig::asptr(result, &swig_optr); if (!SWIG_IsOK(swig_ores) || !swig_optr) { Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError((swig_optr ? swig_ores : SWIG_TypeError))), "in output value of type '""std::vector< ISample const *,std::allocator< ISample const * > >""'"); @@ -8623,14 +8769,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -8742,14 +8888,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -9293,14 +9439,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -9447,34 +9593,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< double >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - try { - result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_double(static_cast< double >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble1d_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -9529,20 +9647,17 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; std::vector< double >::difference_type arg3 ; - std::vector< double,std::allocator< double > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); @@ -9558,19 +9673,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'"); } arg3 = static_cast< std::vector< double >::difference_type >(val3); - { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4); + std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -9580,10 +9684,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -9593,17 +9695,20 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; std::vector< double >::difference_type arg3 ; + std::vector< double,std::allocator< double > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); @@ -9619,8 +9724,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'"); } arg3 = static_cast< std::vector< double >::difference_type >(val3); + { + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_double_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -9630,27 +9746,29 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9663,14 +9781,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vdouble1d_t___setslice____SWIG_1(self, args); + return _wrap_vdouble1d_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9683,10 +9801,10 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vdouble1d_t___setslice____SWIG_0(self, args); + return _wrap_vdouble1d_t___setslice____SWIG_1(self, args); } } } @@ -9696,8 +9814,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n" - " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n"); + " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n" + " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n"); return 0; } @@ -9778,6 +9896,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -9850,7 +9971,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP arg2 = (PySliceObject *) obj1; } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -9956,20 +10077,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9982,7 +10103,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10042,20 +10163,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10068,7 +10189,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10138,20 +10259,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10164,14 +10285,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble1d_t___setitem____SWIG_0(self, args); @@ -10181,7 +10302,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10210,6 +10331,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< double >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + try { + result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vdouble1d_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -10264,7 +10413,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > const &""'"); @@ -10328,27 +10477,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble1d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -10382,28 +10510,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< double > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - result = ((std::vector< double > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< double >::allocator_type(static_cast< const std::vector< double >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_double_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble1d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -10496,6 +10602,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< double > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + result = ((std::vector< double > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< double >::allocator_type(static_cast< const std::vector< double >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_double_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double >::size_type arg1 ; @@ -10661,20 +10810,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -10687,7 +10836,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -10747,14 +10896,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -10773,7 +10922,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble1d_t__SWIG_1(self, args); @@ -10966,20 +11115,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10993,7 +11142,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11127,20 +11276,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -11159,7 +11308,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) { } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -11362,34 +11511,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::vector< double > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - try { - result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -11444,20 +11565,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; std::vector< std::vector< double > >::difference_type arg2 ; std::vector< std::vector< double > >::difference_type arg3 ; - std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); @@ -11473,19 +11591,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3); - { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4); + std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -11495,10 +11602,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -11508,17 +11613,20 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; std::vector< std::vector< double > >::difference_type arg2 ; std::vector< std::vector< double > >::difference_type arg3 ; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); @@ -11534,8 +11642,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3); + { + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -11545,27 +11664,29 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11578,14 +11699,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vdouble2d_t___setslice____SWIG_1(self, args); + return _wrap_vdouble2d_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11598,10 +11719,10 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vdouble2d_t___setslice____SWIG_0(self, args); + return _wrap_vdouble2d_t___setslice____SWIG_1(self, args); } } } @@ -11611,8 +11732,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n" - " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n"); + " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n" + " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"); return 0; } @@ -11693,6 +11814,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -11765,7 +11889,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP arg2 = (PySliceObject *) obj1; } { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); @@ -11871,20 +11995,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11897,7 +12021,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11949,7 +12073,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -11957,20 +12081,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11983,7 +12107,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12031,7 +12155,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP } arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12058,20 +12182,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12084,14 +12208,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t___setitem____SWIG_0(self, args); @@ -12101,7 +12225,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12109,7 +12233,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t___setitem____SWIG_2(self, args); @@ -12128,6 +12252,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::vector< double > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + try { + result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -12145,7 +12297,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), Py } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_append" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12187,7 +12339,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail; { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > > > const &""'"); @@ -12251,27 +12403,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -12305,28 +12436,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - result = ((std::vector< std::vector< double > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::vector< double > >::allocator_type(static_cast< const std::vector< std::vector< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -12419,6 +12528,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + result = ((std::vector< std::vector< double > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::vector< double > >::allocator_type(static_cast< const std::vector< std::vector< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > >::size_type arg1 ; @@ -12584,20 +12736,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12610,7 +12762,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12654,7 +12806,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self } arg1 = static_cast< std::vector< std::vector< double > >::size_type >(val1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vdouble2d_t" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12675,14 +12827,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -12701,7 +12853,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble2d_t__SWIG_1(self, args); @@ -12714,7 +12866,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble2d_t__SWIG_3(self, args); @@ -12750,7 +12902,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_push_back(PyObject *SWIGUNUSEDPARM(self), } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_push_back" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12785,7 +12937,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->front(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -12807,7 +12959,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->back(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -12840,7 +12992,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py } arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_assign" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12886,7 +13038,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s } arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_resize" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -12907,20 +13059,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12934,7 +13086,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12942,7 +13094,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_resize__SWIG_1(self, args); @@ -12993,7 +13145,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s } } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -13055,7 +13207,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s } arg3 = static_cast< std::vector< std::vector< double > >::size_type >(val3); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res4 = swig::asptr(obj3, &ptr); if (!SWIG_IsOK(res4)) { SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t_insert" "', argument " "4"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -13076,27 +13228,27 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0)); if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_insert__SWIG_0(self, args); @@ -13106,7 +13258,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -13118,7 +13270,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_insert__SWIG_1(self, args); @@ -13307,34 +13459,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< int >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - try { - result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_int(static_cast< int >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_integer_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -13389,20 +13513,17 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; std::vector< int >::difference_type arg3 ; - std::vector< int,std::allocator< int > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); @@ -13418,19 +13539,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'"); } arg3 = static_cast< std::vector< int >::difference_type >(val3); - { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4); + std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -13440,10 +13550,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -13453,17 +13561,20 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; std::vector< int >::difference_type arg3 ; + std::vector< int,std::allocator< int > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); @@ -13479,8 +13590,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'"); } arg3 = static_cast< std::vector< int >::difference_type >(val3); + { + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_int_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -13490,27 +13612,29 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13523,14 +13647,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_integer_t___setslice____SWIG_1(self, args); + return _wrap_vector_integer_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13543,10 +13667,10 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_integer_t___setslice____SWIG_0(self, args); + return _wrap_vector_integer_t___setslice____SWIG_1(self, args); } } } @@ -13556,8 +13680,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n" - " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n"); + " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n" + " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n"); return 0; } @@ -13638,6 +13762,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -13710,7 +13837,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); @@ -13816,20 +13943,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13842,7 +13969,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13902,20 +14029,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13928,7 +14055,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13998,20 +14125,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14024,14 +14151,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_integer_t___setitem____SWIG_0(self, args); @@ -14041,7 +14168,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14070,6 +14197,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< int >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + try { + result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_integer_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -14124,7 +14279,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail; { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > const &""'"); @@ -14188,27 +14343,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_integer_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -14242,28 +14376,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< int > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - result = ((std::vector< int > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_int_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_integer_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -14356,6 +14468,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< int > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + result = ((std::vector< int > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_int_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int >::size_type arg1 ; @@ -14521,20 +14676,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14547,7 +14702,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14607,14 +14762,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -14633,7 +14788,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_integer_t__SWIG_1(self, args); @@ -14826,20 +14981,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14853,7 +15008,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14987,20 +15142,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -15019,7 +15174,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -15222,34 +15377,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< unsigned long >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - try { - result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -15304,20 +15431,17 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; std::vector< unsigned long >::difference_type arg2 ; std::vector< unsigned long >::difference_type arg3 ; - std::vector< unsigned long,std::allocator< unsigned long > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); @@ -15333,19 +15457,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'"); } arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3); - { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4); + std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -15355,10 +15468,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -15368,17 +15479,20 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; std::vector< unsigned long >::difference_type arg2 ; std::vector< unsigned long >::difference_type arg3 ; + std::vector< unsigned long,std::allocator< unsigned long > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); @@ -15394,8 +15508,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'"); } arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3); + { + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -15405,27 +15530,29 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15438,14 +15565,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args); + return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15458,10 +15585,10 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args); + return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args); } } } @@ -15471,8 +15598,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n" - " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n"); + " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n" + " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n"); return 0; } @@ -15553,6 +15680,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SW catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -15625,7 +15755,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW arg2 = (PySliceObject *) obj1; } { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); @@ -15731,20 +15861,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15757,7 +15887,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15817,20 +15947,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15843,7 +15973,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15913,20 +16043,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15939,14 +16069,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_longinteger_t___setitem____SWIG_0(self, args); @@ -15956,7 +16086,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15985,6 +16115,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< unsigned long >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + try { + result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_longinteger_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -16039,7 +16197,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail; { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > const &""'"); @@ -16103,27 +16261,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -16157,28 +16294,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< unsigned long > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - result = ((std::vector< unsigned long > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< unsigned long >::allocator_type(static_cast< const std::vector< unsigned long >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_unsigned_long_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -16271,6 +16386,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< unsigned long > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + result = ((std::vector< unsigned long > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< unsigned long >::allocator_type(static_cast< const std::vector< unsigned long >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_unsigned_long_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long >::size_type arg1 ; @@ -16436,20 +16594,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16462,7 +16620,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject * } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16522,14 +16680,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -16548,7 +16706,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_longinteger_t__SWIG_1(self, args); @@ -16741,20 +16899,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16768,7 +16926,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16902,20 +17060,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16934,7 +17092,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -17137,34 +17295,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::complex< double > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - try { - result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_complex_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -17219,20 +17349,17 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; std::vector< std::complex< double > >::difference_type arg2 ; std::vector< std::complex< double > >::difference_type arg3 ; - std::vector< std::complex< double >,std::allocator< std::complex< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); @@ -17248,19 +17375,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3); - { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4); + std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -17270,10 +17386,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -17283,17 +17397,20 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; std::vector< std::complex< double > >::difference_type arg2 ; std::vector< std::complex< double > >::difference_type arg3 ; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); @@ -17309,8 +17426,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3); + { + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -17320,27 +17448,29 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17353,14 +17483,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_complex_t___setslice____SWIG_1(self, args); + return _wrap_vector_complex_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17373,10 +17503,10 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_complex_t___setslice____SWIG_0(self, args); + return _wrap_vector_complex_t___setslice____SWIG_1(self, args); } } } @@ -17386,8 +17516,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n" - " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n"); + " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n" + " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n"); return 0; } @@ -17468,6 +17598,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -17540,7 +17673,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); @@ -17646,20 +17779,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17672,7 +17805,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17732,20 +17865,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17758,7 +17891,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17828,20 +17961,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17854,14 +17987,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_complex_t___setitem____SWIG_0(self, args); @@ -17871,7 +18004,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17900,6 +18033,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::complex< double > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); + try { + result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_complex_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -17954,7 +18115,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail; { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > const &""'"); @@ -18018,27 +18179,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_complex_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -18072,28 +18212,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::complex< double > > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); - } - arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = ((std::vector< std::complex< double > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::complex< double > >::allocator_type(static_cast< const std::vector< std::complex< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -18186,6 +18304,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< std::complex< double > > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); + } + arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); + result = ((std::vector< std::complex< double > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::complex< double > >::allocator_type(static_cast< const std::vector< std::complex< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > >::size_type arg1 ; @@ -18351,20 +18512,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18377,7 +18538,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18437,14 +18598,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -18463,7 +18624,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_complex_t__SWIG_1(self, args); @@ -18656,20 +18817,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -18683,7 +18844,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -18817,20 +18978,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18849,7 +19010,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -19052,34 +19213,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::string >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - try { - result = std_vector_Sl_std_string_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_std_string(static_cast< std::string >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -19134,20 +19267,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; std::vector< std::string >::difference_type arg2 ; std::vector< std::string >::difference_type arg3 ; - std::vector< std::string,std::allocator< std::string > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); @@ -19163,19 +19293,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'"); } arg3 = static_cast< std::vector< std::string >::difference_type >(val3); - { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4); + std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -19185,10 +19304,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -19198,17 +19315,20 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; std::vector< std::string >::difference_type arg2 ; std::vector< std::string >::difference_type arg3 ; + std::vector< std::string,std::allocator< std::string > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); @@ -19224,8 +19344,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'"); } arg3 = static_cast< std::vector< std::string >::difference_type >(val3); + { + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_string_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -19235,27 +19366,29 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19268,14 +19401,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_string_t___setslice____SWIG_1(self, args); + return _wrap_vector_string_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19288,10 +19421,10 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_string_t___setslice____SWIG_0(self, args); + return _wrap_vector_string_t___setslice____SWIG_1(self, args); } } } @@ -19301,8 +19434,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n" - " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n"); + " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n" + " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n"); return 0; } @@ -19383,6 +19516,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNU catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -19455,7 +19591,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU arg2 = (PySliceObject *) obj1; } { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); @@ -19561,20 +19697,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19587,7 +19723,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19647,20 +19783,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19673,7 +19809,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19748,20 +19884,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19774,14 +19910,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_string_t___setitem____SWIG_0(self, args); @@ -19791,7 +19927,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -19818,6 +19954,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::string >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + try { + result = std_vector_Sl_std_string_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_std_string(static_cast< std::string >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_string_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -19877,7 +20041,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM( if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail; { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > const &""'"); @@ -19941,27 +20105,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -19995,28 +20138,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::string > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - result = ((std::vector< std::string > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::string >::allocator_type(static_cast< const std::vector< std::string >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__string_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -20109,6 +20230,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< std::string > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + result = ((std::vector< std::string > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::string >::allocator_type(static_cast< const std::vector< std::string >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__string_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string >::size_type arg1 ; @@ -20274,20 +20438,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -20300,7 +20464,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args) } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -20365,14 +20529,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -20391,7 +20555,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_string_t__SWIG_1(self, args); @@ -20597,20 +20761,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -20624,7 +20788,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -20766,20 +20930,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -20796,7 +20960,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -21636,14 +21800,14 @@ fail: SWIGINTERN PyObject *_wrap_new_INamed(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -21845,14 +22009,14 @@ fail: SWIGINTERN PyObject *_wrap_new_IParameterized(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -22248,12 +22412,12 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter__SWIG_2(PyObject *SW PyObject *resultobj = 0; IParameterized *arg1 = (IParameterized *) 0 ; std::string *arg2 = 0 ; - long arg3 ; + int64_t arg3 ; AttLimits *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; int res2 = SWIG_OLDOBJ ; - long val3 ; + long long val3 ; int ecode3 = 0 ; void *argp4 = 0 ; int res4 = 0 ; @@ -22279,11 +22443,11 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter__SWIG_2(PyObject *SW } arg2 = ptr; } - ecode3 = SWIG_AsVal_long(obj2, &val3); + ecode3 = SWIG_AsVal_long_SS_long(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParameterized_registerParameter" "', argument " "3"" of type '" "long""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParameterized_registerParameter" "', argument " "3"" of type '" "int64_t""'"); } - arg3 = static_cast< long >(val3); + arg3 = static_cast< int64_t >(val3); res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_AttLimits, 0 | 0); if (!SWIG_IsOK(res4)) { SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "IParameterized_registerParameter" "', argument " "4"" of type '" "AttLimits const &""'"); @@ -22306,11 +22470,11 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter__SWIG_3(PyObject *SW PyObject *resultobj = 0; IParameterized *arg1 = (IParameterized *) 0 ; std::string *arg2 = 0 ; - long arg3 ; + int64_t arg3 ; void *argp1 = 0 ; int res1 = 0 ; int res2 = SWIG_OLDOBJ ; - long val3 ; + long long val3 ; int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -22333,11 +22497,11 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter__SWIG_3(PyObject *SW } arg2 = ptr; } - ecode3 = SWIG_AsVal_long(obj2, &val3); + ecode3 = SWIG_AsVal_long_SS_long(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParameterized_registerParameter" "', argument " "3"" of type '" "long""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "IParameterized_registerParameter" "', argument " "3"" of type '" "int64_t""'"); } - arg3 = static_cast< long >(val3); + arg3 = static_cast< int64_t >(val3); IParameterized_registerParameter__SWIG_2(arg1,(std::string const &)*arg2,arg3); resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -22349,14 +22513,14 @@ fail: SWIGINTERN PyObject *_wrap_IParameterized_registerParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -22388,7 +22552,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter(PyObject *self, PyOb _v = SWIG_CheckState(res); if (_v) { { - int res = SWIG_AsVal_long(argv[2], NULL); + int res = SWIG_AsVal_long_SS_long(argv[2], NULL); _v = SWIG_CheckState(res); } if (_v) { @@ -22429,7 +22593,7 @@ SWIGINTERN PyObject *_wrap_IParameterized_registerParameter(PyObject *self, PyOb _v = SWIG_CheckState(res); if (_v) { { - int res = SWIG_AsVal_long(argv[2], NULL); + int res = SWIG_AsVal_long_SS_long(argv[2], NULL); _v = SWIG_CheckState(res); } if (_v) { @@ -22448,8 +22612,8 @@ fail: " Possible C/C++ prototypes are:\n" " IParameterized::registerParameter(std::string const &,double *,AttLimits const &)\n" " IParameterized::registerParameter(std::string const &,double *)\n" - " IParameterized::registerParameter(std::string const &,long,AttLimits const &)\n" - " IParameterized::registerParameter(std::string const &,long)\n"); + " IParameterized::registerParameter(std::string const &,int64_t,AttLimits const &)\n" + " IParameterized::registerParameter(std::string const &,int64_t)\n"); return 0; } @@ -22524,14 +22688,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ParameterPattern(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -22912,14 +23076,14 @@ fail: SWIGINTERN PyObject *_wrap_new_kvector_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -23896,34 +24060,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_kvector_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< Geometry::BasicVector3D< double > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_pop" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); - try { - result = std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< double > >::value_type(static_cast< const std::vector< Geometry::BasicVector3D< double > >::value_type& >(result))), SWIGTYPE_p_Geometry__BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_kvector_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; @@ -23978,20 +24114,17 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGU std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; std::vector< Geometry::BasicVector3D< double > >::difference_type arg2 ; std::vector< Geometry::BasicVector3D< double > >::difference_type arg3 ; - std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setslice__" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); @@ -24007,19 +24140,8 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___setslice__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< double > >::difference_type""'"); } arg3 = static_cast< std::vector< Geometry::BasicVector3D< double > >::difference_type >(val3); - { - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_kvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_kvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &)*arg4); + std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -24029,10 +24151,8 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -24042,17 +24162,20 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGU std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; std::vector< Geometry::BasicVector3D< double > >::difference_type arg2 ; std::vector< Geometry::BasicVector3D< double > >::difference_type arg3 ; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_kvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t___setslice__" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); @@ -24068,8 +24191,19 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_kvector_t___setslice__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< double > >::difference_type""'"); } arg3 = static_cast< std::vector< Geometry::BasicVector3D< double > >::difference_type >(val3); + { + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_kvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_kvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -24079,27 +24213,29 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24112,14 +24248,14 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_kvector_t___setslice____SWIG_1(self, args); + return _wrap_vector_kvector_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24132,10 +24268,10 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_kvector_t___setslice____SWIG_0(self, args); + return _wrap_vector_kvector_t___setslice____SWIG_1(self, args); } } } @@ -24145,8 +24281,8 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_kvector_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< Geometry::BasicVector3D< double > >::__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &)\n" - " std::vector< Geometry::BasicVector3D< double > >::__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double > >::difference_type)\n"); + " std::vector< Geometry::BasicVector3D< double > >::__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double > >::difference_type)\n" + " std::vector< Geometry::BasicVector3D< double > >::__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double > >::difference_type,std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &)\n"); return 0; } @@ -24227,6 +24363,9 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -24299,7 +24438,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_kvector_t___setitem__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > const &""'"); @@ -24405,20 +24544,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24431,7 +24570,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24491,20 +24630,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24517,7 +24656,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24588,20 +24727,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24614,14 +24753,14 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_kvector_t___setitem____SWIG_0(self, args); @@ -24631,7 +24770,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -24658,6 +24797,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_kvector_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< Geometry::BasicVector3D< double > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_pop" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); + try { + result = std_vector_Sl_Geometry_BasicVector3D_Sl_double_Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< double > >::value_type(static_cast< const std::vector< Geometry::BasicVector3D< double > >::value_type& >(result))), SWIGTYPE_p_Geometry__BasicVector3DT_double_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_kvector_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; @@ -24713,7 +24880,7 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_kvector_t",&obj0)) SWIG_fail; { - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_kvector_t" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > const &""'"); @@ -24777,27 +24944,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_kvector_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_clear" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_kvector_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; @@ -24831,28 +24977,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_kvector_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< Geometry::BasicVector3D< double > > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > const *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); - result = ((std::vector< Geometry::BasicVector3D< double > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< double > >::allocator_type(static_cast< const std::vector< Geometry::BasicVector3D< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_double_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_kvector_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; @@ -24945,6 +25069,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_kvector_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_clear" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_kvector_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< double > > *arg1 = (std::vector< Geometry::BasicVector3D< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< Geometry::BasicVector3D< double > > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_kvector_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_double_t_std__allocatorT_Geometry__BasicVector3DT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_kvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< double > > const *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< double > > * >(argp1); + result = ((std::vector< Geometry::BasicVector3D< double > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< double > >::allocator_type(static_cast< const std::vector< Geometry::BasicVector3D< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_double_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_kvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< double > >::size_type arg1 ; @@ -25110,20 +25277,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -25136,7 +25303,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -25197,14 +25364,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25223,7 +25390,7 @@ SWIGINTERN PyObject *_wrap_new_vector_kvector_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_kvector_t__SWIG_1(self, args); @@ -25417,20 +25584,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -25444,7 +25611,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -25578,20 +25745,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -25608,7 +25775,7 @@ SWIGINTERN PyObject *_wrap_vector_kvector_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -25773,14 +25940,14 @@ fail: SWIGINTERN PyObject *_wrap_new_cvector_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26483,34 +26650,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_cvector_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_pop" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); - try { - result = std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type(static_cast< const std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type& >(result))), SWIGTYPE_p_Geometry__BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_cvector_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; @@ -26565,20 +26704,17 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGU std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type arg2 ; std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type arg3 ; - std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setslice__" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); @@ -26594,19 +26730,8 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___setslice__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type""'"); } arg3 = static_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type >(val3); - { - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_cvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_cvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &)*arg4); + std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -26616,10 +26741,8 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -26629,17 +26752,20 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGU std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type arg2 ; std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type arg3 ; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_cvector_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t___setslice__" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); @@ -26655,8 +26781,19 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_cvector_t___setslice__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type""'"); } arg3 = static_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type >(val3); + { + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_cvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_cvector_t___setslice__" "', argument " "4"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -26666,27 +26803,29 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -26699,14 +26838,14 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_cvector_t___setslice____SWIG_1(self, args); + return _wrap_vector_cvector_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -26719,10 +26858,10 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_cvector_t___setslice____SWIG_0(self, args); + return _wrap_vector_cvector_t___setslice____SWIG_1(self, args); } } } @@ -26732,8 +26871,8 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_cvector_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< Geometry::BasicVector3D< std::complex< double > > >::__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &)\n" - " std::vector< Geometry::BasicVector3D< std::complex< double > > >::__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type)\n"); + " std::vector< Geometry::BasicVector3D< std::complex< double > > >::__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type)\n" + " std::vector< Geometry::BasicVector3D< std::complex< double > > >::__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type,std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &)\n"); return 0; } @@ -26814,6 +26953,9 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -26886,7 +27028,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_cvector_t___setitem__" "', argument " "3"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > const &""'"); @@ -26992,20 +27134,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27018,7 +27160,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27078,20 +27220,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27104,7 +27246,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27175,20 +27317,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27201,14 +27343,14 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_cvector_t___setitem____SWIG_0(self, args); @@ -27218,7 +27360,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27245,6 +27387,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_cvector_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_pop" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); + try { + result = std_vector_Sl_Geometry_BasicVector3D_Sl_std_complex_Sl_double_Sg__Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type(static_cast< const std::vector< Geometry::BasicVector3D< std::complex< double > > >::value_type& >(result))), SWIGTYPE_p_Geometry__BasicVector3DT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_cvector_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; @@ -27300,7 +27470,7 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_cvector_t",&obj0)) SWIG_fail; { - std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; + std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *ptr = (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_cvector_t" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > const &""'"); @@ -27364,27 +27534,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_cvector_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_clear" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_cvector_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; @@ -27418,28 +27567,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_cvector_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< Geometry::BasicVector3D< std::complex< double > > > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > const *""'"); - } - arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); - result = ((std::vector< Geometry::BasicVector3D< std::complex< double > > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type(static_cast< const std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_cvector_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; @@ -27532,6 +27659,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_cvector_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_clear" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_cvector_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< Geometry::BasicVector3D< std::complex< double > > > *arg1 = (std::vector< Geometry::BasicVector3D< std::complex< double > > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< Geometry::BasicVector3D< std::complex< double > > > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_cvector_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_Geometry__BasicVector3DT_std__complexT_double_t_t_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_cvector_t_get_allocator" "', argument " "1"" of type '" "std::vector< Geometry::BasicVector3D< std::complex< double > > > const *""'"); + } + arg1 = reinterpret_cast< std::vector< Geometry::BasicVector3D< std::complex< double > > > * >(argp1); + result = ((std::vector< Geometry::BasicVector3D< std::complex< double > > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type(static_cast< const std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_cvector_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< Geometry::BasicVector3D< std::complex< double > > >::size_type arg1 ; @@ -27697,20 +27867,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -27723,7 +27893,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -27784,14 +27954,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27810,7 +27980,7 @@ SWIGINTERN PyObject *_wrap_new_vector_cvector_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_cvector_t__SWIG_1(self, args); @@ -28004,20 +28174,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -28031,7 +28201,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -28165,20 +28335,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -28195,7 +28365,7 @@ SWIGINTERN PyObject *_wrap_vector_cvector_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< Geometry::BasicVector3D< std::complex< double > >,std::allocator< Geometry::BasicVector3D< std::complex< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -28700,14 +28870,14 @@ fail: SWIGINTERN PyObject *_wrap_new_WavevectorInfo(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -28897,14 +29067,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Beam(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29223,14 +29393,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Bin1D(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29536,14 +29706,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Bin1DKVector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29864,14 +30034,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Bin1DCVector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -30388,7 +30558,7 @@ SWIGINTERN PyObject *_wrap_IAxis_getBinCenters(PyObject *SWIGUNUSEDPARM(self), P } arg1 = reinterpret_cast< IAxis * >(argp1); result = ((IAxis const *)arg1)->getBinCenters(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -30410,7 +30580,7 @@ SWIGINTERN PyObject *_wrap_IAxis_getBinBoundaries(PyObject *SWIGUNUSEDPARM(self) } arg1 = reinterpret_cast< IAxis * >(argp1); result = ((IAxis const *)arg1)->getBinBoundaries(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -30598,7 +30768,7 @@ SWIGINTERN PyObject *_wrap_new_VariableBinAxis(PyObject *SWIGUNUSEDPARM(self), P } arg2 = static_cast< size_t >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "new_VariableBinAxis" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -30837,7 +31007,7 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBinCenters(PyObject *SWIGUNUSEDPAR } arg1 = reinterpret_cast< VariableBinAxis * >(argp1); result = ((VariableBinAxis const *)arg1)->getBinCenters(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -30859,7 +31029,7 @@ SWIGINTERN PyObject *_wrap_VariableBinAxis_getBinBoundaries(PyObject *SWIGUNUSED } arg1 = reinterpret_cast< VariableBinAxis * >(argp1); result = ((VariableBinAxis const *)arg1)->getBinBoundaries(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -31235,7 +31405,7 @@ SWIGINTERN PyObject *_wrap_CustomBinAxis_getBinCenters(PyObject *SWIGUNUSEDPARM( } arg1 = reinterpret_cast< CustomBinAxis * >(argp1); result = ((CustomBinAxis const *)arg1)->getBinCenters(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -31398,14 +31568,14 @@ fail: SWIGINTERN PyObject *_wrap_IShape2D_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -32041,34 +32211,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< ISample * >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_pop" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); - try { - result = (std::vector< ISample * >::value_type)std_vector_Sl_ISample_Sm__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ISample, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; @@ -32123,20 +32265,17 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_0(P std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; std::vector< ISample * >::difference_type arg2 ; std::vector< ISample * >::difference_type arg3 ; - std::vector< ISample *,std::allocator< ISample * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_isample_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_isample_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); @@ -32152,19 +32291,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_0(P SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "3"" of type '" "std::vector< ISample * >::difference_type""'"); } arg3 = static_cast< std::vector< ISample * >::difference_type >(val3); - { - std::vector<ISample*,std::allocator< ISample * > > *ptr = (std::vector<ISample*,std::allocator< ISample * > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample *,std::allocator< ISample * > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample *,std::allocator< ISample * > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< ISample *,std::allocator< ISample * > > const &)*arg4); + std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -32174,10 +32302,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_0(P } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -32187,17 +32313,20 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_1(P std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; std::vector< ISample * >::difference_type arg2 ; std::vector< ISample * >::difference_type arg3 ; + std::vector< ISample *,std::allocator< ISample * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_isample_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_isample_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); @@ -32213,8 +32342,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_1(P SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "3"" of type '" "std::vector< ISample * >::difference_type""'"); } arg3 = static_cast< std::vector< ISample * >::difference_type >(val3); + { + std::vector< ISample*,std::allocator< ISample * > > *ptr = (std::vector< ISample*,std::allocator< ISample * > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample *,std::allocator< ISample * > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "swig_dummy_type_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample *,std::allocator< ISample * > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_ISample_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< ISample *,std::allocator< ISample * > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -32224,27 +32364,29 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice____SWIG_1(P } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32257,14 +32399,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice__(PyObject _v = SWIG_CheckState(res); } if (_v) { - return _wrap_swig_dummy_type_isample_vector___setslice____SWIG_1(self, args); + return _wrap_swig_dummy_type_isample_vector___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32277,10 +32419,10 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice__(PyObject _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_swig_dummy_type_isample_vector___setslice____SWIG_0(self, args); + return _wrap_swig_dummy_type_isample_vector___setslice____SWIG_1(self, args); } } } @@ -32290,8 +32432,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setslice__(PyObject fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_isample_vector___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< ISample * >::__setslice__(std::vector< ISample * >::difference_type,std::vector< ISample * >::difference_type,std::vector< ISample *,std::allocator< ISample * > > const &)\n" - " std::vector< ISample * >::__setslice__(std::vector< ISample * >::difference_type,std::vector< ISample * >::difference_type)\n"); + " std::vector< ISample * >::__setslice__(std::vector< ISample * >::difference_type,std::vector< ISample * >::difference_type)\n" + " std::vector< ISample * >::__setslice__(std::vector< ISample * >::difference_type,std::vector< ISample * >::difference_type,std::vector< ISample *,std::allocator< ISample * > > const &)\n"); return 0; } @@ -32372,6 +32514,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___delitem____SWIG_0(Py catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -32444,7 +32589,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setitem____SWIG_0(Py arg2 = (PySliceObject *) obj1; } { - std::vector<ISample*,std::allocator< ISample * > > *ptr = (std::vector<ISample*,std::allocator< ISample * > > *)0; + std::vector< ISample*,std::allocator< ISample * > > *ptr = (std::vector< ISample*,std::allocator< ISample * > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_isample_vector___setitem__" "', argument " "3"" of type '" "std::vector< ISample *,std::allocator< ISample * > > const &""'"); @@ -32550,20 +32695,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32576,7 +32721,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___delitem__(PyObject * } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32636,20 +32781,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32662,7 +32807,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___getitem__(PyObject * } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32730,20 +32875,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32756,14 +32901,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setitem__(PyObject * } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_swig_dummy_type_isample_vector___setitem____SWIG_0(self, args); @@ -32773,7 +32918,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector___setitem__(PyObject * } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -32801,6 +32946,34 @@ fail: } +SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< ISample * >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_pop" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); + try { + result = (std::vector< ISample * >::value_type)std_vector_Sl_ISample_Sm__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ISample, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; @@ -32853,7 +33026,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_isample_vector__SWIG_1(PyObject * if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_isample_vector",&obj0)) SWIG_fail; { - std::vector<ISample*,std::allocator< ISample * > > *ptr = (std::vector<ISample*,std::allocator< ISample * > > *)0; + std::vector< ISample*,std::allocator< ISample * > > *ptr = (std::vector< ISample*,std::allocator< ISample * > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_swig_dummy_type_isample_vector" "', argument " "1"" of type '" "std::vector< ISample * > const &""'"); @@ -32917,27 +33090,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_clear" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; @@ -32971,28 +33123,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< ISample * > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_get_allocator" "', argument " "1"" of type '" "std::vector< ISample * > const *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); - result = ((std::vector< ISample * > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< ISample * >::allocator_type(static_cast< const std::vector< ISample * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_ISample_p_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; @@ -33085,6 +33215,49 @@ fail: } +SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_clear" "', argument " "1"" of type '" "std::vector< ISample * > *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample * > *arg1 = (std::vector< ISample * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< ISample * > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_isample_vector_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_p_std__allocatorT_ISample_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_isample_vector_get_allocator" "', argument " "1"" of type '" "std::vector< ISample * > const *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample * > * >(argp1); + result = ((std::vector< ISample * > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< ISample * >::allocator_type(static_cast< const std::vector< ISample * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_ISample_p_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_swig_dummy_type_isample_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample * >::size_type arg1 ; @@ -33250,20 +33423,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -33276,7 +33449,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_erase(PyObject *self, } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -33334,14 +33507,14 @@ fail: SWIGINTERN PyObject *_wrap_new_swig_dummy_type_isample_vector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -33360,7 +33533,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_isample_vector(PyObject *self, Py } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_swig_dummy_type_isample_vector__SWIG_1(self, args); @@ -33546,20 +33719,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -33573,7 +33746,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_resize(PyObject *self, } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -33702,20 +33875,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -33733,7 +33906,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_isample_vector_insert(PyObject *self, } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample*,std::allocator< ISample * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample*,std::allocator< ISample * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -33935,34 +34108,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< ISample const * >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_pop" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); - try { - result = (std::vector< ISample const * >::value_type)std_vector_Sl_ISample_SS_const_Sm__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ISample, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; @@ -34017,20 +34162,17 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; std::vector< ISample const * >::difference_type arg2 ; std::vector< ISample const * >::difference_type arg3 ; - std::vector< ISample const *,std::allocator< ISample const * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_const_isample_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_isample_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); @@ -34046,19 +34188,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "3"" of type '" "std::vector< ISample const * >::difference_type""'"); } arg3 = static_cast< std::vector< ISample const * >::difference_type >(val3); - { - std::vector<ISample const*,std::allocator< ISample const * > > *ptr = (std::vector<ISample const*,std::allocator< ISample const * > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample const *,std::allocator< ISample const * > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample const *,std::allocator< ISample const * > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< ISample const *,std::allocator< ISample const * > > const &)*arg4); + std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -34068,10 +34199,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -34081,17 +34210,20 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; std::vector< ISample const * >::difference_type arg2 ; std::vector< ISample const * >::difference_type arg3 ; + std::vector< ISample const *,std::allocator< ISample const * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:swig_dummy_type_const_isample_vector___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:swig_dummy_type_const_isample_vector___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); @@ -34107,8 +34239,19 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "3"" of type '" "std::vector< ISample const * >::difference_type""'"); } arg3 = static_cast< std::vector< ISample const * >::difference_type >(val3); + { + std::vector< ISample const*,std::allocator< ISample const * > > *ptr = (std::vector< ISample const*,std::allocator< ISample const * > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample const *,std::allocator< ISample const * > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "swig_dummy_type_const_isample_vector___setslice__" "', argument " "4"" of type '" "std::vector< ISample const *,std::allocator< ISample const * > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_ISample_SS_const_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< ISample const *,std::allocator< ISample const * > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -34118,27 +34261,29 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice____SW } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34151,14 +34296,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice__(PyO _v = SWIG_CheckState(res); } if (_v) { - return _wrap_swig_dummy_type_const_isample_vector___setslice____SWIG_1(self, args); + return _wrap_swig_dummy_type_const_isample_vector___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34171,10 +34316,10 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice__(PyO _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_swig_dummy_type_const_isample_vector___setslice____SWIG_0(self, args); + return _wrap_swig_dummy_type_const_isample_vector___setslice____SWIG_1(self, args); } } } @@ -34184,8 +34329,8 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setslice__(PyO fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'swig_dummy_type_const_isample_vector___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< ISample const * >::__setslice__(std::vector< ISample const * >::difference_type,std::vector< ISample const * >::difference_type,std::vector< ISample const *,std::allocator< ISample const * > > const &)\n" - " std::vector< ISample const * >::__setslice__(std::vector< ISample const * >::difference_type,std::vector< ISample const * >::difference_type)\n"); + " std::vector< ISample const * >::__setslice__(std::vector< ISample const * >::difference_type,std::vector< ISample const * >::difference_type)\n" + " std::vector< ISample const * >::__setslice__(std::vector< ISample const * >::difference_type,std::vector< ISample const * >::difference_type,std::vector< ISample const *,std::allocator< ISample const * > > const &)\n"); return 0; } @@ -34266,6 +34411,9 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___delitem____SWI catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -34338,7 +34486,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setitem____SWI arg2 = (PySliceObject *) obj1; } { - std::vector<ISample const*,std::allocator< ISample const * > > *ptr = (std::vector<ISample const*,std::allocator< ISample const * > > *)0; + std::vector< ISample const*,std::allocator< ISample const * > > *ptr = (std::vector< ISample const*,std::allocator< ISample const * > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "swig_dummy_type_const_isample_vector___setitem__" "', argument " "3"" of type '" "std::vector< ISample const *,std::allocator< ISample const * > > const &""'"); @@ -34444,20 +34592,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34470,7 +34618,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___delitem__(PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34530,20 +34678,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34556,7 +34704,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___getitem__(PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34624,20 +34772,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34650,14 +34798,14 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setitem__(PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_swig_dummy_type_const_isample_vector___setitem____SWIG_0(self, args); @@ -34667,7 +34815,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector___setitem__(PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -34695,6 +34843,34 @@ fail: } +SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< ISample const * >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_pop" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); + try { + result = (std::vector< ISample const * >::value_type)std_vector_Sl_ISample_SS_const_Sm__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_ISample, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; @@ -34747,7 +34923,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_isample_vector__SWIG_1(PyOb if (!PyArg_ParseTuple(args,(char *)"O:new_swig_dummy_type_const_isample_vector",&obj0)) SWIG_fail; { - std::vector<ISample const*,std::allocator< ISample const * > > *ptr = (std::vector<ISample const*,std::allocator< ISample const * > > *)0; + std::vector< ISample const*,std::allocator< ISample const * > > *ptr = (std::vector< ISample const*,std::allocator< ISample const * > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_swig_dummy_type_const_isample_vector" "', argument " "1"" of type '" "std::vector< ISample const * > const &""'"); @@ -34811,27 +34987,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_clear" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; @@ -34865,28 +35020,6 @@ fail: } -SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< ISample const * > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_get_allocator" "', argument " "1"" of type '" "std::vector< ISample const * > const *""'"); - } - arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); - result = ((std::vector< ISample const * > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< ISample const * >::allocator_type(static_cast< const std::vector< ISample const * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_ISample_const_p_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; @@ -34979,6 +35112,49 @@ fail: } +SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_clear" "', argument " "1"" of type '" "std::vector< ISample const * > *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< ISample const * > *arg1 = (std::vector< ISample const * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< ISample const * > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:swig_dummy_type_const_isample_vector_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_ISample_const_p_std__allocatorT_ISample_const_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "swig_dummy_type_const_isample_vector_get_allocator" "', argument " "1"" of type '" "std::vector< ISample const * > const *""'"); + } + arg1 = reinterpret_cast< std::vector< ISample const * > * >(argp1); + result = ((std::vector< ISample const * > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< ISample const * >::allocator_type(static_cast< const std::vector< ISample const * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_ISample_const_p_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_isample_vector__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< ISample const * >::size_type arg1 ; @@ -35144,20 +35320,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -35170,7 +35346,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_erase(PyObject * } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -35228,14 +35404,14 @@ fail: SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_isample_vector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -35254,7 +35430,7 @@ SWIGINTERN PyObject *_wrap_new_swig_dummy_type_const_isample_vector(PyObject *se } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_swig_dummy_type_const_isample_vector__SWIG_1(self, args); @@ -35440,20 +35616,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -35467,7 +35643,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_resize(PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -35596,20 +35772,20 @@ fail: SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -35627,7 +35803,7 @@ SWIGINTERN PyObject *_wrap_swig_dummy_type_const_isample_vector_insert(PyObject } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<ISample const*,std::allocator< ISample const * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< ISample const*,std::allocator< ISample const * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -35910,14 +36086,14 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter__SWIG_0(PyObject *SW PyObject *resultobj = 0; ISampleBuilder *arg1 = (ISampleBuilder *) 0 ; std::string *arg2 = 0 ; - long arg3 ; + int64_t arg3 ; AttLimits *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; std::shared_ptr< ISampleBuilder > tempshared1 ; std::shared_ptr< ISampleBuilder > *smartarg1 = 0 ; int res2 = SWIG_OLDOBJ ; - long val3 ; + long long val3 ; int ecode3 = 0 ; void *argp4 = 0 ; int res4 = 0 ; @@ -35953,11 +36129,11 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter__SWIG_0(PyObject *SW } arg2 = ptr; } - ecode3 = SWIG_AsVal_long(obj2, &val3); + ecode3 = SWIG_AsVal_long_SS_long(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ISampleBuilder_registerParameter" "', argument " "3"" of type '" "long""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ISampleBuilder_registerParameter" "', argument " "3"" of type '" "int64_t""'"); } - arg3 = static_cast< long >(val3); + arg3 = static_cast< int64_t >(val3); res4 = SWIG_ConvertPtr(obj3, &argp4, SWIGTYPE_p_AttLimits, 0 | 0); if (!SWIG_IsOK(res4)) { SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "ISampleBuilder_registerParameter" "', argument " "4"" of type '" "AttLimits const &""'"); @@ -35980,13 +36156,13 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter__SWIG_1(PyObject *SW PyObject *resultobj = 0; ISampleBuilder *arg1 = (ISampleBuilder *) 0 ; std::string *arg2 = 0 ; - long arg3 ; + int64_t arg3 ; void *argp1 = 0 ; int res1 = 0 ; std::shared_ptr< ISampleBuilder > tempshared1 ; std::shared_ptr< ISampleBuilder > *smartarg1 = 0 ; int res2 = SWIG_OLDOBJ ; - long val3 ; + long long val3 ; int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; @@ -36019,11 +36195,11 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter__SWIG_1(PyObject *SW } arg2 = ptr; } - ecode3 = SWIG_AsVal_long(obj2, &val3); + ecode3 = SWIG_AsVal_long_SS_long(obj2, &val3); if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ISampleBuilder_registerParameter" "', argument " "3"" of type '" "long""'"); + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "ISampleBuilder_registerParameter" "', argument " "3"" of type '" "int64_t""'"); } - arg3 = static_cast< long >(val3); + arg3 = static_cast< int64_t >(val3); ISampleBuilder_registerParameter__SWIG_0(arg1,(std::string const &)*arg2,arg3); resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res2)) delete arg2; @@ -36035,14 +36211,14 @@ fail: SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -36055,7 +36231,7 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter(PyObject *self, PyOb _v = SWIG_CheckState(res); if (_v) { { - int res = SWIG_AsVal_long(argv[2], NULL); + int res = SWIG_AsVal_long_SS_long(argv[2], NULL); _v = SWIG_CheckState(res); } if (_v) { @@ -36073,7 +36249,7 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter(PyObject *self, PyOb _v = SWIG_CheckState(res); if (_v) { { - int res = SWIG_AsVal_long(argv[2], NULL); + int res = SWIG_AsVal_long_SS_long(argv[2], NULL); _v = SWIG_CheckState(res); } if (_v) { @@ -36090,8 +36266,8 @@ SWIGINTERN PyObject *_wrap_ISampleBuilder_registerParameter(PyObject *self, PyOb fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'ISampleBuilder_registerParameter'.\n" " Possible C/C++ prototypes are:\n" - " ISampleBuilder::registerParameter(std::string const &,long,AttLimits const &)\n" - " ISampleBuilder::registerParameter(std::string const &,long)\n"); + " ISampleBuilder::registerParameter(std::string const &,int64_t,AttLimits const &)\n" + " ISampleBuilder::registerParameter(std::string const &,int64_t)\n"); return 0; } @@ -38388,14 +38564,14 @@ fail: SWIGINTERN PyObject *_wrap_ISampleVisitor_visit(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -39768,7 +39944,7 @@ SWIGINTERN PyObject *_wrap_ICompositeSample_getChildren(PyObject *SWIGUNUSEDPARM } arg1 = reinterpret_cast< ICompositeSample * >(argp1); result = ((ICompositeSample const *)arg1)->getChildren(); - resultobj = swig::from(static_cast< std::vector<ISample const*,std::allocator< ISample const * > > >(result)); + resultobj = swig::from(static_cast< std::vector< ISample const*,std::allocator< ISample const * > > >(result)); return resultobj; fail: return NULL; @@ -40629,14 +40805,14 @@ fail: SWIGINTERN PyObject *_wrap_IDistribution1D_generateSamples(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -40785,7 +40961,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_generateValueList__SWIG_0(PyObject *S } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((IDistribution1D const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -40825,7 +41001,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_generateValueList__SWIG_1(PyObject *S } arg3 = static_cast< double >(val3); result = ((IDistribution1D const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -40833,14 +41009,14 @@ fail: SWIGINTERN PyObject *_wrap_IDistribution1D_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -40942,7 +41118,7 @@ SWIGINTERN PyObject *_wrap_IDistribution1D_generateValues(PyObject *SWIGUNUSEDPA } arg4 = static_cast< double >(val4); result = ((IDistribution1D const *)arg1)->generateValues(arg2,arg3,arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -41001,14 +41177,14 @@ fail: SWIGINTERN PyObject *_wrap_new_DistributionGate(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -41226,7 +41402,7 @@ SWIGINTERN PyObject *_wrap_DistributionGate_generateValueList__SWIG_0(PyObject * } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((DistributionGate const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -41266,7 +41442,7 @@ SWIGINTERN PyObject *_wrap_DistributionGate_generateValueList__SWIG_1(PyObject * } arg3 = static_cast< double >(val3); result = ((DistributionGate const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -41274,14 +41450,14 @@ fail: SWIGINTERN PyObject *_wrap_DistributionGate_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -41393,14 +41569,14 @@ fail: SWIGINTERN PyObject *_wrap_new_DistributionLorentz(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -41596,7 +41772,7 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_generateValueList__SWIG_0(PyObjec } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((DistributionLorentz const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -41636,7 +41812,7 @@ SWIGINTERN PyObject *_wrap_DistributionLorentz_generateValueList__SWIG_1(PyObjec } arg3 = static_cast< double >(val3); result = ((DistributionLorentz const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -41644,14 +41820,14 @@ fail: SWIGINTERN PyObject *_wrap_DistributionLorentz_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -41763,14 +41939,14 @@ fail: SWIGINTERN PyObject *_wrap_new_DistributionGaussian(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -41966,7 +42142,7 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_generateValueList__SWIG_0(PyObje } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((DistributionGaussian const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42006,7 +42182,7 @@ SWIGINTERN PyObject *_wrap_DistributionGaussian_generateValueList__SWIG_1(PyObje } arg3 = static_cast< double >(val3); result = ((DistributionGaussian const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42014,14 +42190,14 @@ fail: SWIGINTERN PyObject *_wrap_DistributionGaussian_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -42142,14 +42318,14 @@ fail: SWIGINTERN PyObject *_wrap_new_DistributionLogNormal(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -42374,7 +42550,7 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_generateValueList__SWIG_0(PyObj } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((DistributionLogNormal const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42414,7 +42590,7 @@ SWIGINTERN PyObject *_wrap_DistributionLogNormal_generateValueList__SWIG_1(PyObj } arg3 = static_cast< double >(val3); result = ((DistributionLogNormal const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42422,14 +42598,14 @@ fail: SWIGINTERN PyObject *_wrap_DistributionLogNormal_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -42541,14 +42717,14 @@ fail: SWIGINTERN PyObject *_wrap_new_DistributionCosine(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -42744,7 +42920,7 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_generateValueList__SWIG_0(PyObject } arg4 = reinterpret_cast< AttLimits * >(argp4); result = ((DistributionCosine const *)arg1)->generateValueList(arg2,arg3,(AttLimits const &)*arg4); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42784,7 +42960,7 @@ SWIGINTERN PyObject *_wrap_DistributionCosine_generateValueList__SWIG_1(PyObject } arg3 = static_cast< double >(val3); result = ((DistributionCosine const *)arg1)->generateValueList(arg2,arg3); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -42792,14 +42968,14 @@ fail: SWIGINTERN PyObject *_wrap_DistributionCosine_generateValueList(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -42974,14 +43150,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Ellipse(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -43166,14 +43342,14 @@ fail: SWIGINTERN PyObject *_wrap_Ellipse_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -46530,7 +46706,7 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBinCenters(PyObject *SWIGUNUSEDPARM(s } arg1 = reinterpret_cast< FixedBinAxis * >(argp1); result = ((FixedBinAxis const *)arg1)->getBinCenters(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -46552,7 +46728,7 @@ SWIGINTERN PyObject *_wrap_FixedBinAxis_getBinBoundaries(PyObject *SWIGUNUSEDPAR } arg1 = reinterpret_cast< FixedBinAxis * >(argp1); result = ((FixedBinAxis const *)arg1)->getBinBoundaries(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -47188,34 +47364,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< IFormFactor * >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_pop" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); - } - arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); - try { - result = (std::vector< IFormFactor * >::value_type)std_vector_Sl_IFormFactor_Sm__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFormFactor, 0 | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; @@ -47270,20 +47418,17 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; std::vector< IFormFactor * >::difference_type arg2 ; std::vector< IFormFactor * >::difference_type arg3 ; - std::vector< IFormFactor *,std::allocator< IFormFactor * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); @@ -47299,19 +47444,8 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'"); } arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3); - { - std::vector<IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector<IFormFactor*,std::allocator< IFormFactor * > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "4"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "4"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)*arg4); + std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -47321,10 +47455,8 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(PyObject } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -47334,17 +47466,20 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; std::vector< IFormFactor * >::difference_type arg2 ; std::vector< IFormFactor * >::difference_type arg3 ; + std::vector< IFormFactor *,std::allocator< IFormFactor * > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_IFormFactorPtr_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); @@ -47360,8 +47495,19 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "3"" of type '" "std::vector< IFormFactor * >::difference_type""'"); } arg3 = static_cast< std::vector< IFormFactor * >::difference_type >(val3); + { + std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "4"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_IFormFactorPtr_t___setslice__" "', argument " "4"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_IFormFactor_Sm__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -47371,27 +47517,29 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(PyObject } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47404,14 +47552,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self, _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(self, args); + return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47424,10 +47572,10 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self, _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_0(self, args); + return _wrap_vector_IFormFactorPtr_t___setslice____SWIG_1(self, args); } } } @@ -47437,8 +47585,8 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setslice__(PyObject *self, fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_IFormFactorPtr_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)\n" - " std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type)\n"); + " std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type)\n" + " std::vector< IFormFactor * >::__setslice__(std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor * >::difference_type,std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &)\n"); return 0; } @@ -47519,6 +47667,9 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem____SWIG_0(PyObject catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -47591,7 +47742,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(PyObject arg2 = (PySliceObject *) obj1; } { - std::vector<IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector<IFormFactor*,std::allocator< IFormFactor * > > *)0; + std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_IFormFactorPtr_t___setitem__" "', argument " "3"" of type '" "std::vector< IFormFactor *,std::allocator< IFormFactor * > > const &""'"); @@ -47697,20 +47848,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47723,7 +47874,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___delitem__(PyObject *self, P } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47783,20 +47934,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47809,7 +47960,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___getitem__(PyObject *self, P } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47877,20 +48028,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47903,14 +48054,14 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_IFormFactorPtr_t___setitem____SWIG_0(self, args); @@ -47920,7 +48071,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t___setitem__(PyObject *self, P } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -47948,6 +48099,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< IFormFactor * >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_pop" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); + } + arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); + try { + result = (std::vector< IFormFactor * >::value_type)std_vector_Sl_IFormFactor_Sm__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IFormFactor, 0 | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; @@ -48000,7 +48179,7 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_1(PyObject *SWIGUNU if (!PyArg_ParseTuple(args,(char *)"O:new_vector_IFormFactorPtr_t",&obj0)) SWIG_fail; { - std::vector<IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector<IFormFactor*,std::allocator< IFormFactor * > > *)0; + std::vector< IFormFactor*,std::allocator< IFormFactor * > > *ptr = (std::vector< IFormFactor*,std::allocator< IFormFactor * > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_IFormFactorPtr_t" "', argument " "1"" of type '" "std::vector< IFormFactor * > const &""'"); @@ -48064,27 +48243,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_clear" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); - } - arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; @@ -48118,28 +48276,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< IFormFactor * > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_get_allocator" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); - } - arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); - result = ((std::vector< IFormFactor * > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< IFormFactor * >::allocator_type(static_cast< const std::vector< IFormFactor * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_IFormFactor_p_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; @@ -48232,6 +48368,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_clear" "', argument " "1"" of type '" "std::vector< IFormFactor * > *""'"); + } + arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< IFormFactor * > *arg1 = (std::vector< IFormFactor * > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< IFormFactor * > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_IFormFactorPtr_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_IFormFactor_p_std__allocatorT_IFormFactor_p_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_IFormFactorPtr_t_get_allocator" "', argument " "1"" of type '" "std::vector< IFormFactor * > const *""'"); + } + arg1 = reinterpret_cast< std::vector< IFormFactor * > * >(argp1); + result = ((std::vector< IFormFactor * > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< IFormFactor * >::allocator_type(static_cast< const std::vector< IFormFactor * >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_IFormFactor_p_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< IFormFactor * >::size_type arg1 ; @@ -48397,20 +48576,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -48423,7 +48602,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_erase(PyObject *self, PyObjec } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -48481,14 +48660,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -48507,7 +48686,7 @@ SWIGINTERN PyObject *_wrap_new_vector_IFormFactorPtr_t(PyObject *self, PyObject } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_IFormFactorPtr_t__SWIG_1(self, args); @@ -48693,20 +48872,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -48720,7 +48899,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_resize(PyObject *self, PyObje } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -48849,20 +49028,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -48880,7 +49059,7 @@ SWIGINTERN PyObject *_wrap_vector_IFormFactorPtr_t_insert(PyObject *self, PyObje } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<IFormFactor*,std::allocator< IFormFactor * > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< IFormFactor*,std::allocator< IFormFactor * > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -51268,14 +51447,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FormFactorDecoratorDebyeWaller(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -52080,14 +52259,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FormFactorGauss(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -53065,14 +53244,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FormFactorLorentz(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -57116,14 +57295,14 @@ fail: SWIGINTERN PyObject *_wrap_FormFactorWeighted_addFormFactor(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -57664,14 +57843,14 @@ fail: SWIGINTERN PyObject *_wrap_Simulation_getDetectorIntensity(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -57947,14 +58126,14 @@ fail: SWIGINTERN PyObject *_wrap_Simulation_addParameterDistribution(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[7] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 6) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -58398,14 +58577,14 @@ fail: SWIGINTERN PyObject *_wrap_new_GISASSimulation(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -58639,14 +58818,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_getDetectorIntensity(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -58738,14 +58917,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_getIntensityData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -58861,14 +59040,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_getInstrument(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -59186,14 +59365,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_setDetectorParameters(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[8] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 7) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -59427,14 +59606,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_setAnalyzerProperties(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -59589,14 +59768,14 @@ fail: SWIGINTERN PyObject *_wrap_GISASSimulation_addMask(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -60005,14 +60184,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getGlobalBin(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -60298,14 +60477,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getBinContent(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -60505,14 +60684,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getBinError(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -60634,14 +60813,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getBinAverage(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -60763,14 +60942,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getBinNumberOfEntries(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -61014,14 +61193,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_getArray(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -61188,14 +61367,14 @@ fail: SWIGINTERN PyObject *_wrap_IHistogram_createOutputData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -61508,7 +61687,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D__SWIG_1(PyObject *SWIGUNUSEDPARM(self } arg1 = static_cast< int >(val1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Histogram1D" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -61579,14 +61758,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Histogram1D(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -61613,7 +61792,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram1D(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_Histogram1D__SWIG_1(self, args); @@ -61770,14 +61949,14 @@ fail: SWIGINTERN PyObject *_wrap_Histogram1D_fill(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -61842,7 +62021,7 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinCenters(PyObject *SWIGUNUSEDPARM(se } arg1 = reinterpret_cast< Histogram1D * >(argp1); result = ((Histogram1D const *)arg1)->getBinCenters(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -61864,7 +62043,7 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinValues(PyObject *SWIGUNUSEDPARM(sel } arg1 = reinterpret_cast< Histogram1D * >(argp1); result = ((Histogram1D const *)arg1)->getBinValues(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -61886,7 +62065,7 @@ SWIGINTERN PyObject *_wrap_Histogram1D_getBinErrors(PyObject *SWIGUNUSEDPARM(sel } arg1 = reinterpret_cast< Histogram1D * >(argp1); result = ((Histogram1D const *)arg1)->getBinErrors(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -62141,7 +62320,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self } arg1 = static_cast< int >(val1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Histogram2D" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -62157,7 +62336,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D__SWIG_1(PyObject *SWIGUNUSEDPARM(self } arg3 = static_cast< int >(val3); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res4 = swig::asptr(obj3, &ptr); if (!SWIG_IsOK(res4)) { SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "new_Histogram2D" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -62242,14 +62421,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[7] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 6) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -62280,7 +62459,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -62288,7 +62467,7 @@ SWIGINTERN PyObject *_wrap_new_Histogram2D(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_Histogram2D__SWIG_1(self, args); @@ -62483,14 +62662,14 @@ fail: SWIGINTERN PyObject *_wrap_Histogram2D_fill(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -62646,14 +62825,14 @@ fail: SWIGINTERN PyObject *_wrap_Histogram2D_projectionX(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -62807,14 +62986,14 @@ fail: SWIGINTERN PyObject *_wrap_Histogram2D_projectionY(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -63227,14 +63406,14 @@ fail: SWIGINTERN PyObject *_wrap_new_HomogeneousMaterial(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -63532,14 +63711,14 @@ fail: SWIGINTERN PyObject *_wrap_new_HomogeneousMagneticMaterial(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -64268,14 +64447,14 @@ fail: SWIGINTERN PyObject *_wrap_IDetector2D_setAnalyzerProperties(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -64430,14 +64609,14 @@ fail: SWIGINTERN PyObject *_wrap_IDetector2D_addMask(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -66038,14 +66217,14 @@ fail: SWIGINTERN PyObject *_wrap_IParticle_setPosition(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -66968,14 +67147,14 @@ fail: SWIGINTERN PyObject *_wrap_new_RotationZ(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -67678,14 +67857,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Instrument(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -67964,14 +68143,14 @@ fail: SWIGINTERN PyObject *_wrap_Instrument_getDetector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -68369,14 +68548,14 @@ fail: SWIGINTERN PyObject *_wrap_Instrument_setAnalyzerProperties(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -68542,14 +68721,14 @@ fail: SWIGINTERN PyObject *_wrap_Instrument_getDetectorIntensity(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -68698,14 +68877,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityDataFunctions_getRelativeDifference(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -69337,14 +69516,14 @@ fail: SWIGINTERN PyObject *_wrap_new_InterferenceFunctionRadialParaCrystal(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -69822,14 +70001,14 @@ fail: SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DLattice(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -70020,14 +70199,14 @@ fail: SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createSquare(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -70121,14 +70300,14 @@ fail: SWIGINTERN PyObject *_wrap_InterferenceFunction2DLattice_createHexagonal(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -70456,14 +70635,14 @@ fail: SWIGINTERN PyObject *_wrap_new_InterferenceFunction2DParaCrystal(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -70778,14 +70957,14 @@ fail: SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createSquare(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -71020,14 +71199,14 @@ fail: SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_createHexagonal(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -71282,7 +71461,7 @@ SWIGINTERN PyObject *_wrap_InterferenceFunction2DParaCrystal_getDomainSizes(PyOb } arg1 = reinterpret_cast< InterferenceFunction2DParaCrystal * >(argp1); result = ((InterferenceFunction2DParaCrystal const *)arg1)->getDomainSizes(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -71840,14 +72019,14 @@ fail: SWIGINTERN PyObject *_wrap_new_SphericalDetector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[7] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 6) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -72404,14 +72583,14 @@ fail: SWIGINTERN PyObject *_wrap_new_IsGISAXSDetector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[7] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 6) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -72615,14 +72794,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Lattice(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -73602,14 +73781,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Layer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -74300,14 +74479,14 @@ fail: SWIGINTERN PyObject *_wrap_new_LayerRoughness(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -74808,14 +74987,14 @@ fail: SWIGINTERN PyObject *_wrap_Line_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75026,14 +75205,14 @@ fail: SWIGINTERN PyObject *_wrap_VerticalLine_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75266,14 +75445,14 @@ fail: SWIGINTERN PyObject *_wrap_HorizontalLine_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75544,14 +75723,14 @@ fail: SWIGINTERN PyObject *_wrap_sinc(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75727,14 +75906,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J0(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75791,14 +75970,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J1(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75855,14 +76034,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J1c(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -75931,7 +76110,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"OO:FastFourierTransform",&obj0,&obj1)) SWIG_fail; { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FastFourierTransform" "', argument " "1"" of type '" "std::vector< complex_t,std::allocator< complex_t > > const &""'"); @@ -75947,7 +76126,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_0(PyObject *SWIGUNUSEDPARM } arg2 = static_cast< MathFunctions::EFFTDirection >(val2); result = MathFunctions::FastFourierTransform((std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg1,arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; return resultobj; fail: @@ -75969,7 +76148,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"OO:FastFourierTransform",&obj0,&obj1)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FastFourierTransform" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -75985,7 +76164,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM } arg2 = static_cast< MathFunctions::EFFTDirection >(val2); result = MathFunctions::FastFourierTransform((std::vector< double,std::allocator< double > > const &)*arg1,arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; return resultobj; fail: @@ -75995,20 +76174,20 @@ fail: SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -76022,7 +76201,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args) } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -76056,7 +76235,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject if (!PyArg_ParseTuple(args,(char *)"OO:ConvolveFFT",&obj0,&obj1)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvolveFFT" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -76067,7 +76246,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = ptr; } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvolveFFT" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -76078,7 +76257,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject arg2 = ptr; } result = MathFunctions::ConvolveFFT((std::vector< double,std::allocator< double > > const &)*arg1,(std::vector< double,std::allocator< double > > const &)*arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); if (SWIG_IsNewObj(res1)) delete arg1; if (SWIG_IsNewObj(res2)) delete arg2; return resultobj; @@ -76684,14 +76863,14 @@ fail: SWIGINTERN PyObject *_wrap_Logger_SetLevel(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -76793,14 +76972,14 @@ fail: SWIGINTERN PyObject *_wrap_SetLevel(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -77681,14 +77860,14 @@ fail: SWIGINTERN PyObject *_wrap_new_OffSpecSimulation(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -77922,14 +78101,14 @@ fail: SWIGINTERN PyObject *_wrap_OffSpecSimulation_getDetectorIntensity(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -78267,14 +78446,14 @@ fail: SWIGINTERN PyObject *_wrap_OffSpecSimulation_setDetectorParameters(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[8] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 7) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -78494,14 +78673,14 @@ fail: SWIGINTERN PyObject *_wrap_OffSpecSimulation_setAnalyzerProperties(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -78753,14 +78932,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_addAxis(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -78888,14 +79067,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_getAxis(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -79056,7 +79235,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getRawDataVector(PyObject *SWIGUNUSEDPA } arg1 = reinterpret_cast< OutputData< double > * >(argp1); result = ((OutputData< double > const *)arg1)->getRawDataVector(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -79160,14 +79339,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_begin(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -79244,14 +79423,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_end(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -79416,7 +79595,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxesBinIndices(PyObject *SWIGUNUSEDP } arg2 = static_cast< size_t >(val2); result = ((OutputData< double > const *)arg1)->getAxesBinIndices(arg2); - resultobj = swig::from(static_cast< std::vector<int,std::allocator< int > > >(result)); + resultobj = swig::from(static_cast< std::vector< int,std::allocator< int > > >(result)); return resultobj; fail: return NULL; @@ -79511,14 +79690,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_getAxisBinIndex(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -79590,7 +79769,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_toGlobalIndex(PyObject *SWIGUNUSEDPARM( } arg1 = reinterpret_cast< OutputData< double > * >(argp1); { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_toGlobalIndex" "', argument " "2"" of type '" "std::vector< int,std::allocator< int > > const &""'"); @@ -79628,7 +79807,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_findGlobalIndex(PyObject *SWIGUNUSEDPAR } arg1 = reinterpret_cast< OutputData< double > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_findGlobalIndex" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -79736,14 +79915,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_getAxisValue(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -79821,7 +80000,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_getAxesValues(PyObject *SWIGUNUSEDPARM( } arg2 = static_cast< size_t >(val2); result = ((OutputData< double > const *)arg1)->getAxesValues(arg2); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -79916,14 +80095,14 @@ fail: SWIGINTERN PyObject *_wrap_IntensityData_getAxisBin(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -80118,7 +80297,7 @@ SWIGINTERN PyObject *_wrap_IntensityData_setRawDataVector(PyObject *SWIGUNUSEDPA } arg1 = reinterpret_cast< OutputData< double > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "IntensityData_setRawDataVector" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -81008,14 +81187,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ParameterDistribution(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -81319,7 +81498,7 @@ SWIGINTERN PyObject *_wrap_ParameterDistribution_getLinkedParameterNames(PyObjec } arg1 = reinterpret_cast< ParameterDistribution * >(argp1); result = ((ParameterDistribution const *)arg1)->getLinkedParameterNames(); - resultobj = swig::from(static_cast< std::vector<std::string,std::allocator< std::string > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::string,std::allocator< std::string > > >(result)); return resultobj; fail: return NULL; @@ -81687,14 +81866,14 @@ fail: SWIGINTERN PyObject *_wrap_ParameterPool_registerParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -81988,7 +82167,7 @@ SWIGINTERN PyObject *_wrap_ParameterPool_getParameterNames(PyObject *SWIGUNUSEDP } arg1 = reinterpret_cast< ParameterPool * >(argp1); result = ((ParameterPool const *)arg1)->getParameterNames(); - resultobj = swig::from(static_cast< std::vector<std::string,std::allocator< std::string > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::string,std::allocator< std::string > > >(result)); return resultobj; fail: return NULL; @@ -82127,14 +82306,14 @@ fail: SWIGINTERN PyObject *_wrap_new_Particle(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -82640,7 +82819,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleComposition__SWIG_3(PyObject *SWIGUNUSEDP } arg1 = reinterpret_cast< IParticle * >(argp1); { - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; int res = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res) || !ptr) { SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_ParticleComposition" "', argument " "2"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > >""'"); @@ -82657,14 +82836,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ParticleComposition(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -82696,7 +82875,7 @@ SWIGINTERN PyObject *_wrap_new_ParticleComposition(PyObject *self, PyObject *arg int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_IParticle, 0); _v = SWIG_CheckState(res); if (_v) { - int res = swig::asptr(argv[1], (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_ParticleComposition__SWIG_3(self, args); @@ -82894,14 +83073,14 @@ fail: SWIGINTERN PyObject *_wrap_ParticleComposition_addParticle(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -82973,7 +83152,7 @@ SWIGINTERN PyObject *_wrap_ParticleComposition_addParticles(PyObject *SWIGUNUSED } arg2 = reinterpret_cast< IParticle * >(argp2); { - std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector<Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; + std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *ptr = (std::vector< Geometry::BasicVector3D< double >,std::allocator< Geometry::BasicVector3D< double > > > *)0; int res = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res) || !ptr) { SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "ParticleComposition_addParticles" "', argument " "3"" of type '" "std::vector< kvector_t,std::allocator< kvector_t > >""'"); @@ -83282,14 +83461,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ParticleCoreShell(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -83953,14 +84132,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ParticleLayout(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -84291,14 +84470,14 @@ fail: SWIGINTERN PyObject *_wrap_ParticleLayout_addParticle(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -84626,7 +84805,7 @@ SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P if (!PyArg_ParseTuple(args,(char *)"OO:new_Polygon",&obj0,&obj1)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; int res = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res) || !ptr) { SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > >""'"); @@ -84635,7 +84814,7 @@ SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_0(PyObject *SWIGUNUSEDPARM(self), P if (SWIG_IsNewObj(res)) delete ptr; } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; int res = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res) || !ptr) { SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > >""'"); @@ -84659,7 +84838,7 @@ SWIGINTERN PyObject *_wrap_new_Polygon__SWIG_1(PyObject *SWIGUNUSEDPARM(self), P if (!PyArg_ParseTuple(args,(char *)"O:new_Polygon",&obj0)) SWIG_fail; { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; int res = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res) || !ptr) { SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "new_Polygon" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >""'"); @@ -84676,20 +84855,20 @@ fail: SWIGINTERN PyObject *_wrap_new_Polygon(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_Polygon__SWIG_1(self, args); @@ -84697,10 +84876,10 @@ SWIGINTERN PyObject *_wrap_new_Polygon(PyObject *self, PyObject *args) { } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_Polygon__SWIG_0(self, args); @@ -84847,14 +85026,14 @@ fail: SWIGINTERN PyObject *_wrap_Polygon_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -85062,14 +85241,14 @@ fail: SWIGINTERN PyObject *_wrap_new_RealParameterWrapper(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -85486,14 +85665,14 @@ fail: SWIGINTERN PyObject *_wrap_Rectangle_contains(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -85758,14 +85937,14 @@ fail: SWIGINTERN PyObject *_wrap_new_RectangularDetector(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -86006,14 +86185,14 @@ fail: SWIGINTERN PyObject *_wrap_RectangularDetector_setPosition(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -86295,14 +86474,14 @@ fail: SWIGINTERN PyObject *_wrap_RectangularDetector_setPerpendicularToReflectedBeam(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -87272,14 +87451,14 @@ fail: SWIGINTERN PyObject *_wrap_new_SpecularSimulation(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -87598,14 +87777,14 @@ fail: SWIGINTERN PyObject *_wrap_SpecularSimulation_setBeamParameters(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -87753,14 +87932,14 @@ fail: SWIGINTERN PyObject *_wrap_SpecularSimulation_setEvanescentWaveAxis(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -87860,7 +88039,7 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_getScalarR(PyObject *SWIGUNUSEDPAR } arg2 = static_cast< size_t >(val2); result = ((SpecularSimulation const *)arg1)->getScalarR(arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); return resultobj; fail: return NULL; @@ -87891,7 +88070,7 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_getScalarT(PyObject *SWIGUNUSEDPAR } arg2 = static_cast< size_t >(val2); result = ((SpecularSimulation const *)arg1)->getScalarT(arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); return resultobj; fail: return NULL; @@ -87922,7 +88101,7 @@ SWIGINTERN PyObject *_wrap_SpecularSimulation_getScalarKz(PyObject *SWIGUNUSEDPA } arg2 = static_cast< size_t >(val2); result = ((SpecularSimulation const *)arg1)->getScalarKz(arg2); - resultobj = swig::from(static_cast< std::vector<std::complex< double >,std::allocator< std::complex< double > > > >(result)); + resultobj = swig::from(static_cast< std::vector< std::complex< double >,std::allocator< std::complex< double > > > >(result)); return resultobj; fail: return NULL; @@ -88486,11 +88665,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_VARARGS, (char *)"vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_VARARGS, (char *)"vdouble1d_t___bool__(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_VARARGS, (char *)"vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"}, - { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"}, { (char *)"vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, (char *)"vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"}, { (char *)"vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n" - "vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n" + "__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n" + "vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n" ""}, { (char *)"vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, (char *)"vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"}, { (char *)"vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88506,16 +88684,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vdouble1d_t___setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)\n" ""}, + { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"}, { (char *)"vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, (char *)"vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"}, { (char *)"vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_VARARGS, (char *)"vdouble1d_t_empty(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_VARARGS, (char *)"vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"}, - { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"}, { (char *)"vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, (char *)"vdouble1d_t_swap(vdouble1d_t self, vdouble1d_t v)"}, - { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"}, { (char *)"vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_VARARGS, (char *)"vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"}, { (char *)"vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_VARARGS, (char *)"vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"}, { (char *)"vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_VARARGS, (char *)"vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"}, { (char *)"vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_VARARGS, (char *)"vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"}, + { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"}, + { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"}, { (char *)"vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_VARARGS, (char *)"vdouble1d_t_pop_back(vdouble1d_t self)"}, { (char *)"vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< double >::iterator pos) -> std::vector< double >::iterator\n" @@ -88547,11 +88726,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_VARARGS, (char *)"vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_VARARGS, (char *)"vdouble2d_t___bool__(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_VARARGS, (char *)"vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"}, - { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"}, { (char *)"vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, (char *)"vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"}, { (char *)"vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n" - "vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n" + "__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n" + "vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n" ""}, { (char *)"vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, (char *)"vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"}, { (char *)"vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88567,16 +88745,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vdouble2d_t___setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)\n" ""}, + { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"}, { (char *)"vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, (char *)"vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"}, { (char *)"vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_VARARGS, (char *)"vdouble2d_t_empty(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_VARARGS, (char *)"vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"}, - { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"}, { (char *)"vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, (char *)"vdouble2d_t_swap(vdouble2d_t self, vdouble2d_t v)"}, - { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"}, { (char *)"vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_VARARGS, (char *)"vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"}, { (char *)"vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_VARARGS, (char *)"vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"}, { (char *)"vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_VARARGS, (char *)"vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"}, { (char *)"vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_VARARGS, (char *)"vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"}, + { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"}, + { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"}, { (char *)"vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_VARARGS, (char *)"vdouble2d_t_pop_back(vdouble2d_t self)"}, { (char *)"vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n" @@ -88608,11 +88787,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_VARARGS, (char *)"vector_integer_t___nonzero__(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_VARARGS, (char *)"vector_integer_t___bool__(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_VARARGS, (char *)"vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"}, - { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"}, { (char *)"vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, (char *)"vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"}, { (char *)"vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n" - "vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n" + "__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n" + "vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n" ""}, { (char *)"vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, (char *)"vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"}, { (char *)"vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88628,16 +88806,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_integer_t___setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)\n" ""}, + { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"}, { (char *)"vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, (char *)"vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"}, { (char *)"vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_VARARGS, (char *)"vector_integer_t_empty(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t_size", _wrap_vector_integer_t_size, METH_VARARGS, (char *)"vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"}, - { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"}, { (char *)"vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, (char *)"vector_integer_t_swap(vector_integer_t self, vector_integer_t v)"}, - { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"}, { (char *)"vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_VARARGS, (char *)"vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"}, { (char *)"vector_integer_t_end", _wrap_vector_integer_t_end, METH_VARARGS, (char *)"vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"}, { (char *)"vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_VARARGS, (char *)"vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"}, { (char *)"vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_VARARGS, (char *)"vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"}, + { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"}, + { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"}, { (char *)"vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_VARARGS, (char *)"vector_integer_t_pop_back(vector_integer_t self)"}, { (char *)"vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< int >::iterator pos) -> std::vector< int >::iterator\n" @@ -88669,11 +88848,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_VARARGS, (char *)"vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_VARARGS, (char *)"vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_VARARGS, (char *)"vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"}, - { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"}, { (char *)"vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, (char *)"vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"}, { (char *)"vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n" - "vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n" + "__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n" + "vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n" ""}, { (char *)"vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, (char *)"vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"}, { (char *)"vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88689,16 +88867,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_longinteger_t___setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)\n" ""}, + { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"}, { (char *)"vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, (char *)"vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"}, { (char *)"vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_VARARGS, (char *)"vector_longinteger_t_empty(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_VARARGS, (char *)"vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"}, - { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"}, { (char *)"vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, (char *)"vector_longinteger_t_swap(vector_longinteger_t self, vector_longinteger_t v)"}, - { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"}, { (char *)"vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_VARARGS, (char *)"vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"}, { (char *)"vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_VARARGS, (char *)"vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"}, { (char *)"vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_VARARGS, (char *)"vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"}, { (char *)"vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_VARARGS, (char *)"vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"}, + { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"}, + { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"}, { (char *)"vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_VARARGS, (char *)"vector_longinteger_t_pop_back(vector_longinteger_t self)"}, { (char *)"vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n" @@ -88730,11 +88909,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_VARARGS, (char *)"vector_complex_t___nonzero__(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_VARARGS, (char *)"vector_complex_t___bool__(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_VARARGS, (char *)"vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"}, - { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"}, { (char *)"vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, (char *)"vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"}, { (char *)"vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n" - "vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n" + "__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n" + "vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n" ""}, { (char *)"vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, (char *)"vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"}, { (char *)"vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88750,16 +88928,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_complex_t___setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)\n" ""}, + { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"}, { (char *)"vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, (char *)"vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"}, { (char *)"vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_VARARGS, (char *)"vector_complex_t_empty(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t_size", _wrap_vector_complex_t_size, METH_VARARGS, (char *)"vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"}, - { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"}, { (char *)"vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, (char *)"vector_complex_t_swap(vector_complex_t self, vector_complex_t v)"}, - { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"}, { (char *)"vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_VARARGS, (char *)"vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"}, { (char *)"vector_complex_t_end", _wrap_vector_complex_t_end, METH_VARARGS, (char *)"vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"}, { (char *)"vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_VARARGS, (char *)"vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"}, { (char *)"vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_VARARGS, (char *)"vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"}, + { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"}, + { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"}, { (char *)"vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_VARARGS, (char *)"vector_complex_t_pop_back(vector_complex_t self)"}, { (char *)"vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n" @@ -88791,11 +88970,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_VARARGS, (char *)"vector_string_t___nonzero__(vector_string_t self) -> bool"}, { (char *)"vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_VARARGS, (char *)"vector_string_t___bool__(vector_string_t self) -> bool"}, { (char *)"vector_string_t___len__", _wrap_vector_string_t___len__, METH_VARARGS, (char *)"vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"}, - { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"}, { (char *)"vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, (char *)"vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"}, { (char *)"vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n" - "vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n" + "__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n" + "vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n" ""}, { (char *)"vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, (char *)"vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"}, { (char *)"vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, (char *)"\n" @@ -88811,16 +88989,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_string_t___setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)\n" ""}, + { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"}, { (char *)"vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, (char *)"vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"}, { (char *)"vector_string_t_empty", _wrap_vector_string_t_empty, METH_VARARGS, (char *)"vector_string_t_empty(vector_string_t self) -> bool"}, { (char *)"vector_string_t_size", _wrap_vector_string_t_size, METH_VARARGS, (char *)"vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"}, - { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"}, { (char *)"vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, (char *)"vector_string_t_swap(vector_string_t self, vector_string_t v)"}, - { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"}, { (char *)"vector_string_t_begin", _wrap_vector_string_t_begin, METH_VARARGS, (char *)"vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"}, { (char *)"vector_string_t_end", _wrap_vector_string_t_end, METH_VARARGS, (char *)"vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"}, { (char *)"vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_VARARGS, (char *)"vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"}, { (char *)"vector_string_t_rend", _wrap_vector_string_t_rend, METH_VARARGS, (char *)"vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"}, + { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"}, + { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"}, { (char *)"vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_VARARGS, (char *)"vector_string_t_pop_back(vector_string_t self)"}, { (char *)"vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n" @@ -89042,8 +89221,8 @@ static PyMethodDef SwigMethods[] = { { (char *)"IParameterized_registerParameter", _wrap_IParameterized_registerParameter, METH_VARARGS, (char *)"\n" "registerParameter(std::string const & name, double * parpointer, AttLimits limits)\n" "registerParameter(std::string const & name, double * parpointer)\n" - "registerParameter(std::string const & name, long parpointer, AttLimits limits)\n" - "IParameterized_registerParameter(IParameterized self, std::string const & name, long parpointer)\n" + "registerParameter(std::string const & name, int64_t parpointer, AttLimits limits)\n" + "IParameterized_registerParameter(IParameterized self, std::string const & name, int64_t parpointer)\n" ""}, { (char *)"disown_IParameterized", _wrap_disown_IParameterized, METH_VARARGS, NULL}, { (char *)"IParameterized_swigregister", IParameterized_swigregister, METH_VARARGS, NULL}, @@ -89317,11 +89496,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_kvector_t___nonzero__", _wrap_vector_kvector_t___nonzero__, METH_VARARGS, (char *)"vector_kvector_t___nonzero__(vector_kvector_t self) -> bool"}, { (char *)"vector_kvector_t___bool__", _wrap_vector_kvector_t___bool__, METH_VARARGS, (char *)"vector_kvector_t___bool__(vector_kvector_t self) -> bool"}, { (char *)"vector_kvector_t___len__", _wrap_vector_kvector_t___len__, METH_VARARGS, (char *)"vector_kvector_t___len__(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::size_type"}, - { (char *)"vector_kvector_t_pop", _wrap_vector_kvector_t_pop, METH_VARARGS, (char *)"vector_kvector_t_pop(vector_kvector_t self) -> kvector_t"}, { (char *)"vector_kvector_t___getslice__", _wrap_vector_kvector_t___getslice__, METH_VARARGS, (char *)"vector_kvector_t___getslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j) -> vector_kvector_t"}, { (char *)"vector_kvector_t___setslice__", _wrap_vector_kvector_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j, vector_kvector_t v)\n" - "vector_kvector_t___setslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j)\n" + "__setslice__(std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j)\n" + "vector_kvector_t___setslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j, vector_kvector_t v)\n" ""}, { (char *)"vector_kvector_t___delslice__", _wrap_vector_kvector_t___delslice__, METH_VARARGS, (char *)"vector_kvector_t___delslice__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, std::vector< Geometry::BasicVector3D< double > >::difference_type j)"}, { (char *)"vector_kvector_t___delitem__", _wrap_vector_kvector_t___delitem__, METH_VARARGS, (char *)"\n" @@ -89337,16 +89515,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_kvector_t___setitem__(vector_kvector_t self, std::vector< Geometry::BasicVector3D< double > >::difference_type i, kvector_t x)\n" ""}, + { (char *)"vector_kvector_t_pop", _wrap_vector_kvector_t_pop, METH_VARARGS, (char *)"vector_kvector_t_pop(vector_kvector_t self) -> kvector_t"}, { (char *)"vector_kvector_t_append", _wrap_vector_kvector_t_append, METH_VARARGS, (char *)"vector_kvector_t_append(vector_kvector_t self, kvector_t x)"}, { (char *)"vector_kvector_t_empty", _wrap_vector_kvector_t_empty, METH_VARARGS, (char *)"vector_kvector_t_empty(vector_kvector_t self) -> bool"}, { (char *)"vector_kvector_t_size", _wrap_vector_kvector_t_size, METH_VARARGS, (char *)"vector_kvector_t_size(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::size_type"}, - { (char *)"vector_kvector_t_clear", _wrap_vector_kvector_t_clear, METH_VARARGS, (char *)"vector_kvector_t_clear(vector_kvector_t self)"}, { (char *)"vector_kvector_t_swap", _wrap_vector_kvector_t_swap, METH_VARARGS, (char *)"vector_kvector_t_swap(vector_kvector_t self, vector_kvector_t v)"}, - { (char *)"vector_kvector_t_get_allocator", _wrap_vector_kvector_t_get_allocator, METH_VARARGS, (char *)"vector_kvector_t_get_allocator(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::allocator_type"}, { (char *)"vector_kvector_t_begin", _wrap_vector_kvector_t_begin, METH_VARARGS, (char *)"vector_kvector_t_begin(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::iterator"}, { (char *)"vector_kvector_t_end", _wrap_vector_kvector_t_end, METH_VARARGS, (char *)"vector_kvector_t_end(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::iterator"}, { (char *)"vector_kvector_t_rbegin", _wrap_vector_kvector_t_rbegin, METH_VARARGS, (char *)"vector_kvector_t_rbegin(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::reverse_iterator"}, { (char *)"vector_kvector_t_rend", _wrap_vector_kvector_t_rend, METH_VARARGS, (char *)"vector_kvector_t_rend(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::reverse_iterator"}, + { (char *)"vector_kvector_t_clear", _wrap_vector_kvector_t_clear, METH_VARARGS, (char *)"vector_kvector_t_clear(vector_kvector_t self)"}, + { (char *)"vector_kvector_t_get_allocator", _wrap_vector_kvector_t_get_allocator, METH_VARARGS, (char *)"vector_kvector_t_get_allocator(vector_kvector_t self) -> std::vector< Geometry::BasicVector3D< double > >::allocator_type"}, { (char *)"vector_kvector_t_pop_back", _wrap_vector_kvector_t_pop_back, METH_VARARGS, (char *)"vector_kvector_t_pop_back(vector_kvector_t self)"}, { (char *)"vector_kvector_t_erase", _wrap_vector_kvector_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< Geometry::BasicVector3D< double > >::iterator pos) -> std::vector< Geometry::BasicVector3D< double > >::iterator\n" @@ -89511,11 +89690,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_cvector_t___nonzero__", _wrap_vector_cvector_t___nonzero__, METH_VARARGS, (char *)"vector_cvector_t___nonzero__(vector_cvector_t self) -> bool"}, { (char *)"vector_cvector_t___bool__", _wrap_vector_cvector_t___bool__, METH_VARARGS, (char *)"vector_cvector_t___bool__(vector_cvector_t self) -> bool"}, { (char *)"vector_cvector_t___len__", _wrap_vector_cvector_t___len__, METH_VARARGS, (char *)"vector_cvector_t___len__(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::size_type"}, - { (char *)"vector_cvector_t_pop", _wrap_vector_cvector_t_pop, METH_VARARGS, (char *)"vector_cvector_t_pop(vector_cvector_t self) -> cvector_t"}, { (char *)"vector_cvector_t___getslice__", _wrap_vector_cvector_t___getslice__, METH_VARARGS, (char *)"vector_cvector_t___getslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j) -> vector_cvector_t"}, { (char *)"vector_cvector_t___setslice__", _wrap_vector_cvector_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v)\n" - "vector_cvector_t___setslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j)\n" + "__setslice__(std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j)\n" + "vector_cvector_t___setslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j, vector_cvector_t v)\n" ""}, { (char *)"vector_cvector_t___delslice__", _wrap_vector_cvector_t___delslice__, METH_VARARGS, (char *)"vector_cvector_t___delslice__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type j)"}, { (char *)"vector_cvector_t___delitem__", _wrap_vector_cvector_t___delitem__, METH_VARARGS, (char *)"\n" @@ -89531,16 +89709,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_cvector_t___setitem__(vector_cvector_t self, std::vector< Geometry::BasicVector3D< std::complex< double > > >::difference_type i, cvector_t x)\n" ""}, + { (char *)"vector_cvector_t_pop", _wrap_vector_cvector_t_pop, METH_VARARGS, (char *)"vector_cvector_t_pop(vector_cvector_t self) -> cvector_t"}, { (char *)"vector_cvector_t_append", _wrap_vector_cvector_t_append, METH_VARARGS, (char *)"vector_cvector_t_append(vector_cvector_t self, cvector_t x)"}, { (char *)"vector_cvector_t_empty", _wrap_vector_cvector_t_empty, METH_VARARGS, (char *)"vector_cvector_t_empty(vector_cvector_t self) -> bool"}, { (char *)"vector_cvector_t_size", _wrap_vector_cvector_t_size, METH_VARARGS, (char *)"vector_cvector_t_size(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::size_type"}, - { (char *)"vector_cvector_t_clear", _wrap_vector_cvector_t_clear, METH_VARARGS, (char *)"vector_cvector_t_clear(vector_cvector_t self)"}, { (char *)"vector_cvector_t_swap", _wrap_vector_cvector_t_swap, METH_VARARGS, (char *)"vector_cvector_t_swap(vector_cvector_t self, vector_cvector_t v)"}, - { (char *)"vector_cvector_t_get_allocator", _wrap_vector_cvector_t_get_allocator, METH_VARARGS, (char *)"vector_cvector_t_get_allocator(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type"}, { (char *)"vector_cvector_t_begin", _wrap_vector_cvector_t_begin, METH_VARARGS, (char *)"vector_cvector_t_begin(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::iterator"}, { (char *)"vector_cvector_t_end", _wrap_vector_cvector_t_end, METH_VARARGS, (char *)"vector_cvector_t_end(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::iterator"}, { (char *)"vector_cvector_t_rbegin", _wrap_vector_cvector_t_rbegin, METH_VARARGS, (char *)"vector_cvector_t_rbegin(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::reverse_iterator"}, { (char *)"vector_cvector_t_rend", _wrap_vector_cvector_t_rend, METH_VARARGS, (char *)"vector_cvector_t_rend(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::reverse_iterator"}, + { (char *)"vector_cvector_t_clear", _wrap_vector_cvector_t_clear, METH_VARARGS, (char *)"vector_cvector_t_clear(vector_cvector_t self)"}, + { (char *)"vector_cvector_t_get_allocator", _wrap_vector_cvector_t_get_allocator, METH_VARARGS, (char *)"vector_cvector_t_get_allocator(vector_cvector_t self) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type"}, { (char *)"vector_cvector_t_pop_back", _wrap_vector_cvector_t_pop_back, METH_VARARGS, (char *)"vector_cvector_t_pop_back(vector_cvector_t self)"}, { (char *)"vector_cvector_t_erase", _wrap_vector_cvector_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< Geometry::BasicVector3D< std::complex< double > > >::iterator pos) -> std::vector< Geometry::BasicVector3D< std::complex< double > > >::iterator\n" @@ -90198,11 +90377,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"swig_dummy_type_isample_vector___nonzero__", _wrap_swig_dummy_type_isample_vector___nonzero__, METH_VARARGS, (char *)"swig_dummy_type_isample_vector___nonzero__(swig_dummy_type_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_isample_vector___bool__", _wrap_swig_dummy_type_isample_vector___bool__, METH_VARARGS, (char *)"swig_dummy_type_isample_vector___bool__(swig_dummy_type_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_isample_vector___len__", _wrap_swig_dummy_type_isample_vector___len__, METH_VARARGS, (char *)"swig_dummy_type_isample_vector___len__(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::size_type"}, - { (char *)"swig_dummy_type_isample_vector_pop", _wrap_swig_dummy_type_isample_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_pop(swig_dummy_type_isample_vector self) -> ISample"}, { (char *)"swig_dummy_type_isample_vector___getslice__", _wrap_swig_dummy_type_isample_vector___getslice__, METH_VARARGS, (char *)"swig_dummy_type_isample_vector___getslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j) -> swig_dummy_type_isample_vector"}, { (char *)"swig_dummy_type_isample_vector___setslice__", _wrap_swig_dummy_type_isample_vector___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j, swig_dummy_type_isample_vector v)\n" - "swig_dummy_type_isample_vector___setslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j)\n" + "__setslice__(std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j)\n" + "swig_dummy_type_isample_vector___setslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j, swig_dummy_type_isample_vector v)\n" ""}, { (char *)"swig_dummy_type_isample_vector___delslice__", _wrap_swig_dummy_type_isample_vector___delslice__, METH_VARARGS, (char *)"swig_dummy_type_isample_vector___delslice__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, std::vector< ISample * >::difference_type j)"}, { (char *)"swig_dummy_type_isample_vector___delitem__", _wrap_swig_dummy_type_isample_vector___delitem__, METH_VARARGS, (char *)"\n" @@ -90218,16 +90396,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "swig_dummy_type_isample_vector___setitem__(swig_dummy_type_isample_vector self, std::vector< ISample * >::difference_type i, ISample x)\n" ""}, + { (char *)"swig_dummy_type_isample_vector_pop", _wrap_swig_dummy_type_isample_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_pop(swig_dummy_type_isample_vector self) -> ISample"}, { (char *)"swig_dummy_type_isample_vector_append", _wrap_swig_dummy_type_isample_vector_append, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_append(swig_dummy_type_isample_vector self, ISample x)"}, { (char *)"swig_dummy_type_isample_vector_empty", _wrap_swig_dummy_type_isample_vector_empty, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_empty(swig_dummy_type_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_isample_vector_size", _wrap_swig_dummy_type_isample_vector_size, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_size(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::size_type"}, - { (char *)"swig_dummy_type_isample_vector_clear", _wrap_swig_dummy_type_isample_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_clear(swig_dummy_type_isample_vector self)"}, { (char *)"swig_dummy_type_isample_vector_swap", _wrap_swig_dummy_type_isample_vector_swap, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_swap(swig_dummy_type_isample_vector self, swig_dummy_type_isample_vector v)"}, - { (char *)"swig_dummy_type_isample_vector_get_allocator", _wrap_swig_dummy_type_isample_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_get_allocator(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::allocator_type"}, { (char *)"swig_dummy_type_isample_vector_begin", _wrap_swig_dummy_type_isample_vector_begin, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_begin(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::iterator"}, { (char *)"swig_dummy_type_isample_vector_end", _wrap_swig_dummy_type_isample_vector_end, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_end(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::iterator"}, { (char *)"swig_dummy_type_isample_vector_rbegin", _wrap_swig_dummy_type_isample_vector_rbegin, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_rbegin(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::reverse_iterator"}, { (char *)"swig_dummy_type_isample_vector_rend", _wrap_swig_dummy_type_isample_vector_rend, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_rend(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::reverse_iterator"}, + { (char *)"swig_dummy_type_isample_vector_clear", _wrap_swig_dummy_type_isample_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_clear(swig_dummy_type_isample_vector self)"}, + { (char *)"swig_dummy_type_isample_vector_get_allocator", _wrap_swig_dummy_type_isample_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_get_allocator(swig_dummy_type_isample_vector self) -> std::vector< ISample * >::allocator_type"}, { (char *)"swig_dummy_type_isample_vector_pop_back", _wrap_swig_dummy_type_isample_vector_pop_back, METH_VARARGS, (char *)"swig_dummy_type_isample_vector_pop_back(swig_dummy_type_isample_vector self)"}, { (char *)"swig_dummy_type_isample_vector_erase", _wrap_swig_dummy_type_isample_vector_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< ISample * >::iterator pos) -> std::vector< ISample * >::iterator\n" @@ -90259,11 +90438,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"swig_dummy_type_const_isample_vector___nonzero__", _wrap_swig_dummy_type_const_isample_vector___nonzero__, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector___nonzero__(swig_dummy_type_const_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_const_isample_vector___bool__", _wrap_swig_dummy_type_const_isample_vector___bool__, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector___bool__(swig_dummy_type_const_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_const_isample_vector___len__", _wrap_swig_dummy_type_const_isample_vector___len__, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector___len__(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::size_type"}, - { (char *)"swig_dummy_type_const_isample_vector_pop", _wrap_swig_dummy_type_const_isample_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_pop(swig_dummy_type_const_isample_vector self) -> ISample"}, { (char *)"swig_dummy_type_const_isample_vector___getslice__", _wrap_swig_dummy_type_const_isample_vector___getslice__, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector___getslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j) -> swig_dummy_type_const_isample_vector"}, { (char *)"swig_dummy_type_const_isample_vector___setslice__", _wrap_swig_dummy_type_const_isample_vector___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j, swig_dummy_type_const_isample_vector v)\n" - "swig_dummy_type_const_isample_vector___setslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j)\n" + "__setslice__(std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j)\n" + "swig_dummy_type_const_isample_vector___setslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j, swig_dummy_type_const_isample_vector v)\n" ""}, { (char *)"swig_dummy_type_const_isample_vector___delslice__", _wrap_swig_dummy_type_const_isample_vector___delslice__, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector___delslice__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, std::vector< ISample const * >::difference_type j)"}, { (char *)"swig_dummy_type_const_isample_vector___delitem__", _wrap_swig_dummy_type_const_isample_vector___delitem__, METH_VARARGS, (char *)"\n" @@ -90279,16 +90457,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "swig_dummy_type_const_isample_vector___setitem__(swig_dummy_type_const_isample_vector self, std::vector< ISample const * >::difference_type i, ISample x)\n" ""}, + { (char *)"swig_dummy_type_const_isample_vector_pop", _wrap_swig_dummy_type_const_isample_vector_pop, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_pop(swig_dummy_type_const_isample_vector self) -> ISample"}, { (char *)"swig_dummy_type_const_isample_vector_append", _wrap_swig_dummy_type_const_isample_vector_append, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_append(swig_dummy_type_const_isample_vector self, ISample x)"}, { (char *)"swig_dummy_type_const_isample_vector_empty", _wrap_swig_dummy_type_const_isample_vector_empty, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_empty(swig_dummy_type_const_isample_vector self) -> bool"}, { (char *)"swig_dummy_type_const_isample_vector_size", _wrap_swig_dummy_type_const_isample_vector_size, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_size(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::size_type"}, - { (char *)"swig_dummy_type_const_isample_vector_clear", _wrap_swig_dummy_type_const_isample_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_clear(swig_dummy_type_const_isample_vector self)"}, { (char *)"swig_dummy_type_const_isample_vector_swap", _wrap_swig_dummy_type_const_isample_vector_swap, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_swap(swig_dummy_type_const_isample_vector self, swig_dummy_type_const_isample_vector v)"}, - { (char *)"swig_dummy_type_const_isample_vector_get_allocator", _wrap_swig_dummy_type_const_isample_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_get_allocator(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::allocator_type"}, { (char *)"swig_dummy_type_const_isample_vector_begin", _wrap_swig_dummy_type_const_isample_vector_begin, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_begin(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::iterator"}, { (char *)"swig_dummy_type_const_isample_vector_end", _wrap_swig_dummy_type_const_isample_vector_end, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_end(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::iterator"}, { (char *)"swig_dummy_type_const_isample_vector_rbegin", _wrap_swig_dummy_type_const_isample_vector_rbegin, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_rbegin(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::reverse_iterator"}, { (char *)"swig_dummy_type_const_isample_vector_rend", _wrap_swig_dummy_type_const_isample_vector_rend, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_rend(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::reverse_iterator"}, + { (char *)"swig_dummy_type_const_isample_vector_clear", _wrap_swig_dummy_type_const_isample_vector_clear, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_clear(swig_dummy_type_const_isample_vector self)"}, + { (char *)"swig_dummy_type_const_isample_vector_get_allocator", _wrap_swig_dummy_type_const_isample_vector_get_allocator, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_get_allocator(swig_dummy_type_const_isample_vector self) -> std::vector< ISample const * >::allocator_type"}, { (char *)"swig_dummy_type_const_isample_vector_pop_back", _wrap_swig_dummy_type_const_isample_vector_pop_back, METH_VARARGS, (char *)"swig_dummy_type_const_isample_vector_pop_back(swig_dummy_type_const_isample_vector self)"}, { (char *)"swig_dummy_type_const_isample_vector_erase", _wrap_swig_dummy_type_const_isample_vector_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< ISample const * >::iterator pos) -> std::vector< ISample const * >::iterator\n" @@ -90341,8 +90520,8 @@ static PyMethodDef SwigMethods[] = { "\n" ""}, { (char *)"ISampleBuilder_registerParameter", _wrap_ISampleBuilder_registerParameter, METH_VARARGS, (char *)"\n" - "registerParameter(std::string const & name, long parpointer, AttLimits limits)\n" - "ISampleBuilder_registerParameter(ISampleBuilder self, std::string const & name, long parpointer)\n" + "registerParameter(std::string const & name, int64_t parpointer, AttLimits limits)\n" + "ISampleBuilder_registerParameter(ISampleBuilder self, std::string const & name, int64_t parpointer)\n" ""}, { (char *)"ISampleBuilder_setParameterValue", _wrap_ISampleBuilder_setParameterValue, METH_VARARGS, (char *)"ISampleBuilder_setParameterValue(ISampleBuilder self, std::string const & name, double value) -> bool"}, { (char *)"disown_ISampleBuilder", _wrap_disown_ISampleBuilder, METH_VARARGS, NULL}, @@ -91987,11 +92166,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_IFormFactorPtr_t___nonzero__", _wrap_vector_IFormFactorPtr_t___nonzero__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___nonzero__(vector_IFormFactorPtr_t self) -> bool"}, { (char *)"vector_IFormFactorPtr_t___bool__", _wrap_vector_IFormFactorPtr_t___bool__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___bool__(vector_IFormFactorPtr_t self) -> bool"}, { (char *)"vector_IFormFactorPtr_t___len__", _wrap_vector_IFormFactorPtr_t___len__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___len__(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"}, - { (char *)"vector_IFormFactorPtr_t_pop", _wrap_vector_IFormFactorPtr_t_pop, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_pop(vector_IFormFactorPtr_t self) -> IFormFactor"}, { (char *)"vector_IFormFactorPtr_t___getslice__", _wrap_vector_IFormFactorPtr_t___getslice__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___getslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j) -> vector_IFormFactorPtr_t"}, { (char *)"vector_IFormFactorPtr_t___setslice__", _wrap_vector_IFormFactorPtr_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v)\n" - "vector_IFormFactorPtr_t___setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)\n" + "__setslice__(std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)\n" + "vector_IFormFactorPtr_t___setslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j, vector_IFormFactorPtr_t v)\n" ""}, { (char *)"vector_IFormFactorPtr_t___delslice__", _wrap_vector_IFormFactorPtr_t___delslice__, METH_VARARGS, (char *)"vector_IFormFactorPtr_t___delslice__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, std::vector< IFormFactor * >::difference_type j)"}, { (char *)"vector_IFormFactorPtr_t___delitem__", _wrap_vector_IFormFactorPtr_t___delitem__, METH_VARARGS, (char *)"\n" @@ -92007,16 +92185,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_IFormFactorPtr_t___setitem__(vector_IFormFactorPtr_t self, std::vector< IFormFactor * >::difference_type i, IFormFactor x)\n" ""}, + { (char *)"vector_IFormFactorPtr_t_pop", _wrap_vector_IFormFactorPtr_t_pop, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_pop(vector_IFormFactorPtr_t self) -> IFormFactor"}, { (char *)"vector_IFormFactorPtr_t_append", _wrap_vector_IFormFactorPtr_t_append, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_append(vector_IFormFactorPtr_t self, IFormFactor x)"}, { (char *)"vector_IFormFactorPtr_t_empty", _wrap_vector_IFormFactorPtr_t_empty, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_empty(vector_IFormFactorPtr_t self) -> bool"}, { (char *)"vector_IFormFactorPtr_t_size", _wrap_vector_IFormFactorPtr_t_size, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_size(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::size_type"}, - { (char *)"vector_IFormFactorPtr_t_clear", _wrap_vector_IFormFactorPtr_t_clear, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_clear(vector_IFormFactorPtr_t self)"}, { (char *)"vector_IFormFactorPtr_t_swap", _wrap_vector_IFormFactorPtr_t_swap, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_swap(vector_IFormFactorPtr_t self, vector_IFormFactorPtr_t v)"}, - { (char *)"vector_IFormFactorPtr_t_get_allocator", _wrap_vector_IFormFactorPtr_t_get_allocator, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"}, { (char *)"vector_IFormFactorPtr_t_begin", _wrap_vector_IFormFactorPtr_t_begin, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_begin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"}, { (char *)"vector_IFormFactorPtr_t_end", _wrap_vector_IFormFactorPtr_t_end, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_end(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::iterator"}, { (char *)"vector_IFormFactorPtr_t_rbegin", _wrap_vector_IFormFactorPtr_t_rbegin, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_rbegin(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"}, { (char *)"vector_IFormFactorPtr_t_rend", _wrap_vector_IFormFactorPtr_t_rend, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_rend(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::reverse_iterator"}, + { (char *)"vector_IFormFactorPtr_t_clear", _wrap_vector_IFormFactorPtr_t_clear, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_clear(vector_IFormFactorPtr_t self)"}, + { (char *)"vector_IFormFactorPtr_t_get_allocator", _wrap_vector_IFormFactorPtr_t_get_allocator, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_get_allocator(vector_IFormFactorPtr_t self) -> std::vector< IFormFactor * >::allocator_type"}, { (char *)"vector_IFormFactorPtr_t_pop_back", _wrap_vector_IFormFactorPtr_t_pop_back, METH_VARARGS, (char *)"vector_IFormFactorPtr_t_pop_back(vector_IFormFactorPtr_t self)"}, { (char *)"vector_IFormFactorPtr_t_erase", _wrap_vector_IFormFactorPtr_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< IFormFactor * >::iterator pos) -> std::vector< IFormFactor * >::iterator\n" @@ -101807,14 +101986,17 @@ static swig_type_info _swigt__p_const_iterator = {"_p_const_iterator", "const_it static swig_type_info _swigt__p_const_reference = {"_p_const_reference", "const_reference *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "difference_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_iterator = {"_p_iterator", "iterator *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|int_fast64_t *|int64_t *|long long *|intmax_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_observer_t = {"_p_observer_t", "observer_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_observerlist_t = {"_p_observerlist_t", "observerlist_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p__object = {"_p_p__object", "_object **|PyObject **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_parameter_t = {"_p_parameter_t", "parameter_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_parametermap_t = {"_p_parametermap_t", "parametermap_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_reference = {"_p_reference", "reference *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__allocatorT_Geometry__BasicVector3DT_double_t_t = {"_p_std__allocatorT_Geometry__BasicVector3DT_double_t_t", "std::vector< Geometry::BasicVector3D< double > >::allocator_type *|std::allocator< Geometry::BasicVector3D< double > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t = {"_p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t", "std::vector< Geometry::BasicVector3D< std::complex< double > > >::allocator_type *|std::allocator< Geometry::BasicVector3D< std::complex< double > > > *", 0, 0, (void*)0, 0}; @@ -101852,6 +102034,10 @@ static swig_type_info _swigt__p_std__vectorT_std__string_std__allocatorT_std__st static swig_type_info _swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t = {"_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t", "std::vector< std::vector< double > > *|std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *|std::vector< std::vector< double,std::allocator< double > > > *|vdouble2d_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t = {"_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t", "std::vector< unsigned long > *|std::vector< unsigned long,std::allocator< unsigned long > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_swig__SwigPyIterator = {"_p_swig__SwigPyIterator", "swig::SwigPyIterator *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint_least8_t *|uint_fast8_t *|uint8_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "uintptr_t *|uint_least32_t *|uint_fast32_t *|uint32_t *|unsigned int *|uint_fast16_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint_least64_t *|uint_fast64_t *|uint64_t *|unsigned long long *|uintmax_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { @@ -102049,12 +102235,15 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_double, &_swigt__p_int, &_swigt__p_iterator, + &_swigt__p_long_long, &_swigt__p_observer_t, &_swigt__p_observerlist_t, &_swigt__p_p__object, &_swigt__p_parameter_t, &_swigt__p_parametermap_t, &_swigt__p_reference, + &_swigt__p_short, + &_swigt__p_signed_char, &_swigt__p_size_type, &_swigt__p_std__allocatorT_Geometry__BasicVector3DT_double_t_t, &_swigt__p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t, @@ -102092,6 +102281,10 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, &_swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, &_swigt__p_swig__SwigPyIterator, + &_swigt__p_unsigned_char, + &_swigt__p_unsigned_int, + &_swigt__p_unsigned_long_long, + &_swigt__p_unsigned_short, &_swigt__p_value_type, }; @@ -102289,12 +102482,15 @@ static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_ty static swig_cast_info _swigc__p_double[] = { {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_iterator[] = { {&_swigt__p_iterator, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_long_long[] = { {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_observer_t[] = { {&_swigt__p_observer_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_observerlist_t[] = { {&_swigt__p_observerlist_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p__object[] = { {&_swigt__p_p__object, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_parameter_t[] = { {&_swigt__p_parameter_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_parametermap_t[] = { {&_swigt__p_parametermap_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_reference[] = { {&_swigt__p_reference, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_short[] = { {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_signed_char[] = { {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_size_type[] = { {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__allocatorT_Geometry__BasicVector3DT_double_t_t[] = { {&_swigt__p_std__allocatorT_Geometry__BasicVector3DT_double_t_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t[] = { {&_swigt__p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -102332,6 +102528,10 @@ static swig_cast_info _swigc__p_std__vectorT_std__string_std__allocatorT_std__st static swig_cast_info _swigc__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t[] = { {&_swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t[] = { {&_swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_swig__SwigPyIterator[] = { {&_swigt__p_swig__SwigPyIterator, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_long_long[] = { {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_short[] = { {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_value_type[] = { {&_swigt__p_value_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { @@ -102529,12 +102729,15 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_double, _swigc__p_int, _swigc__p_iterator, + _swigc__p_long_long, _swigc__p_observer_t, _swigc__p_observerlist_t, _swigc__p_p__object, _swigc__p_parameter_t, _swigc__p_parametermap_t, _swigc__p_reference, + _swigc__p_short, + _swigc__p_signed_char, _swigc__p_size_type, _swigc__p_std__allocatorT_Geometry__BasicVector3DT_double_t_t, _swigc__p_std__allocatorT_Geometry__BasicVector3DT_std__complexT_double_t_t_t, @@ -102572,6 +102775,10 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, _swigc__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, _swigc__p_swig__SwigPyIterator, + _swigc__p_unsigned_char, + _swigc__p_unsigned_int, + _swigc__p_unsigned_long_long, + _swigc__p_unsigned_short, _swigc__p_value_type, }; @@ -102990,10 +103197,19 @@ extern "C" { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; varlink_type = tmp; diff --git a/Core/PythonAPI/libBornAgainCore_wrap.h b/Core/PythonAPI/libBornAgainCore_wrap.h index 71511993b4a76cc6de1a1c8847505c8084a9e3f7..4db817683048dbecedeff0c3fc9759c04e6b9163 100644 --- a/Core/PythonAPI/libBornAgainCore_wrap.h +++ b/Core/PythonAPI/libBornAgainCore_wrap.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.7 + * Version 3.0.8 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt index 5f03b767d526488ca9d2663980366a275299de2f..b4096836b0ac63adcaaef3d94f632b444ed7910b 100644 --- a/Fit/CMakeLists.txt +++ b/Fit/CMakeLists.txt @@ -77,13 +77,13 @@ if(BORNAGAIN_PYTHON) add_custom_command ( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py COMMAND ${SWIG_EXECUTABLE} ${SWIG_FLAGS} ${bornagain_swig_dir}/libBornAgainFit.i - COMMAND mv ${bornagain_swig_dir}/libBornAgainFit.py ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py - COMMAND mv ${bornagain_swig_dir}/libBornAgainFit_wrap.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.cxx - COMMAND mv ${bornagain_swig_dir}/libBornAgainFit_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.h - COMMAND sed -i "'s/_libBornAgainCore.ICloneable_transferToCPP(self)/self.__disown__()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinCenters(self)/self.getBinCentersNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinErrors(self)/self.getBinErrorsNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py - COMMAND sed -i "'s/_libBornAgainCore.Histogram1D_getBinValues(self)/self.getBinValuesNumpy()/g'" ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py + COMMAND ${PYTHON_EXECUTABLE} ${bornagain_swig_dir}/tweaks.py ${bornagain_swig_dir}/libBornAgainFit.py ${bornagain_swig_dir}/libBornAgainFit.py + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainFit.py ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit.py + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainFit_wrap.cxx ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E copy ${bornagain_swig_dir}/libBornAgainFit_wrap.h ${CMAKE_CURRENT_SOURCE_DIR}/PythonAPI/libBornAgainFit_wrap.h + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainFit.py + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainFit_wrap.cxx + COMMAND ${CMAKE_COMMAND} -E remove ${bornagain_swig_dir}/libBornAgainFit_wrap.h DEPENDS ${swig_dependencies} ) diff --git a/Fit/PythonAPI/libBornAgainFit.py b/Fit/PythonAPI/libBornAgainFit.py index f512a6ef1cf82e9c41cb84aa5d3b12bca5577bdb..330015dbfcaba66483ae2683fecef8fee4dbb52f 100644 --- a/Fit/PythonAPI/libBornAgainFit.py +++ b/Fit/PythonAPI/libBornAgainFit.py @@ -1,5 +1,5 @@ # This file was automatically generated by SWIG (http://www.swig.org). -# Version 3.0.7 +# Version 3.0.8 # # Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. @@ -77,7 +77,7 @@ def _swig_getattr(self, class_type, name): def _swig_repr(self): try: strthis = "proxy of " + self.this.__repr__() - except: + except Exception: strthis = "" return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) @@ -93,12 +93,13 @@ except AttributeError: try: import weakref weakref_proxy = weakref.proxy -except: +except Exception: weakref_proxy = lambda x: x class SwigPyIterator(_object): - """Proxy of C++ swig::SwigPyIterator class""" + """Proxy of C++ swig::SwigPyIterator class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, SwigPyIterator, name, value) __swig_getmethods__ = {} @@ -207,7 +208,8 @@ SwigPyIterator_swigregister(SwigPyIterator) _libBornAgainFit.SHARED_PTR_DISOWN_swigconstant(_libBornAgainFit) SHARED_PTR_DISOWN = _libBornAgainFit.SHARED_PTR_DISOWN class vdouble1d_t(_object): - """Proxy of C++ std::vector<(double)> class""" + """Proxy of C++ std::vector<(double)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble1d_t, name, value) __swig_getmethods__ = {} @@ -236,11 +238,6 @@ class vdouble1d_t(_object): return _libBornAgainFit.vdouble1d_t___len__(self) - def pop(self): - """pop(vdouble1d_t self) -> std::vector< double >::value_type""" - return _libBornAgainFit.vdouble1d_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t""" return _libBornAgainFit.vdouble1d_t___getslice__(self, i, j) @@ -248,8 +245,8 @@ class vdouble1d_t(_object): def __setslice__(self, *args): """ - __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v) __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) + __setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v) """ return _libBornAgainFit.vdouble1d_t___setslice__(self, *args) @@ -284,6 +281,11 @@ class vdouble1d_t(_object): return _libBornAgainFit.vdouble1d_t___setitem__(self, *args) + def pop(self): + """pop(vdouble1d_t self) -> std::vector< double >::value_type""" + return _libBornAgainFit.vdouble1d_t_pop(self) + + def append(self, x): """append(vdouble1d_t self, std::vector< double >::value_type const & x)""" return _libBornAgainFit.vdouble1d_t_append(self, x) @@ -299,21 +301,11 @@ class vdouble1d_t(_object): return _libBornAgainFit.vdouble1d_t_size(self) - def clear(self): - """clear(vdouble1d_t self)""" - return _libBornAgainFit.vdouble1d_t_clear(self) - - def swap(self, v): """swap(vdouble1d_t self, vdouble1d_t v)""" return _libBornAgainFit.vdouble1d_t_swap(self, v) - def get_allocator(self): - """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type""" - return _libBornAgainFit.vdouble1d_t_get_allocator(self) - - def begin(self): """begin(vdouble1d_t self) -> std::vector< double >::iterator""" return _libBornAgainFit.vdouble1d_t_begin(self) @@ -334,6 +326,16 @@ class vdouble1d_t(_object): return _libBornAgainFit.vdouble1d_t_rend(self) + def clear(self): + """clear(vdouble1d_t self)""" + return _libBornAgainFit.vdouble1d_t_clear(self) + + + def get_allocator(self): + """get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type""" + return _libBornAgainFit.vdouble1d_t_get_allocator(self) + + def pop_back(self): """pop_back(vdouble1d_t self)""" return _libBornAgainFit.vdouble1d_t_pop_back(self) @@ -357,7 +359,7 @@ class vdouble1d_t(_object): this = _libBornAgainFit.new_vdouble1d_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -411,7 +413,8 @@ vdouble1d_t_swigregister = _libBornAgainFit.vdouble1d_t_swigregister vdouble1d_t_swigregister(vdouble1d_t) class vdouble2d_t(_object): - """Proxy of C++ std::vector<(std::vector<(double)>)> class""" + """Proxy of C++ std::vector<(std::vector<(double)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vdouble2d_t, name, value) __swig_getmethods__ = {} @@ -440,11 +443,6 @@ class vdouble2d_t(_object): return _libBornAgainFit.vdouble2d_t___len__(self) - def pop(self): - """pop(vdouble2d_t self) -> vdouble1d_t""" - return _libBornAgainFit.vdouble2d_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t""" return _libBornAgainFit.vdouble2d_t___getslice__(self, i, j) @@ -452,8 +450,8 @@ class vdouble2d_t(_object): def __setslice__(self, *args): """ - __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v) __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) + __setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v) """ return _libBornAgainFit.vdouble2d_t___setslice__(self, *args) @@ -488,6 +486,11 @@ class vdouble2d_t(_object): return _libBornAgainFit.vdouble2d_t___setitem__(self, *args) + def pop(self): + """pop(vdouble2d_t self) -> vdouble1d_t""" + return _libBornAgainFit.vdouble2d_t_pop(self) + + def append(self, x): """append(vdouble2d_t self, vdouble1d_t x)""" return _libBornAgainFit.vdouble2d_t_append(self, x) @@ -503,21 +506,11 @@ class vdouble2d_t(_object): return _libBornAgainFit.vdouble2d_t_size(self) - def clear(self): - """clear(vdouble2d_t self)""" - return _libBornAgainFit.vdouble2d_t_clear(self) - - def swap(self, v): """swap(vdouble2d_t self, vdouble2d_t v)""" return _libBornAgainFit.vdouble2d_t_swap(self, v) - def get_allocator(self): - """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type""" - return _libBornAgainFit.vdouble2d_t_get_allocator(self) - - def begin(self): """begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator""" return _libBornAgainFit.vdouble2d_t_begin(self) @@ -538,6 +531,16 @@ class vdouble2d_t(_object): return _libBornAgainFit.vdouble2d_t_rend(self) + def clear(self): + """clear(vdouble2d_t self)""" + return _libBornAgainFit.vdouble2d_t_clear(self) + + + def get_allocator(self): + """get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type""" + return _libBornAgainFit.vdouble2d_t_get_allocator(self) + + def pop_back(self): """pop_back(vdouble2d_t self)""" return _libBornAgainFit.vdouble2d_t_pop_back(self) @@ -561,7 +564,7 @@ class vdouble2d_t(_object): this = _libBornAgainFit.new_vdouble2d_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -615,7 +618,8 @@ vdouble2d_t_swigregister = _libBornAgainFit.vdouble2d_t_swigregister vdouble2d_t_swigregister(vdouble2d_t) class vector_integer_t(_object): - """Proxy of C++ std::vector<(int)> class""" + """Proxy of C++ std::vector<(int)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_integer_t, name, value) __swig_getmethods__ = {} @@ -644,11 +648,6 @@ class vector_integer_t(_object): return _libBornAgainFit.vector_integer_t___len__(self) - def pop(self): - """pop(vector_integer_t self) -> std::vector< int >::value_type""" - return _libBornAgainFit.vector_integer_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t""" return _libBornAgainFit.vector_integer_t___getslice__(self, i, j) @@ -656,8 +655,8 @@ class vector_integer_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v) __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) + __setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v) """ return _libBornAgainFit.vector_integer_t___setslice__(self, *args) @@ -692,6 +691,11 @@ class vector_integer_t(_object): return _libBornAgainFit.vector_integer_t___setitem__(self, *args) + def pop(self): + """pop(vector_integer_t self) -> std::vector< int >::value_type""" + return _libBornAgainFit.vector_integer_t_pop(self) + + def append(self, x): """append(vector_integer_t self, std::vector< int >::value_type const & x)""" return _libBornAgainFit.vector_integer_t_append(self, x) @@ -707,21 +711,11 @@ class vector_integer_t(_object): return _libBornAgainFit.vector_integer_t_size(self) - def clear(self): - """clear(vector_integer_t self)""" - return _libBornAgainFit.vector_integer_t_clear(self) - - def swap(self, v): """swap(vector_integer_t self, vector_integer_t v)""" return _libBornAgainFit.vector_integer_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type""" - return _libBornAgainFit.vector_integer_t_get_allocator(self) - - def begin(self): """begin(vector_integer_t self) -> std::vector< int >::iterator""" return _libBornAgainFit.vector_integer_t_begin(self) @@ -742,6 +736,16 @@ class vector_integer_t(_object): return _libBornAgainFit.vector_integer_t_rend(self) + def clear(self): + """clear(vector_integer_t self)""" + return _libBornAgainFit.vector_integer_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type""" + return _libBornAgainFit.vector_integer_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_integer_t self)""" return _libBornAgainFit.vector_integer_t_pop_back(self) @@ -765,7 +769,7 @@ class vector_integer_t(_object): this = _libBornAgainFit.new_vector_integer_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -819,7 +823,8 @@ vector_integer_t_swigregister = _libBornAgainFit.vector_integer_t_swigregister vector_integer_t_swigregister(vector_integer_t) class vector_longinteger_t(_object): - """Proxy of C++ std::vector<(unsigned long)> class""" + """Proxy of C++ std::vector<(unsigned long)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_longinteger_t, name, value) __swig_getmethods__ = {} @@ -848,11 +853,6 @@ class vector_longinteger_t(_object): return _libBornAgainFit.vector_longinteger_t___len__(self) - def pop(self): - """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type""" - return _libBornAgainFit.vector_longinteger_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t""" return _libBornAgainFit.vector_longinteger_t___getslice__(self, i, j) @@ -860,8 +860,8 @@ class vector_longinteger_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v) __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) + __setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v) """ return _libBornAgainFit.vector_longinteger_t___setslice__(self, *args) @@ -896,6 +896,11 @@ class vector_longinteger_t(_object): return _libBornAgainFit.vector_longinteger_t___setitem__(self, *args) + def pop(self): + """pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type""" + return _libBornAgainFit.vector_longinteger_t_pop(self) + + def append(self, x): """append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)""" return _libBornAgainFit.vector_longinteger_t_append(self, x) @@ -911,21 +916,11 @@ class vector_longinteger_t(_object): return _libBornAgainFit.vector_longinteger_t_size(self) - def clear(self): - """clear(vector_longinteger_t self)""" - return _libBornAgainFit.vector_longinteger_t_clear(self) - - def swap(self, v): """swap(vector_longinteger_t self, vector_longinteger_t v)""" return _libBornAgainFit.vector_longinteger_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type""" - return _libBornAgainFit.vector_longinteger_t_get_allocator(self) - - def begin(self): """begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator""" return _libBornAgainFit.vector_longinteger_t_begin(self) @@ -946,6 +941,16 @@ class vector_longinteger_t(_object): return _libBornAgainFit.vector_longinteger_t_rend(self) + def clear(self): + """clear(vector_longinteger_t self)""" + return _libBornAgainFit.vector_longinteger_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type""" + return _libBornAgainFit.vector_longinteger_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_longinteger_t self)""" return _libBornAgainFit.vector_longinteger_t_pop_back(self) @@ -969,7 +974,7 @@ class vector_longinteger_t(_object): this = _libBornAgainFit.new_vector_longinteger_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1023,7 +1028,8 @@ vector_longinteger_t_swigregister = _libBornAgainFit.vector_longinteger_t_swigre vector_longinteger_t_swigregister(vector_longinteger_t) class vector_complex_t(_object): - """Proxy of C++ std::vector<(std::complex<(double)>)> class""" + """Proxy of C++ std::vector<(std::complex<(double)>)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_complex_t, name, value) __swig_getmethods__ = {} @@ -1052,11 +1058,6 @@ class vector_complex_t(_object): return _libBornAgainFit.vector_complex_t___len__(self) - def pop(self): - """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type""" - return _libBornAgainFit.vector_complex_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t""" return _libBornAgainFit.vector_complex_t___getslice__(self, i, j) @@ -1064,8 +1065,8 @@ class vector_complex_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v) __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) + __setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v) """ return _libBornAgainFit.vector_complex_t___setslice__(self, *args) @@ -1100,6 +1101,11 @@ class vector_complex_t(_object): return _libBornAgainFit.vector_complex_t___setitem__(self, *args) + def pop(self): + """pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type""" + return _libBornAgainFit.vector_complex_t_pop(self) + + def append(self, x): """append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)""" return _libBornAgainFit.vector_complex_t_append(self, x) @@ -1115,21 +1121,11 @@ class vector_complex_t(_object): return _libBornAgainFit.vector_complex_t_size(self) - def clear(self): - """clear(vector_complex_t self)""" - return _libBornAgainFit.vector_complex_t_clear(self) - - def swap(self, v): """swap(vector_complex_t self, vector_complex_t v)""" return _libBornAgainFit.vector_complex_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type""" - return _libBornAgainFit.vector_complex_t_get_allocator(self) - - def begin(self): """begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator""" return _libBornAgainFit.vector_complex_t_begin(self) @@ -1150,6 +1146,16 @@ class vector_complex_t(_object): return _libBornAgainFit.vector_complex_t_rend(self) + def clear(self): + """clear(vector_complex_t self)""" + return _libBornAgainFit.vector_complex_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type""" + return _libBornAgainFit.vector_complex_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_complex_t self)""" return _libBornAgainFit.vector_complex_t_pop_back(self) @@ -1173,7 +1179,7 @@ class vector_complex_t(_object): this = _libBornAgainFit.new_vector_complex_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1227,7 +1233,8 @@ vector_complex_t_swigregister = _libBornAgainFit.vector_complex_t_swigregister vector_complex_t_swigregister(vector_complex_t) class vector_string_t(_object): - """Proxy of C++ std::vector<(std::string)> class""" + """Proxy of C++ std::vector<(std::string)> class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, vector_string_t, name, value) __swig_getmethods__ = {} @@ -1256,11 +1263,6 @@ class vector_string_t(_object): return _libBornAgainFit.vector_string_t___len__(self) - def pop(self): - """pop(vector_string_t self) -> std::vector< std::string >::value_type""" - return _libBornAgainFit.vector_string_t_pop(self) - - def __getslice__(self, i, j): """__getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t""" return _libBornAgainFit.vector_string_t___getslice__(self, i, j) @@ -1268,8 +1270,8 @@ class vector_string_t(_object): def __setslice__(self, *args): """ - __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v) __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) + __setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v) """ return _libBornAgainFit.vector_string_t___setslice__(self, *args) @@ -1304,6 +1306,11 @@ class vector_string_t(_object): return _libBornAgainFit.vector_string_t___setitem__(self, *args) + def pop(self): + """pop(vector_string_t self) -> std::vector< std::string >::value_type""" + return _libBornAgainFit.vector_string_t_pop(self) + + def append(self, x): """append(vector_string_t self, std::vector< std::string >::value_type const & x)""" return _libBornAgainFit.vector_string_t_append(self, x) @@ -1319,21 +1326,11 @@ class vector_string_t(_object): return _libBornAgainFit.vector_string_t_size(self) - def clear(self): - """clear(vector_string_t self)""" - return _libBornAgainFit.vector_string_t_clear(self) - - def swap(self, v): """swap(vector_string_t self, vector_string_t v)""" return _libBornAgainFit.vector_string_t_swap(self, v) - def get_allocator(self): - """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type""" - return _libBornAgainFit.vector_string_t_get_allocator(self) - - def begin(self): """begin(vector_string_t self) -> std::vector< std::string >::iterator""" return _libBornAgainFit.vector_string_t_begin(self) @@ -1354,6 +1351,16 @@ class vector_string_t(_object): return _libBornAgainFit.vector_string_t_rend(self) + def clear(self): + """clear(vector_string_t self)""" + return _libBornAgainFit.vector_string_t_clear(self) + + + def get_allocator(self): + """get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type""" + return _libBornAgainFit.vector_string_t_get_allocator(self) + + def pop_back(self): """pop_back(vector_string_t self)""" return _libBornAgainFit.vector_string_t_pop_back(self) @@ -1377,7 +1384,7 @@ class vector_string_t(_object): this = _libBornAgainFit.new_vector_string_t(*args) try: self.this.append(this) - except: + except Exception: self.this = this def push_back(self, x): @@ -1443,6 +1450,7 @@ class IMinimizer(_object): C++ includes: IMinimizer.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IMinimizer, name, value) __swig_getmethods__ = {} @@ -1696,7 +1704,8 @@ IMinimizer_swigregister = _libBornAgainFit.IMinimizer_swigregister IMinimizer_swigregister(IMinimizer) class IChiSquaredModule(libBornAgainCore.ICloneable): - """Proxy of C++ IChiSquaredModule class""" + """Proxy of C++ IChiSquaredModule class.""" + __swig_setmethods__ = {} for _s in [libBornAgainCore.ICloneable]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1769,6 +1778,7 @@ class IFitObserver(libBornAgainCore.IObserver): C++ includes: IFitObserver.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.IObserver]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1793,7 +1803,7 @@ class IFitObserver(libBornAgainCore.IObserver): this = _libBornAgainFit.new_IFitObserver(_self, update_every_nth) try: self.this.append(this) - except: + except Exception: self.this = this def notify(self, subject): @@ -1839,6 +1849,7 @@ class IFitStrategy(libBornAgainCore.INamed): C++ includes: IFitStrategy.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.INamed]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1895,6 +1906,7 @@ class FitStrategyDefault(IFitStrategy): C++ includes: IFitStrategy.h """ + __swig_setmethods__ = {} for _s in [IFitStrategy]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1915,7 +1927,7 @@ class FitStrategyDefault(IFitStrategy): this = _libBornAgainFit.new_FitStrategyDefault() try: self.this.append(this) - except: + except Exception: self.this = this def clone(self): @@ -1943,7 +1955,8 @@ FitStrategyDefault_swigregister = _libBornAgainFit.FitStrategyDefault_swigregist FitStrategyDefault_swigregister(FitStrategyDefault) class IIntensityFunction(_object): - """Proxy of C++ IIntensityFunction class""" + """Proxy of C++ IIntensityFunction class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, IIntensityFunction, name, value) __swig_getmethods__ = {} @@ -1968,7 +1981,8 @@ IIntensityFunction_swigregister = _libBornAgainFit.IIntensityFunction_swigregist IIntensityFunction_swigregister(IIntensityFunction) class IntensityFunctionLog(IIntensityFunction): - """Proxy of C++ IntensityFunctionLog class""" + """Proxy of C++ IntensityFunctionLog class.""" + __swig_setmethods__ = {} for _s in [IIntensityFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -1996,13 +2010,14 @@ class IntensityFunctionLog(IIntensityFunction): this = _libBornAgainFit.new_IntensityFunctionLog() try: self.this.append(this) - except: + except Exception: self.this = this IntensityFunctionLog_swigregister = _libBornAgainFit.IntensityFunctionLog_swigregister IntensityFunctionLog_swigregister(IntensityFunctionLog) class IntensityFunctionSqrt(IIntensityFunction): - """Proxy of C++ IntensityFunctionSqrt class""" + """Proxy of C++ IntensityFunctionSqrt class.""" + __swig_setmethods__ = {} for _s in [IIntensityFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2030,13 +2045,14 @@ class IntensityFunctionSqrt(IIntensityFunction): this = _libBornAgainFit.new_IntensityFunctionSqrt() try: self.this.append(this) - except: + except Exception: self.this = this IntensityFunctionSqrt_swigregister = _libBornAgainFit.IntensityFunctionSqrt_swigregister IntensityFunctionSqrt_swigregister(IntensityFunctionSqrt) class IIntensityNormalizer(libBornAgainCore.IParameterized): - """Proxy of C++ IIntensityNormalizer class""" + """Proxy of C++ IIntensityNormalizer class.""" + __swig_setmethods__ = {} for _s in [libBornAgainCore.IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2075,7 +2091,8 @@ IIntensityNormalizer_swigregister = _libBornAgainFit.IIntensityNormalizer_swigre IIntensityNormalizer_swigregister(IIntensityNormalizer) class IntensityNormalizer(IIntensityNormalizer): - """Proxy of C++ IntensityNormalizer class""" + """Proxy of C++ IntensityNormalizer class.""" + __swig_setmethods__ = {} for _s in [IIntensityNormalizer]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2095,7 +2112,7 @@ class IntensityNormalizer(IIntensityNormalizer): this = _libBornAgainFit.new_IntensityNormalizer(scale, shift) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_IntensityNormalizer __del__ = lambda self: None @@ -2123,7 +2140,8 @@ IntensityNormalizer_swigregister = _libBornAgainFit.IntensityNormalizer_swigregi IntensityNormalizer_swigregister(IntensityNormalizer) class IntensityScaleAndShiftNormalizer(IntensityNormalizer): - """Proxy of C++ IntensityScaleAndShiftNormalizer class""" + """Proxy of C++ IntensityScaleAndShiftNormalizer class.""" + __swig_setmethods__ = {} for _s in [IntensityNormalizer]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2143,7 +2161,7 @@ class IntensityScaleAndShiftNormalizer(IntensityNormalizer): this = _libBornAgainFit.new_IntensityScaleAndShiftNormalizer(scale, shift) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_IntensityScaleAndShiftNormalizer __del__ = lambda self: None @@ -2161,7 +2179,8 @@ IntensityScaleAndShiftNormalizer_swigregister = _libBornAgainFit.IntensityScaleA IntensityScaleAndShiftNormalizer_swigregister(IntensityScaleAndShiftNormalizer) class ISquaredFunction(_object): - """Proxy of C++ ISquaredFunction class""" + """Proxy of C++ ISquaredFunction class.""" + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, ISquaredFunction, name, value) __swig_getmethods__ = {} @@ -2194,7 +2213,8 @@ ISquaredFunction_swigregister = _libBornAgainFit.ISquaredFunction_swigregister ISquaredFunction_swigregister(ISquaredFunction) class SquaredFunctionDefault(ISquaredFunction): - """Proxy of C++ SquaredFunctionDefault class""" + """Proxy of C++ SquaredFunctionDefault class.""" + __swig_setmethods__ = {} for _s in [ISquaredFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2210,7 +2230,7 @@ class SquaredFunctionDefault(ISquaredFunction): this = _libBornAgainFit.new_SquaredFunctionDefault() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_SquaredFunctionDefault __del__ = lambda self: None @@ -2236,7 +2256,8 @@ SquaredFunctionDefault_swigregister = _libBornAgainFit.SquaredFunctionDefault_sw SquaredFunctionDefault_swigregister(SquaredFunctionDefault) class SquaredFunctionSimError(ISquaredFunction): - """Proxy of C++ SquaredFunctionSimError class""" + """Proxy of C++ SquaredFunctionSimError class.""" + __swig_setmethods__ = {} for _s in [ISquaredFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2270,7 +2291,8 @@ SquaredFunctionSimError_swigregister = _libBornAgainFit.SquaredFunctionSimError_ SquaredFunctionSimError_swigregister(SquaredFunctionSimError) class SquaredFunctionMeanSquaredError(ISquaredFunction): - """Proxy of C++ SquaredFunctionMeanSquaredError class""" + """Proxy of C++ SquaredFunctionMeanSquaredError class.""" + __swig_setmethods__ = {} for _s in [ISquaredFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2304,7 +2326,8 @@ SquaredFunctionMeanSquaredError_swigregister = _libBornAgainFit.SquaredFunctionM SquaredFunctionMeanSquaredError_swigregister(SquaredFunctionMeanSquaredError) class SquaredFunctionSystematicError(ISquaredFunction): - """Proxy of C++ SquaredFunctionSystematicError class""" + """Proxy of C++ SquaredFunctionSystematicError class.""" + __swig_setmethods__ = {} for _s in [ISquaredFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2338,7 +2361,8 @@ SquaredFunctionSystematicError_swigregister = _libBornAgainFit.SquaredFunctionSy SquaredFunctionSystematicError_swigregister(SquaredFunctionSystematicError) class SquaredFunctionGaussianError(ISquaredFunction): - """Proxy of C++ SquaredFunctionGaussianError class""" + """Proxy of C++ SquaredFunctionGaussianError class.""" + __swig_setmethods__ = {} for _s in [ISquaredFunction]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2372,7 +2396,8 @@ SquaredFunctionGaussianError_swigregister = _libBornAgainFit.SquaredFunctionGaus SquaredFunctionGaussianError_swigregister(SquaredFunctionGaussianError) class ChiSquaredModule(IChiSquaredModule): - """Proxy of C++ ChiSquaredModule class""" + """Proxy of C++ ChiSquaredModule class.""" + __swig_setmethods__ = {} for _s in [IChiSquaredModule]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2391,7 +2416,7 @@ class ChiSquaredModule(IChiSquaredModule): this = _libBornAgainFit.new_ChiSquaredModule(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_ChiSquaredModule __del__ = lambda self: None @@ -2417,6 +2442,7 @@ class FitObject(libBornAgainCore.IParameterized): C++ includes: FitObject.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2456,7 +2482,7 @@ class FitObject(libBornAgainCore.IParameterized): this = _libBornAgainFit.new_FitObject(simulation, real_data, weight, adjust_detector_to_data) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitObject __del__ = lambda self: None @@ -2557,6 +2583,7 @@ class FitOptions(_object): C++ includes: FitOptions.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, FitOptions, name, value) __swig_getmethods__ = {} @@ -2573,7 +2600,7 @@ class FitOptions(_object): this = _libBornAgainFit.new_FitOptions() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitOptions __del__ = lambda self: None @@ -2629,6 +2656,7 @@ class FitParameter(libBornAgainCore.INamed, libBornAgainCore.AttLimits): C++ includes: FitParameter.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.INamed, libBornAgainCore.AttLimits]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2653,7 +2681,7 @@ class FitParameter(libBornAgainCore.INamed, libBornAgainCore.AttLimits): this = _libBornAgainFit.new_FitParameter(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitParameter __del__ = lambda self: None @@ -2741,6 +2769,7 @@ class FitSuite(libBornAgainCore.IObservable): C++ includes: FitSuite.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.IObservable]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -2761,7 +2790,7 @@ class FitSuite(libBornAgainCore.IObservable): this = _libBornAgainFit.new_FitSuite() try: self.this.append(this) - except: + except Exception: self.this = this def addSimulationAndRealData(self, *args): @@ -3164,6 +3193,7 @@ class FitSuiteObjects(libBornAgainCore.IParameterized): C++ includes: FitSuiteObjects.h """ + __swig_setmethods__ = {} for _s in [libBornAgainCore.IParameterized]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -3184,7 +3214,7 @@ class FitSuiteObjects(libBornAgainCore.IParameterized): this = _libBornAgainFit.new_FitSuiteObjects() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitSuiteObjects __del__ = lambda self: None @@ -3368,6 +3398,7 @@ class FitSuiteParameters(_object): C++ includes: FitSuiteParameters.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, FitSuiteParameters, name, value) __swig_getmethods__ = {} @@ -3384,7 +3415,7 @@ class FitSuiteParameters(_object): this = _libBornAgainFit.new_FitSuiteParameters() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitSuiteParameters __del__ = lambda self: None @@ -3715,6 +3746,7 @@ class MinimizerOptions(_object): C++ includes: MinimizerOptions.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, MinimizerOptions, name, value) __swig_getmethods__ = {} @@ -3731,7 +3763,7 @@ class MinimizerOptions(_object): this = _libBornAgainFit.new_MinimizerOptions() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_MinimizerOptions __del__ = lambda self: None @@ -3943,6 +3975,7 @@ class MinimizerFactory(_object): C++ includes: MinimizerFactory.h """ + __swig_setmethods__ = {} __setattr__ = lambda self, name, value: _swig_setattr(self, MinimizerFactory, name, value) __swig_getmethods__ = {} @@ -3984,7 +4017,7 @@ class MinimizerFactory(_object): this = _libBornAgainFit.new_MinimizerFactory() try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_MinimizerFactory __del__ = lambda self: None @@ -4013,6 +4046,7 @@ class FitStrategyAdjustMinimizer(IFitStrategy): C++ includes: FitStrategyAdjustMinimizer.h """ + __swig_setmethods__ = {} for _s in [IFitStrategy]: __swig_setmethods__.update(getattr(_s, '__swig_setmethods__', {})) @@ -4036,7 +4070,7 @@ class FitStrategyAdjustMinimizer(IFitStrategy): this = _libBornAgainFit.new_FitStrategyAdjustMinimizer(*args) try: self.this.append(this) - except: + except Exception: self.this = this __swig_destroy__ = _libBornAgainFit.delete_FitStrategyAdjustMinimizer __del__ = lambda self: None diff --git a/Fit/PythonAPI/libBornAgainFit_wrap.cxx b/Fit/PythonAPI/libBornAgainFit_wrap.cxx index 34b118f0ddd932ec70fcc6da124a7895b7930645..4ce448ecd0527ea51a100a239e35656aa6914270 100644 --- a/Fit/PythonAPI/libBornAgainFit_wrap.cxx +++ b/Fit/PythonAPI/libBornAgainFit_wrap.cxx @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.7 + * Version 3.0.8 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make @@ -8,7 +8,11 @@ * interface file instead. * ----------------------------------------------------------------------------- */ + +#ifndef SWIGPYTHON #define SWIGPYTHON +#endif + #define SWIG_DIRECTORS #define SWIG_PYTHON_DIRECTOR_NO_VTABLE @@ -1326,7 +1330,7 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { /* Unpack the argument tuple */ -SWIGINTERN int +SWIGINTERN Py_ssize_t SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs) { if (!args) { @@ -1340,7 +1344,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi } if (!PyTuple_Check(args)) { if (min <= 1 && max >= 1) { - int i; + Py_ssize_t i; objs[0] = args; for (i = 1; i < max; ++i) { objs[i] = 0; @@ -1360,7 +1364,7 @@ SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssi name, (min == max ? "" : "at most "), (int)max, (int)l); return 0; } else { - int i; + Py_ssize_t i; for (i = 0; i < l; ++i) { objs[i] = PyTuple_GET_ITEM(args, i); } @@ -1701,16 +1705,32 @@ SwigPyObject_dealloc(PyObject *v) if (destroy) { /* destroy is always a VARARGS method */ PyObject *res; + + /* PyObject_CallFunction() has the potential to silently drop + the active active exception. In cases of unnamed temporary + variable or where we just finished iterating over a generator + StopIteration will be active right now, and this needs to + remain true upon return from SwigPyObject_dealloc. So save + and restore. */ + + PyObject *val = NULL, *type = NULL, *tb = NULL; + PyErr_Fetch(&val, &type, &tb); + if (data->delargs) { - /* we need to create a temporary object to carry the destroy operation */ - PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); - res = SWIG_Python_CallFunctor(destroy, tmp); - Py_DECREF(tmp); + /* we need to create a temporary object to carry the destroy operation */ + PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); + res = SWIG_Python_CallFunctor(destroy, tmp); + Py_DECREF(tmp); } else { - PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); - PyObject *mself = PyCFunction_GET_SELF(destroy); - res = ((*meth)(mself, v)); + PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); + PyObject *mself = PyCFunction_GET_SELF(destroy); + res = ((*meth)(mself, v)); } + if (!res) + PyErr_WriteUnraisable(destroy); + + PyErr_Restore(val, type, tb); + Py_XDECREF(res); } #if !defined(SWIG_PYTHON_SILENT_MEMLEAK) @@ -1734,6 +1754,7 @@ SwigPyObject_append(PyObject* v, PyObject* next) next = tmp; #endif if (!SwigPyObject_Check(next)) { + PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject"); return NULL; } sobj->next = next; @@ -1889,7 +1910,9 @@ SwigPyObject_TypeOnce(void) { (unaryfunc)SwigPyObject_oct, /*nb_oct*/ (unaryfunc)SwigPyObject_hex, /*nb_hex*/ #endif -#if PY_VERSION_HEX >= 0x03000000 /* 3.0 */ +#if PY_VERSION_HEX >= 0x03050000 /* 3.5 */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_matrix_multiply */ +#elif PY_VERSION_HEX >= 0x03000000 /* 3.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index, nb_inplace_divide removed */ #elif PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */ @@ -1969,10 +1992,19 @@ SwigPyObject_TypeOnce(void) { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; swigpyobject_type = tmp; @@ -2148,10 +2180,19 @@ SwigPyPacked_TypeOnce(void) { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; swigpypacked_type = tmp; @@ -2679,13 +2720,11 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o) { PyObject *dict; if (!PyModule_Check(m)) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs module as first arg"); + PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs module as first arg"); return SWIG_ERROR; } if (!o) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs non-NULL value"); + PyErr_SetString(PyExc_TypeError, "PyModule_AddObject() needs non-NULL value"); return SWIG_ERROR; } @@ -3467,38 +3506,45 @@ namespace Swig { #define SWIGTYPE_p_function_gradient_t swig_types[49] #define SWIGTYPE_p_int swig_types[50] #define SWIGTYPE_p_iterator swig_types[51] -#define SWIGTYPE_p_observer_t swig_types[52] -#define SWIGTYPE_p_observerlist_t swig_types[53] -#define SWIGTYPE_p_p_PyObject swig_types[54] -#define SWIGTYPE_p_parameters_t swig_types[55] -#define SWIGTYPE_p_size_type swig_types[56] -#define SWIGTYPE_p_std__allocatorT_double_t swig_types[57] -#define SWIGTYPE_p_std__allocatorT_int_t swig_types[58] -#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[59] -#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[60] -#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[61] -#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[62] -#define SWIGTYPE_p_std__invalid_argument swig_types[63] -#define SWIGTYPE_p_std__shared_ptrT_IFitObserver_t swig_types[64] -#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[65] -#define SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t swig_types[66] -#define SWIGTYPE_p_std__string swig_types[67] -#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t swig_types[68] -#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t__const_iterator swig_types[69] -#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t__iterator swig_types[70] -#define SWIGTYPE_p_std__vectorT_FitParameter_p_std__allocatorT_FitParameter_p_t_t__const_iterator swig_types[71] -#define SWIGTYPE_p_std__vectorT_FitParameter_p_std__allocatorT_FitParameter_p_t_t__iterator swig_types[72] -#define SWIGTYPE_p_std__vectorT_complex_t_std__allocatorT_complex_t_t_t swig_types[73] -#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[74] -#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[75] -#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[76] -#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[77] -#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[78] -#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[79] -#define SWIGTYPE_p_swig__SwigPyIterator swig_types[80] -#define SWIGTYPE_p_value_type swig_types[81] -static swig_type_info *swig_types[83]; -static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; +#define SWIGTYPE_p_long_long swig_types[52] +#define SWIGTYPE_p_observer_t swig_types[53] +#define SWIGTYPE_p_observerlist_t swig_types[54] +#define SWIGTYPE_p_p_PyObject swig_types[55] +#define SWIGTYPE_p_parameters_t swig_types[56] +#define SWIGTYPE_p_short swig_types[57] +#define SWIGTYPE_p_signed_char swig_types[58] +#define SWIGTYPE_p_size_type swig_types[59] +#define SWIGTYPE_p_std__allocatorT_double_t swig_types[60] +#define SWIGTYPE_p_std__allocatorT_int_t swig_types[61] +#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[62] +#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[63] +#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[64] +#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[65] +#define SWIGTYPE_p_std__invalid_argument swig_types[66] +#define SWIGTYPE_p_std__shared_ptrT_IFitObserver_t swig_types[67] +#define SWIGTYPE_p_std__shared_ptrT_IObserver_t swig_types[68] +#define SWIGTYPE_p_std__shared_ptrT_ISampleBuilder_t swig_types[69] +#define SWIGTYPE_p_std__string swig_types[70] +#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t swig_types[71] +#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t__const_iterator swig_types[72] +#define SWIGTYPE_p_std__vectorT_FitElement_std__allocatorT_FitElement_t_t__iterator swig_types[73] +#define SWIGTYPE_p_std__vectorT_FitParameter_p_std__allocatorT_FitParameter_p_t_t__const_iterator swig_types[74] +#define SWIGTYPE_p_std__vectorT_FitParameter_p_std__allocatorT_FitParameter_p_t_t__iterator swig_types[75] +#define SWIGTYPE_p_std__vectorT_complex_t_std__allocatorT_complex_t_t_t swig_types[76] +#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[77] +#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[78] +#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[79] +#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[80] +#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[81] +#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[82] +#define SWIGTYPE_p_swig__SwigPyIterator swig_types[83] +#define SWIGTYPE_p_unsigned_char swig_types[84] +#define SWIGTYPE_p_unsigned_int swig_types[85] +#define SWIGTYPE_p_unsigned_long_long swig_types[86] +#define SWIGTYPE_p_unsigned_short swig_types[87] +#define SWIGTYPE_p_value_type swig_types[88] +static swig_type_info *swig_types[90]; +static swig_module_info swig_module = {swig_types, 89, 0, 0, 0, 0}; #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name) #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name) @@ -3522,7 +3568,7 @@ static swig_module_info swig_module = {swig_types, 82, 0, 0, 0, 0}; #endif #define SWIG_name "_libBornAgainFit" -#define SWIGVERSION 0x030007 +#define SWIGVERSION 0x030008 #define SWIG_VERSION SWIGVERSION @@ -3603,6 +3649,9 @@ namespace swig { } +#include <stdint.h> // Use the C99 official header + + #include <complex> @@ -3765,9 +3814,11 @@ SWIG_AsVal_double (PyObject *obj, double *val) if (PyFloat_Check(obj)) { if (val) *val = PyFloat_AsDouble(obj); return SWIG_OK; +#if PY_VERSION_HEX < 0x03000000 } else if (PyInt_Check(obj)) { if (val) *val = PyInt_AsLong(obj); return SWIG_OK; +#endif } else if (PyLong_Check(obj)) { double v = PyLong_AsDouble(obj); if (!PyErr_Occurred()) { @@ -3859,18 +3910,7 @@ SWIG_AsVal_unsigned_SS_long (PyObject *obj, unsigned long *val) return SWIG_OK; } else { PyErr_Clear(); -#if PY_VERSION_HEX >= 0x03000000 - { - long v = PyLong_AsLong(obj); - if (!PyErr_Occurred()) { - if (v < 0) { - return SWIG_OverflowError; - } - } else { - PyErr_Clear(); - } - } -#endif + return SWIG_OverflowError; } } #ifdef SWIG_PYTHON_CAST_MODE @@ -3927,16 +3967,20 @@ SWIGINTERNINLINE PyObject* SWIGINTERN int SWIG_AsVal_long (PyObject *obj, long* val) { +#if PY_VERSION_HEX < 0x03000000 if (PyInt_Check(obj)) { if (val) *val = PyInt_AsLong(obj); return SWIG_OK; - } else if (PyLong_Check(obj)) { + } else +#endif + if (PyLong_Check(obj)) { long v = PyLong_AsLong(obj); if (!PyErr_Occurred()) { if (val) *val = v; return SWIG_OK; } else { PyErr_Clear(); + return SWIG_OverflowError; } } #ifdef SWIG_PYTHON_CAST_MODE @@ -3986,7 +4030,7 @@ SWIGINTERNINLINE PyObject* } -namespace swig { +namespace swig { template <class Type> struct noconst_traits { typedef Type noconst_type; @@ -4000,7 +4044,7 @@ namespace swig { /* type categories */ - struct pointer_category { }; + struct pointer_category { }; struct value_category { }; /* @@ -4013,12 +4057,12 @@ namespace swig { return traits<typename noconst_traits<Type >::noconst_type >::type_name(); } - template <class Type> + template <class Type> struct traits_info { static swig_type_info *type_query(std::string name) { name += " *"; return SWIG_TypeQuery(name.c_str()); - } + } static swig_type_info *type_info() { static swig_type_info *info = type_query(type_name<Type>()); return info; @@ -4039,17 +4083,17 @@ namespace swig { std::string ptrname = name; ptrname += " *"; return ptrname; - } + } static const char* type_name() { static std::string name = make_ptr_name(swig::type_name<Type>()); return name.c_str(); } }; - template <class Type, class Category> + template <class Type, class Category> struct traits_as { }; - - template <class Type, class Category> + + template <class Type, class Category> struct traits_check { }; } @@ -4393,6 +4437,12 @@ namespace swig { return pos; } + template <class Sequence> + inline void + erase(Sequence* seq, const typename Sequence::iterator& position) { + seq->erase(position); + } + template <class Sequence, class Difference> inline Sequence* getslice(const Sequence* self, Difference i, Difference j, Py_ssize_t step) { @@ -4767,7 +4817,7 @@ namespace swig template <class T> struct SwigPySequence_Ref { - SwigPySequence_Ref(PyObject* seq, int index) + SwigPySequence_Ref(PyObject* seq, Py_ssize_t index) : _seq(seq), _index(index) { } @@ -4779,7 +4829,7 @@ namespace swig return swig::as<T>(item, true); } catch (std::exception& e) { char msg[1024]; - sprintf(msg, "in sequence element %d ", _index); + sprintf(msg, "in sequence element %d ", (int)_index); if (!PyErr_Occurred()) { ::SWIG_Error(SWIG_TypeError, swig::type_name<T>()); } @@ -4797,7 +4847,7 @@ namespace swig private: PyObject* _seq; - int _index; + Py_ssize_t _index; }; template <class T> @@ -4818,13 +4868,13 @@ namespace swig typedef Reference reference; typedef T value_type; typedef T* pointer; - typedef int difference_type; + typedef Py_ssize_t difference_type; SwigPySequence_InputIterator() { } - SwigPySequence_InputIterator(PyObject* seq, int index) + SwigPySequence_InputIterator(PyObject* seq, Py_ssize_t index) : _seq(seq), _index(index) { } @@ -4904,6 +4954,7 @@ namespace swig difference_type _index; }; + // STL container wrapper around a Python sequence template <class T> struct SwigPySequence_Cont { @@ -4911,8 +4962,8 @@ namespace swig typedef const SwigPySequence_Ref<T> const_reference; typedef T value_type; typedef T* pointer; - typedef int difference_type; - typedef int size_type; + typedef Py_ssize_t difference_type; + typedef size_t size_type; typedef const pointer const_pointer; typedef SwigPySequence_InputIterator<T, reference> iterator; typedef SwigPySequence_InputIterator<T, const_reference> const_iterator; @@ -4973,13 +5024,13 @@ namespace swig bool check(bool set_err = true) const { - int s = size(); - for (int i = 0; i < s; ++i) { + Py_ssize_t s = size(); + for (Py_ssize_t i = 0; i < s; ++i) { swig::SwigVar_PyObject item = PySequence_GetItem(_seq, i); if (!swig::check<value_type>(item)) { if (set_err) { char msg[1024]; - sprintf(msg, "in sequence element %d", i); + sprintf(msg, "in sequence element %d", (int)i); SWIG_Error(SWIG_RuntimeError, msg); } return false; @@ -4999,17 +5050,17 @@ namespace swig namespace swig { - template <> struct traits<double > { + template <> struct traits< double > { typedef value_category category; static const char* type_name() { return"double"; } - }; - template <> struct traits_asval<double > { + }; + template <> struct traits_asval< double > { typedef double value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_double (obj, val); } }; - template <> struct traits_from<double > { + template <> struct traits_from< double > { typedef double value_type; static PyObject *from(const value_type& val) { return SWIG_From_double (val); @@ -5083,10 +5134,9 @@ namespace swig { #endif size_type size = seq.size(); if (size <= (size_type)INT_MAX) { - PyObject *obj = PyTuple_New((int)size); - int i = 0; - for (const_iterator it = seq.begin(); - it != seq.end(); ++it, ++i) { + PyObject *obj = PyTuple_New((Py_ssize_t)size); + Py_ssize_t i = 0; + for (const_iterator it = seq.begin(); it != seq.end(); ++it, ++i) { PyTuple_SetItem(obj,i,swig::from<value_type>(*it)); } return obj; @@ -5117,7 +5167,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<double, std::allocator< double > > > { + template <> struct traits<std::vector< double, std::allocator< double > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "double" "," "std::allocator< double >" " >"; @@ -5152,24 +5202,20 @@ SWIG_From_size_t (size_t value) return SWIG_From_unsigned_SS_long (static_cast< unsigned long >(value)); } -SWIGINTERN std::vector< double >::value_type std_vector_Sl_double_Sg__pop(std::vector< double > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<double,std::allocator< double > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j,std::vector< double,std::allocator< double > > const &v=std::vector< double,std::allocator< double > >()){ +SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< double,std::allocator< double > >()); + } +SWIGINTERN void std_vector_Sl_double_Sg____setslice____SWIG_1(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j,std::vector< double,std::allocator< double > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_double_Sg____delslice__(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_Sg____getitem____SWIG_0(std::vector< double > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5178,8 +5224,8 @@ SWIGINTERN std::vector< double,std::allocator< double > > *std_vector_Sl_double_ return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double > *self,PySliceObject *slice,std::vector< double,std::allocator< double > > const &v){ @@ -5189,8 +5235,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ @@ -5200,8 +5246,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ @@ -5211,8 +5257,8 @@ SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<double,std::allocator< double > >::difference_type id = i; - std::vector<double,std::allocator< double > >::difference_type jd = j; + std::vector< double,std::allocator< double > >::difference_type id = i; + std::vector< double,std::allocator< double > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____getitem____SWIG_1(std::vector< double > const *self,std::vector< double >::difference_type i){ @@ -5221,6 +5267,13 @@ SWIGINTERN std::vector< double >::value_type const &std_vector_Sl_double_Sg____g SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_2(std::vector< double > *self,std::vector< double >::difference_type i,std::vector< double >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< double >::value_type std_vector_Sl_double_Sg__pop(std::vector< double > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< double,std::allocator< double > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_double_Sg__append(std::vector< double > *self,std::vector< double >::value_type const &x){ self->push_back(x); } @@ -5230,7 +5283,7 @@ SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__insert__SWIG SWIGINTERN void std_vector_Sl_double_Sg__insert__SWIG_1(std::vector< double > *self,std::vector< double >::iterator pos,std::vector< double >::size_type n,std::vector< double >::value_type const &x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<std::vector<std::vector< double,std::allocator< double > >, std::allocator< std::vector< double,std::allocator< double > > > > > { + template <> struct traits<std::vector< std::vector< double,std::allocator< double > >, std::allocator< std::vector< double,std::allocator< double > > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::vector< double,std::allocator< double > >" "," "std::allocator< std::vector< double,std::allocator< double > > >" " >"; @@ -5250,24 +5303,20 @@ SWIGINTERN bool std_vector_Sl_std_vector_Sl_double_Sg__Sg____bool__(std::vector< SWIGINTERN std::vector< std::vector< double > >::size_type std_vector_Sl_std_vector_Sl_double_Sg__Sg____len__(std::vector< std::vector< double > > const *self){ return self->size(); } -SWIGINTERN std::vector< std::vector< double > >::value_type std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(std::vector< std::vector< double > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *std_vector_Sl_std_vector_Sl_double_Sg__Sg____getslice__(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v=std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >()){ +SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >()); + } +SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delslice__(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_0(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_0(std::vector< std::vector< double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5276,8 +5325,8 @@ SWIGINTERN std::vector< std::vector< double,std::allocator< double > >,std::allo return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(std::vector< std::vector< double > > *self,PySliceObject *slice,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &v){ @@ -5287,8 +5336,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_0(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(std::vector< std::vector< double > > *self,PySliceObject *slice){ @@ -5298,8 +5347,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_1(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(std::vector< std::vector< double > > *self,PySliceObject *slice){ @@ -5309,8 +5358,8 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____delitem____SWIG_1(s return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type id = i; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::vector< double > >::value_type const &std_vector_Sl_std_vector_Sl_double_Sg__Sg____getitem____SWIG_1(std::vector< std::vector< double > > const *self,std::vector< std::vector< double > >::difference_type i){ @@ -5319,6 +5368,13 @@ SWIGINTERN std::vector< std::vector< double > >::value_type const &std_vector_Sl SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg____setitem____SWIG_2(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::difference_type i,std::vector< std::vector< double > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::vector< double > >::value_type std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(std::vector< std::vector< double > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_vector_Sl_double_Sg__Sg__append(std::vector< std::vector< double > > *self,std::vector< std::vector< double > >::value_type const &x){ self->push_back(x); } @@ -5354,17 +5410,17 @@ SWIG_AsVal_int (PyObject * obj, int *val) namespace swig { - template <> struct traits<int > { + template <> struct traits< int > { typedef value_category category; static const char* type_name() { return"int"; } - }; - template <> struct traits_asval<int > { + }; + template <> struct traits_asval< int > { typedef int value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_int (obj, val); } }; - template <> struct traits_from<int > { + template <> struct traits_from< int > { typedef int value_type; static PyObject *from(const value_type& val) { return SWIG_From_int (val); @@ -5374,7 +5430,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<int, std::allocator< int > > > { + template <> struct traits<std::vector< int, std::allocator< int > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "int" "," "std::allocator< int >" " >"; @@ -5394,24 +5450,20 @@ SWIGINTERN bool std_vector_Sl_int_Sg____bool__(std::vector< int > const *self){ SWIGINTERN std::vector< int >::size_type std_vector_Sl_int_Sg____len__(std::vector< int > const *self){ return self->size(); } -SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<int,std::allocator< int > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v=std::vector< int,std::allocator< int > >()){ +SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< int,std::allocator< int > >()); + } +SWIGINTERN void std_vector_Sl_int_Sg____setslice____SWIG_1(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j,std::vector< int,std::allocator< int > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____getitem____SWIG_0(std::vector< int > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5420,8 +5472,8 @@ SWIGINTERN std::vector< int,std::allocator< int > > *std_vector_Sl_int_Sg____get return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *self,PySliceObject *slice,std::vector< int,std::allocator< int > > const &v){ @@ -5431,8 +5483,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ @@ -5442,8 +5494,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ @@ -5453,8 +5505,8 @@ SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *se return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<int,std::allocator< int > >::difference_type id = i; - std::vector<int,std::allocator< int > >::difference_type jd = j; + std::vector< int,std::allocator< int > >::difference_type id = i; + std::vector< int,std::allocator< int > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem____SWIG_1(std::vector< int > const *self,std::vector< int >::difference_type i){ @@ -5463,6 +5515,13 @@ SWIGINTERN std::vector< int >::value_type const &std_vector_Sl_int_Sg____getitem SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_2(std::vector< int > *self,std::vector< int >::difference_type i,std::vector< int >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< int >::value_type std_vector_Sl_int_Sg__pop(std::vector< int > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< int,std::allocator< int > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_int_Sg__append(std::vector< int > *self,std::vector< int >::value_type const &x){ self->push_back(x); } @@ -5472,17 +5531,17 @@ SWIGINTERN std::vector< int >::iterator std_vector_Sl_int_Sg__insert__SWIG_0(std SWIGINTERN void std_vector_Sl_int_Sg__insert__SWIG_1(std::vector< int > *self,std::vector< int >::iterator pos,std::vector< int >::size_type n,std::vector< int >::value_type const &x){ self->insert(pos, n, x); } namespace swig { - template <> struct traits<unsigned long > { + template <> struct traits< unsigned long > { typedef value_category category; static const char* type_name() { return"unsigned long"; } - }; - template <> struct traits_asval<unsigned long > { + }; + template <> struct traits_asval< unsigned long > { typedef unsigned long value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_unsigned_SS_long (obj, val); } }; - template <> struct traits_from<unsigned long > { + template <> struct traits_from< unsigned long > { typedef unsigned long value_type; static PyObject *from(const value_type& val) { return SWIG_From_unsigned_SS_long (val); @@ -5492,7 +5551,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<unsigned long, std::allocator< unsigned long > > > { + template <> struct traits<std::vector< unsigned long, std::allocator< unsigned long > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "unsigned long" "," "std::allocator< unsigned long >" " >"; @@ -5512,24 +5571,20 @@ SWIGINTERN bool std_vector_Sl_unsigned_SS_long_Sg____bool__(std::vector< unsigne SWIGINTERN std::vector< unsigned long >::size_type std_vector_Sl_unsigned_SS_long_Sg____len__(std::vector< unsigned long > const *self){ return self->size(); } -SWIGINTERN std::vector< unsigned long >::value_type std_vector_Sl_unsigned_SS_long_Sg__pop(std::vector< unsigned long > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<unsigned long,std::allocator< unsigned long > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vector_Sl_unsigned_SS_long_Sg____getslice__(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j,std::vector< unsigned long,std::allocator< unsigned long > > const &v=std::vector< unsigned long,std::allocator< unsigned long > >()){ +SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< unsigned long,std::allocator< unsigned long > >()); + } +SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j,std::vector< unsigned long,std::allocator< unsigned long > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delslice__(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_0(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_0(std::vector< unsigned long > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5538,8 +5593,8 @@ SWIGINTERN std::vector< unsigned long,std::allocator< unsigned long > > *std_vec return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(std::vector< unsigned long > *self,PySliceObject *slice,std::vector< unsigned long,std::allocator< unsigned long > > const &v){ @@ -5549,8 +5604,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_0(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(std::vector< unsigned long > *self,PySliceObject *slice){ @@ -5560,8 +5615,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_1(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(std::vector< unsigned long > *self,PySliceObject *slice){ @@ -5571,8 +5626,8 @@ SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____delitem____SWIG_1(std::vect return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type id = i; - std::vector<unsigned long,std::allocator< unsigned long > >::difference_type jd = j; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type id = i; + std::vector< unsigned long,std::allocator< unsigned long > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< unsigned long >::value_type const &std_vector_Sl_unsigned_SS_long_Sg____getitem____SWIG_1(std::vector< unsigned long > const *self,std::vector< unsigned long >::difference_type i){ @@ -5581,6 +5636,13 @@ SWIGINTERN std::vector< unsigned long >::value_type const &std_vector_Sl_unsigne SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg____setitem____SWIG_2(std::vector< unsigned long > *self,std::vector< unsigned long >::difference_type i,std::vector< unsigned long >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< unsigned long >::value_type std_vector_Sl_unsigned_SS_long_Sg__pop(std::vector< unsigned long > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< unsigned long,std::allocator< unsigned long > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_unsigned_SS_long_Sg__append(std::vector< unsigned long > *self,std::vector< unsigned long >::value_type const &x){ self->push_back(x); } @@ -5608,7 +5670,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val) SWIGINTERNINLINE PyObject* -SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig/3.0.7/typemaps/swigmacros.swg,104,%ifcplusplus@*/ +SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/ const std::complex<double>& @@ -5621,17 +5683,17 @@ const std::complex<double>& namespace swig { - template <> struct traits<std::complex<double> > { + template <> struct traits< std::complex<double> > { typedef value_category category; static const char* type_name() { return"std::complex<double>"; } - }; - template <> struct traits_asval<std::complex<double> > { + }; + template <> struct traits_asval< std::complex<double> > { typedef std::complex<double> value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_std_complex_Sl_double_Sg_ (obj, val); } }; - template <> struct traits_from<std::complex<double> > { + template <> struct traits_from< std::complex<double> > { typedef std::complex<double> value_type; static PyObject *from(const value_type& val) { return SWIG_From_std_complex_Sl_double_Sg_ (val); @@ -5641,7 +5703,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<std::complex< double >, std::allocator< std::complex< double > > > > { + template <> struct traits<std::vector< std::complex< double >, std::allocator< std::complex< double > > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::complex< double >" "," "std::allocator< std::complex< double > >" " >"; @@ -5661,24 +5723,20 @@ SWIGINTERN bool std_vector_Sl_std_complex_Sl_double_Sg__Sg____bool__(std::vector SWIGINTERN std::vector< std::complex< double > >::size_type std_vector_Sl_std_complex_Sl_double_Sg__Sg____len__(std::vector< std::complex< double > > const *self){ return self->size(); } -SWIGINTERN std::vector< std::complex< double > >::value_type std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(std::vector< std::complex< double > > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< double > > > *std_vector_Sl_std_complex_Sl_double_Sg__Sg____getslice__(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v=std::vector< std::complex< double >,std::allocator< std::complex< double > > >()){ +SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::complex< double >,std::allocator< std::complex< double > > >()); + } +SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delslice__(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_0(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< double > > > *std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_0(std::vector< std::complex< double > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5687,8 +5745,8 @@ SWIGINTERN std::vector< std::complex< double >,std::allocator< std::complex< dou return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0(std::vector< std::complex< double > > *self,PySliceObject *slice,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &v){ @@ -5698,8 +5756,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_0( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1(std::vector< std::complex< double > > *self,PySliceObject *slice){ @@ -5709,8 +5767,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_1( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1(std::vector< std::complex< double > > *self,PySliceObject *slice){ @@ -5720,8 +5778,8 @@ SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____delitem____SWIG_1( return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; - std::vector<std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type id = i; + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::complex< double > >::value_type const &std_vector_Sl_std_complex_Sl_double_Sg__Sg____getitem____SWIG_1(std::vector< std::complex< double > > const *self,std::vector< std::complex< double > >::difference_type i){ @@ -5730,6 +5788,13 @@ SWIGINTERN std::vector< std::complex< double > >::value_type const &std_vector_S SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg____setitem____SWIG_2(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::difference_type i,std::vector< std::complex< double > >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::complex< double > >::value_type std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(std::vector< std::complex< double > > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::complex< double >,std::allocator< std::complex< double > > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_complex_Sl_double_Sg__Sg__append(std::vector< std::complex< double > > *self,std::vector< std::complex< double > >::value_type const &x){ self->push_back(x); } @@ -5791,18 +5856,17 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) #else if (*alloc == SWIG_NEWOBJ) #endif - { - *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); - *alloc = SWIG_NEWOBJ; - } - else { + { + *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + *alloc = SWIG_NEWOBJ; + } else { *cptr = cstr; *alloc = SWIG_OLDOBJ; } } else { - #if PY_VERSION_HEX>=0x03000000 - assert(0); /* Should never reach here in Python 3 */ - #endif + #if PY_VERSION_HEX>=0x03000000 + assert(0); /* Should never reach here in Python 3 */ + #endif *cptr = SWIG_Python_str_AsChar(obj); } } @@ -5812,6 +5876,30 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc) #endif return SWIG_OK; } else { +#if defined(SWIG_PYTHON_2_UNICODE) +#if PY_VERSION_HEX<0x03000000 + if (PyUnicode_Check(obj)) { + char *cstr; Py_ssize_t len; + if (!alloc && cptr) { + return SWIG_RuntimeError; + } + obj = PyUnicode_AsUTF8String(obj); + if (PyString_AsStringAndSize(obj, &cstr, &len) != -1) { + if (cptr) { + if (alloc) *alloc = SWIG_NEWOBJ; + *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); + } + if (psize) *psize = len + 1; + + Py_XDECREF(obj); + return SWIG_OK; + } else { + Py_XDECREF(obj); + } + } +#endif +#endif + swig_type_info* pchar_descriptor = SWIG_pchar_descriptor(); if (pchar_descriptor) { void* vptr = 0; @@ -5887,12 +5975,12 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size) } else { #if PY_VERSION_HEX >= 0x03000000 #if PY_VERSION_HEX >= 0x03010000 - return PyUnicode_DecodeUTF8(carray, static_cast< int >(size), "surrogateescape"); + return PyUnicode_DecodeUTF8(carray, static_cast< Py_ssize_t >(size), "surrogateescape"); #else - return PyUnicode_FromStringAndSize(carray, static_cast< int >(size)); + return PyUnicode_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif #else - return PyString_FromStringAndSize(carray, static_cast< int >(size)); + return PyString_FromStringAndSize(carray, static_cast< Py_ssize_t >(size)); #endif } } else { @@ -5909,17 +5997,17 @@ SWIG_From_std_string (const std::string& s) namespace swig { - template <> struct traits<std::string > { + template <> struct traits< std::string > { typedef value_category category; static const char* type_name() { return"std::string"; } - }; - template <> struct traits_asval<std::string > { + }; + template <> struct traits_asval< std::string > { typedef std::string value_type; - static int asval(PyObject *obj, value_type *val) { + static int asval(PyObject *obj, value_type *val) { return SWIG_AsVal_std_string (obj, val); } }; - template <> struct traits_from<std::string > { + template <> struct traits_from< std::string > { typedef std::string value_type; static PyObject *from(const value_type& val) { return SWIG_From_std_string (val); @@ -5929,7 +6017,7 @@ namespace swig { namespace swig { - template <> struct traits<std::vector<std::string, std::allocator< std::string > > > { + template <> struct traits<std::vector< std::string, std::allocator< std::string > > > { typedef pointer_category category; static const char* type_name() { return "std::vector<" "std::string" "," "std::allocator< std::string >" " >"; @@ -5949,24 +6037,20 @@ SWIGINTERN bool std_vector_Sl_std_string_Sg____bool__(std::vector< std::string > SWIGINTERN std::vector< std::string >::size_type std_vector_Sl_std_string_Sg____len__(std::vector< std::string > const *self){ return self->size(); } -SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__pop(std::vector< std::string > *self){ - if (self->size() == 0) - throw std::out_of_range("pop from empty container"); - std::vector<std::string,std::allocator< std::string > >::value_type x = self->back(); - self->pop_back(); - return x; - } SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_Sl_std_string_Sg____getslice__(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ return swig::getslice(self, i, j, 1); } -SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j,std::vector< std::string,std::allocator< std::string > > const &v=std::vector< std::string,std::allocator< std::string > >()){ +SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ + swig::setslice(self, i, j, 1, std::vector< std::string,std::allocator< std::string > >()); + } +SWIGINTERN void std_vector_Sl_std_string_Sg____setslice____SWIG_1(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j,std::vector< std::string,std::allocator< std::string > > const &v){ swig::setslice(self, i, j, 1, v); } SWIGINTERN void std_vector_Sl_std_string_Sg____delslice__(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::difference_type j){ swig::delslice(self, i, j, 1); } SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_0(std::vector< std::string > *self,std::vector< std::string >::difference_type i){ - self->erase(swig::getpos(self,i)); + swig::erase(self, swig::getpos(self, i)); } SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_Sl_std_string_Sg____getitem____SWIG_0(std::vector< std::string > *self,PySliceObject *slice){ Py_ssize_t i, j, step; @@ -5975,8 +6059,8 @@ SWIGINTERN std::vector< std::string,std::allocator< std::string > > *std_vector_ return NULL; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_0(std::vector< std::string > *self,PySliceObject *slice,std::vector< std::string,std::allocator< std::string > > const &v){ @@ -5986,8 +6070,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_0(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_1(std::vector< std::string > *self,PySliceObject *slice){ @@ -5997,8 +6081,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_1(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_1(std::vector< std::string > *self,PySliceObject *slice){ @@ -6008,8 +6092,8 @@ SWIGINTERN void std_vector_Sl_std_string_Sg____delitem____SWIG_1(std::vector< st return; } PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); - std::vector<std::string,std::allocator< std::string > >::difference_type id = i; - std::vector<std::string,std::allocator< std::string > >::difference_type jd = j; + std::vector< std::string,std::allocator< std::string > >::difference_type id = i; + std::vector< std::string,std::allocator< std::string > >::difference_type jd = j; swig::delslice(self, id, jd, step); } SWIGINTERN std::vector< std::string >::value_type const &std_vector_Sl_std_string_Sg____getitem____SWIG_1(std::vector< std::string > const *self,std::vector< std::string >::difference_type i){ @@ -6018,6 +6102,13 @@ SWIGINTERN std::vector< std::string >::value_type const &std_vector_Sl_std_strin SWIGINTERN void std_vector_Sl_std_string_Sg____setitem____SWIG_2(std::vector< std::string > *self,std::vector< std::string >::difference_type i,std::vector< std::string >::value_type const &x){ *(swig::getpos(self,i)) = x; } +SWIGINTERN std::vector< std::string >::value_type std_vector_Sl_std_string_Sg__pop(std::vector< std::string > *self){ + if (self->size() == 0) + throw std::out_of_range("pop from empty container"); + std::vector< std::string,std::allocator< std::string > >::value_type x = self->back(); + self->pop_back(); + return x; + } SWIGINTERN void std_vector_Sl_std_string_Sg__append(std::vector< std::string > *self,std::vector< std::string >::value_type const &x){ self->push_back(x); } @@ -6296,14 +6387,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -6415,14 +6506,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -6966,14 +7057,14 @@ fail: SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -7120,34 +7211,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< double >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - try { - result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_double(static_cast< double >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble1d_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -7202,20 +7265,17 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; std::vector< double >::difference_type arg3 ; - std::vector< double,std::allocator< double > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); @@ -7231,19 +7291,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'"); } arg3 = static_cast< std::vector< double >::difference_type >(val3); - { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4); + std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -7253,10 +7302,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_0(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -7266,17 +7313,20 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; std::vector< double >::difference_type arg3 ; + std::vector< double,std::allocator< double > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble1d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t___setslice__" "', argument " "1"" of type '" "std::vector< double > *""'"); @@ -7292,8 +7342,19 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble1d_t___setslice__" "', argument " "3"" of type '" "std::vector< double >::difference_type""'"); } arg3 = static_cast< std::vector< double >::difference_type >(val3); + { + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble1d_t___setslice__" "', argument " "4"" of type '" "std::vector< double,std::allocator< double > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_double_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< double,std::allocator< double > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -7303,27 +7364,29 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice____SWIG_1(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7336,14 +7399,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vdouble1d_t___setslice____SWIG_1(self, args); + return _wrap_vdouble1d_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7356,10 +7419,10 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vdouble1d_t___setslice____SWIG_0(self, args); + return _wrap_vdouble1d_t___setslice____SWIG_1(self, args); } } } @@ -7369,8 +7432,8 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setslice__(PyObject *self, PyObject *ar fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble1d_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n" - " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n"); + " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type)\n" + " std::vector< double >::__setslice__(std::vector< double >::difference_type,std::vector< double >::difference_type,std::vector< double,std::allocator< double > > const &)\n"); return 0; } @@ -7451,6 +7514,9 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -7523,7 +7589,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP arg2 = (PySliceObject *) obj1; } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble1d_t___setitem__" "', argument " "3"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -7629,20 +7695,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7655,7 +7721,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___delitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7715,20 +7781,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7741,7 +7807,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___getitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7811,20 +7877,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7837,14 +7903,14 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble1d_t___setitem____SWIG_0(self, args); @@ -7854,7 +7920,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -7883,6 +7949,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble1d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< double >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_pop" "', argument " "1"" of type '" "std::vector< double > *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + try { + result = (std::vector< double >::value_type)std_vector_Sl_double_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_double(static_cast< double >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vdouble1d_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -7937,7 +8031,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble1d_t",&obj0)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble1d_t" "', argument " "1"" of type '" "std::vector< double > const &""'"); @@ -8001,42 +8095,21 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vdouble1d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; + std::vector< double > *arg2 = 0 ; void *argp1 = 0 ; int res1 = 0 ; + void *argp2 = 0 ; + int res2 = 0 ; PyObject * obj0 = 0 ; + PyObject * obj1 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_swap",&obj0,&obj1)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_vdouble1d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - std::vector< double > *arg2 = 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - PyObject * obj0 = 0 ; - PyObject * obj1 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"OO:vdouble1d_t_swap",&obj0,&obj1)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_swap" "', argument " "1"" of type '" "std::vector< double > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_swap" "', argument " "1"" of type '" "std::vector< double > *""'"); } arg1 = reinterpret_cast< std::vector< double > * >(argp1); res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 ); @@ -8055,28 +8128,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< double > *arg1 = (std::vector< double > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< double > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); - } - arg1 = reinterpret_cast< std::vector< double > * >(argp1); - result = ((std::vector< double > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< double >::allocator_type(static_cast< const std::vector< double >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_double_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble1d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; @@ -8169,6 +8220,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble1d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_clear" "', argument " "1"" of type '" "std::vector< double > *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vdouble1d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< double > *arg1 = (std::vector< double > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< double > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble1d_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble1d_t_get_allocator" "', argument " "1"" of type '" "std::vector< double > const *""'"); + } + arg1 = reinterpret_cast< std::vector< double > * >(argp1); + result = ((std::vector< double > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< double >::allocator_type(static_cast< const std::vector< double >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_double_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vdouble1d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double >::size_type arg1 ; @@ -8334,20 +8428,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -8360,7 +8454,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_erase(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -8420,14 +8514,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -8446,7 +8540,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble1d_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble1d_t__SWIG_1(self, args); @@ -8639,20 +8733,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -8666,7 +8760,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_resize(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -8800,20 +8894,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -8832,7 +8926,7 @@ SWIGINTERN PyObject *_wrap_vdouble1d_t_insert(PyObject *self, PyObject *args) { } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -9035,34 +9129,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::vector< double > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - try { - result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -9117,20 +9183,17 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; std::vector< std::vector< double > >::difference_type arg2 ; std::vector< std::vector< double > >::difference_type arg3 ; - std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); @@ -9146,19 +9209,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3); - { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4); + std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -9168,10 +9220,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_0(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -9181,17 +9231,20 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; std::vector< std::vector< double > >::difference_type arg2 ; std::vector< std::vector< double > >::difference_type arg3 ; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vdouble2d_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t___setslice__" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); @@ -9207,8 +9260,19 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vdouble2d_t___setslice__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::vector< double > >::difference_type >(val3); + { + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vdouble2d_t___setslice__" "', argument " "4"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_vector_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -9218,27 +9282,29 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice____SWIG_1(PyObject *SWIGUNUSED } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9251,14 +9317,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vdouble2d_t___setslice____SWIG_1(self, args); + return _wrap_vdouble2d_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9271,10 +9337,10 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vdouble2d_t___setslice____SWIG_0(self, args); + return _wrap_vdouble2d_t___setslice____SWIG_1(self, args); } } } @@ -9284,8 +9350,8 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setslice__(PyObject *self, PyObject *ar fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vdouble2d_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n" - " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n"); + " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type)\n" + " std::vector< std::vector< double > >::__setslice__(std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double > >::difference_type,std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &)\n"); return 0; } @@ -9366,6 +9432,9 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem____SWIG_0(PyObject *SWIGUNUSEDP catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -9438,7 +9507,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_0(PyObject *SWIGUNUSEDP arg2 = (PySliceObject *) obj1; } { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > const &""'"); @@ -9544,20 +9613,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9570,7 +9639,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___delitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9622,7 +9691,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem____SWIG_1(PyObject *SWIGUNUSEDP SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -9630,20 +9699,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9656,7 +9725,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___getitem__(PyObject *self, PyObject *arg } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9704,7 +9773,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem____SWIG_2(PyObject *SWIGUNUSEDP } arg2 = static_cast< std::vector< std::vector< double > >::difference_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t___setitem__" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -9731,20 +9800,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9757,14 +9826,14 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t___setitem____SWIG_0(self, args); @@ -9774,7 +9843,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -9782,7 +9851,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t___setitem__(PyObject *self, PyObject *arg _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t___setitem____SWIG_2(self, args); @@ -9801,6 +9870,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble2d_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::vector< double > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_pop" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + try { + result = std_vector_Sl_std_vector_Sl_double_Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -9818,7 +9915,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_append(PyObject *SWIGUNUSEDPARM(self), Py } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_append" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -9860,7 +9957,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_1(PyObject *SWIGUNUSEDPARM(self if (!PyArg_ParseTuple(args,(char *)"O:new_vdouble2d_t",&obj0)) SWIG_fail; { - std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; + std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *ptr = (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vdouble2d_t" "', argument " "1"" of type '" "std::vector< std::vector< double,std::allocator< double > > > const &""'"); @@ -9924,27 +10021,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -9978,28 +10054,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); - } - arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); - result = ((std::vector< std::vector< double > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::vector< double > >::allocator_type(static_cast< const std::vector< std::vector< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vdouble2d_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; @@ -10092,6 +10146,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vdouble2d_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_clear" "', argument " "1"" of type '" "std::vector< std::vector< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vdouble2d_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::vector< double > > *arg1 = (std::vector< std::vector< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< std::vector< double,std::allocator< double > > > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vdouble2d_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vdouble2d_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::vector< double > > const *""'"); + } + arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); + result = ((std::vector< std::vector< double > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::vector< double > >::allocator_type(static_cast< const std::vector< std::vector< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< double > >::size_type arg1 ; @@ -10257,20 +10354,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -10283,7 +10380,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_erase(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -10327,7 +10424,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t__SWIG_3(PyObject *SWIGUNUSEDPARM(self } arg1 = static_cast< std::vector< std::vector< double > >::size_type >(val1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_vdouble2d_t" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10348,14 +10445,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -10374,7 +10471,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble2d_t__SWIG_1(self, args); @@ -10387,7 +10484,7 @@ SWIGINTERN PyObject *_wrap_new_vdouble2d_t(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vdouble2d_t__SWIG_3(self, args); @@ -10423,7 +10520,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_push_back(PyObject *SWIGUNUSEDPARM(self), } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vdouble2d_t_push_back" "', argument " "2"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10458,7 +10555,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_front(PyObject *SWIGUNUSEDPARM(self), PyO } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->front(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -10480,7 +10577,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_back(PyObject *SWIGUNUSEDPARM(self), PyOb } arg1 = reinterpret_cast< std::vector< std::vector< double > > * >(argp1); result = (std::vector< std::vector< double > >::value_type *) &((std::vector< std::vector< double > > const *)arg1)->back(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(*result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(*result)); return resultobj; fail: return NULL; @@ -10513,7 +10610,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_assign(PyObject *SWIGUNUSEDPARM(self), Py } arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_assign" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10559,7 +10656,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(s } arg2 = static_cast< std::vector< std::vector< double > >::size_type >(val2); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_resize" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10580,20 +10677,20 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10607,7 +10704,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -10615,7 +10712,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_resize(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_resize__SWIG_1(self, args); @@ -10666,7 +10763,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(s } } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vdouble2d_t_insert" "', argument " "3"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10728,7 +10825,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(s } arg3 = static_cast< std::vector< std::vector< double > >::size_type >(val3); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res4 = swig::asptr(obj3, &ptr); if (!SWIG_IsOK(res4)) { SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vdouble2d_t_insert" "', argument " "4"" of type '" "std::vector< std::vector< double > >::value_type const &""'"); @@ -10749,27 +10846,27 @@ fail: SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; int res = SWIG_ConvertPtr(argv[1], SWIG_as_voidptrptr(&iter), swig::SwigPyIterator::descriptor(), 0); _v = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SwigPyIterator_T<std::vector< std::vector< double > >::iterator > *>(iter) != 0)); if (_v) { - int res = swig::asptr(argv[2], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_insert__SWIG_0(self, args); @@ -10779,7 +10876,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -10791,7 +10888,7 @@ SWIGINTERN PyObject *_wrap_vdouble2d_t_insert(PyObject *self, PyObject *args) { _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vdouble2d_t_insert__SWIG_1(self, args); @@ -10969,39 +11066,11 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___len__(PyObject *SWIGUNUSEDPARM(sel if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t___len__",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - result = std_vector_Sl_int_Sg____len__((std::vector< int > const *)arg1); - resultobj = SWIG_From_size_t(static_cast< size_t >(result)); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< int >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - try { - result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___len__" "', argument " "1"" of type '" "std::vector< int > const *""'"); } - - resultobj = SWIG_From_int(static_cast< int >(result)); + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + result = std_vector_Sl_int_Sg____len__((std::vector< int > const *)arg1); + resultobj = SWIG_From_size_t(static_cast< size_t >(result)); return resultobj; fail: return NULL; @@ -11062,20 +11131,17 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; std::vector< int >::difference_type arg3 ; - std::vector< int,std::allocator< int > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); @@ -11091,19 +11157,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'"); } arg3 = static_cast< std::vector< int >::difference_type >(val3); - { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4); + std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -11113,10 +11168,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -11126,17 +11179,20 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; std::vector< int >::difference_type arg3 ; + std::vector< int,std::allocator< int > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_integer_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t___setslice__" "', argument " "1"" of type '" "std::vector< int > *""'"); @@ -11152,8 +11208,19 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_integer_t___setslice__" "', argument " "3"" of type '" "std::vector< int >::difference_type""'"); } arg3 = static_cast< std::vector< int >::difference_type >(val3); + { + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_integer_t___setslice__" "', argument " "4"" of type '" "std::vector< int,std::allocator< int > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_int_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< int,std::allocator< int > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -11163,27 +11230,29 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11196,14 +11265,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_integer_t___setslice____SWIG_1(self, args); + return _wrap_vector_integer_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11216,10 +11285,10 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_integer_t___setslice____SWIG_0(self, args); + return _wrap_vector_integer_t___setslice____SWIG_1(self, args); } } } @@ -11229,8 +11298,8 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_integer_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n" - " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n"); + " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type)\n" + " std::vector< int >::__setslice__(std::vector< int >::difference_type,std::vector< int >::difference_type,std::vector< int,std::allocator< int > > const &)\n"); return 0; } @@ -11311,6 +11380,9 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -11383,7 +11455,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_integer_t___setitem__" "', argument " "3"" of type '" "std::vector< int,std::allocator< int > > const &""'"); @@ -11489,20 +11561,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11515,7 +11587,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11575,20 +11647,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11601,7 +11673,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11671,20 +11743,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11697,14 +11769,14 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_integer_t___setitem____SWIG_0(self, args); @@ -11714,7 +11786,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -11743,6 +11815,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_integer_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< int >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_pop" "', argument " "1"" of type '" "std::vector< int > *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + try { + result = (std::vector< int >::value_type)std_vector_Sl_int_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_int(static_cast< int >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_integer_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -11797,7 +11897,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_integer_t",&obj0)) SWIG_fail; { - std::vector<int,std::allocator< int > > *ptr = (std::vector<int,std::allocator< int > > *)0; + std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_integer_t" "', argument " "1"" of type '" "std::vector< int > const &""'"); @@ -11861,27 +11961,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_integer_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -11915,28 +11994,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< int > *arg1 = (std::vector< int > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< int > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); - } - arg1 = reinterpret_cast< std::vector< int > * >(argp1); - result = ((std::vector< int > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_int_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_integer_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; @@ -12029,6 +12086,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_integer_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_clear" "', argument " "1"" of type '" "std::vector< int > *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_integer_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< int > *arg1 = (std::vector< int > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< int > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_integer_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_integer_t_get_allocator" "', argument " "1"" of type '" "std::vector< int > const *""'"); + } + arg1 = reinterpret_cast< std::vector< int > * >(argp1); + result = ((std::vector< int > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(static_cast< const std::vector< int >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_int_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_integer_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int >::size_type arg1 ; @@ -12194,20 +12294,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12220,7 +12320,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12280,14 +12380,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -12306,7 +12406,7 @@ SWIGINTERN PyObject *_wrap_new_vector_integer_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_integer_t__SWIG_1(self, args); @@ -12499,20 +12599,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12526,7 +12626,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -12660,20 +12760,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12692,7 +12792,7 @@ SWIGINTERN PyObject *_wrap_vector_integer_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<int,std::allocator< int > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -12895,34 +12995,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< unsigned long >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - try { - result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -12977,20 +13049,17 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; std::vector< unsigned long >::difference_type arg2 ; std::vector< unsigned long >::difference_type arg3 ; - std::vector< unsigned long,std::allocator< unsigned long > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); @@ -13006,19 +13075,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'"); } arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3); - { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4); + std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -13028,10 +13086,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_0(PyObject *S } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -13041,17 +13097,20 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; std::vector< unsigned long >::difference_type arg2 ; std::vector< unsigned long >::difference_type arg3 ; + std::vector< unsigned long,std::allocator< unsigned long > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_longinteger_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t___setslice__" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); @@ -13067,8 +13126,19 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_longinteger_t___setslice__" "', argument " "3"" of type '" "std::vector< unsigned long >::difference_type""'"); } arg3 = static_cast< std::vector< unsigned long >::difference_type >(val3); + { + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_longinteger_t___setslice__" "', argument " "4"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_unsigned_SS_long_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< unsigned long,std::allocator< unsigned long > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -13078,27 +13148,29 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice____SWIG_1(PyObject *S } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13111,14 +13183,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args); + return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13131,10 +13203,10 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_longinteger_t___setslice____SWIG_0(self, args); + return _wrap_vector_longinteger_t___setslice____SWIG_1(self, args); } } } @@ -13144,8 +13216,8 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setslice__(PyObject *self, PyO fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n" - " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n"); + " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type)\n" + " std::vector< unsigned long >::__setslice__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::difference_type,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n"); return 0; } @@ -13226,6 +13298,9 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem____SWIG_0(PyObject *SW catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -13298,7 +13373,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem____SWIG_0(PyObject *SW arg2 = (PySliceObject *) obj1; } { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_longinteger_t___setitem__" "', argument " "3"" of type '" "std::vector< unsigned long,std::allocator< unsigned long > > const &""'"); @@ -13404,20 +13479,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13430,7 +13505,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___delitem__(PyObject *self, PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13490,20 +13565,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13516,7 +13591,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___getitem__(PyObject *self, PyOb } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13586,20 +13661,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13612,14 +13687,14 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_longinteger_t___setitem____SWIG_0(self, args); @@ -13629,7 +13704,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -13649,12 +13724,40 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t___setitem__(PyObject *self, PyOb } fail: - SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n" - " Possible C/C++ prototypes are:\n" - " std::vector< unsigned long >::__setitem__(PySliceObject *,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n" - " std::vector< unsigned long >::__setitem__(PySliceObject *)\n" - " std::vector< unsigned long >::__setitem__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::value_type const &)\n"); - return 0; + SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_longinteger_t___setitem__'.\n" + " Possible C/C++ prototypes are:\n" + " std::vector< unsigned long >::__setitem__(PySliceObject *,std::vector< unsigned long,std::allocator< unsigned long > > const &)\n" + " std::vector< unsigned long >::__setitem__(PySliceObject *)\n" + " std::vector< unsigned long >::__setitem__(std::vector< unsigned long >::difference_type,std::vector< unsigned long >::value_type const &)\n"); + return 0; +} + + +SWIGINTERN PyObject *_wrap_vector_longinteger_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< unsigned long >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_pop" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + try { + result = (std::vector< unsigned long >::value_type)std_vector_Sl_unsigned_SS_long_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(result)); + return resultobj; +fail: + return NULL; } @@ -13712,7 +13815,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_1(PyObject *SWIGUNUSED if (!PyArg_ParseTuple(args,(char *)"O:new_vector_longinteger_t",&obj0)) SWIG_fail; { - std::vector<unsigned long,std::allocator< unsigned long > > *ptr = (std::vector<unsigned long,std::allocator< unsigned long > > *)0; + std::vector< unsigned long,std::allocator< unsigned long > > *ptr = (std::vector< unsigned long,std::allocator< unsigned long > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_longinteger_t" "', argument " "1"" of type '" "std::vector< unsigned long > const &""'"); @@ -13776,27 +13879,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -13830,28 +13912,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< unsigned long > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); - } - arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); - result = ((std::vector< unsigned long > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< unsigned long >::allocator_type(static_cast< const std::vector< unsigned long >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_unsigned_long_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_longinteger_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; @@ -13944,6 +14004,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_longinteger_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_clear" "', argument " "1"" of type '" "std::vector< unsigned long > *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_longinteger_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< unsigned long > *arg1 = (std::vector< unsigned long > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< unsigned long > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_longinteger_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_longinteger_t_get_allocator" "', argument " "1"" of type '" "std::vector< unsigned long > const *""'"); + } + arg1 = reinterpret_cast< std::vector< unsigned long > * >(argp1); + result = ((std::vector< unsigned long > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< unsigned long >::allocator_type(static_cast< const std::vector< unsigned long >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_unsigned_long_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_longinteger_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< unsigned long >::size_type arg1 ; @@ -14109,20 +14212,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14135,7 +14238,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_erase(PyObject *self, PyObject * } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14195,14 +14298,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -14221,7 +14324,7 @@ SWIGINTERN PyObject *_wrap_new_vector_longinteger_t(PyObject *self, PyObject *ar } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_longinteger_t__SWIG_1(self, args); @@ -14414,20 +14517,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14441,7 +14544,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_resize(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -14575,20 +14678,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14607,7 +14710,7 @@ SWIGINTERN PyObject *_wrap_vector_longinteger_t_insert(PyObject *self, PyObject } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<unsigned long,std::allocator< unsigned long > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< unsigned long,std::allocator< unsigned long > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -14810,34 +14913,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::complex< double > >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - try { - result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_complex_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -14892,20 +14967,17 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; std::vector< std::complex< double > >::difference_type arg2 ; std::vector< std::complex< double > >::difference_type arg3 ; - std::vector< std::complex< double >,std::allocator< std::complex< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); @@ -14921,19 +14993,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3); - { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4); + std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -14943,10 +15004,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_0(PyObject *SWIGU } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -14956,17 +15015,20 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; std::vector< std::complex< double > >::difference_type arg2 ; std::vector< std::complex< double > >::difference_type arg3 ; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_complex_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t___setslice__" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); @@ -14982,8 +15044,19 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_complex_t___setslice__" "', argument " "3"" of type '" "std::vector< std::complex< double > >::difference_type""'"); } arg3 = static_cast< std::vector< std::complex< double > >::difference_type >(val3); + { + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_complex_t___setslice__" "', argument " "4"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_complex_Sl_double_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -14993,27 +15066,29 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice____SWIG_1(PyObject *SWIGU } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15026,14 +15101,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_complex_t___setslice____SWIG_1(self, args); + return _wrap_vector_complex_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15046,10 +15121,10 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_complex_t___setslice____SWIG_0(self, args); + return _wrap_vector_complex_t___setslice____SWIG_1(self, args); } } } @@ -15059,8 +15134,8 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setslice__(PyObject *self, PyObjec fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_complex_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n" - " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n"); + " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type)\n" + " std::vector< std::complex< double > >::__setslice__(std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double > >::difference_type,std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &)\n"); return 0; } @@ -15141,6 +15216,9 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem____SWIG_0(PyObject *SWIGUN catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -15213,7 +15291,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem____SWIG_0(PyObject *SWIGUN arg2 = (PySliceObject *) obj1; } { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_complex_t___setitem__" "', argument " "3"" of type '" "std::vector< std::complex< double >,std::allocator< std::complex< double > > > const &""'"); @@ -15319,20 +15397,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15345,7 +15423,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15405,20 +15483,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15431,7 +15509,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15501,20 +15579,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15527,14 +15605,14 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_complex_t___setitem____SWIG_0(self, args); @@ -15544,7 +15622,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -15573,6 +15651,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_complex_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::complex< double > >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_pop" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); + try { + result = std_vector_Sl_std_complex_Sl_double_Sg__Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_std_complex_Sl_double_Sg_(static_cast< std::complex<double> >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_complex_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -15627,7 +15733,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"O:new_vector_complex_t",&obj0)) SWIG_fail; { - std::vector<std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector<std::complex< double >,std::allocator< std::complex< double > > > *)0; + std::vector< std::complex< double >,std::allocator< std::complex< double > > > *ptr = (std::vector< std::complex< double >,std::allocator< std::complex< double > > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_complex_t" "', argument " "1"" of type '" "std::vector< std::complex< double > > const &""'"); @@ -15691,27 +15797,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_complex_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; @@ -15745,29 +15830,30 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::complex< double > > > result; + std::vector< std::complex< double > >::iterator result; - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_begin",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_begin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); } arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = ((std::vector< std::complex< double > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::complex< double > >::allocator_type(static_cast< const std::vector< std::complex< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); + result = (arg1)->begin(); + resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::iterator & >(result)), + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vector_complex_t_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; void *argp1 = 0 ; @@ -15775,13 +15861,13 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_begin(PyObject *SWIGUNUSEDPARM(self) PyObject * obj0 = 0 ; std::vector< std::complex< double > >::iterator result; - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_begin",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_end",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_begin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_end" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); } arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = (arg1)->begin(); + result = (arg1)->end(); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -15790,22 +15876,45 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vector_complex_t_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::complex< double > >::reverse_iterator result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rbegin",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rbegin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); + result = (arg1)->rbegin(); + resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::reverse_iterator & >(result)), + swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_complex_t_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - std::vector< std::complex< double > >::iterator result; + std::vector< std::complex< double > >::reverse_iterator result; - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_end",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rend",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_end" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rend" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); } arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = (arg1)->end(); - resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::iterator & >(result)), + result = (arg1)->rend(); + resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::reverse_iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; fail: @@ -15813,46 +15922,43 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_complex_t_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vector_complex_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - std::vector< std::complex< double > >::reverse_iterator result; - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rbegin",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_clear",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rbegin" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_clear" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); } arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = (arg1)->rbegin(); - resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::reverse_iterator & >(result)), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_vector_complex_t_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { +SWIGINTERN PyObject *_wrap_vector_complex_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::complex< double > > *arg1 = (std::vector< std::complex< double > > *) 0 ; void *argp1 = 0 ; int res1 = 0 ; PyObject * obj0 = 0 ; - std::vector< std::complex< double > >::reverse_iterator result; + SwigValueWrapper< std::allocator< std::complex< double > > > result; - if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_rend",&obj0)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"O:vector_complex_t_get_allocator",&obj0)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_rend" "', argument " "1"" of type '" "std::vector< std::complex< double > > *""'"); + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_complex_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::complex< double > > const *""'"); } arg1 = reinterpret_cast< std::vector< std::complex< double > > * >(argp1); - result = (arg1)->rend(); - resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::complex< double > >::reverse_iterator & >(result)), - swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); + result = ((std::vector< std::complex< double > > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::complex< double > >::allocator_type(static_cast< const std::vector< std::complex< double > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; @@ -16024,20 +16130,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16050,7 +16156,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_erase(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16110,14 +16216,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -16136,7 +16242,7 @@ SWIGINTERN PyObject *_wrap_new_vector_complex_t(PyObject *self, PyObject *args) } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_complex_t__SWIG_1(self, args); @@ -16329,20 +16435,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16356,7 +16462,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_resize(PyObject *self, PyObject *arg } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16490,20 +16596,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16522,7 +16628,7 @@ SWIGINTERN PyObject *_wrap_vector_complex_t_insert(PyObject *self, PyObject *arg } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::complex< double >,std::allocator< std::complex< double > > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::complex< double >,std::allocator< std::complex< double > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -16725,34 +16831,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - std::vector< std::string >::value_type result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - try { - result = std_vector_Sl_std_string_Sg__pop(arg1); - } - catch(std::out_of_range &_e) { - SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); - } - - resultobj = SWIG_From_std_string(static_cast< std::string >(result)); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -16807,20 +16885,17 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; std::vector< std::string >::difference_type arg2 ; std::vector< std::string >::difference_type arg3 ; - std::vector< std::string,std::allocator< std::string > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; - int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; - PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); @@ -16836,19 +16911,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'"); } arg3 = static_cast< std::vector< std::string >::difference_type >(val3); - { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; - res4 = swig::asptr(obj3, &ptr); - if (!SWIG_IsOK(res4)) { - SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); - } - if (!ptr) { - SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); - } - arg4 = ptr; - } try { - std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4); + std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -16858,10 +16922,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_0(PyObject *SWIGUN } resultobj = SWIG_Py_Void(); - if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: - if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } @@ -16871,17 +16933,20 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; std::vector< std::string >::difference_type arg2 ; std::vector< std::string >::difference_type arg3 ; + std::vector< std::string,std::allocator< std::string > > *arg4 = 0 ; void *argp1 = 0 ; int res1 = 0 ; ptrdiff_t val2 ; int ecode2 = 0 ; ptrdiff_t val3 ; int ecode3 = 0 ; + int res4 = SWIG_OLDOBJ ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; PyObject * obj2 = 0 ; + PyObject * obj3 = 0 ; - if (!PyArg_ParseTuple(args,(char *)"OOO:vector_string_t___setslice__",&obj0,&obj1,&obj2)) SWIG_fail; + if (!PyArg_ParseTuple(args,(char *)"OOOO:vector_string_t___setslice__",&obj0,&obj1,&obj2,&obj3)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t___setslice__" "', argument " "1"" of type '" "std::vector< std::string > *""'"); @@ -16897,8 +16962,19 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vector_string_t___setslice__" "', argument " "3"" of type '" "std::vector< std::string >::difference_type""'"); } arg3 = static_cast< std::vector< std::string >::difference_type >(val3); + { + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; + res4 = swig::asptr(obj3, &ptr); + if (!SWIG_IsOK(res4)) { + SWIG_exception_fail(SWIG_ArgError(res4), "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); + } + if (!ptr) { + SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vector_string_t___setslice__" "', argument " "4"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); + } + arg4 = ptr; + } try { - std_vector_Sl_std_string_Sg____setslice____SWIG_0(arg1,arg2,arg3); + std_vector_Sl_std_string_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::string,std::allocator< std::string > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); @@ -16908,27 +16984,29 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice____SWIG_1(PyObject *SWIGUN } resultobj = SWIG_Py_Void(); + if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; fail: + if (SWIG_IsNewObj(res4)) delete arg4; return NULL; } SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16941,14 +17019,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject _v = SWIG_CheckState(res); } if (_v) { - return _wrap_vector_string_t___setslice____SWIG_1(self, args); + return _wrap_vector_string_t___setslice____SWIG_0(self, args); } } } } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -16961,10 +17039,10 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject _v = SWIG_CheckState(res); } if (_v) { - int res = swig::asptr(argv[3], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[3], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { - return _wrap_vector_string_t___setslice____SWIG_0(self, args); + return _wrap_vector_string_t___setslice____SWIG_1(self, args); } } } @@ -16974,8 +17052,8 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setslice__(PyObject *self, PyObject fail: SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number or type of arguments for overloaded function 'vector_string_t___setslice__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n" - " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n"); + " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type)\n" + " std::vector< std::string >::__setslice__(std::vector< std::string >::difference_type,std::vector< std::string >::difference_type,std::vector< std::string,std::allocator< std::string > > const &)\n"); return 0; } @@ -17056,6 +17134,9 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem____SWIG_0(PyObject *SWIGUNU catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } + catch(std::invalid_argument &_e) { + SWIG_exception_fail(SWIG_ValueError, (&_e)->what()); + } resultobj = SWIG_Py_Void(); return resultobj; @@ -17128,7 +17209,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem____SWIG_0(PyObject *SWIGUNU arg2 = (PySliceObject *) obj1; } { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res3 = swig::asptr(obj2, &ptr); if (!SWIG_IsOK(res3)) { SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vector_string_t___setitem__" "', argument " "3"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); @@ -17234,20 +17315,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17260,7 +17341,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___delitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17320,20 +17401,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17346,7 +17427,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___getitem__(PyObject *self, PyObject } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17421,20 +17502,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17447,14 +17528,14 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { _v = PySlice_Check(argv[1]); } if (_v) { - int res = swig::asptr(argv[2], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[2], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_vector_string_t___setitem____SWIG_0(self, args); @@ -17464,7 +17545,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t___setitem__(PyObject *self, PyObject } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -17491,6 +17572,34 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_string_t_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + std::vector< std::string >::value_type result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_pop",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_pop" "', argument " "1"" of type '" "std::vector< std::string > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + try { + result = std_vector_Sl_std_string_Sg__pop(arg1); + } + catch(std::out_of_range &_e) { + SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); + } + + resultobj = SWIG_From_std_string(static_cast< std::string >(result)); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_vector_string_t_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -17550,7 +17659,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_1(PyObject *SWIGUNUSEDPARM( if (!PyArg_ParseTuple(args,(char *)"O:new_vector_string_t",&obj0)) SWIG_fail; { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_vector_string_t" "', argument " "1"" of type '" "std::vector< std::string > const &""'"); @@ -17614,27 +17723,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - (arg1)->clear(); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -17668,28 +17756,6 @@ fail: } -SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { - PyObject *resultobj = 0; - std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; - void *argp1 = 0 ; - int res1 = 0 ; - PyObject * obj0 = 0 ; - SwigValueWrapper< std::allocator< std::string > > result; - - if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail; - res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); - } - arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); - result = ((std::vector< std::string > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::string >::allocator_type(static_cast< const std::vector< std::string >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__string_t, SWIG_POINTER_OWN | 0 ); - return resultobj; -fail: - return NULL; -} - - SWIGINTERN PyObject *_wrap_vector_string_t_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; @@ -17782,6 +17848,49 @@ fail: } +SWIGINTERN PyObject *_wrap_vector_string_t_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_clear",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_clear" "', argument " "1"" of type '" "std::vector< std::string > *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + (arg1)->clear(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + +SWIGINTERN PyObject *_wrap_vector_string_t_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + std::vector< std::string > *arg1 = (std::vector< std::string > *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + SwigValueWrapper< std::allocator< std::string > > result; + + if (!PyArg_ParseTuple(args,(char *)"O:vector_string_t_get_allocator",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vector_string_t_get_allocator" "', argument " "1"" of type '" "std::vector< std::string > const *""'"); + } + arg1 = reinterpret_cast< std::vector< std::string > * >(argp1); + result = ((std::vector< std::string > const *)arg1)->get_allocator(); + resultobj = SWIG_NewPointerObj((new std::vector< std::string >::allocator_type(static_cast< const std::vector< std::string >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__string_t, SWIG_POINTER_OWN | 0 ); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_new_vector_string_t__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::string >::size_type arg1 ; @@ -17947,20 +18056,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -17973,7 +18082,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_erase(PyObject *self, PyObject *args) } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18038,14 +18147,14 @@ fail: SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -18064,7 +18173,7 @@ SWIGINTERN PyObject *_wrap_new_vector_string_t(PyObject *self, PyObject *args) { } if (argc == 1) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_new_vector_string_t__SWIG_1(self, args); @@ -18270,20 +18379,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -18297,7 +18406,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_resize(PyObject *self, PyObject *args } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -18439,20 +18548,20 @@ fail: SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } if (argc == 3) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18469,7 +18578,7 @@ SWIGINTERN PyObject *_wrap_vector_string_t_insert(PyObject *self, PyObject *args } if (argc == 4) { int _v; - int res = swig::asptr(argv[0], (std::vector<std::string,std::allocator< std::string > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< std::string,std::allocator< std::string > >**)(0)); _v = SWIG_CheckState(res); if (_v) { swig::SwigPyIterator *iter = 0; @@ -18898,7 +19007,7 @@ SWIGINTERN PyObject *_wrap_IMinimizer_getValueOfVariablesAtMinimum(PyObject *SWI } arg1 = reinterpret_cast< IMinimizer * >(argp1); result = ((IMinimizer const *)arg1)->getValueOfVariablesAtMinimum(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -18951,7 +19060,7 @@ SWIGINTERN PyObject *_wrap_IMinimizer_getErrorOfVariables(PyObject *SWIGUNUSEDPA } arg1 = reinterpret_cast< IMinimizer * >(argp1); result = ((IMinimizer const *)arg1)->getErrorOfVariables(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -19067,14 +19176,14 @@ fail: SWIGINTERN PyObject *_wrap_IMinimizer_getOptions(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -19378,14 +19487,14 @@ fail: SWIGINTERN PyObject *_wrap_IChiSquaredModule_setChiSquaredFunction(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -19471,14 +19580,14 @@ fail: SWIGINTERN PyObject *_wrap_IChiSquaredModule_getIntensityNormalizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -20547,14 +20656,14 @@ fail: SWIGINTERN PyObject *_wrap_new_IntensityNormalizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -20812,14 +20921,14 @@ fail: SWIGINTERN PyObject *_wrap_new_IntensityScaleAndShiftNormalizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -21098,14 +21207,14 @@ fail: SWIGINTERN PyObject *_wrap_ISquaredFunction_calculateSquaredError(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -21330,14 +21439,14 @@ fail: SWIGINTERN PyObject *_wrap_SquaredFunctionDefault_calculateSquaredError(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -21953,14 +22062,14 @@ fail: SWIGINTERN PyObject *_wrap_new_ChiSquaredModule(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -22229,14 +22338,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FitObject(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -22530,14 +22639,14 @@ fail: SWIGINTERN PyObject *_wrap_FitObject_prepareFitElements(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -23030,14 +23139,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FitParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -23541,14 +23650,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_addSimulationAndRealData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -23816,14 +23925,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_addFitParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[6] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 5) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -24165,14 +24274,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_setMinimizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -24368,7 +24477,7 @@ SWIGINTERN PyObject *_wrap_FitSuite_setParametersFixed(PyObject *SWIGUNUSEDPARM( } arg1 = reinterpret_cast< FitSuite * >(argp1); { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitSuite_setParametersFixed" "', argument " "2"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); @@ -24490,14 +24599,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getRealData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -24589,14 +24698,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getSimulationData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -24688,14 +24797,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getChiSquaredMap(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25026,14 +25135,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getRealOutputData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25125,14 +25234,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getSimulationOutputData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25224,14 +25333,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuite_getChiSquaredOutputData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25431,14 +25540,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteObjects_add(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25623,14 +25732,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteObjects_getRealData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25722,14 +25831,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteObjects_getSimulationData(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -25821,14 +25930,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteObjects_getChiSquaredMap(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26197,14 +26306,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_addParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[7] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 6) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26359,14 +26468,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_getParameter(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26453,7 +26562,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_setValues__SWIG_1(PyObject *SWIGUN } arg1 = reinterpret_cast< FitSuiteParameters * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitSuiteParameters_setValues" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -26474,14 +26583,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_setValues(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26505,7 +26614,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_setValues(PyObject *self, PyObject int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_FitSuiteParameters, 0); _v = SWIG_CheckState(res); if (_v) { - int res = swig::asptr(argv[1], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[1], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { return _wrap_FitSuiteParameters_setValues__SWIG_1(self, args); @@ -26537,7 +26646,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_getValues(PyObject *SWIGUNUSEDPARM } arg1 = reinterpret_cast< FitSuiteParameters * >(argp1); result = ((FitSuiteParameters const *)arg1)->getValues(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -26561,7 +26670,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_setErrors(PyObject *SWIGUNUSEDPARM } arg1 = reinterpret_cast< FitSuiteParameters * >(argp1); { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitSuiteParameters_setErrors" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -26596,7 +26705,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_getErrors(PyObject *SWIGUNUSEDPARM } arg1 = reinterpret_cast< FitSuiteParameters * >(argp1); result = ((FitSuiteParameters const *)arg1)->getErrors(); - resultobj = swig::from(static_cast< std::vector<double,std::allocator< double > > >(result)); + resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result)); return resultobj; fail: return NULL; @@ -26700,14 +26809,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_begin(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26784,14 +26893,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_end(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -26947,14 +27056,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters_valuesAreDifferrent(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27086,7 +27195,7 @@ SWIGINTERN PyObject *_wrap_FitSuiteParameters_setParametersFixed(PyObject *SWIGU } arg1 = reinterpret_cast< FitSuiteParameters * >(argp1); { - std::vector<std::string,std::allocator< std::string > > *ptr = (std::vector<std::string,std::allocator< std::string > > *)0; + std::vector< std::string,std::allocator< std::string > > *ptr = (std::vector< std::string,std::allocator< std::string > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "FitSuiteParameters_setParametersFixed" "', argument " "2"" of type '" "std::vector< std::string,std::allocator< std::string > > const &""'"); @@ -27176,14 +27285,14 @@ fail: SWIGINTERN PyObject *_wrap_FitSuiteParameters___getitem__(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27409,14 +27518,14 @@ fail: SWIGINTERN PyObject *_wrap_sinc(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27614,14 +27723,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J0(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27684,14 +27793,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J1(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27754,14 +27863,14 @@ fail: SWIGINTERN PyObject *_wrap_Bessel_J1c(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[2] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 1) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27862,7 +27971,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform__SWIG_1(PyObject *SWIGUNUSEDPARM if (!PyArg_ParseTuple(args,(char *)"OO:FastFourierTransform",&obj0,&obj1)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "FastFourierTransform" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -27888,14 +27997,14 @@ fail: SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[3] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 2) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -27915,7 +28024,7 @@ SWIGINTERN PyObject *_wrap_FastFourierTransform(PyObject *self, PyObject *args) } if (argc == 2) { int _v; - int res = swig::asptr(argv[0], (std::vector<double,std::allocator< double > >**)(0)); + int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { { @@ -27949,7 +28058,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject if (!PyArg_ParseTuple(args,(char *)"OO:ConvolveFFT",&obj0,&obj1)) SWIG_fail; { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res1 = swig::asptr(obj0, &ptr); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "ConvolveFFT" "', argument " "1"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -27960,7 +28069,7 @@ SWIGINTERN PyObject *_wrap_ConvolveFFT(PyObject *SWIGUNUSEDPARM(self), PyObject arg1 = ptr; } { - std::vector<double,std::allocator< double > > *ptr = (std::vector<double,std::allocator< double > > *)0; + std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; res2 = swig::asptr(obj1, &ptr); if (!SWIG_IsOK(res2)) { SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "ConvolveFFT" "', argument " "2"" of type '" "std::vector< double,std::allocator< double > > const &""'"); @@ -28523,14 +28632,14 @@ fail: SWIGINTERN PyObject *_wrap_MinimizerOptions_setValue(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -28748,14 +28857,14 @@ fail: SWIGINTERN PyObject *_wrap_MinimizerOptions_getValue(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -28970,14 +29079,14 @@ fail: SWIGINTERN PyObject *_wrap_MinimizerOptions_addValue(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29359,14 +29468,14 @@ fail: SWIGINTERN PyObject *_wrap_MinimizerFactory_createMinimizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29617,14 +29726,14 @@ fail: SWIGINTERN PyObject *_wrap_new_FitStrategyAdjustMinimizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[4] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 3) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -29934,14 +30043,14 @@ fail: SWIGINTERN PyObject *_wrap_FitStrategyAdjustMinimizer_setMinimizer(PyObject *self, PyObject *args) { - int argc; + Py_ssize_t argc; PyObject *argv[5] = { 0 }; - int ii; + Py_ssize_t ii; if (!PyTuple_Check(args)) SWIG_fail; - argc = args ? (int)PyObject_Length(args) : 0; + argc = args ? PyObject_Length(args) : 0; for (ii = 0; (ii < 4) && (ii < argc); ii++) { argv[ii] = PyTuple_GET_ITEM(args,ii); } @@ -30106,11 +30215,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vdouble1d_t___nonzero__", _wrap_vdouble1d_t___nonzero__, METH_VARARGS, (char *)"vdouble1d_t___nonzero__(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t___bool__", _wrap_vdouble1d_t___bool__, METH_VARARGS, (char *)"vdouble1d_t___bool__(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t___len__", _wrap_vdouble1d_t___len__, METH_VARARGS, (char *)"vdouble1d_t___len__(vdouble1d_t self) -> std::vector< double >::size_type"}, - { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"}, { (char *)"vdouble1d_t___getslice__", _wrap_vdouble1d_t___getslice__, METH_VARARGS, (char *)"vdouble1d_t___getslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j) -> vdouble1d_t"}, { (char *)"vdouble1d_t___setslice__", _wrap_vdouble1d_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n" - "vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n" + "__setslice__(std::vector< double >::difference_type i, std::vector< double >::difference_type j)\n" + "vdouble1d_t___setslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j, vdouble1d_t v)\n" ""}, { (char *)"vdouble1d_t___delslice__", _wrap_vdouble1d_t___delslice__, METH_VARARGS, (char *)"vdouble1d_t___delslice__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::difference_type j)"}, { (char *)"vdouble1d_t___delitem__", _wrap_vdouble1d_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30126,16 +30234,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vdouble1d_t___setitem__(vdouble1d_t self, std::vector< double >::difference_type i, std::vector< double >::value_type const & x)\n" ""}, + { (char *)"vdouble1d_t_pop", _wrap_vdouble1d_t_pop, METH_VARARGS, (char *)"vdouble1d_t_pop(vdouble1d_t self) -> std::vector< double >::value_type"}, { (char *)"vdouble1d_t_append", _wrap_vdouble1d_t_append, METH_VARARGS, (char *)"vdouble1d_t_append(vdouble1d_t self, std::vector< double >::value_type const & x)"}, { (char *)"vdouble1d_t_empty", _wrap_vdouble1d_t_empty, METH_VARARGS, (char *)"vdouble1d_t_empty(vdouble1d_t self) -> bool"}, { (char *)"vdouble1d_t_size", _wrap_vdouble1d_t_size, METH_VARARGS, (char *)"vdouble1d_t_size(vdouble1d_t self) -> std::vector< double >::size_type"}, - { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"}, { (char *)"vdouble1d_t_swap", _wrap_vdouble1d_t_swap, METH_VARARGS, (char *)"vdouble1d_t_swap(vdouble1d_t self, vdouble1d_t v)"}, - { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"}, { (char *)"vdouble1d_t_begin", _wrap_vdouble1d_t_begin, METH_VARARGS, (char *)"vdouble1d_t_begin(vdouble1d_t self) -> std::vector< double >::iterator"}, { (char *)"vdouble1d_t_end", _wrap_vdouble1d_t_end, METH_VARARGS, (char *)"vdouble1d_t_end(vdouble1d_t self) -> std::vector< double >::iterator"}, { (char *)"vdouble1d_t_rbegin", _wrap_vdouble1d_t_rbegin, METH_VARARGS, (char *)"vdouble1d_t_rbegin(vdouble1d_t self) -> std::vector< double >::reverse_iterator"}, { (char *)"vdouble1d_t_rend", _wrap_vdouble1d_t_rend, METH_VARARGS, (char *)"vdouble1d_t_rend(vdouble1d_t self) -> std::vector< double >::reverse_iterator"}, + { (char *)"vdouble1d_t_clear", _wrap_vdouble1d_t_clear, METH_VARARGS, (char *)"vdouble1d_t_clear(vdouble1d_t self)"}, + { (char *)"vdouble1d_t_get_allocator", _wrap_vdouble1d_t_get_allocator, METH_VARARGS, (char *)"vdouble1d_t_get_allocator(vdouble1d_t self) -> std::vector< double >::allocator_type"}, { (char *)"vdouble1d_t_pop_back", _wrap_vdouble1d_t_pop_back, METH_VARARGS, (char *)"vdouble1d_t_pop_back(vdouble1d_t self)"}, { (char *)"vdouble1d_t_erase", _wrap_vdouble1d_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< double >::iterator pos) -> std::vector< double >::iterator\n" @@ -30167,11 +30276,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vdouble2d_t___nonzero__", _wrap_vdouble2d_t___nonzero__, METH_VARARGS, (char *)"vdouble2d_t___nonzero__(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t___bool__", _wrap_vdouble2d_t___bool__, METH_VARARGS, (char *)"vdouble2d_t___bool__(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t___len__", _wrap_vdouble2d_t___len__, METH_VARARGS, (char *)"vdouble2d_t___len__(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"}, - { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"}, { (char *)"vdouble2d_t___getslice__", _wrap_vdouble2d_t___getslice__, METH_VARARGS, (char *)"vdouble2d_t___getslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j) -> vdouble2d_t"}, { (char *)"vdouble2d_t___setslice__", _wrap_vdouble2d_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n" - "vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n" + "__setslice__(std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)\n" + "vdouble2d_t___setslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j, vdouble2d_t v)\n" ""}, { (char *)"vdouble2d_t___delslice__", _wrap_vdouble2d_t___delslice__, METH_VARARGS, (char *)"vdouble2d_t___delslice__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, std::vector< std::vector< double > >::difference_type j)"}, { (char *)"vdouble2d_t___delitem__", _wrap_vdouble2d_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30187,16 +30295,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vdouble2d_t___setitem__(vdouble2d_t self, std::vector< std::vector< double > >::difference_type i, vdouble1d_t x)\n" ""}, + { (char *)"vdouble2d_t_pop", _wrap_vdouble2d_t_pop, METH_VARARGS, (char *)"vdouble2d_t_pop(vdouble2d_t self) -> vdouble1d_t"}, { (char *)"vdouble2d_t_append", _wrap_vdouble2d_t_append, METH_VARARGS, (char *)"vdouble2d_t_append(vdouble2d_t self, vdouble1d_t x)"}, { (char *)"vdouble2d_t_empty", _wrap_vdouble2d_t_empty, METH_VARARGS, (char *)"vdouble2d_t_empty(vdouble2d_t self) -> bool"}, { (char *)"vdouble2d_t_size", _wrap_vdouble2d_t_size, METH_VARARGS, (char *)"vdouble2d_t_size(vdouble2d_t self) -> std::vector< std::vector< double > >::size_type"}, - { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"}, { (char *)"vdouble2d_t_swap", _wrap_vdouble2d_t_swap, METH_VARARGS, (char *)"vdouble2d_t_swap(vdouble2d_t self, vdouble2d_t v)"}, - { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"}, { (char *)"vdouble2d_t_begin", _wrap_vdouble2d_t_begin, METH_VARARGS, (char *)"vdouble2d_t_begin(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"}, { (char *)"vdouble2d_t_end", _wrap_vdouble2d_t_end, METH_VARARGS, (char *)"vdouble2d_t_end(vdouble2d_t self) -> std::vector< std::vector< double > >::iterator"}, { (char *)"vdouble2d_t_rbegin", _wrap_vdouble2d_t_rbegin, METH_VARARGS, (char *)"vdouble2d_t_rbegin(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"}, { (char *)"vdouble2d_t_rend", _wrap_vdouble2d_t_rend, METH_VARARGS, (char *)"vdouble2d_t_rend(vdouble2d_t self) -> std::vector< std::vector< double > >::reverse_iterator"}, + { (char *)"vdouble2d_t_clear", _wrap_vdouble2d_t_clear, METH_VARARGS, (char *)"vdouble2d_t_clear(vdouble2d_t self)"}, + { (char *)"vdouble2d_t_get_allocator", _wrap_vdouble2d_t_get_allocator, METH_VARARGS, (char *)"vdouble2d_t_get_allocator(vdouble2d_t self) -> std::vector< std::vector< double > >::allocator_type"}, { (char *)"vdouble2d_t_pop_back", _wrap_vdouble2d_t_pop_back, METH_VARARGS, (char *)"vdouble2d_t_pop_back(vdouble2d_t self)"}, { (char *)"vdouble2d_t_erase", _wrap_vdouble2d_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::vector< double > >::iterator pos) -> std::vector< std::vector< double > >::iterator\n" @@ -30228,11 +30337,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_integer_t___nonzero__", _wrap_vector_integer_t___nonzero__, METH_VARARGS, (char *)"vector_integer_t___nonzero__(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t___bool__", _wrap_vector_integer_t___bool__, METH_VARARGS, (char *)"vector_integer_t___bool__(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t___len__", _wrap_vector_integer_t___len__, METH_VARARGS, (char *)"vector_integer_t___len__(vector_integer_t self) -> std::vector< int >::size_type"}, - { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"}, { (char *)"vector_integer_t___getslice__", _wrap_vector_integer_t___getslice__, METH_VARARGS, (char *)"vector_integer_t___getslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j) -> vector_integer_t"}, { (char *)"vector_integer_t___setslice__", _wrap_vector_integer_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n" - "vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n" + "__setslice__(std::vector< int >::difference_type i, std::vector< int >::difference_type j)\n" + "vector_integer_t___setslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j, vector_integer_t v)\n" ""}, { (char *)"vector_integer_t___delslice__", _wrap_vector_integer_t___delslice__, METH_VARARGS, (char *)"vector_integer_t___delslice__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::difference_type j)"}, { (char *)"vector_integer_t___delitem__", _wrap_vector_integer_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30248,16 +30356,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_integer_t___setitem__(vector_integer_t self, std::vector< int >::difference_type i, std::vector< int >::value_type const & x)\n" ""}, + { (char *)"vector_integer_t_pop", _wrap_vector_integer_t_pop, METH_VARARGS, (char *)"vector_integer_t_pop(vector_integer_t self) -> std::vector< int >::value_type"}, { (char *)"vector_integer_t_append", _wrap_vector_integer_t_append, METH_VARARGS, (char *)"vector_integer_t_append(vector_integer_t self, std::vector< int >::value_type const & x)"}, { (char *)"vector_integer_t_empty", _wrap_vector_integer_t_empty, METH_VARARGS, (char *)"vector_integer_t_empty(vector_integer_t self) -> bool"}, { (char *)"vector_integer_t_size", _wrap_vector_integer_t_size, METH_VARARGS, (char *)"vector_integer_t_size(vector_integer_t self) -> std::vector< int >::size_type"}, - { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"}, { (char *)"vector_integer_t_swap", _wrap_vector_integer_t_swap, METH_VARARGS, (char *)"vector_integer_t_swap(vector_integer_t self, vector_integer_t v)"}, - { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"}, { (char *)"vector_integer_t_begin", _wrap_vector_integer_t_begin, METH_VARARGS, (char *)"vector_integer_t_begin(vector_integer_t self) -> std::vector< int >::iterator"}, { (char *)"vector_integer_t_end", _wrap_vector_integer_t_end, METH_VARARGS, (char *)"vector_integer_t_end(vector_integer_t self) -> std::vector< int >::iterator"}, { (char *)"vector_integer_t_rbegin", _wrap_vector_integer_t_rbegin, METH_VARARGS, (char *)"vector_integer_t_rbegin(vector_integer_t self) -> std::vector< int >::reverse_iterator"}, { (char *)"vector_integer_t_rend", _wrap_vector_integer_t_rend, METH_VARARGS, (char *)"vector_integer_t_rend(vector_integer_t self) -> std::vector< int >::reverse_iterator"}, + { (char *)"vector_integer_t_clear", _wrap_vector_integer_t_clear, METH_VARARGS, (char *)"vector_integer_t_clear(vector_integer_t self)"}, + { (char *)"vector_integer_t_get_allocator", _wrap_vector_integer_t_get_allocator, METH_VARARGS, (char *)"vector_integer_t_get_allocator(vector_integer_t self) -> std::vector< int >::allocator_type"}, { (char *)"vector_integer_t_pop_back", _wrap_vector_integer_t_pop_back, METH_VARARGS, (char *)"vector_integer_t_pop_back(vector_integer_t self)"}, { (char *)"vector_integer_t_erase", _wrap_vector_integer_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< int >::iterator pos) -> std::vector< int >::iterator\n" @@ -30289,11 +30398,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_longinteger_t___nonzero__", _wrap_vector_longinteger_t___nonzero__, METH_VARARGS, (char *)"vector_longinteger_t___nonzero__(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t___bool__", _wrap_vector_longinteger_t___bool__, METH_VARARGS, (char *)"vector_longinteger_t___bool__(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t___len__", _wrap_vector_longinteger_t___len__, METH_VARARGS, (char *)"vector_longinteger_t___len__(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"}, - { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"}, { (char *)"vector_longinteger_t___getslice__", _wrap_vector_longinteger_t___getslice__, METH_VARARGS, (char *)"vector_longinteger_t___getslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j) -> vector_longinteger_t"}, { (char *)"vector_longinteger_t___setslice__", _wrap_vector_longinteger_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n" - "vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n" + "__setslice__(std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)\n" + "vector_longinteger_t___setslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j, vector_longinteger_t v)\n" ""}, { (char *)"vector_longinteger_t___delslice__", _wrap_vector_longinteger_t___delslice__, METH_VARARGS, (char *)"vector_longinteger_t___delslice__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::difference_type j)"}, { (char *)"vector_longinteger_t___delitem__", _wrap_vector_longinteger_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30309,16 +30417,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_longinteger_t___setitem__(vector_longinteger_t self, std::vector< unsigned long >::difference_type i, std::vector< unsigned long >::value_type const & x)\n" ""}, + { (char *)"vector_longinteger_t_pop", _wrap_vector_longinteger_t_pop, METH_VARARGS, (char *)"vector_longinteger_t_pop(vector_longinteger_t self) -> std::vector< unsigned long >::value_type"}, { (char *)"vector_longinteger_t_append", _wrap_vector_longinteger_t_append, METH_VARARGS, (char *)"vector_longinteger_t_append(vector_longinteger_t self, std::vector< unsigned long >::value_type const & x)"}, { (char *)"vector_longinteger_t_empty", _wrap_vector_longinteger_t_empty, METH_VARARGS, (char *)"vector_longinteger_t_empty(vector_longinteger_t self) -> bool"}, { (char *)"vector_longinteger_t_size", _wrap_vector_longinteger_t_size, METH_VARARGS, (char *)"vector_longinteger_t_size(vector_longinteger_t self) -> std::vector< unsigned long >::size_type"}, - { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"}, { (char *)"vector_longinteger_t_swap", _wrap_vector_longinteger_t_swap, METH_VARARGS, (char *)"vector_longinteger_t_swap(vector_longinteger_t self, vector_longinteger_t v)"}, - { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"}, { (char *)"vector_longinteger_t_begin", _wrap_vector_longinteger_t_begin, METH_VARARGS, (char *)"vector_longinteger_t_begin(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"}, { (char *)"vector_longinteger_t_end", _wrap_vector_longinteger_t_end, METH_VARARGS, (char *)"vector_longinteger_t_end(vector_longinteger_t self) -> std::vector< unsigned long >::iterator"}, { (char *)"vector_longinteger_t_rbegin", _wrap_vector_longinteger_t_rbegin, METH_VARARGS, (char *)"vector_longinteger_t_rbegin(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"}, { (char *)"vector_longinteger_t_rend", _wrap_vector_longinteger_t_rend, METH_VARARGS, (char *)"vector_longinteger_t_rend(vector_longinteger_t self) -> std::vector< unsigned long >::reverse_iterator"}, + { (char *)"vector_longinteger_t_clear", _wrap_vector_longinteger_t_clear, METH_VARARGS, (char *)"vector_longinteger_t_clear(vector_longinteger_t self)"}, + { (char *)"vector_longinteger_t_get_allocator", _wrap_vector_longinteger_t_get_allocator, METH_VARARGS, (char *)"vector_longinteger_t_get_allocator(vector_longinteger_t self) -> std::vector< unsigned long >::allocator_type"}, { (char *)"vector_longinteger_t_pop_back", _wrap_vector_longinteger_t_pop_back, METH_VARARGS, (char *)"vector_longinteger_t_pop_back(vector_longinteger_t self)"}, { (char *)"vector_longinteger_t_erase", _wrap_vector_longinteger_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< unsigned long >::iterator pos) -> std::vector< unsigned long >::iterator\n" @@ -30350,11 +30459,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_complex_t___nonzero__", _wrap_vector_complex_t___nonzero__, METH_VARARGS, (char *)"vector_complex_t___nonzero__(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t___bool__", _wrap_vector_complex_t___bool__, METH_VARARGS, (char *)"vector_complex_t___bool__(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t___len__", _wrap_vector_complex_t___len__, METH_VARARGS, (char *)"vector_complex_t___len__(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"}, - { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"}, { (char *)"vector_complex_t___getslice__", _wrap_vector_complex_t___getslice__, METH_VARARGS, (char *)"vector_complex_t___getslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j) -> vector_complex_t"}, { (char *)"vector_complex_t___setslice__", _wrap_vector_complex_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n" - "vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n" + "__setslice__(std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)\n" + "vector_complex_t___setslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j, vector_complex_t v)\n" ""}, { (char *)"vector_complex_t___delslice__", _wrap_vector_complex_t___delslice__, METH_VARARGS, (char *)"vector_complex_t___delslice__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::difference_type j)"}, { (char *)"vector_complex_t___delitem__", _wrap_vector_complex_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30370,16 +30478,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_complex_t___setitem__(vector_complex_t self, std::vector< std::complex< double > >::difference_type i, std::vector< std::complex< double > >::value_type const & x)\n" ""}, + { (char *)"vector_complex_t_pop", _wrap_vector_complex_t_pop, METH_VARARGS, (char *)"vector_complex_t_pop(vector_complex_t self) -> std::vector< std::complex< double > >::value_type"}, { (char *)"vector_complex_t_append", _wrap_vector_complex_t_append, METH_VARARGS, (char *)"vector_complex_t_append(vector_complex_t self, std::vector< std::complex< double > >::value_type const & x)"}, { (char *)"vector_complex_t_empty", _wrap_vector_complex_t_empty, METH_VARARGS, (char *)"vector_complex_t_empty(vector_complex_t self) -> bool"}, { (char *)"vector_complex_t_size", _wrap_vector_complex_t_size, METH_VARARGS, (char *)"vector_complex_t_size(vector_complex_t self) -> std::vector< std::complex< double > >::size_type"}, - { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"}, { (char *)"vector_complex_t_swap", _wrap_vector_complex_t_swap, METH_VARARGS, (char *)"vector_complex_t_swap(vector_complex_t self, vector_complex_t v)"}, - { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"}, { (char *)"vector_complex_t_begin", _wrap_vector_complex_t_begin, METH_VARARGS, (char *)"vector_complex_t_begin(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"}, { (char *)"vector_complex_t_end", _wrap_vector_complex_t_end, METH_VARARGS, (char *)"vector_complex_t_end(vector_complex_t self) -> std::vector< std::complex< double > >::iterator"}, { (char *)"vector_complex_t_rbegin", _wrap_vector_complex_t_rbegin, METH_VARARGS, (char *)"vector_complex_t_rbegin(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"}, { (char *)"vector_complex_t_rend", _wrap_vector_complex_t_rend, METH_VARARGS, (char *)"vector_complex_t_rend(vector_complex_t self) -> std::vector< std::complex< double > >::reverse_iterator"}, + { (char *)"vector_complex_t_clear", _wrap_vector_complex_t_clear, METH_VARARGS, (char *)"vector_complex_t_clear(vector_complex_t self)"}, + { (char *)"vector_complex_t_get_allocator", _wrap_vector_complex_t_get_allocator, METH_VARARGS, (char *)"vector_complex_t_get_allocator(vector_complex_t self) -> std::vector< std::complex< double > >::allocator_type"}, { (char *)"vector_complex_t_pop_back", _wrap_vector_complex_t_pop_back, METH_VARARGS, (char *)"vector_complex_t_pop_back(vector_complex_t self)"}, { (char *)"vector_complex_t_erase", _wrap_vector_complex_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::complex< double > >::iterator pos) -> std::vector< std::complex< double > >::iterator\n" @@ -30411,11 +30520,10 @@ static PyMethodDef SwigMethods[] = { { (char *)"vector_string_t___nonzero__", _wrap_vector_string_t___nonzero__, METH_VARARGS, (char *)"vector_string_t___nonzero__(vector_string_t self) -> bool"}, { (char *)"vector_string_t___bool__", _wrap_vector_string_t___bool__, METH_VARARGS, (char *)"vector_string_t___bool__(vector_string_t self) -> bool"}, { (char *)"vector_string_t___len__", _wrap_vector_string_t___len__, METH_VARARGS, (char *)"vector_string_t___len__(vector_string_t self) -> std::vector< std::string >::size_type"}, - { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"}, { (char *)"vector_string_t___getslice__", _wrap_vector_string_t___getslice__, METH_VARARGS, (char *)"vector_string_t___getslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j) -> vector_string_t"}, { (char *)"vector_string_t___setslice__", _wrap_vector_string_t___setslice__, METH_VARARGS, (char *)"\n" - "__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n" - "vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n" + "__setslice__(std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)\n" + "vector_string_t___setslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j, vector_string_t v)\n" ""}, { (char *)"vector_string_t___delslice__", _wrap_vector_string_t___delslice__, METH_VARARGS, (char *)"vector_string_t___delslice__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::difference_type j)"}, { (char *)"vector_string_t___delitem__", _wrap_vector_string_t___delitem__, METH_VARARGS, (char *)"\n" @@ -30431,16 +30539,17 @@ static PyMethodDef SwigMethods[] = { "__setitem__(PySliceObject * slice)\n" "vector_string_t___setitem__(vector_string_t self, std::vector< std::string >::difference_type i, std::vector< std::string >::value_type const & x)\n" ""}, + { (char *)"vector_string_t_pop", _wrap_vector_string_t_pop, METH_VARARGS, (char *)"vector_string_t_pop(vector_string_t self) -> std::vector< std::string >::value_type"}, { (char *)"vector_string_t_append", _wrap_vector_string_t_append, METH_VARARGS, (char *)"vector_string_t_append(vector_string_t self, std::vector< std::string >::value_type const & x)"}, { (char *)"vector_string_t_empty", _wrap_vector_string_t_empty, METH_VARARGS, (char *)"vector_string_t_empty(vector_string_t self) -> bool"}, { (char *)"vector_string_t_size", _wrap_vector_string_t_size, METH_VARARGS, (char *)"vector_string_t_size(vector_string_t self) -> std::vector< std::string >::size_type"}, - { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"}, { (char *)"vector_string_t_swap", _wrap_vector_string_t_swap, METH_VARARGS, (char *)"vector_string_t_swap(vector_string_t self, vector_string_t v)"}, - { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"}, { (char *)"vector_string_t_begin", _wrap_vector_string_t_begin, METH_VARARGS, (char *)"vector_string_t_begin(vector_string_t self) -> std::vector< std::string >::iterator"}, { (char *)"vector_string_t_end", _wrap_vector_string_t_end, METH_VARARGS, (char *)"vector_string_t_end(vector_string_t self) -> std::vector< std::string >::iterator"}, { (char *)"vector_string_t_rbegin", _wrap_vector_string_t_rbegin, METH_VARARGS, (char *)"vector_string_t_rbegin(vector_string_t self) -> std::vector< std::string >::reverse_iterator"}, { (char *)"vector_string_t_rend", _wrap_vector_string_t_rend, METH_VARARGS, (char *)"vector_string_t_rend(vector_string_t self) -> std::vector< std::string >::reverse_iterator"}, + { (char *)"vector_string_t_clear", _wrap_vector_string_t_clear, METH_VARARGS, (char *)"vector_string_t_clear(vector_string_t self)"}, + { (char *)"vector_string_t_get_allocator", _wrap_vector_string_t_get_allocator, METH_VARARGS, (char *)"vector_string_t_get_allocator(vector_string_t self) -> std::vector< std::string >::allocator_type"}, { (char *)"vector_string_t_pop_back", _wrap_vector_string_t_pop_back, METH_VARARGS, (char *)"vector_string_t_pop_back(vector_string_t self)"}, { (char *)"vector_string_t_erase", _wrap_vector_string_t_erase, METH_VARARGS, (char *)"\n" "erase(std::vector< std::string >::iterator pos) -> std::vector< std::string >::iterator\n" @@ -31972,12 +32081,15 @@ static swig_type_info _swigt__p_difference_type = {"_p_difference_type", "differ static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_function_chi2_t = {"_p_function_chi2_t", "function_chi2_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_function_gradient_t = {"_p_function_gradient_t", "function_gradient_t *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_int = {"_p_int", "int *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_int = {"_p_int", "intptr_t *|int *|int_least32_t *|int_fast32_t *|int32_t *|int_fast16_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_iterator = {"_p_iterator", "iterator *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_long_long = {"_p_long_long", "int_least64_t *|int_fast64_t *|int64_t *|long long *|intmax_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_observer_t = {"_p_observer_t", "observer_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_observerlist_t = {"_p_observerlist_t", "observerlist_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_p_PyObject = {"_p_p_PyObject", "PyObject **", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_parameters_t = {"_p_parameters_t", "parameters_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_short = {"_p_short", "short *|int_least16_t *|int16_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_signed_char = {"_p_signed_char", "signed char *|int_least8_t *|int_fast8_t *|int8_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_size_type = {"_p_size_type", "size_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__allocatorT_double_t = {"_p_std__allocatorT_double_t", "std::vector< double >::allocator_type *|std::allocator< double > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__allocatorT_int_t = {"_p_std__allocatorT_int_t", "std::vector< int >::allocator_type *|std::allocator< int > *", 0, 0, (void*)0, 0}; @@ -32003,6 +32115,10 @@ static swig_type_info _swigt__p_std__vectorT_std__string_std__allocatorT_std__st static swig_type_info _swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t = {"_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t", "std::vector< std::vector< double > > *|std::vector< std::vector< double,std::allocator< double > >,std::allocator< std::vector< double,std::allocator< double > > > > *|std::vector< std::vector< double,std::allocator< double > > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t = {"_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t", "std::vector< unsigned long > *|std::vector< unsigned long,std::allocator< unsigned long > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_swig__SwigPyIterator = {"_p_swig__SwigPyIterator", "swig::SwigPyIterator *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|uint_least8_t *|uint_fast8_t *|uint8_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "uintptr_t *|uint_least32_t *|uint_fast32_t *|uint32_t *|unsigned int *|uint_fast16_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_long_long = {"_p_unsigned_long_long", "uint_least64_t *|uint_fast64_t *|uint64_t *|unsigned long long *|uintmax_t *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|uint_least16_t *|uint16_t *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0}; static swig_type_info *swig_type_initial[] = { @@ -32058,10 +32174,13 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_function_gradient_t, &_swigt__p_int, &_swigt__p_iterator, + &_swigt__p_long_long, &_swigt__p_observer_t, &_swigt__p_observerlist_t, &_swigt__p_p_PyObject, &_swigt__p_parameters_t, + &_swigt__p_short, + &_swigt__p_signed_char, &_swigt__p_size_type, &_swigt__p_std__allocatorT_double_t, &_swigt__p_std__allocatorT_int_t, @@ -32087,6 +32206,10 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, &_swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, &_swigt__p_swig__SwigPyIterator, + &_swigt__p_unsigned_char, + &_swigt__p_unsigned_int, + &_swigt__p_unsigned_long_long, + &_swigt__p_unsigned_short, &_swigt__p_value_type, }; @@ -32142,10 +32265,13 @@ static swig_cast_info _swigc__p_function_chi2_t[] = { {&_swigt__p_function_chi2 static swig_cast_info _swigc__p_function_gradient_t[] = { {&_swigt__p_function_gradient_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_iterator[] = { {&_swigt__p_iterator, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_long_long[] = { {&_swigt__p_long_long, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_observer_t[] = { {&_swigt__p_observer_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_observerlist_t[] = { {&_swigt__p_observerlist_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_p_PyObject[] = { {&_swigt__p_p_PyObject, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_parameters_t[] = { {&_swigt__p_parameters_t, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_short[] = { {&_swigt__p_short, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_signed_char[] = { {&_swigt__p_signed_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_size_type[] = { {&_swigt__p_size_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__allocatorT_double_t[] = { {&_swigt__p_std__allocatorT_double_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__allocatorT_int_t[] = { {&_swigt__p_std__allocatorT_int_t, 0, 0, 0},{0, 0, 0, 0}}; @@ -32171,6 +32297,10 @@ static swig_cast_info _swigc__p_std__vectorT_std__string_std__allocatorT_std__st static swig_cast_info _swigc__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t[] = { {&_swigt__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t[] = { {&_swigt__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_swig__SwigPyIterator[] = { {&_swigt__p_swig__SwigPyIterator, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_long_long[] = { {&_swigt__p_unsigned_long_long, 0, 0, 0},{0, 0, 0, 0}}; +static swig_cast_info _swigc__p_unsigned_short[] = { {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_value_type[] = { {&_swigt__p_value_type, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info *swig_cast_initial[] = { @@ -32226,10 +32356,13 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_function_gradient_t, _swigc__p_int, _swigc__p_iterator, + _swigc__p_long_long, _swigc__p_observer_t, _swigc__p_observerlist_t, _swigc__p_p_PyObject, _swigc__p_parameters_t, + _swigc__p_short, + _swigc__p_signed_char, _swigc__p_size_type, _swigc__p_std__allocatorT_double_t, _swigc__p_std__allocatorT_int_t, @@ -32255,6 +32388,10 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t, _swigc__p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t, _swigc__p_swig__SwigPyIterator, + _swigc__p_unsigned_char, + _swigc__p_unsigned_int, + _swigc__p_unsigned_long_long, + _swigc__p_unsigned_short, _swigc__p_value_type, }; @@ -32673,10 +32810,19 @@ extern "C" { 0, /* tp_del */ #endif #if PY_VERSION_HEX >= 0x02060000 - 0, /* tp_version */ + 0, /* tp_version_tag */ +#endif +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ #endif #ifdef COUNT_ALLOCS - 0,0,0,0 /* tp_alloc -> tp_next */ + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ +#if PY_VERSION_HEX >= 0x02050000 + 0, /* tp_prev */ +#endif + 0 /* tp_next */ #endif }; varlink_type = tmp; diff --git a/Fit/PythonAPI/libBornAgainFit_wrap.h b/Fit/PythonAPI/libBornAgainFit_wrap.h index 1a057689d5735ec407584282287e0196bb5507d7..718336e1d7d8207a58ce326d8315db2f22642a5d 100644 --- a/Fit/PythonAPI/libBornAgainFit_wrap.h +++ b/Fit/PythonAPI/libBornAgainFit_wrap.h @@ -1,6 +1,6 @@ /* ---------------------------------------------------------------------------- * This file was automatically generated by SWIG (http://www.swig.org). - * Version 3.0.7 + * Version 3.0.8 * * This file is not intended to be easily readable and contains a number of * coding conventions designed to improve portability and efficiency. Do not make diff --git a/dev-tools/swig/extends.i b/dev-tools/swig/extends.i index e8d602d174d4366eaad722d300e867c42711047f..46d98d1a9f75efe1435e1cdb6b9a437c25714cc6 100644 --- a/dev-tools/swig/extends.i +++ b/dev-tools/swig/extends.i @@ -78,30 +78,55 @@ namespace Geometry { }; +%include "stdint.i" %extend IParameterized { - virtual void registerParameter(const std::string &name, long int parpointer, const AttLimits& limits = AttLimits::limitless()) + virtual void registerParameter(const std::string &name, int64_t parpointer, const AttLimits& limits = AttLimits::limitless()) { return (*($self)).registerParameter(name, (double*)parpointer, limits); } + /* virtual void registerParameter(const std::string &name, int parpointer, const AttLimits& limits = AttLimits::limitless()) + { + return (*($self)).registerParameter(name, (double*)parpointer, limits); + } /**/ + /*virtual void registerParameter(const std::string &name, int parpointer, const AttLimits& limits = AttLimits::limitless()) { return (*($self)).registerParameter(name, (double*)parpointer, limits); }*/ - /*virtual std::string addParametersToExternalPool(std::string path, std::shared_ptr<ParameterPool> external_pool, + /*virtual std::string addParametersToExternalPool(std::string path, int64_t external_pool, int copy_number = -1) const { - return ($self)->addParametersToExternalPool(path, external_pool.get(), copy_number); - }*/ + return ($self)->addParametersToExternalPool(path, ()external_pool.get(), copy_number); + }/**/ }; %extend ISampleBuilder { - virtual void registerParameter(const std::string &name, long int parpointer, const AttLimits& limits = AttLimits::limitless()) + /*virtual void registerParameter(const std::string &name, double* parpointer, const AttLimits& limits = AttLimits::limitless()) + { + return (*($self)).registerParameter(name, parpointer, limits); + } /**/ + + virtual void registerParameter(const std::string &name, int64_t parpointer, const AttLimits& limits = AttLimits::limitless()) + { + std::cout << "value passed to ISampleBuilder::registerParameter: " << (double*)parpointer << std::endl; + std::cout << "current value of the parameters: " << *(double*)parpointer << std::endl; + return (*($self)).registerParameter(name, (double*)parpointer, limits); + }/**/ + + + /*virtual std::string addParametersToExternalPool(std::string path, ParameterPool* external_pool, + int copy_number = -1) const + { + return dynamic_cast<const IParameterized*>($self)->addParametersToExternalPool(path, external_pool, copy_number); + }/**/ + + /*virtual void registerParameter(const std::string &name, int parpointer, const AttLimits& limits = AttLimits::limitless()) { return (*($self)).registerParameter(name, (double*)parpointer, limits); - } + }/**/ /*virtual void registerParameter(const std::string &name, int parpointer, const AttLimits& limits = AttLimits::limitless()) { diff --git a/dev-tools/swig/ignores.i b/dev-tools/swig/ignores.i index a5205e0d2df45fae643d2b682e6b4fea0a3c6aed..b9510b0d7dde18c1514b38ef13e8137aaefacd2d 100644 --- a/dev-tools/swig/ignores.i +++ b/dev-tools/swig/ignores.i @@ -47,8 +47,6 @@ namespace Geometry { // need this to play nicely with ctypes -%ignore IParameterizedShared::registerParameter(const std::string &, double*, const AttLimits&); -%ignore IParameterizedShared::registerParameter(const std::string &, double*); %ignore ISampleBuilder::registerParameter(const std::string &, double*, const AttLimits&); %ignore ISampleBuilder::registerParameter(const std::string &, double*); %ignore IParameterized::addParametersToExternalPool(std::string, ParameterPool*, int) const; diff --git a/dev-tools/swig/libBornAgainCore.i b/dev-tools/swig/libBornAgainCore.i index ad264ee1d652fa8c72972fc3f08bb684f322cc3b..9809a85ce6f0c0b6fe116a4a450a36655320adc2 100644 --- a/dev-tools/swig/libBornAgainCore.i +++ b/dev-tools/swig/libBornAgainCore.i @@ -25,6 +25,7 @@ /**/ +%include "stdint.i" %include "std_complex.i" %include "std_string.i" %include "std_vector.i" diff --git a/dev-tools/swig/libBornAgainFit.i b/dev-tools/swig/libBornAgainFit.i index c3057c3d544ccf5ec7cb48e341c2e7616468928e..965b0519fa33a9ddffa6ac97fa7346aa8adc6d36 100644 --- a/dev-tools/swig/libBornAgainFit.i +++ b/dev-tools/swig/libBornAgainFit.i @@ -22,6 +22,7 @@ // gives libBornAgainFit knowledge of the libBornAgainCore python module // %import "../../Core/PythonAPI/libBornAgainCore.i" +%include "stdint.i" %include "std_complex.i" %include "std_string.i" %include "std_vector.i" diff --git a/dev-tools/swig/tweaks.py b/dev-tools/swig/tweaks.py new file mode 100644 index 0000000000000000000000000000000000000000..ec766df7ddbe0928b41c8ea7a3f0ab90a4fb36e9 --- /dev/null +++ b/dev-tools/swig/tweaks.py @@ -0,0 +1,49 @@ +# this script is used to manually tweak swig-generated wrapper + +from __future__ import print_function +import sys +import os +import string + +# compatibility with windows filename conventions +def windowsify(filename): + if ( sys.platform == "win32" ): + new_filename = filename.replace("/", "\\") + else: + new_filename = filename + + return os.path.abspath(new_filename) + +if len(sys.argv) != 3: + print("Usage: tweaks.py inputfile outputfile") + exit(1) + +in_name = windowsify(sys.argv[1]) +out_name = windowsify(sys.argv[2]) +tmp_name = in_name + ".tmp" + +print("tweaks.py:", in_name, out_name, tmp_name) + +# we use a temp file because output could be same as input +in_file = open(in_name, "r") +tmp_file = open(tmp_name, "w") + + +# now loop over each line of f, making modification as necessary +for line in in_file: + line = line.replace("_libBornAgainCore.ICloneable_transferToCPP(self)", "self.__disown__()") + line = line.replace("_libBornAgainCore.Histogram1D_getBinCenters(self)", "self.getBinCentersNumpy()") + line = line.replace("_libBornAgainCore.Histogram1D_getBinErrors(self)", "self.getBinErrorsNumpy()") + line = line.replace("_libBornAgainCore.Histogram1D_getBinValues(self)", "self.getBinValuesNumpy()") + tmp_file.write(line) + +# done the search/replace +in_file.close() +tmp_file.close() + +# have to check this for correct behaviour +if ( out_name == in_name): + os.remove(in_name) + +# rename tmp file to output file +os.rename(tmp_name, out_name)