From b4c88d4167396421b73c0cd4d2697f1d0bc48bdb Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Sun, 4 Feb 2024 21:46:35 +0100 Subject: [PATCH 1/6] Add a correct way to input a numpy array --- pyproject.toml | 2 +- python/CSF/CSF.i | 6 + python/CSF/CSF.py | 23 +- python/CSF/CSF_wrap.cxx | 2606 ++++++++++++++++++++++----------------- setup.py | 5 +- src/CSF.cpp | 30 +- src/CSF.h | 4 +- src/point_cloud.h | 1 + 8 files changed, 1537 insertions(+), 1140 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7fd26b9..6afce03 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools"] +requires = ["wheel","setuptools", "oldest-supported-numpy"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/python/CSF/CSF.i b/python/CSF/CSF.i index 6d59d81..fd82402 100644 --- a/python/CSF/CSF.i +++ b/python/CSF/CSF.i @@ -7,6 +7,11 @@ %include "std_string.i" %include "std_vector.i" +%include "numpy.i" + +%init %{ +import_array(); +%} namespace std { @@ -16,4 +21,5 @@ namespace std %template(VecDouble) vector; } +%apply (double* IN_ARRAY2, int DIM1, int DIM2) {(double *points, int rows, int cols)}; %include "../src/CSF.h" diff --git a/python/CSF/CSF.py b/python/CSF/CSF.py index e1760e1..9300e43 100644 --- a/python/CSF/CSF.py +++ b/python/CSF/CSF.py @@ -1,10 +1,13 @@ -# This file was automatically generated by SWIG (https://www.swig.org). -# Version 4.1.1 +# This file was automatically generated by SWIG (http://www.swig.org). +# Version 4.0.2 # -# Do not make changes to this file unless you know what you are doing - modify +# Do not make changes to this file unless you know what you are doing--modify # the SWIG interface file instead. from sys import version_info as _swig_python_version_info +if _swig_python_version_info < (2, 7, 0): + raise RuntimeError("Python 2.7 or later required") + # Import the low-level C/C++ module if __package__ or "." in __name__: from . import _CSF @@ -26,10 +29,10 @@ def _swig_repr(self): def _swig_setattr_nondynamic_instance_variable(set): def set_instance_attr(self, name, value): - if name == "this": - set(self, name, value) - elif name == "thisown": + if name == "thisown": self.this.own(value) + elif name == "this": + set(self, name, value) elif hasattr(self, name) and isinstance(getattr(type(self), name), property): set(self, name, value) else: @@ -118,6 +121,7 @@ def __iter__(self): # Register SwigPyIterator in _CSF: _CSF.SwigPyIterator_swigregister(SwigPyIterator) + class VecInt(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -223,6 +227,7 @@ def capacity(self): # Register VecInt in _CSF: _CSF.VecInt_swigregister(VecInt) + class VecFloat(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -328,6 +333,7 @@ def capacity(self): # Register VecFloat in _CSF: _CSF.VecFloat_swigregister(VecFloat) + class VecVecFloat(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -433,6 +439,7 @@ def capacity(self): # Register VecVecFloat in _CSF: _CSF.VecVecFloat_swigregister(VecVecFloat) + class VecDouble(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -538,6 +545,7 @@ def capacity(self): # Register VecDouble in _CSF: _CSF.VecDouble_swigregister(VecDouble) + class Params(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -554,6 +562,7 @@ def __init__(self): # Register Params in _CSF: _CSF.Params_swigregister(Params) + class CSF(object): thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag") __repr__ = _swig_repr @@ -588,3 +597,5 @@ def do_cloth_export(self): # Register CSF in _CSF: _CSF.CSF_swigregister(CSF) + + diff --git a/python/CSF/CSF_wrap.cxx b/python/CSF/CSF_wrap.cxx index c161b7e..2ef9c9c 100644 --- a/python/CSF/CSF_wrap.cxx +++ b/python/CSF/CSF_wrap.cxx @@ -1,16 +1,44 @@ /* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (https://www.swig.org). - * Version 4.1.1 + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 4.0.2 * - * Do not make changes to this file unless you know what you are doing - modify - * the SWIG interface file instead. + * 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 + * changes to this file unless you know what you are doing--modify the SWIG + * interface file instead. * ----------------------------------------------------------------------------- */ -#define SWIG_VERSION 0x040101 +#ifndef SWIGPYTHON #define SWIGPYTHON +#endif + #define SWIG_PYTHON_DIRECTOR_NO_VTABLE + +#ifdef __cplusplus +/* SwigValueWrapper is described in swig.swg */ +template class SwigValueWrapper { + struct SwigMovePointer { + T *ptr; + SwigMovePointer(T *p) : ptr(p) { } + ~SwigMovePointer() { delete ptr; } + SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } + } pointer; + SwigValueWrapper& operator=(const SwigValueWrapper& rhs); + SwigValueWrapper(const SwigValueWrapper& rhs); +public: + SwigValueWrapper() : pointer(0) { } + SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; } + operator T&() const { return *pointer.ptr; } + T *operator&() { return pointer.ptr; } +}; + +template T SwigValueInit() { + return T(); +} +#endif + /* ----------------------------------------------------------------------------- * This section contains generic SWIG labels for method/variable * declarations/attributes, and other compiler dependent labels. @@ -141,26 +169,8 @@ # include #endif -#if !defined(PY_SSIZE_T_CLEAN) && !defined(SWIG_NO_PY_SSIZE_T_CLEAN) -#define PY_SSIZE_T_CLEAN -#endif - -#if __GNUC__ >= 7 -#pragma GCC diagnostic push -#if defined(__cplusplus) && __cplusplus >=201703L -#pragma GCC diagnostic ignored "-Wregister" /* For python-2.7 headers that use register */ -#endif -#endif - #if defined(_DEBUG) && defined(SWIG_PYTHON_INTERPRETER_NO_DEBUG) /* Use debug wrappers with the Python release dll */ - -#if defined(_MSC_VER) && _MSC_VER >= 1929 -/* Workaround compilation errors when redefining _DEBUG in MSVC 2019 version 16.10 and later - * See https://github.com/swig/swig/issues/2090 */ -# include -#endif - # undef _DEBUG # include # define _DEBUG 1 @@ -168,10 +178,6 @@ # include #endif -#if __GNUC__ >= 7 -#pragma GCC diagnostic pop -#endif - /* ----------------------------------------------------------------------------- * swigrun.swg * @@ -218,8 +224,6 @@ #define SWIG_POINTER_DISOWN 0x1 #define SWIG_CAST_NEW_MEMORY 0x2 #define SWIG_POINTER_NO_NULL 0x4 -#define SWIG_POINTER_CLEAR 0x8 -#define SWIG_POINTER_RELEASE (SWIG_POINTER_CLEAR | SWIG_POINTER_DISOWN) /* Flags for new pointer objects */ #define SWIG_POINTER_OWN 0x1 @@ -291,7 +295,7 @@ SWIG errors code. Finally, if the SWIG_CASTRANK_MODE is enabled, the result code - allows returning the 'cast rank', for example, if you have this + allows to return the 'cast rank', for example, if you have this int food(double) int fooi(int); @@ -305,13 +309,7 @@ */ #define SWIG_OK (0) -/* Runtime errors are < 0 */ #define SWIG_ERROR (-1) -/* Errors in range -1 to -99 are in swigerrors.swg (errors for all languages including those not using the runtime) */ -/* Errors in range -100 to -199 are language specific errors defined in *errors.swg */ -/* Errors < -200 are generic runtime specific errors */ -#define SWIG_ERROR_RELEASE_NOT_OWNED (-200) - #define SWIG_IsOK(r) (r >= 0) #define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError) @@ -326,7 +324,7 @@ #define SWIG_OLDOBJ (SWIG_OK) #define SWIG_NEWOBJ (SWIG_OK | SWIG_NEWOBJMASK) #define SWIG_TMPOBJ (SWIG_OK | SWIG_TMPOBJMASK) -/* Check, add and del object mask methods */ +/* Check, add and del mask methods */ #define SWIG_AddNewMask(r) (SWIG_IsOK(r) ? (r | SWIG_NEWOBJMASK) : r) #define SWIG_DelNewMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_NEWOBJMASK) : r) #define SWIG_IsNewObj(r) (SWIG_IsOK(r) && (r & SWIG_NEWOBJMASK)) @@ -472,7 +470,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) { Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison */ SWIGRUNTIME swig_cast_info * -SWIG_TypeCheckStruct(const swig_type_info *from, swig_type_info *ty) { +SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) { if (ty) { swig_cast_info *iter = ty->cast; while (iter) { @@ -532,9 +530,9 @@ SWIG_TypeName(const swig_type_info *ty) { SWIGRUNTIME const char * SWIG_TypePrettyName(const swig_type_info *type) { /* The "str" field contains the equivalent pretty names of the - type, separated by vertical-bar characters. Choose the last - name. It should be the most specific; a fully resolved name - but not necessarily with default template parameters expanded. */ + type, separated by vertical-bar characters. We choose + to print the last name, as it is often (?) the most + specific. */ if (!type) return NULL; if (type->str != NULL) { const char *last_name = type->str; @@ -754,7 +752,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { } #endif -/* SWIG Errors applicable to all language modules, values are reserved from -1 to -99 */ +/* Errors in SWIG */ #define SWIG_UnknownError -1 #define SWIG_IOError -2 #define SWIG_RuntimeError -3 @@ -770,6 +768,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #define SWIG_NullReferenceError -13 + /* Compatibility macros for Python 3 */ #if PY_VERSION_HEX >= 0x03000000 @@ -785,6 +784,7 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #define PyString_Size(str) PyBytes_Size(str) #define PyString_InternFromString(key) PyUnicode_InternFromString(key) #define Py_TPFLAGS_HAVE_CLASS Py_TPFLAGS_BASETYPE +#define PyString_AS_STRING(x) PyUnicode_AS_STRING(x) #define _PyLong_FromSsize_t(x) PyLong_FromSsize_t(x) #endif @@ -802,19 +802,38 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) { #endif +/* Warning: This function will allocate a new string in Python 3, + * so please call SWIG_Python_str_DelForPy3(x) to free the space. + */ SWIGINTERN char* SWIG_Python_str_AsChar(PyObject *str) { #if PY_VERSION_HEX >= 0x03030000 return (char *)PyUnicode_AsUTF8(str); +#elif PY_VERSION_HEX >= 0x03000000 + char *newstr = 0; + str = PyUnicode_AsUTF8String(str); + if (str) { + char *cstr; + Py_ssize_t len; + if (PyBytes_AsStringAndSize(str, &cstr, &len) != -1) { + newstr = (char *) malloc(len+1); + if (newstr) + memcpy(newstr, cstr, len+1); + } + Py_XDECREF(str); + } + return newstr; #else return PyString_AsString(str); #endif } -/* Was useful for Python 3.0.x-3.2.x - now provided only for compatibility - * with any uses in user interface files. */ -#define SWIG_Python_str_DelForPy3(x) +#if PY_VERSION_HEX >= 0x03030000 || PY_VERSION_HEX < 0x03000000 +# define SWIG_Python_str_DelForPy3(x) +#else +# define SWIG_Python_str_DelForPy3(x) free( (void*) (x) ) +#endif SWIGINTERN PyObject* @@ -831,14 +850,10 @@ SWIG_Python_str_FromChar(const char *c) # define PyObject_DEL PyObject_Del #endif -/* SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user interface files check for it. */ +// SWIGPY_USE_CAPSULE is no longer used within SWIG itself, but some user +// interface files check for it. # define SWIGPY_USE_CAPSULE -#ifdef SWIGPYTHON_BUILTIN -# define SWIGPY_CAPSULE_ATTR_NAME "type_pointer_capsule_builtin" SWIG_TYPE_TABLE_NAME -#else -# define SWIGPY_CAPSULE_ATTR_NAME "type_pointer_capsule" SWIG_TYPE_TABLE_NAME -#endif -# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION "." SWIGPY_CAPSULE_ATTR_NAME) +# define SWIGPY_CAPSULE_NAME ("swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME) #if PY_VERSION_HEX < 0x03020000 #define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type) @@ -912,6 +927,7 @@ SWIG_Python_AddErrorMsg(const char* mesg) PyErr_Format(type, "%s %s", tmp, mesg); else PyErr_Format(type, "%s", mesg); + SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); Py_DECREF(value); } else { @@ -942,12 +958,8 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message) #else newvalue = PyString_FromFormat("%s\nAdditional information:\n%s", PyString_AsString(value), message); #endif - if (newvalue) { - Py_XDECREF(value); - PyErr_Restore(type, newvalue, traceback); - } else { - PyErr_Restore(type, value, traceback); - } + Py_XDECREF(value); + PyErr_Restore(type, newvalue, traceback); } else { /* Raise TypeError using given message */ PyErr_SetString(PyExc_TypeError, message); @@ -964,12 +976,8 @@ SWIG_Python_RaiseOrModifyTypeError(const char *message) # define SWIG_PYTHON_USE_GIL # endif # if defined(SWIG_PYTHON_USE_GIL) /* Use PyGILState threads calls */ -# if !defined(SWIG_PYTHON_INITIALIZE_THREADS) -# if PY_VERSION_HEX < 0x03070000 -# define SWIG_PYTHON_INITIALIZE_THREADS PyEval_InitThreads() -# else -# define SWIG_PYTHON_INITIALIZE_THREADS -# endif +# ifndef SWIG_PYTHON_INITIALIZE_THREADS +# define SWIG_PYTHON_INITIALIZE_THREADS PyEval_InitThreads() # endif # ifdef __cplusplus /* C++ code */ class SWIG_Python_Thread_Block { @@ -1067,8 +1075,8 @@ typedef struct swig_const_info { # error "This version of SWIG only supports Python >= 2.7" #endif -#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03030000 -# error "This version of SWIG only supports Python 3 >= 3.3" +#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03020000 +# error "This version of SWIG only supports Python 3 >= 3.2" #endif /* Common SWIG API */ @@ -1183,12 +1191,7 @@ SWIG_Python_AppendOutput(PyObject* result, PyObject* obj) { if (!PyList_Check(result)) { PyObject *o2 = result; result = PyList_New(1); - if (result) { - PyList_SET_ITEM(result, 0, o2); - } else { - Py_DECREF(obj); - return o2; - } + PyList_SetItem(result, 0, o2); } PyList_Append(result,obj); Py_DECREF(obj); @@ -1270,238 +1273,6 @@ SWIG_Python_CheckNoKeywords(PyObject *kwargs, const char *name) { #define SWIG_STATIC_POINTER(var) var = 0; if (!var) var #endif -#ifdef __cplusplus -extern "C" { -#endif - -/* Python-specific SWIG API */ -#define SWIG_newvarlink() SWIG_Python_newvarlink() -#define SWIG_addvarlink(p, name, get_attr, set_attr) SWIG_Python_addvarlink(p, name, get_attr, set_attr) -#define SWIG_InstallConstants(d, constants) SWIG_Python_InstallConstants(d, constants) - -/* ----------------------------------------------------------------------------- - * global variable support code. - * ----------------------------------------------------------------------------- */ - -typedef struct swig_globalvar { - char *name; /* Name of global variable */ - PyObject *(*get_attr)(void); /* Return the current value */ - int (*set_attr)(PyObject *); /* Set the value */ - struct swig_globalvar *next; -} swig_globalvar; - -typedef struct swig_varlinkobject { - PyObject_HEAD - swig_globalvar *vars; -} swig_varlinkobject; - -SWIGINTERN PyObject * -swig_varlink_repr(PyObject *SWIGUNUSEDPARM(v)) { -#if PY_VERSION_HEX >= 0x03000000 - return PyUnicode_InternFromString(""); -#else - return PyString_FromString(""); -#endif -} - -SWIGINTERN PyObject * -swig_varlink_str(PyObject *o) { - swig_varlinkobject *v = (swig_varlinkobject *) o; -#if PY_VERSION_HEX >= 0x03000000 - PyObject *str = PyUnicode_InternFromString("("); - PyObject *tail; - PyObject *joined; - swig_globalvar *var; - for (var = v->vars; var; var=var->next) { - tail = PyUnicode_FromString(var->name); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; - if (var->next) { - tail = PyUnicode_InternFromString(", "); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; - } - } - tail = PyUnicode_InternFromString(")"); - joined = PyUnicode_Concat(str, tail); - Py_DecRef(str); - Py_DecRef(tail); - str = joined; -#else - PyObject *str = PyString_FromString("("); - swig_globalvar *var; - for (var = v->vars; var; var=var->next) { - PyString_ConcatAndDel(&str,PyString_FromString(var->name)); - if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", ")); - } - PyString_ConcatAndDel(&str,PyString_FromString(")")); -#endif - return str; -} - -SWIGINTERN void -swig_varlink_dealloc(PyObject *o) { - swig_varlinkobject *v = (swig_varlinkobject *) o; - swig_globalvar *var = v->vars; - while (var) { - swig_globalvar *n = var->next; - free(var->name); - free(var); - var = n; - } -} - -SWIGINTERN PyObject * -swig_varlink_getattr(PyObject *o, char *n) { - swig_varlinkobject *v = (swig_varlinkobject *) o; - PyObject *res = NULL; - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - res = (*var->get_attr)(); - break; - } - var = var->next; - } - if (res == NULL && !PyErr_Occurred()) { - PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n); - } - return res; -} - -SWIGINTERN int -swig_varlink_setattr(PyObject *o, char *n, PyObject *p) { - swig_varlinkobject *v = (swig_varlinkobject *) o; - int res = 1; - swig_globalvar *var = v->vars; - while (var) { - if (strcmp(var->name,n) == 0) { - res = (*var->set_attr)(p); - break; - } - var = var->next; - } - if (res == 1 && !PyErr_Occurred()) { - PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n); - } - return res; -} - -SWIGINTERN PyTypeObject* -swig_varlink_type(void) { - static char varlink__doc__[] = "Swig var link object"; - static PyTypeObject varlink_type; - static int type_init = 0; - if (!type_init) { - const PyTypeObject tmp = { -#if PY_VERSION_HEX >= 0x03000000 - PyVarObject_HEAD_INIT(NULL, 0) -#else - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ -#endif - "swigvarlink", /* tp_name */ - sizeof(swig_varlinkobject), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor) swig_varlink_dealloc, /* tp_dealloc */ -#if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ -#else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ -#endif - (getattrfunc) swig_varlink_getattr, /* tp_getattr */ - (setattrfunc) swig_varlink_setattr, /* tp_setattr */ - 0, /* tp_compare */ - (reprfunc) swig_varlink_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - (reprfunc) swig_varlink_str, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - 0, /* tp_flags */ - varlink__doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ - 0, /* tp_del */ - 0, /* tp_version_tag */ -#if PY_VERSION_HEX >= 0x03040000 - 0, /* tp_finalize */ -#endif -#if PY_VERSION_HEX >= 0x03080000 - 0, /* tp_vectorcall */ -#endif -#if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000) - 0, /* tp_print */ -#endif -#ifdef COUNT_ALLOCS - 0, /* tp_allocs */ - 0, /* tp_frees */ - 0, /* tp_maxalloc */ - 0, /* tp_prev */ - 0 /* tp_next */ -#endif - }; - varlink_type = tmp; - type_init = 1; - if (PyType_Ready(&varlink_type) < 0) - return NULL; - } - return &varlink_type; -} - -/* Create a variable linking object for use later */ -SWIGINTERN PyObject * -SWIG_Python_newvarlink(void) { - swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); - if (result) { - result->vars = 0; - } - return ((PyObject*) result); -} - -SWIGINTERN void -SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { - swig_varlinkobject *v = (swig_varlinkobject *) p; - swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); - if (gv) { - size_t size = strlen(name)+1; - gv->name = (char *)malloc(size); - if (gv->name) { - memcpy(gv->name, name, size); - gv->get_attr = get_attr; - gv->set_attr = set_attr; - gv->next = v->vars; - } - } - v->vars = gv; -} - - -static PyObject *Swig_Globals_global = NULL; - -SWIGINTERN PyObject * -SWIG_globals(void) { - if (Swig_Globals_global == NULL) { - Swig_Globals_global = SWIG_newvarlink(); - } - return Swig_Globals_global; -} - -#ifdef __cplusplus -} -#endif - /* ----------------------------------------------------------------------------- * Pointer declarations * ----------------------------------------------------------------------------- */ @@ -1572,25 +1343,18 @@ SwigPyClientData_New(PyObject* obj) /* the newraw method and newargs arguments used to create a new raw instance */ if (PyClass_Check(obj)) { data->newraw = 0; - Py_INCREF(obj); data->newargs = obj; + Py_INCREF(obj); } else { data->newraw = PyObject_GetAttrString(data->klass, "__new__"); if (data->newraw) { - data->newargs = PyTuple_New(1); - if (data->newargs) { - Py_INCREF(obj); - PyTuple_SET_ITEM(data->newargs, 0, obj); - } else { - Py_DECREF(data->newraw); - Py_DECREF(data->klass); - free(data); - return 0; - } + Py_INCREF(data->newraw); + data->newargs = PyTuple_New(1); + PyTuple_SetItem(data->newargs, 0, obj); } else { - Py_INCREF(obj); - data->newargs = obj; + data->newargs = obj; } + Py_INCREF(data->newargs); } /* the destroy method, aka as the C++ delete method */ data->destroy = PyObject_GetAttrString(data->klass, "__swig_destroy__"); @@ -1599,7 +1363,10 @@ SwigPyClientData_New(PyObject* obj) data->destroy = 0; } if (data->destroy) { - data->delargs = !(PyCFunction_GET_FLAGS(data->destroy) & METH_O); + int flags; + Py_INCREF(data->destroy); + flags = PyCFunction_GET_FLAGS(data->destroy); + data->delargs = !(flags & (METH_O)); } else { data->delargs = 0; } @@ -1610,13 +1377,10 @@ SwigPyClientData_New(PyObject* obj) } SWIGRUNTIME void -SwigPyClientData_Del(SwigPyClientData *data) -{ - Py_XDECREF(data->klass); +SwigPyClientData_Del(SwigPyClientData *data) { Py_XDECREF(data->newraw); Py_XDECREF(data->newargs); Py_XDECREF(data->destroy); - free(data); } /* =============== SwigPyObject =====================*/ @@ -1643,7 +1407,7 @@ SwigPyObject_get___dict__(PyObject *v, PyObject *SWIGUNUSEDPARM(args)) if (!sobj->dict) sobj->dict = PyDict_New(); - Py_XINCREF(sobj->dict); + Py_INCREF(sobj->dict); return sobj->dict; } @@ -1661,21 +1425,18 @@ SwigPyObject_format(const char* fmt, SwigPyObject *v) PyObject *res = NULL; PyObject *args = PyTuple_New(1); if (args) { - PyObject *val = SwigPyObject_long(v); - if (val) { - PyObject *ofmt; - PyTuple_SET_ITEM(args, 0, val); - ofmt = SWIG_Python_str_FromChar(fmt); + if (PyTuple_SetItem(args, 0, SwigPyObject_long(v)) == 0) { + PyObject *ofmt = SWIG_Python_str_FromChar(fmt); if (ofmt) { #if PY_VERSION_HEX >= 0x03000000 - res = PyUnicode_Format(ofmt,args); + res = PyUnicode_Format(ofmt,args); #else - res = PyString_Format(ofmt,args); + res = PyString_Format(ofmt,args); #endif - Py_DECREF(ofmt); + Py_DECREF(ofmt); } + Py_DECREF(args); } - Py_DECREF(args); } return res; } @@ -1697,23 +1458,18 @@ SwigPyObject_repr(SwigPyObject *v) { const char *name = SWIG_TypePrettyName(v->ty); PyObject *repr = SWIG_Python_str_FromFormat("", (name ? name : "unknown"), (void *)v); - if (repr && v->next) { + if (v->next) { PyObject *nrep = SwigPyObject_repr((SwigPyObject *)v->next); - if (nrep) { # if PY_VERSION_HEX >= 0x03000000 - PyObject *joined = PyUnicode_Concat(repr, nrep); - Py_DecRef(repr); - Py_DecRef(nrep); - repr = joined; + PyObject *joined = PyUnicode_Concat(repr, nrep); + Py_DecRef(repr); + Py_DecRef(nrep); + repr = joined; # else - PyString_ConcatAndDel(&repr,nrep); + PyString_ConcatAndDel(&repr,nrep); # endif - } else { - Py_DecRef(repr); - repr = NULL; - } } - return repr; + return repr; } /* We need a version taking two PyObject* parameters so it's a valid @@ -1783,8 +1539,6 @@ SwigPyObject_Check(PyObject *op) { SWIGRUNTIME PyObject * SwigPyObject_New(void *ptr, swig_type_info *ty, int own); -static PyObject* Swig_Capsule_global = NULL; - SWIGRUNTIME void SwigPyObject_dealloc(PyObject *v) { @@ -1811,12 +1565,8 @@ SwigPyObject_dealloc(PyObject *v) if (data->delargs) { /* we need to create a temporary object to carry the destroy operation */ PyObject *tmp = SwigPyObject_New(sobj->ptr, ty, 0); - if (tmp) { - res = SWIG_Python_CallFunctor(destroy, tmp); - } else { - res = 0; - } - Py_XDECREF(tmp); + res = SWIG_Python_CallFunctor(destroy, tmp); + Py_DECREF(tmp); } else { PyCFunction meth = PyCFunction_GET_FUNCTION(destroy); PyObject *mself = PyCFunction_GET_SELF(destroy); @@ -1835,12 +1585,8 @@ SwigPyObject_dealloc(PyObject *v) printf("swig/python detected a memory leak of type '%s', no destructor found.\n", (name ? name : "unknown")); } #endif - Py_XDECREF(Swig_Capsule_global); - } + } Py_XDECREF(next); -#ifdef SWIGPYTHON_BUILTIN - Py_XDECREF(sobj->dict); -#endif PyObject_DEL(v); } @@ -1852,7 +1598,6 @@ SwigPyObject_append(PyObject* v, PyObject* next) PyErr_SetString(PyExc_TypeError, "Attempt to append a non SwigPyObject"); return NULL; } - ((SwigPyObject *)next)->next = sobj->next; sobj->next = next; Py_INCREF(next); return SWIG_Py_Void(); @@ -1897,9 +1642,9 @@ SwigPyObject_own(PyObject *v, PyObject *args) PyObject *obj = PyBool_FromLong(sobj->own); if (val) { if (PyObject_IsTrue(val)) { - Py_DECREF(SwigPyObject_acquire(v,args)); + SwigPyObject_acquire(v,args); } else { - Py_DECREF(SwigPyObject_disown(v,args)); + SwigPyObject_disown(v,args); } } return obj; @@ -1979,11 +1724,7 @@ SwigPyObject_TypeOnce(void) { sizeof(SwigPyObject), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)SwigPyObject_dealloc, /* tp_dealloc */ -#if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ -#else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ -#endif + 0, /* tp_print */ (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ #if PY_VERSION_HEX >= 0x03000000 @@ -2048,7 +1789,7 @@ SwigPyObject_TypeOnce(void) { }; swigpyobject_type = tmp; type_init = 1; - if (PyType_Ready(&swigpyobject_type) != 0) + if (PyType_Ready(&swigpyobject_type) < 0) return NULL; } return &swigpyobject_type; @@ -2063,15 +1804,6 @@ SwigPyObject_New(void *ptr, swig_type_info *ty, int own) sobj->ty = ty; sobj->own = own; sobj->next = 0; -#ifdef SWIGPYTHON_BUILTIN - sobj->dict = 0; -#endif - if (own == SWIG_POINTER_OWN) { - /* Obtain a reference to the Python capsule wrapping the module information, so that the - * module information is correctly destroyed after all SWIG python objects have been freed - * by the GC (and corresponding destructors invoked) */ - Py_XINCREF(Swig_Capsule_global); - } } return (PyObject *)sobj; } @@ -2159,11 +1891,7 @@ SwigPyPacked_TypeOnce(void) { sizeof(SwigPyPacked), /* tp_basicsize */ 0, /* tp_itemsize */ (destructor)SwigPyPacked_dealloc, /* tp_dealloc */ -#if PY_VERSION_HEX < 0x030800b4 - (printfunc)0, /*tp_print*/ -#else - (Py_ssize_t)0, /*tp_vectorcall_offset*/ -#endif + 0, /* tp_print */ (getattrfunc)0, /* tp_getattr */ (setattrfunc)0, /* tp_setattr */ #if PY_VERSION_HEX>=0x03000000 @@ -2228,7 +1956,7 @@ SwigPyPacked_TypeOnce(void) { }; swigpypacked_type = tmp; type_init = 1; - if (PyType_Ready(&swigpypacked_type) != 0) + if (PyType_Ready(&swigpypacked_type) < 0) return NULL; } return &swigpypacked_type; @@ -2418,19 +2146,12 @@ SWIG_Python_ConvertPtrAndOwn(PyObject *obj, void **ptr, swig_type_info *ty, int } } if (sobj) { - if (((flags & SWIG_POINTER_RELEASE) == SWIG_POINTER_RELEASE) && !sobj->own) { - res = SWIG_ERROR_RELEASE_NOT_OWNED; - } else { - if (own) - *own = *own | sobj->own; - if (flags & SWIG_POINTER_DISOWN) { - sobj->own = 0; - } - if (flags & SWIG_POINTER_CLEAR) { - sobj->ptr = 0; - } - res = SWIG_OK; + if (own) + *own = *own | sobj->own; + if (flags & SWIG_POINTER_DISOWN) { + sobj->own = 0; } + res = SWIG_OK; } else { if (implicit_conv) { SwigPyClientData *data = ty ? (SwigPyClientData *) ty->clientdata : 0; @@ -2543,17 +2264,12 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) #if !defined(SWIG_PYTHON_SLOW_GETSET_THIS) PyObject **dictptr = _PyObject_GetDictPtr(inst); if (dictptr != NULL) { - PyObject *dict = *dictptr; - if (dict == NULL) { - dict = PyDict_New(); - *dictptr = dict; - } - if (dict) { - PyDict_SetItem(dict, SWIG_This(), swig_this); - } else{ - Py_DECREF(inst); - inst = 0; - } + PyObject *dict = *dictptr; + if (dict == NULL) { + dict = PyDict_New(); + *dictptr = dict; + PyDict_SetItem(dict, SWIG_This(), swig_this); + } } #else if (PyObject_SetAttr(inst, SWIG_This(), swig_this) == -1) { @@ -2575,7 +2291,7 @@ SWIG_Python_NewShadowInstance(SwigPyClientData *data, PyObject *swig_this) Py_DECREF(inst); inst = 0; } else { - PyType_Modified(Py_TYPE(inst)); + Py_TYPE(inst)->tp_flags &= ~Py_TPFLAGS_VALID_VERSION_TAG; } } } @@ -2604,11 +2320,7 @@ SWIG_Python_SetSwigThis(PyObject *inst, PyObject *swig_this) dict = PyDict_New(); *dictptr = dict; } - if (dict) { - return PyDict_SetItem(dict, SWIG_This(), swig_this); - } else{ - return -1; - } + return PyDict_SetItem(dict, SWIG_This(), swig_this); } #endif return PyObject_SetAttr(inst, SWIG_This(), swig_this); @@ -2623,7 +2335,7 @@ SWIG_Python_InitShadowInstance(PyObject *args) { } else { SwigPyObject *sthis = SWIG_Python_GetSwigThis(obj[0]); if (sthis) { - Py_DECREF(SwigPyObject_append((PyObject*) sthis, obj[1])); + SwigPyObject_append((PyObject*) sthis, obj[1]); } else { if (SWIG_Python_SetSwigThis(obj[0], obj[1]) != 0) return NULL; @@ -2662,9 +2374,7 @@ SWIG_Python_NewPointerObj(PyObject *self, void *ptr, swig_type_info *type, int f } else { newobj = PyObject_New(SwigPyObject, clientdata->pytype); #ifdef SWIGPYTHON_BUILTIN - if (newobj) { - newobj->dict = 0; - } + newobj->dict = 0; #endif } if (newobj) { @@ -2703,61 +2413,39 @@ SWIG_Python_NewPackedObj(void *ptr, size_t sz, swig_type_info *type) { void *SWIG_ReturnGlobalTypeList(void *); #endif -static PyObject *Swig_TypeCache_global = NULL; - -/* The python cached type query */ -SWIGRUNTIME PyObject * -SWIG_Python_TypeCache(void) { - if (Swig_TypeCache_global == NULL) { - Swig_TypeCache_global = PyDict_New(); - } - return Swig_TypeCache_global; -} - SWIGRUNTIME swig_module_info * SWIG_Python_GetModule(void *SWIGUNUSEDPARM(clientdata)) { -#ifdef SWIG_LINK_RUNTIME static void *type_pointer = (void *)0; /* first check if module already created */ if (!type_pointer) { +#ifdef SWIG_LINK_RUNTIME type_pointer = SWIG_ReturnGlobalTypeList((void *)0); - } #else - void *type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0); - if (PyErr_Occurred()) { - PyErr_Clear(); - type_pointer = (void *)0; - } + type_pointer = PyCapsule_Import(SWIGPY_CAPSULE_NAME, 0); + if (PyErr_Occurred()) { + PyErr_Clear(); + type_pointer = (void *)0; + } #endif + } return (swig_module_info *) type_pointer; } - -static int interpreter_counter = 0; // how many (sub-)interpreters are using swig_module's types - SWIGRUNTIME void SWIG_Python_DestroyModule(PyObject *obj) { swig_module_info *swig_module = (swig_module_info *) PyCapsule_GetPointer(obj, SWIGPY_CAPSULE_NAME); swig_type_info **types = swig_module->types; size_t i; - if (--interpreter_counter != 0) // another sub-interpreter may still be using the swig_module's types - return; for (i =0; i < swig_module->size; ++i) { swig_type_info *ty = types[i]; if (ty->owndata) { SwigPyClientData *data = (SwigPyClientData *) ty->clientdata; - ty->clientdata = 0; if (data) SwigPyClientData_Del(data); } } Py_DECREF(SWIG_This()); Swig_This_global = NULL; - Py_DECREF(SWIG_globals()); - Swig_Globals_global = NULL; - Py_DECREF(SWIG_Python_TypeCache()); - Swig_TypeCache_global = NULL; - Swig_Capsule_global = NULL; } SWIGRUNTIME void @@ -2771,17 +2459,19 @@ SWIG_Python_SetModule(swig_module_info *swig_module) { #endif PyObject *pointer = PyCapsule_New((void *) swig_module, SWIGPY_CAPSULE_NAME, SWIG_Python_DestroyModule); if (pointer && module) { - if (PyModule_AddObject(module, SWIGPY_CAPSULE_ATTR_NAME, pointer) == 0) { - ++interpreter_counter; - Swig_Capsule_global = pointer; - } else { - Py_DECREF(pointer); - } + PyModule_AddObject(module, "type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer); } else { Py_XDECREF(pointer); } } +/* The python cached type query */ +SWIGRUNTIME PyObject * +SWIG_Python_TypeCache(void) { + static PyObject *SWIG_STATIC_POINTER(cache) = PyDict_New(); + return cache; +} + SWIGRUNTIME swig_type_info * SWIG_Python_TypeQuery(const char *type) { @@ -2796,10 +2486,8 @@ SWIG_Python_TypeQuery(const char *type) descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type); if (descriptor) { obj = PyCapsule_New((void*) descriptor, NULL, NULL); - if (obj) { - PyDict_SetItem(cache, key, obj); - Py_DECREF(obj); - } + PyDict_SetItem(cache, key, obj); + Py_DECREF(obj); } } Py_DECREF(key); @@ -2832,6 +2520,7 @@ SWIG_Python_AddErrMesg(const char* mesg, int infront) } else { PyErr_Format(type, "%s %s", errmesg, mesg); } + SWIG_Python_str_DelForPy3(tmp); Py_DECREF(old_str); } return 1; @@ -2883,6 +2572,7 @@ SWIG_Python_TypeError(const char *type, PyObject *obj) if (cstr) { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s(%s)' is received", type, otype, cstr); + SWIG_Python_str_DelForPy3(cstr); } else { PyErr_Format(PyExc_TypeError, "a '%s' is expected, '%s' is received", type, otype); @@ -2904,6 +2594,12 @@ SWIG_Python_MustGetPtr(PyObject *obj, swig_type_info *ty, int SWIGUNUSEDPARM(arg void *result; if (SWIG_Python_ConvertPtr(obj, &result, ty, flags) == -1) { PyErr_Clear(); +#if SWIG_POINTER_EXCEPTION + if (flags) { + SWIG_Python_TypeError(SWIG_TypePrettyName(ty), obj); + SWIG_Python_ArgFail(argnum); + } +#endif } return result; } @@ -2934,7 +2630,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { } if (!tp->tp_dict) { - if (PyType_Ready(tp) != 0) + if (PyType_Ready(tp) < 0) goto done; } @@ -2949,7 +2645,7 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { } else { encoded_name = PyUnicode_AsUTF8String(name); if (!encoded_name) - goto done; + return -1; } PyErr_Format(PyExc_AttributeError, "'%.100s' object has no attribute '%.200s'", tp->tp_name, PyString_AsString(encoded_name)); Py_DECREF(encoded_name); @@ -2972,8 +2668,23 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIG_exception_fail(code, msg) do { SWIG_Error(code, msg); SWIG_fail; } while(0) -#define SWIG_contract_assert(expr, msg) do { if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } } while (0) +#define SWIG_contract_assert(expr, msg) if (!(expr)) { SWIG_Error(SWIG_RuntimeError, msg); SWIG_fail; } else + + + +#ifdef __cplusplus +extern "C" { +#endif + +/* Method creation and docstring support functions */ + +SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name); +SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func); +SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func); +#ifdef __cplusplus +} +#endif #define SWIG_exception(code, msg) do { SWIG_Error(code, msg); SWIG_fail;; } while(0) @@ -2987,23 +2698,22 @@ SWIG_Python_NonDynamicSetAttr(PyObject *obj, PyObject *name, PyObject *value) { #define SWIGTYPE_p_char swig_types[3] #define SWIGTYPE_p_csf__PointCloud swig_types[4] #define SWIGTYPE_p_difference_type swig_types[5] -#define SWIGTYPE_p_double swig_types[6] -#define SWIGTYPE_p_p_PyObject swig_types[7] -#define SWIGTYPE_p_size_type swig_types[8] -#define SWIGTYPE_p_std__allocatorT_double_t swig_types[9] -#define SWIGTYPE_p_std__allocatorT_float_t swig_types[10] -#define SWIGTYPE_p_std__allocatorT_int_t swig_types[11] -#define SWIGTYPE_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t swig_types[12] -#define SWIGTYPE_p_std__invalid_argument swig_types[13] -#define SWIGTYPE_p_std__vectorT_csf__Point_std__allocatorT_csf__Point_t_t swig_types[14] -#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[15] -#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t swig_types[16] -#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[17] -#define SWIGTYPE_p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t swig_types[18] -#define SWIGTYPE_p_swig__SwigPyIterator swig_types[19] -#define SWIGTYPE_p_value_type swig_types[20] -static swig_type_info *swig_types[22]; -static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0}; +#define SWIGTYPE_p_p_PyObject swig_types[6] +#define SWIGTYPE_p_size_type swig_types[7] +#define SWIGTYPE_p_std__allocatorT_double_t swig_types[8] +#define SWIGTYPE_p_std__allocatorT_float_t swig_types[9] +#define SWIGTYPE_p_std__allocatorT_int_t swig_types[10] +#define SWIGTYPE_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t swig_types[11] +#define SWIGTYPE_p_std__invalid_argument swig_types[12] +#define SWIGTYPE_p_std__vectorT_csf__Point_std__allocatorT_csf__Point_t_t swig_types[13] +#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[14] +#define SWIGTYPE_p_std__vectorT_float_std__allocatorT_float_t_t swig_types[15] +#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[16] +#define SWIGTYPE_p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t swig_types[17] +#define SWIGTYPE_p_swig__SwigPyIterator swig_types[18] +#define SWIGTYPE_p_value_type swig_types[19] +static swig_type_info *swig_types[21]; +static swig_module_info swig_module = {swig_types, 20, 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) @@ -3026,52 +2736,8 @@ static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0}; #endif #define SWIG_name "_CSF" -#ifdef __cplusplus -#include -/* SwigValueWrapper is described in swig.swg */ -template class SwigValueWrapper { - struct SwigSmartPointer { - T *ptr; - SwigSmartPointer(T *p) : ptr(p) { } - ~SwigSmartPointer() { delete ptr; } - SwigSmartPointer& operator=(SwigSmartPointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; } - void reset(T *p) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = p; } - } pointer; - SwigValueWrapper& operator=(const SwigValueWrapper& rhs); - SwigValueWrapper(const SwigValueWrapper& rhs); -public: - SwigValueWrapper() : pointer(0) { } - SwigValueWrapper& operator=(const T& t) { SwigSmartPointer tmp(new T(t)); pointer = tmp; return *this; } -#if __cplusplus >=201103L - SwigValueWrapper& operator=(T&& t) { SwigSmartPointer tmp(new T(std::move(t))); pointer = tmp; return *this; } - operator T&&() const { return std::move(*pointer.ptr); } -#else - operator T&() const { return *pointer.ptr; } -#endif - T *operator&() const { return pointer.ptr; } - static void reset(SwigValueWrapper& t, T *p) { t.pointer.reset(p); } -}; - -/* - * SwigValueInit() is a generic initialisation solution as the following approach: - * - * T c_result = T(); - * - * doesn't compile for all types for example: - * - * unsigned int c_result = unsigned int(); - */ -template T SwigValueInit() { - return T(); -} - -#if __cplusplus >=201103L -# define SWIG_STD_MOVE(OBJ) std::move(OBJ) -#else -# define SWIG_STD_MOVE(OBJ) OBJ -#endif - -#endif +#define SWIGVERSION 0x040002 +#define SWIG_VERSION SWIGVERSION #define SWIG_as_voidptr(a) const_cast< void * >(static_cast< const void * >(a)) @@ -3152,8 +2818,8 @@ namespace swig { #define SWIG_FILE_WITH_INIT - #include "../../src/CSF.h" - #include "../../src/Cloth.h" + #include "../src/CSF.h" + #include "../src/Cloth.h" #include @@ -3162,9 +2828,9 @@ namespace swig { #include #if PY_VERSION_HEX >= 0x03020000 -# define SWIGPY_SLICEOBJECT PyObject +# define SWIGPY_SLICE_ARG(obj) ((PyObject*) (obj)) #else -# define SWIGPY_SLICEOBJECT PySliceObject +# define SWIGPY_SLICE_ARG(obj) ((PySliceObject*) (obj)) #endif @@ -3664,6 +3330,17 @@ SWIG_AsVal_ptrdiff_t (PyObject * obj, ptrdiff_t *val) #include +#ifndef SWIG_FILE_WITH_INIT +#define NO_IMPORT_ARRAY +#endif +#include "stdio.h" +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +#include + + +#include + + namespace swig { template struct noconst_traits { @@ -4966,46 +4643,46 @@ SWIGINTERN void std_vector_Sl_int_Sg____delslice__(std::vector< int > *self,std: SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_0(std::vector< int > *self,std::vector< int >::difference_type 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,SWIGPY_SLICEOBJECT *slice){ +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; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return NULL; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; return swig::getslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *self,SWIGPY_SLICEOBJECT *slice,std::vector< int,std::allocator< int > > const &v){ +SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_0(std::vector< int > *self,PySliceObject *slice,std::vector< int,std::allocator< int > > const &v){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; swig::setslice(self, id, jd, step, v); } -SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_int_Sg____setitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; swig::delslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_int_Sg____delitem____SWIG_1(std::vector< int > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; swig::delslice(self, id, jd, step); @@ -5089,6 +4766,10 @@ inline int SWIG_isfinite_func(T x) { # define SWIG_isfinite(X) (SWIG_isfinite_func(X)) # elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) # define SWIG_isfinite(X) (__builtin_isfinite(X)) +# elif defined(__clang__) && defined(__has_builtin) +# if __has_builtin(__builtin_isfinite) +# define SWIG_isfinite(X) (__builtin_isfinite(X)) +# endif # elif defined(_MSC_VER) # define SWIG_isfinite(X) (_finite(X)) # elif defined(__sun) && defined(__SVR4) @@ -5188,46 +4869,46 @@ SWIGINTERN void std_vector_Sl_float_Sg____delslice__(std::vector< float > *self, SWIGINTERN void std_vector_Sl_float_Sg____delitem____SWIG_0(std::vector< float > *self,std::vector< float >::difference_type i){ swig::erase(self, swig::getpos(self, i)); } -SWIGINTERN std::vector< float,std::allocator< float > > *std_vector_Sl_float_Sg____getitem____SWIG_0(std::vector< float > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN std::vector< float,std::allocator< float > > *std_vector_Sl_float_Sg____getitem____SWIG_0(std::vector< float > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return NULL; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< float,std::allocator< float > >::difference_type id = i; std::vector< float,std::allocator< float > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_0(std::vector< float > *self,SWIGPY_SLICEOBJECT *slice,std::vector< float,std::allocator< float > > const &v){ +SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_0(std::vector< float > *self,PySliceObject *slice,std::vector< float,std::allocator< float > > const &v){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< float,std::allocator< float > >::difference_type id = i; std::vector< float,std::allocator< float > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } -SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_1(std::vector< float > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_float_Sg____setitem____SWIG_1(std::vector< float > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< float,std::allocator< float > >::difference_type id = i; std::vector< float,std::allocator< float > >::difference_type jd = j; swig::delslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_float_Sg____delitem____SWIG_1(std::vector< float > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_float_Sg____delitem____SWIG_1(std::vector< float > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< float,std::allocator< float > >::difference_type id = i; std::vector< float,std::allocator< float > >::difference_type jd = j; swig::delslice(self, id, jd, step); @@ -5289,46 +4970,46 @@ SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____delslice__(std::vect SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_0(std::vector< std::vector< float > > *self,std::vector< std::vector< float > >::difference_type i){ swig::erase(self, swig::getpos(self, i)); } -SWIGINTERN std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *std_vector_Sl_std_vector_Sl_float_Sg__Sg____getitem____SWIG_0(std::vector< std::vector< float > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *std_vector_Sl_std_vector_Sl_float_Sg__Sg____getitem____SWIG_0(std::vector< std::vector< float > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return NULL; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type id = i; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type jd = j; return swig::getslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_0(std::vector< std::vector< float > > *self,SWIGPY_SLICEOBJECT *slice,std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &v){ +SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_0(std::vector< std::vector< float > > *self,PySliceObject *slice,std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &v){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type id = i; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type jd = j; swig::setslice(self, id, jd, step, v); } -SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_1(std::vector< std::vector< float > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_1(std::vector< std::vector< float > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type id = i; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_1(std::vector< std::vector< float > > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_1(std::vector< std::vector< float > > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + PySlice_GetIndices(SWIGPY_SLICE_ARG(slice), (Py_ssize_t)self->size(), &i, &j, &step); std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type id = i; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >::difference_type jd = j; swig::delslice(self, id, jd, step); @@ -5410,83 +5091,556 @@ SWIGINTERN void std_vector_Sl_double_Sg____delslice__(std::vector< double > *sel SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_0(std::vector< double > *self,std::vector< double >::difference_type 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,SWIGPY_SLICEOBJECT *slice){ +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; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return NULL; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; return swig::getslice(self, id, jd, step); } -SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double > *self,SWIGPY_SLICEOBJECT *slice,std::vector< double,std::allocator< double > > const &v){ +SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_0(std::vector< double > *self,PySliceObject *slice,std::vector< double,std::allocator< double > > const &v){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(slice, (Py_ssize_t)self->size(), &i, &j, &step); + 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; swig::setslice(self, id, jd, step, v); } -SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double > *self,SWIGPY_SLICEOBJECT *slice){ +SWIGINTERN void std_vector_Sl_double_Sg____setitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ Py_ssize_t i, j, step; if( !PySlice_Check(slice) ) { SWIG_Error(SWIG_TypeError, "Slice object expected."); return; } - PySlice_GetIndices(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; - swig::delslice(self, id, jd, step); + 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; + swig::delslice(self, id, jd, step); + } +SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double > *self,PySliceObject *slice){ + Py_ssize_t i, j, step; + if( !PySlice_Check(slice) ) { + SWIG_Error(SWIG_TypeError, "Slice object expected."); + 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; + 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){ + return *(swig::cgetpos(self, i)); + } +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); + } +SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__erase__SWIG_0(std::vector< double > *self,std::vector< double >::iterator pos){ return self->erase(pos); } +SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__erase__SWIG_1(std::vector< double > *self,std::vector< double >::iterator first,std::vector< double >::iterator last){ return self->erase(first, last); } +SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__insert__SWIG_0(std::vector< double > *self,std::vector< double >::iterator pos,std::vector< double >::value_type const &x){ return self->insert(pos, x); } +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); } + +SWIGINTERN int +SWIG_AsVal_bool (PyObject *obj, bool *val) +{ + int r; + if (!PyBool_Check(obj)) + return SWIG_ERROR; + r = PyObject_IsTrue(obj); + if (r == -1) + return SWIG_ERROR; + if (val) *val = r ? true : false; + return SWIG_OK; +} + + +#if NPY_API_VERSION < 0x00000007 +#define NPY_ARRAY_DEFAULT NPY_DEFAULT +#define NPY_ARRAY_FARRAY NPY_FARRAY +#define NPY_FORTRANORDER NPY_FORTRAN +#endif + + +/* Macros to extract array attributes. + */ +#if NPY_API_VERSION < 0x00000007 +#define is_array(a) ((a) && PyArray_Check((PyArrayObject*)a)) +#define array_type(a) (int)(PyArray_TYPE((PyArrayObject*)a)) +#define array_numdims(a) (((PyArrayObject*)a)->nd) +#define array_dimensions(a) (((PyArrayObject*)a)->dimensions) +#define array_size(a,i) (((PyArrayObject*)a)->dimensions[i]) +#define array_strides(a) (((PyArrayObject*)a)->strides) +#define array_stride(a,i) (((PyArrayObject*)a)->strides[i]) +#define array_data(a) (((PyArrayObject*)a)->data) +#define array_descr(a) (((PyArrayObject*)a)->descr) +#define array_flags(a) (((PyArrayObject*)a)->flags) +#define array_clearflags(a,f) (((PyArrayObject*)a)->flags) &= ~f +#define array_enableflags(a,f) (((PyArrayObject*)a)->flags) = f +#define array_is_fortran(a) (PyArray_ISFORTRAN((PyArrayObject*)a)) +#else +#define is_array(a) ((a) && PyArray_Check(a)) +#define array_type(a) PyArray_TYPE((PyArrayObject*)a) +#define array_numdims(a) PyArray_NDIM((PyArrayObject*)a) +#define array_dimensions(a) PyArray_DIMS((PyArrayObject*)a) +#define array_strides(a) PyArray_STRIDES((PyArrayObject*)a) +#define array_stride(a,i) PyArray_STRIDE((PyArrayObject*)a,i) +#define array_size(a,i) PyArray_DIM((PyArrayObject*)a,i) +#define array_data(a) PyArray_DATA((PyArrayObject*)a) +#define array_descr(a) PyArray_DESCR((PyArrayObject*)a) +#define array_flags(a) PyArray_FLAGS((PyArrayObject*)a) +#define array_enableflags(a,f) PyArray_ENABLEFLAGS((PyArrayObject*)a,f) +#define array_clearflags(a,f) PyArray_CLEARFLAGS((PyArrayObject*)a,f) +#define array_is_fortran(a) (PyArray_IS_F_CONTIGUOUS((PyArrayObject*)a)) +#endif +#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS((PyArrayObject*)a)) +#define array_is_native(a) (PyArray_ISNOTSWAPPED((PyArrayObject*)a)) + + + /* Given a PyObject, return a string describing its type. + */ + const char* pytype_string(PyObject* py_obj) + { + if (py_obj == NULL ) return "C NULL value"; + if (py_obj == Py_None ) return "Python None" ; + if (PyCallable_Check(py_obj)) return "callable" ; + if (PyBytes_Check( py_obj)) return "string" ; + if (PyLong_Check( py_obj)) return "int" ; + if (PyFloat_Check( py_obj)) return "float" ; + if (PyDict_Check( py_obj)) return "dict" ; + if (PyList_Check( py_obj)) return "list" ; + if (PyTuple_Check( py_obj)) return "tuple" ; + + return "unknown type"; + } + + /* Given a NumPy typecode, return a string describing the type. + */ + const char* typecode_string(int typecode) + { + static const char* type_names[25] = {"bool", + "byte", + "unsigned byte", + "short", + "unsigned short", + "int", + "unsigned int", + "long", + "unsigned long", + "long long", + "unsigned long long", + "float", + "double", + "long double", + "complex float", + "complex double", + "complex long double", + "object", + "string", + "unicode", + "void", + "ntypes", + "notype", + "char", + "unknown"}; + return typecode < 24 ? type_names[typecode] : type_names[24]; + } + + /* Make sure input has correct numpy type. This now just calls + PyArray_EquivTypenums(). + */ + int type_match(int actual_type, + int desired_type) + { + return PyArray_EquivTypenums(actual_type, desired_type); + } + +#ifdef SWIGPY_USE_CAPSULE + void free_cap(PyObject * cap) + { + void* array = (void*) PyCapsule_GetPointer(cap,SWIGPY_CAPSULE_NAME); + if (array != NULL) free(array); + } +#endif + + + + + /* Given a PyObject pointer, cast it to a PyArrayObject pointer if + * legal. If not, set the python error string appropriately and + * return NULL. + */ + PyArrayObject* obj_to_array_no_conversion(PyObject* input, + int typecode) + { + PyArrayObject* ary = NULL; + if (is_array(input) && (typecode == NPY_NOTYPE || + PyArray_EquivTypenums(array_type(input), typecode))) + { + ary = (PyArrayObject*) input; + } + else if is_array(input) + { + const char* desired_type = typecode_string(typecode); + const char* actual_type = typecode_string(array_type(input)); + PyErr_Format(PyExc_TypeError, + "Array of type '%s' required. Array of type '%s' given", + desired_type, actual_type); + ary = NULL; + } + else + { + const char* desired_type = typecode_string(typecode); + const char* actual_type = pytype_string(input); + PyErr_Format(PyExc_TypeError, + "Array of type '%s' required. A '%s' was given", + desired_type, + actual_type); + ary = NULL; + } + return ary; + } + + /* Convert the given PyObject to a NumPy array with the given + * typecode. On success, return a valid PyArrayObject* with the + * correct type. On failure, the python error string will be set and + * the routine returns NULL. + */ + PyArrayObject* obj_to_array_allow_conversion(PyObject* input, + int typecode, + int* is_new_object) + { + PyArrayObject* ary = NULL; + PyObject* py_obj; + if (is_array(input) && (typecode == NPY_NOTYPE || + PyArray_EquivTypenums(array_type(input),typecode))) + { + ary = (PyArrayObject*) input; + *is_new_object = 0; + } + else + { + py_obj = PyArray_FROMANY(input, typecode, 0, 0, NPY_ARRAY_DEFAULT); + /* If NULL, PyArray_FromObject will have set python error value.*/ + ary = (PyArrayObject*) py_obj; + *is_new_object = 1; + } + return ary; + } + + /* Given a PyArrayObject, check to see if it is contiguous. If so, + * return the input pointer and flag it as not a new object. If it is + * not contiguous, create a new PyArrayObject using the original data, + * flag it as a new object and return the pointer. + */ + PyArrayObject* make_contiguous(PyArrayObject* ary, + int* is_new_object, + int min_dims, + int max_dims) + { + PyArrayObject* result; + if (array_is_contiguous(ary)) + { + result = ary; + *is_new_object = 0; + } + else + { + result = (PyArrayObject*) PyArray_ContiguousFromObject((PyObject*)ary, + array_type(ary), + min_dims, + max_dims); + *is_new_object = 1; + } + return result; + } + + /* Given a PyArrayObject, check to see if it is Fortran-contiguous. + * If so, return the input pointer, but do not flag it as not a new + * object. If it is not Fortran-contiguous, create a new + * PyArrayObject using the original data, flag it as a new object + * and return the pointer. + */ + PyArrayObject* make_fortran(PyArrayObject* ary, + int* is_new_object) + { + PyArrayObject* result; + if (array_is_fortran(ary)) + { + result = ary; + *is_new_object = 0; + } + else + { + Py_INCREF(array_descr(ary)); + result = (PyArrayObject*) PyArray_FromArray(ary, + array_descr(ary), +#if NPY_API_VERSION < 0x00000007 + NPY_FORTRANORDER); +#else + NPY_ARRAY_F_CONTIGUOUS); +#endif + *is_new_object = 1; + } + return result; + } + + /* Convert a given PyObject to a contiguous PyArrayObject of the + * specified type. If the input object is not a contiguous + * PyArrayObject, a new one will be created and the new object flag + * will be set. + */ + PyArrayObject* obj_to_array_contiguous_allow_conversion(PyObject* input, + int typecode, + int* is_new_object) + { + int is_new1 = 0; + int is_new2 = 0; + PyArrayObject* ary2; + PyArrayObject* ary1 = obj_to_array_allow_conversion(input, + typecode, + &is_new1); + if (ary1) + { + ary2 = make_contiguous(ary1, &is_new2, 0, 0); + if ( is_new1 && is_new2) + { + Py_DECREF(ary1); + } + ary1 = ary2; } -SWIGINTERN void std_vector_Sl_double_Sg____delitem____SWIG_1(std::vector< double > *self,SWIGPY_SLICEOBJECT *slice){ - Py_ssize_t i, j, step; - if( !PySlice_Check(slice) ) { - SWIG_Error(SWIG_TypeError, "Slice object expected."); - return; + *is_new_object = is_new1 || is_new2; + return ary1; + } + + /* Convert a given PyObject to a Fortran-ordered PyArrayObject of the + * specified type. If the input object is not a Fortran-ordered + * PyArrayObject, a new one will be created and the new object flag + * will be set. + */ + PyArrayObject* obj_to_array_fortran_allow_conversion(PyObject* input, + int typecode, + int* is_new_object) + { + int is_new1 = 0; + int is_new2 = 0; + PyArrayObject* ary2; + PyArrayObject* ary1 = obj_to_array_allow_conversion(input, + typecode, + &is_new1); + if (ary1) + { + ary2 = make_fortran(ary1, &is_new2); + if (is_new1 && is_new2) + { + Py_DECREF(ary1); } - PySlice_GetIndices(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; - swig::delslice(self, id, jd, step); + ary1 = ary2; } -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){ - return *(swig::cgetpos(self, i)); + *is_new_object = is_new1 || is_new2; + return ary1; + } + + + /* Test whether a python object is contiguous. If array is + * contiguous, return 1. Otherwise, set the python error string and + * return 0. + */ + int require_contiguous(PyArrayObject* ary) + { + int contiguous = 1; + if (!array_is_contiguous(ary)) + { + PyErr_SetString(PyExc_TypeError, + "Array must be contiguous. A non-contiguous array was given"); + contiguous = 0; } -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; + return contiguous; + } + + /* Test whether a python object is (C_ or F_) contiguous. If array is + * contiguous, return 1. Otherwise, set the python error string and + * return 0. + */ + int require_c_or_f_contiguous(PyArrayObject* ary) + { + int contiguous = 1; + if (!(array_is_contiguous(ary) || array_is_fortran(ary))) + { + PyErr_SetString(PyExc_TypeError, + "Array must be contiguous (C_ or F_). A non-contiguous array was given"); + contiguous = 0; } -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; + return contiguous; + } + + /* Require that a numpy array is not byte-swapped. If the array is + * not byte-swapped, return 1. Otherwise, set the python error string + * and return 0. + */ + int require_native(PyArrayObject* ary) + { + int native = 1; + if (!array_is_native(ary)) + { + PyErr_SetString(PyExc_TypeError, + "Array must have native byteorder. " + "A byte-swapped array was given"); + native = 0; } -SWIGINTERN void std_vector_Sl_double_Sg__append(std::vector< double > *self,std::vector< double >::value_type const &x){ - self->push_back(x); + return native; + } + + /* Require the given PyArrayObject to have a specified number of + * dimensions. If the array has the specified number of dimensions, + * return 1. Otherwise, set the python error string and return 0. + */ + int require_dimensions(PyArrayObject* ary, + int exact_dimensions) + { + int success = 1; + if (array_numdims(ary) != exact_dimensions) + { + PyErr_Format(PyExc_TypeError, + "Array must have %d dimensions. Given array has %d dimensions", + exact_dimensions, + array_numdims(ary)); + success = 0; + } + return success; + } + + /* Require the given PyArrayObject to have one of a list of specified + * number of dimensions. If the array has one of the specified number + * of dimensions, return 1. Otherwise, set the python error string + * and return 0. + */ + int require_dimensions_n(PyArrayObject* ary, + int* exact_dimensions, + int n) + { + int success = 0; + int i; + char dims_str[255] = ""; + char s[255]; + for (i = 0; i < n && !success; i++) + { + if (array_numdims(ary) == exact_dimensions[i]) + { + success = 1; + } } -SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__erase__SWIG_0(std::vector< double > *self,std::vector< double >::iterator pos){ return self->erase(pos); } -SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__erase__SWIG_1(std::vector< double > *self,std::vector< double >::iterator first,std::vector< double >::iterator last){ return self->erase(first, last); } -SWIGINTERN std::vector< double >::iterator std_vector_Sl_double_Sg__insert__SWIG_0(std::vector< double > *self,std::vector< double >::iterator pos,std::vector< double >::value_type const &x){ return self->insert(pos, x); } -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); } + if (!success) + { + for (i = 0; i < n-1; i++) + { + sprintf(s, "%d, ", exact_dimensions[i]); + strcat(dims_str,s); + } + sprintf(s, " or %d", exact_dimensions[n-1]); + strcat(dims_str,s); + PyErr_Format(PyExc_TypeError, + "Array must have %s dimensions. Given array has %d dimensions", + dims_str, + array_numdims(ary)); + } + return success; + } + + /* Require the given PyArrayObject to have a specified shape. If the + * array has the specified shape, return 1. Otherwise, set the python + * error string and return 0. + */ + int require_size(PyArrayObject* ary, + npy_intp* size, + int n) + { + int i; + int success = 1; + size_t len; + char desired_dims[255] = "["; + char s[255]; + char actual_dims[255] = "["; + for(i=0; i < n;i++) + { + if (size[i] != -1 && size[i] != array_size(ary,i)) + { + success = 0; + } + } + if (!success) + { + for (i = 0; i < n; i++) + { + if (size[i] == -1) + { + sprintf(s, "*,"); + } + else + { + sprintf(s, "%ld,", (long int)size[i]); + } + strcat(desired_dims,s); + } + len = strlen(desired_dims); + desired_dims[len-1] = ']'; + for (i = 0; i < n; i++) + { + sprintf(s, "%ld,", (long int)array_size(ary,i)); + strcat(actual_dims,s); + } + len = strlen(actual_dims); + actual_dims[len-1] = ']'; + PyErr_Format(PyExc_TypeError, + "Array must have shape of %s. Given array has shape of %s", + desired_dims, + actual_dims); + } + return success; + } + + /* Require the given PyArrayObject to to be Fortran ordered. If the + * the PyArrayObject is already Fortran ordered, do nothing. Else, + * set the Fortran ordering flag and recompute the strides. + */ + int require_fortran(PyArrayObject* ary) + { + int success = 1; + int nd = array_numdims(ary); + int i; + npy_intp * strides = array_strides(ary); + if (array_is_fortran(ary)) return success; + int n_non_one = 0; + /* Set the Fortran ordered flag */ + const npy_intp *dims = array_dimensions(ary); + for (i=0; i < nd; ++i) + n_non_one += (dims[i] != 1) ? 1 : 0; + if (n_non_one > 1) + array_clearflags(ary,NPY_ARRAY_CARRAY); + array_enableflags(ary,NPY_ARRAY_FARRAY); + /* Recompute the strides */ + strides[0] = strides[nd-1]; + for (i=1; i < nd; ++i) + strides[i] = strides[i-1] * array_size(ary,i-1); + return success; + } + -SWIGINTERN int -SWIG_AsVal_bool (PyObject *obj, bool *val) -{ - int r; - if (!PyBool_Check(obj)) - return SWIG_ERROR; - r = PyObject_IsTrue(obj); - if (r == -1) - return SWIG_ERROR; - if (val) *val = r ? true : false; - return SWIG_OK; -} SWIGINTERN swig_type_info* @@ -5644,7 +5798,7 @@ SWIG_AsPtr_std_string (PyObject * obj, std::string **val) #ifdef __cplusplus extern "C" { #endif -SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -5666,7 +5820,7 @@ SWIGINTERN PyObject *_wrap_delete_SwigPyIterator(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -5697,7 +5851,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_value(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; size_t arg2 ; @@ -5734,7 +5888,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_0(PyObject *self, Py_ssize_ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_incr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -5772,7 +5926,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_incr", 0, 2, argv))) SWIG_fail; --argc; if (argc == 1) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -5781,7 +5935,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -5805,7 +5959,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_incr(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; size_t arg2 ; @@ -5842,7 +5996,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_0(PyObject *self, Py_ssize_ } -SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_decr__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -5880,7 +6034,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator_decr", 0, 2, argv))) SWIG_fail; --argc; if (argc == 1) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -5889,7 +6043,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -5913,7 +6067,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_decr(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -5950,7 +6104,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_distance(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -5987,7 +6141,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_equal(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6010,7 +6164,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_copy(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6041,7 +6195,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_next(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6072,7 +6226,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___next__(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; void *argp1 = 0 ; @@ -6103,7 +6257,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_previous(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -6141,7 +6295,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator_advance(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -6176,7 +6330,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___eq__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -6211,7 +6365,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___ne__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -6249,7 +6403,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___iadd__(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -6287,7 +6441,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___isub__(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -6327,7 +6481,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___add__(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; ptrdiff_t arg2 ; @@ -6366,7 +6520,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_0(PyObject *self, Py_ssi } -SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_SwigPyIterator___sub____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; swig::SwigPyIterator *arg1 = (swig::SwigPyIterator *) 0 ; swig::SwigPyIterator *arg2 = 0 ; @@ -6409,7 +6563,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args if (!(argc = SWIG_Python_UnpackTuple(args, "SwigPyIterator___sub__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -6422,7 +6576,7 @@ SWIGINTERN PyObject *_wrap_SwigPyIterator___sub__(PyObject *self, PyObject *args } } if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_swig__SwigPyIterator, 0); _v = SWIG_CheckState(res); @@ -6450,7 +6604,7 @@ SWIGINTERN PyObject *SwigPyIterator_swigregister(PyObject *SWIGUNUSEDPARM(self), return SWIG_Py_Void(); } -SWIGINTERN PyObject *_wrap_VecInt_iterator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; PyObject **arg2 = (PyObject **) 0 ; @@ -6475,7 +6629,7 @@ SWIGINTERN PyObject *_wrap_VecInt_iterator(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___nonzero__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -6498,7 +6652,7 @@ SWIGINTERN PyObject *_wrap_VecInt___nonzero__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___bool__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -6521,7 +6675,7 @@ SWIGINTERN PyObject *_wrap_VecInt___bool__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___len__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -6544,7 +6698,7 @@ SWIGINTERN PyObject *_wrap_VecInt___len__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___getslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -6575,7 +6729,7 @@ SWIGINTERN PyObject *_wrap_VecInt___getslice__(PyObject *self, PyObject *args) { } arg3 = static_cast< std::vector< int >::difference_type >(val3); try { - result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -6588,7 +6742,7 @@ SWIGINTERN PyObject *_wrap_VecInt___getslice__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -6617,7 +6771,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_0(PyObject *self, Py_ssize_ } arg3 = static_cast< std::vector< int >::difference_type >(val3); try { - std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_int_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -6630,7 +6784,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_0(PyObject *self, Py_ssize_ } -SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -6672,7 +6826,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice____SWIG_1(PyObject *self, Py_ssize_ arg4 = ptr; } try { - std_vector_Sl_int_Sg____setslice____SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< int,std::allocator< int > > const &)*arg4); + 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()); } catch(std::invalid_argument &_e) { @@ -6696,7 +6850,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice__(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt___setslice__", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -6716,7 +6870,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice__(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -6749,7 +6903,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setslice__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___delslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -6779,7 +6933,7 @@ SWIGINTERN PyObject *_wrap_VecInt___delslice__(PyObject *self, PyObject *args) { } arg3 = static_cast< std::vector< int >::difference_type >(val3); try { - std_vector_Sl_int_Sg____delslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_int_Sg____delslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -6792,7 +6946,7 @@ SWIGINTERN PyObject *_wrap_VecInt___delslice__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -6813,7 +6967,7 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_0(PyObject *self, Py_ssize_t } arg2 = static_cast< std::vector< int >::difference_type >(val2); try { - std_vector_Sl_int_Sg____delitem____SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + std_vector_Sl_int_Sg____delitem____SWIG_0(arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -6826,10 +6980,10 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; std::vector< int,std::allocator< int > > *result = 0 ; @@ -6842,9 +6996,9 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_0(PyObject *self, Py_ssize_t arg1 = reinterpret_cast< std::vector< int > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___getitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___getitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { result = (std::vector< int,std::allocator< int > > *)std_vector_Sl_int_Sg____getitem____SWIG_0(arg1,arg2); @@ -6860,10 +7014,10 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; std::vector< int,std::allocator< int > > *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6877,9 +7031,9 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_0(PyObject *self, Py_ssize_t arg1 = reinterpret_cast< std::vector< int > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } { std::vector< int,std::allocator< int > > *ptr = (std::vector< int,std::allocator< int > > *)0; @@ -6908,10 +7062,10 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6923,9 +7077,9 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_1(PyObject *self, Py_ssize_t arg1 = reinterpret_cast< std::vector< int > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_int_Sg____setitem____SWIG_1(arg1,arg2); @@ -6941,10 +7095,10 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_1(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -6956,9 +7110,9 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem____SWIG_1(PyObject *self, Py_ssize_t arg1 = reinterpret_cast< std::vector< int > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___delitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt___delitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_int_Sg____delitem____SWIG_1(arg1,arg2); @@ -6983,7 +7137,7 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem__(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt___delitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -6996,7 +7150,7 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem__(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7014,12 +7168,12 @@ SWIGINTERN PyObject *_wrap_VecInt___delitem__(PyObject *self, PyObject *args) { SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecInt___delitem__'.\n" " Possible C/C++ prototypes are:\n" " std::vector< int >::__delitem__(std::vector< int >::difference_type)\n" - " std::vector< int >::__delitem__(SWIGPY_SLICEOBJECT *)\n"); + " std::vector< int >::__delitem__(PySliceObject *)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -7041,7 +7195,7 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem____SWIG_1(PyObject *self, Py_ssize_t } arg2 = static_cast< std::vector< int >::difference_type >(val2); try { - result = (std::vector< int >::value_type *) &std_vector_Sl_int_Sg____getitem____SWIG_1((std::vector< int > const *)arg1,SWIG_STD_MOVE(arg2)); + result = (std::vector< int >::value_type *) &std_vector_Sl_int_Sg____getitem____SWIG_1((std::vector< int > const *)arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -7062,7 +7216,7 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem__(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt___getitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7075,7 +7229,7 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem__(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7092,13 +7246,13 @@ SWIGINTERN PyObject *_wrap_VecInt___getitem__(PyObject *self, PyObject *args) { fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecInt___getitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< int >::__getitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< int >::__getitem__(PySliceObject *)\n" " std::vector< int >::__getitem__(std::vector< int >::difference_type) const\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::difference_type arg2 ; @@ -7129,7 +7283,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem____SWIG_2(PyObject *self, Py_ssize_t temp3 = static_cast< std::vector< int >::value_type >(val3); arg3 = &temp3; try { - std_vector_Sl_int_Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(int const &)*arg3); + std_vector_Sl_int_Sg____setitem____SWIG_2(arg1,arg2,(int const &)*arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -7149,7 +7303,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem__(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt___setitem__", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7162,7 +7316,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem__(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7179,7 +7333,7 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem__(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7202,14 +7356,14 @@ SWIGINTERN PyObject *_wrap_VecInt___setitem__(PyObject *self, PyObject *args) { fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecInt___setitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< int >::__setitem__(SWIGPY_SLICEOBJECT *,std::vector< int,std::allocator< int > > const &)\n" - " std::vector< int >::__setitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< int >::__setitem__(PySliceObject *,std::vector< int,std::allocator< int > > const &)\n" + " std::vector< int >::__setitem__(PySliceObject *)\n" " std::vector< int >::__setitem__(std::vector< int >::difference_type,std::vector< int >::value_type const &)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecInt_pop(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7236,7 +7390,7 @@ SWIGINTERN PyObject *_wrap_VecInt_pop(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_append(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::value_type *arg2 = 0 ; @@ -7267,7 +7421,7 @@ SWIGINTERN PyObject *_wrap_VecInt_append(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; std::vector< int > *result = 0 ; @@ -7280,7 +7434,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_0(PyObject *self, Py_ssize_t nobjs, } -SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -7308,7 +7462,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_1(PyObject *self, Py_ssize_t nobjs, } -SWIGINTERN PyObject *_wrap_VecInt_empty(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7331,7 +7485,7 @@ SWIGINTERN PyObject *_wrap_VecInt_empty(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_size(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7354,7 +7508,7 @@ SWIGINTERN PyObject *_wrap_VecInt_size(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_swap(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int > *arg2 = 0 ; @@ -7386,7 +7540,7 @@ SWIGINTERN PyObject *_wrap_VecInt_swap(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_begin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7410,7 +7564,7 @@ SWIGINTERN PyObject *_wrap_VecInt_begin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_end(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7434,7 +7588,7 @@ SWIGINTERN PyObject *_wrap_VecInt_end(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_rbegin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7458,7 +7612,7 @@ SWIGINTERN PyObject *_wrap_VecInt_rbegin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_rend(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7482,7 +7636,7 @@ SWIGINTERN PyObject *_wrap_VecInt_rend(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_clear(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7504,7 +7658,7 @@ SWIGINTERN PyObject *_wrap_VecInt_clear(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_get_allocator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7520,14 +7674,14 @@ SWIGINTERN PyObject *_wrap_VecInt_get_allocator(PyObject *self, PyObject *args) } arg1 = reinterpret_cast< std::vector< int > * >(argp1); result = ((std::vector< int > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< int >::allocator_type(result)), SWIGTYPE_p_std__allocatorT_int_t, SWIG_POINTER_OWN | 0 ); + 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_VecInt__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int >::size_type arg1 ; size_t val1 ; @@ -7548,7 +7702,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_2(PyObject *self, Py_ssize_t nobjs, } -SWIGINTERN PyObject *_wrap_VecInt_pop_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7570,7 +7724,7 @@ SWIGINTERN PyObject *_wrap_VecInt_pop_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_resize__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::size_type arg2 ; @@ -7598,7 +7752,7 @@ SWIGINTERN PyObject *_wrap_VecInt_resize__SWIG_0(PyObject *self, Py_ssize_t nobj } -SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::iterator arg2 ; @@ -7625,7 +7779,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt_erase" "', argument " "2"" of type '" "std::vector< int >::iterator""'"); } } - result = std_vector_Sl_int_Sg__erase__SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + result = std_vector_Sl_int_Sg__erase__SWIG_0(arg1,arg2); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7634,7 +7788,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs } -SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::iterator arg2 ; @@ -7675,7 +7829,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecInt_erase" "', argument " "3"" of type '" "std::vector< int >::iterator""'"); } } - result = std_vector_Sl_int_Sg__erase__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = std_vector_Sl_int_Sg__erase__SWIG_1(arg1,arg2,arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -7693,7 +7847,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt_erase", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7706,7 +7860,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7733,7 +7887,7 @@ SWIGINTERN PyObject *_wrap_VecInt_erase(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecInt__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int >::size_type arg1 ; std::vector< int >::value_type *arg2 = 0 ; @@ -7776,7 +7930,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt(PyObject *self, PyObject *args) { return _wrap_new_VecInt__SWIG_0(self, argc, argv); } if (argc == 1) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -7786,7 +7940,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt(PyObject *self, PyObject *args) { } } if (argc == 1) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -7794,7 +7948,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -7821,7 +7975,7 @@ SWIGINTERN PyObject *_wrap_new_VecInt(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_push_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::value_type *arg2 = 0 ; @@ -7852,7 +8006,7 @@ SWIGINTERN PyObject *_wrap_VecInt_push_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_front(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7876,7 +8030,7 @@ SWIGINTERN PyObject *_wrap_VecInt_front(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -7900,7 +8054,7 @@ SWIGINTERN PyObject *_wrap_VecInt_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_assign(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::size_type arg2 ; @@ -7939,7 +8093,7 @@ SWIGINTERN PyObject *_wrap_VecInt_assign(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_resize__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::size_type arg2 ; @@ -7986,7 +8140,7 @@ SWIGINTERN PyObject *_wrap_VecInt_resize(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt_resize", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8000,7 +8154,7 @@ SWIGINTERN PyObject *_wrap_VecInt_resize(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8029,7 +8183,7 @@ SWIGINTERN PyObject *_wrap_VecInt_resize(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::iterator arg2 ; @@ -8066,7 +8220,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_0(PyObject *self, Py_ssize_t nobj } temp3 = static_cast< std::vector< int >::value_type >(val3); arg3 = &temp3; - result = std_vector_Sl_int_Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(int const &)*arg3); + result = std_vector_Sl_int_Sg__insert__SWIG_0(arg1,arg2,(int const &)*arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< int >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -8075,7 +8229,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_0(PyObject *self, Py_ssize_t nobj } -SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::iterator arg2 ; @@ -8119,7 +8273,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert__SWIG_1(PyObject *self, Py_ssize_t nobj } temp4 = static_cast< std::vector< int >::value_type >(val4); arg4 = &temp4; - std_vector_Sl_int_Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(int const &)*arg4); + std_vector_Sl_int_Sg__insert__SWIG_1(arg1,arg2,arg3,(int const &)*arg4); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -8136,7 +8290,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecInt_insert", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8155,7 +8309,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< int,std::allocator< int > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8189,7 +8343,7 @@ SWIGINTERN PyObject *_wrap_VecInt_insert(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_reserve(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; std::vector< int >::size_type arg2 ; @@ -8218,7 +8372,7 @@ SWIGINTERN PyObject *_wrap_VecInt_reserve(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecInt_capacity(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecInt_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -8241,7 +8395,7 @@ SWIGINTERN PyObject *_wrap_VecInt_capacity(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_delete_VecInt(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_VecInt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< int > *arg1 = (std::vector< int > *) 0 ; void *argp1 = 0 ; @@ -8274,7 +8428,7 @@ SWIGINTERN PyObject *VecInt_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *a return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_VecFloat_iterator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; PyObject **arg2 = (PyObject **) 0 ; @@ -8299,7 +8453,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_iterator(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat___nonzero__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -8322,7 +8476,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___nonzero__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecFloat___bool__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -8345,7 +8499,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___bool__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat___len__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -8368,7 +8522,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___len__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat___getslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8399,7 +8553,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___getslice__(PyObject *self, PyObject *args) } arg3 = static_cast< std::vector< float >::difference_type >(val3); try { - result = (std::vector< float,std::allocator< float > > *)std_vector_Sl_float_Sg____getslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = (std::vector< float,std::allocator< float > > *)std_vector_Sl_float_Sg____getslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -8412,7 +8566,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___getslice__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8441,7 +8595,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_0(PyObject *self, Py_ssiz } arg3 = static_cast< std::vector< float >::difference_type >(val3); try { - std_vector_Sl_float_Sg____setslice____SWIG_0(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_float_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -8454,7 +8608,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_0(PyObject *self, Py_ssiz } -SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8496,7 +8650,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice____SWIG_1(PyObject *self, Py_ssiz arg4 = ptr; } try { - std_vector_Sl_float_Sg____setslice____SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< float,std::allocator< float > > const &)*arg4); + std_vector_Sl_float_Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< float,std::allocator< float > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -8520,7 +8674,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat___setslice__", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8540,7 +8694,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice__(PyObject *self, PyObject *args) } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8573,7 +8727,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setslice__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecFloat___delslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8603,7 +8757,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___delslice__(PyObject *self, PyObject *args) } arg3 = static_cast< std::vector< float >::difference_type >(val3); try { - std_vector_Sl_float_Sg____delslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_float_Sg____delslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -8616,7 +8770,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___delslice__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8637,7 +8791,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_0(PyObject *self, Py_ssize } arg2 = static_cast< std::vector< float >::difference_type >(val2); try { - std_vector_Sl_float_Sg____delitem____SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + std_vector_Sl_float_Sg____delitem____SWIG_0(arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -8650,10 +8804,10 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_0(PyObject *self, Py_ssize } -SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; std::vector< float,std::allocator< float > > *result = 0 ; @@ -8666,9 +8820,9 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_0(PyObject *self, Py_ssize arg1 = reinterpret_cast< std::vector< float > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___getitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___getitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { result = (std::vector< float,std::allocator< float > > *)std_vector_Sl_float_Sg____getitem____SWIG_0(arg1,arg2); @@ -8684,10 +8838,10 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_0(PyObject *self, Py_ssize } -SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; std::vector< float,std::allocator< float > > *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -8701,9 +8855,9 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_0(PyObject *self, Py_ssize arg1 = reinterpret_cast< std::vector< float > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } { std::vector< float,std::allocator< float > > *ptr = (std::vector< float,std::allocator< float > > *)0; @@ -8732,10 +8886,10 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_0(PyObject *self, Py_ssize } -SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -8747,9 +8901,9 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_1(PyObject *self, Py_ssize arg1 = reinterpret_cast< std::vector< float > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_float_Sg____setitem____SWIG_1(arg1,arg2); @@ -8765,10 +8919,10 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_1(PyObject *self, Py_ssize } -SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -8780,9 +8934,9 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem____SWIG_1(PyObject *self, Py_ssize arg1 = reinterpret_cast< std::vector< float > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___delitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat___delitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_float_Sg____delitem____SWIG_1(arg1,arg2); @@ -8807,7 +8961,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat___delitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8820,7 +8974,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem__(PyObject *self, PyObject *args) } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8838,12 +8992,12 @@ SWIGINTERN PyObject *_wrap_VecFloat___delitem__(PyObject *self, PyObject *args) SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecFloat___delitem__'.\n" " Possible C/C++ prototypes are:\n" " std::vector< float >::__delitem__(std::vector< float >::difference_type)\n" - " std::vector< float >::__delitem__(SWIGPY_SLICEOBJECT *)\n"); + " std::vector< float >::__delitem__(PySliceObject *)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8865,7 +9019,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem____SWIG_1(PyObject *self, Py_ssize } arg2 = static_cast< std::vector< float >::difference_type >(val2); try { - result = (std::vector< float >::value_type *) &std_vector_Sl_float_Sg____getitem____SWIG_1((std::vector< float > const *)arg1,SWIG_STD_MOVE(arg2)); + result = (std::vector< float >::value_type *) &std_vector_Sl_float_Sg____getitem____SWIG_1((std::vector< float > const *)arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -8886,7 +9040,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat___getitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8899,7 +9053,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem__(PyObject *self, PyObject *args) } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8916,13 +9070,13 @@ SWIGINTERN PyObject *_wrap_VecFloat___getitem__(PyObject *self, PyObject *args) fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecFloat___getitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< float >::__getitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< float >::__getitem__(PySliceObject *)\n" " std::vector< float >::__getitem__(std::vector< float >::difference_type) const\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::difference_type arg2 ; @@ -8953,7 +9107,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem____SWIG_2(PyObject *self, Py_ssize temp3 = static_cast< std::vector< float >::value_type >(val3); arg3 = &temp3; try { - std_vector_Sl_float_Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(float const &)*arg3); + std_vector_Sl_float_Sg____setitem____SWIG_2(arg1,arg2,(float const &)*arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -8973,7 +9127,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat___setitem__", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -8986,7 +9140,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem__(PyObject *self, PyObject *args) } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9003,7 +9157,7 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem__(PyObject *self, PyObject *args) } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9026,14 +9180,14 @@ SWIGINTERN PyObject *_wrap_VecFloat___setitem__(PyObject *self, PyObject *args) fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecFloat___setitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< float >::__setitem__(SWIGPY_SLICEOBJECT *,std::vector< float,std::allocator< float > > const &)\n" - " std::vector< float >::__setitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< float >::__setitem__(PySliceObject *,std::vector< float,std::allocator< float > > const &)\n" + " std::vector< float >::__setitem__(PySliceObject *)\n" " std::vector< float >::__setitem__(std::vector< float >::difference_type,std::vector< float >::value_type const &)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecFloat_pop(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9060,7 +9214,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_pop(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_append(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::value_type *arg2 = 0 ; @@ -9091,7 +9245,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_append(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; std::vector< float > *result = 0 ; @@ -9104,7 +9258,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_0(PyObject *self, Py_ssize_t nobjs } -SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -9132,7 +9286,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_1(PyObject *self, Py_ssize_t nobjs } -SWIGINTERN PyObject *_wrap_VecFloat_empty(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9155,7 +9309,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_empty(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_size(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9178,7 +9332,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_size(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_swap(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float > *arg2 = 0 ; @@ -9210,7 +9364,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_swap(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_begin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9234,7 +9388,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_begin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_end(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9258,7 +9412,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_end(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_rbegin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9282,7 +9436,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_rbegin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_rend(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9306,7 +9460,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_rend(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_clear(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9328,7 +9482,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_clear(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_get_allocator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9344,14 +9498,14 @@ SWIGINTERN PyObject *_wrap_VecFloat_get_allocator(PyObject *self, PyObject *args } arg1 = reinterpret_cast< std::vector< float > * >(argp1); result = ((std::vector< float > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< float >::allocator_type(result)), SWIGTYPE_p_std__allocatorT_float_t, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_NewPointerObj((new std::vector< float >::allocator_type(static_cast< const std::vector< float >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_float_t, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float >::size_type arg1 ; size_t val1 ; @@ -9372,7 +9526,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_2(PyObject *self, Py_ssize_t nobjs } -SWIGINTERN PyObject *_wrap_VecFloat_pop_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9394,7 +9548,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_pop_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_resize__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::size_type arg2 ; @@ -9422,7 +9576,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_resize__SWIG_0(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::iterator arg2 ; @@ -9449,7 +9603,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t nob SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat_erase" "', argument " "2"" of type '" "std::vector< float >::iterator""'"); } } - result = std_vector_Sl_float_Sg__erase__SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + result = std_vector_Sl_float_Sg__erase__SWIG_0(arg1,arg2); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -9458,7 +9612,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t nob } -SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::iterator arg2 ; @@ -9499,7 +9653,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase__SWIG_1(PyObject *self, Py_ssize_t nob SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecFloat_erase" "', argument " "3"" of type '" "std::vector< float >::iterator""'"); } } - result = std_vector_Sl_float_Sg__erase__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = std_vector_Sl_float_Sg__erase__SWIG_1(arg1,arg2,arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -9517,7 +9671,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat_erase", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9530,7 +9684,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9557,7 +9711,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_erase(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecFloat__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float >::size_type arg1 ; std::vector< float >::value_type *arg2 = 0 ; @@ -9600,7 +9754,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat(PyObject *self, PyObject *args) { return _wrap_new_VecFloat__SWIG_0(self, argc, argv); } if (argc == 1) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -9610,7 +9764,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat(PyObject *self, PyObject *args) { } } if (argc == 1) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9618,7 +9772,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -9645,7 +9799,7 @@ SWIGINTERN PyObject *_wrap_new_VecFloat(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_push_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::value_type *arg2 = 0 ; @@ -9676,7 +9830,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_push_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_front(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9700,7 +9854,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_front(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -9724,7 +9878,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_assign(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::size_type arg2 ; @@ -9763,7 +9917,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_assign(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_resize__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::size_type arg2 ; @@ -9810,7 +9964,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_resize(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat_resize", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9824,7 +9978,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_resize(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9853,7 +10007,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_resize(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::iterator arg2 ; @@ -9890,7 +10044,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t no } temp3 = static_cast< std::vector< float >::value_type >(val3); arg3 = &temp3; - result = std_vector_Sl_float_Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(float const &)*arg3); + result = std_vector_Sl_float_Sg__insert__SWIG_0(arg1,arg2,(float const &)*arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< float >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -9899,7 +10053,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::iterator arg2 ; @@ -9943,7 +10097,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert__SWIG_1(PyObject *self, Py_ssize_t no } temp4 = static_cast< std::vector< float >::value_type >(val4); arg4 = &temp4; - std_vector_Sl_float_Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(float const &)*arg4); + std_vector_Sl_float_Sg__insert__SWIG_1(arg1,arg2,arg3,(float const &)*arg4); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -9960,7 +10114,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecFloat_insert", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -9979,7 +10133,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< float,std::allocator< float > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10013,7 +10167,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_insert(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_reserve(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; std::vector< float >::size_type arg2 ; @@ -10042,7 +10196,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_reserve(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecFloat_capacity(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecFloat_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -10065,7 +10219,7 @@ SWIGINTERN PyObject *_wrap_VecFloat_capacity(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_delete_VecFloat(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_VecFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< float > *arg1 = (std::vector< float > *) 0 ; void *argp1 = 0 ; @@ -10098,7 +10252,7 @@ SWIGINTERN PyObject *VecFloat_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_VecVecFloat_iterator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; PyObject **arg2 = (PyObject **) 0 ; @@ -10123,7 +10277,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_iterator(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecVecFloat___nonzero__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -10146,7 +10300,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___nonzero__(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_VecVecFloat___bool__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -10169,7 +10323,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___bool__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecVecFloat___len__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -10192,7 +10346,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___len__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat___getslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10223,7 +10377,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getslice__(PyObject *self, PyObject *ar } arg3 = static_cast< std::vector< std::vector< float > >::difference_type >(val3); try { - result = (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *)std_vector_Sl_std_vector_Sl_float_Sg__Sg____getslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *)std_vector_Sl_std_vector_Sl_float_Sg__Sg____getslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -10236,7 +10390,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getslice__(PyObject *self, PyObject *ar } -SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10265,7 +10419,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_0(PyObject *self, Py_s } arg3 = static_cast< std::vector< std::vector< float > >::difference_type >(val3); try { - std_vector_Sl_std_vector_Sl_float_Sg__Sg____setslice____SWIG_0(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_std_vector_Sl_float_Sg__Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -10278,7 +10432,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_0(PyObject *self, Py_s } -SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10320,7 +10474,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice____SWIG_1(PyObject *self, Py_s arg4 = ptr; } try { - std_vector_Sl_std_vector_Sl_float_Sg__Sg____setslice____SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &)*arg4); + std_vector_Sl_std_vector_Sl_float_Sg__Sg____setslice____SWIG_1(arg1,arg2,arg3,(std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &)*arg4); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -10344,7 +10498,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice__(PyObject *self, PyObject *ar if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat___setslice__", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10364,7 +10518,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice__(PyObject *self, PyObject *ar } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10397,7 +10551,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setslice__(PyObject *self, PyObject *ar } -SWIGINTERN PyObject *_wrap_VecVecFloat___delslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10427,7 +10581,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delslice__(PyObject *self, PyObject *ar } arg3 = static_cast< std::vector< std::vector< float > >::difference_type >(val3); try { - std_vector_Sl_std_vector_Sl_float_Sg__Sg____delslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_std_vector_Sl_float_Sg__Sg____delslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -10440,7 +10594,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delslice__(PyObject *self, PyObject *ar } -SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10461,7 +10615,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_0(PyObject *self, Py_ss } arg2 = static_cast< std::vector< std::vector< float > >::difference_type >(val2); try { - std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_0(arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -10474,10 +10628,10 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_0(PyObject *self, Py_ss } -SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *result = 0 ; @@ -10490,9 +10644,9 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_0(PyObject *self, Py_ss arg1 = reinterpret_cast< std::vector< std::vector< float > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___getitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___getitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { result = (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *)std_vector_Sl_std_vector_Sl_float_Sg__Sg____getitem____SWIG_0(arg1,arg2); @@ -10508,10 +10662,10 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_0(PyObject *self, Py_ss } -SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10525,9 +10679,9 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_0(PyObject *self, Py_ss arg1 = reinterpret_cast< std::vector< std::vector< float > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } { std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *ptr = (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *)0; @@ -10556,10 +10710,10 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_0(PyObject *self, Py_ss } -SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10571,9 +10725,9 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_1(PyObject *self, Py_ss arg1 = reinterpret_cast< std::vector< std::vector< float > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_1(arg1,arg2); @@ -10589,10 +10743,10 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_1(PyObject *self, Py_ss } -SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -10604,9 +10758,9 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem____SWIG_1(PyObject *self, Py_ss arg1 = reinterpret_cast< std::vector< std::vector< float > > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___delitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat___delitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_std_vector_Sl_float_Sg__Sg____delitem____SWIG_1(arg1,arg2); @@ -10631,7 +10785,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem__(PyObject *self, PyObject *arg if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat___delitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10644,7 +10798,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem__(PyObject *self, PyObject *arg } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10662,12 +10816,12 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___delitem__(PyObject *self, PyObject *arg SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecVecFloat___delitem__'.\n" " Possible C/C++ prototypes are:\n" " std::vector< std::vector< float > >::__delitem__(std::vector< std::vector< float > >::difference_type)\n" - " std::vector< std::vector< float > >::__delitem__(SWIGPY_SLICEOBJECT *)\n"); + " std::vector< std::vector< float > >::__delitem__(PySliceObject *)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10689,7 +10843,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem____SWIG_1(PyObject *self, Py_ss } arg2 = static_cast< std::vector< std::vector< float > >::difference_type >(val2); try { - result = (std::vector< std::vector< float > >::value_type *) &std_vector_Sl_std_vector_Sl_float_Sg__Sg____getitem____SWIG_1((std::vector< std::vector< float > > const *)arg1,SWIG_STD_MOVE(arg2)); + result = (std::vector< std::vector< float > >::value_type *) &std_vector_Sl_std_vector_Sl_float_Sg__Sg____getitem____SWIG_1((std::vector< std::vector< float > > const *)arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -10710,7 +10864,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem__(PyObject *self, PyObject *arg if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat___getitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10723,7 +10877,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem__(PyObject *self, PyObject *arg } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10740,13 +10894,13 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___getitem__(PyObject *self, PyObject *arg fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecVecFloat___getitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::vector< float > >::__getitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< std::vector< float > >::__getitem__(PySliceObject *)\n" " std::vector< std::vector< float > >::__getitem__(std::vector< std::vector< float > >::difference_type) const\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::difference_type arg2 ; @@ -10780,7 +10934,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem____SWIG_2(PyObject *self, Py_ss arg3 = ptr; } try { - std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(std::vector< float,std::allocator< float > > const &)*arg3); + std_vector_Sl_std_vector_Sl_float_Sg__Sg____setitem____SWIG_2(arg1,arg2,(std::vector< float,std::allocator< float > > const &)*arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -10802,7 +10956,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem__(PyObject *self, PyObject *arg if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat___setitem__", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10815,7 +10969,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem__(PyObject *self, PyObject *arg } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10832,7 +10986,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem__(PyObject *self, PyObject *arg } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -10853,14 +11007,14 @@ SWIGINTERN PyObject *_wrap_VecVecFloat___setitem__(PyObject *self, PyObject *arg fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecVecFloat___setitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< std::vector< float > >::__setitem__(SWIGPY_SLICEOBJECT *,std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &)\n" - " std::vector< std::vector< float > >::__setitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< std::vector< float > >::__setitem__(PySliceObject *,std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > const &)\n" + " std::vector< std::vector< float > >::__setitem__(PySliceObject *)\n" " std::vector< std::vector< float > >::__setitem__(std::vector< std::vector< float > >::difference_type,std::vector< std::vector< float > >::value_type const &)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecVecFloat_pop(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -10887,7 +11041,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_pop(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_append(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::value_type *arg2 = 0 ; @@ -10923,7 +11077,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_append(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; std::vector< std::vector< float > > *result = 0 ; @@ -10936,7 +11090,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_0(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float,std::allocator< float > > > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -10964,7 +11118,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_1(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_VecVecFloat_empty(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -10987,7 +11141,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_empty(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_size(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11010,7 +11164,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_size(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_swap(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float,std::allocator< float > > > *arg2 = 0 ; @@ -11042,7 +11196,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_swap(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_begin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11066,7 +11220,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_begin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_end(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11090,7 +11244,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_end(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_rbegin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11114,7 +11268,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_rbegin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_rend(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11138,7 +11292,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_rend(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_clear(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11160,7 +11314,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_clear(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_get_allocator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11176,14 +11330,14 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_get_allocator(PyObject *self, PyObject *a } arg1 = reinterpret_cast< std::vector< std::vector< float > > * >(argp1); result = ((std::vector< std::vector< float > > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< std::vector< float > >::allocator_type(result)), SWIGTYPE_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t, SWIG_POINTER_OWN | 0 ); + resultobj = SWIG_NewPointerObj((new std::vector< std::vector< float > >::allocator_type(static_cast< const std::vector< std::vector< float > >::allocator_type& >(result))), SWIGTYPE_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t, SWIG_POINTER_OWN | 0 ); return resultobj; fail: return NULL; } -SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > >::size_type arg1 ; size_t val1 ; @@ -11204,7 +11358,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_2(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_VecVecFloat_pop_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11226,7 +11380,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_pop_back(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecVecFloat_resize__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::size_type arg2 ; @@ -11254,7 +11408,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_resize__SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::iterator arg2 ; @@ -11281,7 +11435,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat_erase" "', argument " "2"" of type '" "std::vector< std::vector< float > >::iterator""'"); } } - result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__erase__SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__erase__SWIG_0(arg1,arg2); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::vector< float > >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -11290,7 +11444,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::iterator arg2 ; @@ -11331,7 +11485,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase__SWIG_1(PyObject *self, Py_ssize_t SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecVecFloat_erase" "', argument " "3"" of type '" "std::vector< std::vector< float > >::iterator""'"); } } - result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__erase__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__erase__SWIG_1(arg1,arg2,arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::vector< float > >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -11349,7 +11503,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat_erase", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11362,7 +11516,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11389,7 +11543,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_erase(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecVecFloat__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > >::size_type arg1 ; std::vector< std::vector< float > >::value_type *arg2 = 0 ; @@ -11437,7 +11591,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat(PyObject *self, PyObject *args) { return _wrap_new_VecVecFloat__SWIG_0(self, argc, argv); } if (argc == 1) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -11447,7 +11601,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat(PyObject *self, PyObject *args) { } } if (argc == 1) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11455,7 +11609,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -11480,7 +11634,7 @@ SWIGINTERN PyObject *_wrap_new_VecVecFloat(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_push_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::value_type *arg2 = 0 ; @@ -11516,7 +11670,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_push_back(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecVecFloat_front(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11540,7 +11694,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_front(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11564,7 +11718,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_assign(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::size_type arg2 ; @@ -11608,7 +11762,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_assign(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_resize__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::size_type arg2 ; @@ -11660,7 +11814,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_resize(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat_resize", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11674,7 +11828,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_resize(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11701,7 +11855,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_resize(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::iterator arg2 ; @@ -11741,7 +11895,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t } arg3 = ptr; } - result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(std::vector< float,std::allocator< float > > const &)*arg3); + result = std_vector_Sl_std_vector_Sl_float_Sg__Sg__insert__SWIG_0(arg1,arg2,(std::vector< float,std::allocator< float > > const &)*arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< std::vector< float > >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); if (SWIG_IsNewObj(res3)) delete arg3; @@ -11752,7 +11906,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::iterator arg2 ; @@ -11799,7 +11953,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert__SWIG_1(PyObject *self, Py_ssize_t } arg4 = ptr; } - std_vector_Sl_std_vector_Sl_float_Sg__Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< float,std::allocator< float > > const &)*arg4); + std_vector_Sl_std_vector_Sl_float_Sg__Sg__insert__SWIG_1(arg1,arg2,arg3,(std::vector< float,std::allocator< float > > const &)*arg4); resultobj = SWIG_Py_Void(); if (SWIG_IsNewObj(res4)) delete arg4; return resultobj; @@ -11818,7 +11972,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecVecFloat_insert", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11835,7 +11989,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -11867,7 +12021,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_insert(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_reserve(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; std::vector< std::vector< float > >::size_type arg2 ; @@ -11896,7 +12050,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_reserve(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecVecFloat_capacity(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecVecFloat_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11919,7 +12073,7 @@ SWIGINTERN PyObject *_wrap_VecVecFloat_capacity(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_delete_VecVecFloat(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_VecVecFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< std::vector< float > > *arg1 = (std::vector< std::vector< float > > *) 0 ; void *argp1 = 0 ; @@ -11952,7 +12106,7 @@ SWIGINTERN PyObject *VecVecFloat_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObje return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_VecDouble_iterator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_iterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; PyObject **arg2 = (PyObject **) 0 ; @@ -11977,7 +12131,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_iterator(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble___nonzero__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble___nonzero__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12000,7 +12154,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___nonzero__(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_VecDouble___bool__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble___bool__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12023,7 +12177,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___bool__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble___len__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble___len__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12046,7 +12200,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___len__(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble___getslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble___getslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12077,7 +12231,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___getslice__(PyObject *self, PyObject *args } arg3 = static_cast< std::vector< double >::difference_type >(val3); try { - result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -12090,7 +12244,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___getslice__(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12119,7 +12273,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_0(PyObject *self, Py_ssi } arg3 = static_cast< std::vector< double >::difference_type >(val3); try { - std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_double_Sg____setslice____SWIG_0(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -12132,7 +12286,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_0(PyObject *self, Py_ssi } -SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12174,7 +12328,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice____SWIG_1(PyObject *self, Py_ssi arg4 = ptr; } try { - std_vector_Sl_double_Sg____setslice____SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(std::vector< double,std::allocator< double > > const &)*arg4); + 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()); } catch(std::invalid_argument &_e) { @@ -12198,7 +12352,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice__(PyObject *self, PyObject *args if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble___setslice__", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12218,7 +12372,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice__(PyObject *self, PyObject *args } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12251,7 +12405,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setslice__(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_VecDouble___delslice__(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble___delslice__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12281,7 +12435,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___delslice__(PyObject *self, PyObject *args } arg3 = static_cast< std::vector< double >::difference_type >(val3); try { - std_vector_Sl_double_Sg____delslice__(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + std_vector_Sl_double_Sg____delslice__(arg1,arg2,arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -12294,7 +12448,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___delslice__(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12315,7 +12469,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_0(PyObject *self, Py_ssiz } arg2 = static_cast< std::vector< double >::difference_type >(val2); try { - std_vector_Sl_double_Sg____delitem____SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + std_vector_Sl_double_Sg____delitem____SWIG_0(arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } catch(std::invalid_argument &_e) { @@ -12328,10 +12482,10 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_0(PyObject *self, Py_ssiz } -SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; std::vector< double,std::allocator< double > > *result = 0 ; @@ -12344,9 +12498,9 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_0(PyObject *self, Py_ssiz arg1 = reinterpret_cast< std::vector< double > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___getitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___getitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { result = (std::vector< double,std::allocator< double > > *)std_vector_Sl_double_Sg____getitem____SWIG_0(arg1,arg2); @@ -12362,10 +12516,10 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_0(PyObject *self, Py_ssiz } -SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; std::vector< double,std::allocator< double > > *arg3 = 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -12379,9 +12533,9 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_0(PyObject *self, Py_ssiz arg1 = reinterpret_cast< std::vector< double > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } { std::vector< double,std::allocator< double > > *ptr = (std::vector< double,std::allocator< double > > *)0; @@ -12410,10 +12564,10 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_0(PyObject *self, Py_ssiz } -SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -12425,9 +12579,9 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_1(PyObject *self, Py_ssiz arg1 = reinterpret_cast< std::vector< double > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___setitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___setitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_double_Sg____setitem____SWIG_1(arg1,arg2); @@ -12443,10 +12597,10 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_1(PyObject *self, Py_ssiz } -SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; - SWIGPY_SLICEOBJECT *arg2 = (SWIGPY_SLICEOBJECT *) 0 ; + PySliceObject *arg2 = (PySliceObject *) 0 ; void *argp1 = 0 ; int res1 = 0 ; @@ -12458,9 +12612,9 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem____SWIG_1(PyObject *self, Py_ssiz arg1 = reinterpret_cast< std::vector< double > * >(argp1); { if (!PySlice_Check(swig_obj[1])) { - SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___delitem__" "', argument " "2"" of type '" "SWIGPY_SLICEOBJECT *""'"); + SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble___delitem__" "', argument " "2"" of type '" "PySliceObject *""'"); } - arg2 = (SWIGPY_SLICEOBJECT *) swig_obj[1]; + arg2 = (PySliceObject *) swig_obj[1]; } try { std_vector_Sl_double_Sg____delitem____SWIG_1(arg1,arg2); @@ -12485,7 +12639,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble___delitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12498,7 +12652,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem__(PyObject *self, PyObject *args) } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12516,12 +12670,12 @@ SWIGINTERN PyObject *_wrap_VecDouble___delitem__(PyObject *self, PyObject *args) SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecDouble___delitem__'.\n" " Possible C/C++ prototypes are:\n" " std::vector< double >::__delitem__(std::vector< double >::difference_type)\n" - " std::vector< double >::__delitem__(SWIGPY_SLICEOBJECT *)\n"); + " std::vector< double >::__delitem__(PySliceObject *)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12543,7 +12697,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem____SWIG_1(PyObject *self, Py_ssiz } arg2 = static_cast< std::vector< double >::difference_type >(val2); try { - result = (std::vector< double >::value_type *) &std_vector_Sl_double_Sg____getitem____SWIG_1((std::vector< double > const *)arg1,SWIG_STD_MOVE(arg2)); + result = (std::vector< double >::value_type *) &std_vector_Sl_double_Sg____getitem____SWIG_1((std::vector< double > const *)arg1,arg2); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -12564,7 +12718,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble___getitem__", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12577,7 +12731,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem__(PyObject *self, PyObject *args) } } if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12594,13 +12748,13 @@ SWIGINTERN PyObject *_wrap_VecDouble___getitem__(PyObject *self, PyObject *args) fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecDouble___getitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< double >::__getitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< double >::__getitem__(PySliceObject *)\n" " std::vector< double >::__getitem__(std::vector< double >::difference_type) const\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::difference_type arg2 ; @@ -12631,7 +12785,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem____SWIG_2(PyObject *self, Py_ssiz temp3 = static_cast< std::vector< double >::value_type >(val3); arg3 = &temp3; try { - std_vector_Sl_double_Sg____setitem____SWIG_2(arg1,SWIG_STD_MOVE(arg2),(double const &)*arg3); + std_vector_Sl_double_Sg____setitem____SWIG_2(arg1,arg2,(double const &)*arg3); } catch(std::out_of_range &_e) { SWIG_exception_fail(SWIG_IndexError, (&_e)->what()); } @@ -12651,7 +12805,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem__(PyObject *self, PyObject *args) if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble___setitem__", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12664,7 +12818,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem__(PyObject *self, PyObject *args) } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12681,7 +12835,7 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem__(PyObject *self, PyObject *args) } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -12704,14 +12858,14 @@ SWIGINTERN PyObject *_wrap_VecDouble___setitem__(PyObject *self, PyObject *args) fail: SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'VecDouble___setitem__'.\n" " Possible C/C++ prototypes are:\n" - " std::vector< double >::__setitem__(SWIGPY_SLICEOBJECT *,std::vector< double,std::allocator< double > > const &)\n" - " std::vector< double >::__setitem__(SWIGPY_SLICEOBJECT *)\n" + " std::vector< double >::__setitem__(PySliceObject *,std::vector< double,std::allocator< double > > const &)\n" + " std::vector< double >::__setitem__(PySliceObject *)\n" " std::vector< double >::__setitem__(std::vector< double >::difference_type,std::vector< double >::value_type const &)\n"); return 0; } -SWIGINTERN PyObject *_wrap_VecDouble_pop(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_pop(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12738,7 +12892,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_pop(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_append(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_append(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::value_type *arg2 = 0 ; @@ -12769,7 +12923,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_append(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; std::vector< double > *result = 0 ; @@ -12782,7 +12936,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_0(PyObject *self, Py_ssize_t nobj } -SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = 0 ; int res1 = SWIG_OLDOBJ ; @@ -12810,7 +12964,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_1(PyObject *self, Py_ssize_t nobj } -SWIGINTERN PyObject *_wrap_VecDouble_empty(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12833,7 +12987,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_empty(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_size(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12856,7 +13010,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_size(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_swap(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_swap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double > *arg2 = 0 ; @@ -12888,7 +13042,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_swap(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_begin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12912,7 +13066,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_begin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_end(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12936,7 +13090,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_end(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_rbegin(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_rbegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12960,7 +13114,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_rbegin(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_rend(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_rend(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -12984,7 +13138,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_rend(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_clear(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_clear(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13006,7 +13160,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_clear(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_get_allocator(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_get_allocator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13022,14 +13176,14 @@ SWIGINTERN PyObject *_wrap_VecDouble_get_allocator(PyObject *self, PyObject *arg } arg1 = reinterpret_cast< std::vector< double > * >(argp1); result = ((std::vector< double > const *)arg1)->get_allocator(); - resultobj = SWIG_NewPointerObj((new std::vector< double >::allocator_type(result)), SWIGTYPE_p_std__allocatorT_double_t, SWIG_POINTER_OWN | 0 ); + 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_VecDouble__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double >::size_type arg1 ; size_t val1 ; @@ -13050,7 +13204,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_2(PyObject *self, Py_ssize_t nobj } -SWIGINTERN PyObject *_wrap_VecDouble_pop_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_pop_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13072,7 +13226,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_pop_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_resize__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_resize__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::size_type arg2 ; @@ -13100,7 +13254,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_resize__SWIG_0(PyObject *self, Py_ssize_t n } -SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::iterator arg2 ; @@ -13127,7 +13281,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_0(PyObject *self, Py_ssize_t no SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble_erase" "', argument " "2"" of type '" "std::vector< double >::iterator""'"); } } - result = std_vector_Sl_double_Sg__erase__SWIG_0(arg1,SWIG_STD_MOVE(arg2)); + result = std_vector_Sl_double_Sg__erase__SWIG_0(arg1,arg2); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< double >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -13136,7 +13290,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_0(PyObject *self, Py_ssize_t no } -SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::iterator arg2 ; @@ -13177,7 +13331,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase__SWIG_1(PyObject *self, Py_ssize_t no SWIG_exception_fail(SWIG_ArgError(SWIG_TypeError), "in method '" "VecDouble_erase" "', argument " "3"" of type '" "std::vector< double >::iterator""'"); } } - result = std_vector_Sl_double_Sg__erase__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3)); + result = std_vector_Sl_double_Sg__erase__SWIG_1(arg1,arg2,arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< double >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -13195,7 +13349,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble_erase", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13208,7 +13362,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13235,7 +13389,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_erase(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_VecDouble__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double >::size_type arg1 ; std::vector< double >::value_type *arg2 = 0 ; @@ -13278,7 +13432,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble(PyObject *self, PyObject *args) { return _wrap_new_VecDouble__SWIG_0(self, argc, argv); } if (argc == 1) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -13288,7 +13442,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble(PyObject *self, PyObject *args) { } } if (argc == 1) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13296,7 +13450,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; { int res = SWIG_AsVal_size_t(argv[0], NULL); _v = SWIG_CheckState(res); @@ -13323,7 +13477,7 @@ SWIGINTERN PyObject *_wrap_new_VecDouble(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_push_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::value_type *arg2 = 0 ; @@ -13354,7 +13508,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_push_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_front(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13378,7 +13532,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_front(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_back(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13402,7 +13556,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_back(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_assign(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_assign(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::size_type arg2 ; @@ -13441,7 +13595,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_assign(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_resize__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_resize__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::size_type arg2 ; @@ -13488,7 +13642,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_resize(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble_resize", 0, 3, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13502,7 +13656,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_resize(PyObject *self, PyObject *args) { } } if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13531,7 +13685,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_resize(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::iterator arg2 ; @@ -13568,7 +13722,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_0(PyObject *self, Py_ssize_t n } temp3 = static_cast< std::vector< double >::value_type >(val3); arg3 = &temp3; - result = std_vector_Sl_double_Sg__insert__SWIG_0(arg1,SWIG_STD_MOVE(arg2),(double const &)*arg3); + result = std_vector_Sl_double_Sg__insert__SWIG_0(arg1,arg2,(double const &)*arg3); resultobj = SWIG_NewPointerObj(swig::make_output_iterator(static_cast< const std::vector< double >::iterator & >(result)), swig::SwigPyIterator::descriptor(),SWIG_POINTER_OWN); return resultobj; @@ -13577,7 +13731,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_0(PyObject *self, Py_ssize_t n } -SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::iterator arg2 ; @@ -13621,7 +13775,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert__SWIG_1(PyObject *self, Py_ssize_t n } temp4 = static_cast< std::vector< double >::value_type >(val4); arg4 = &temp4; - std_vector_Sl_double_Sg__insert__SWIG_1(arg1,SWIG_STD_MOVE(arg2),SWIG_STD_MOVE(arg3),(double const &)*arg4); + std_vector_Sl_double_Sg__insert__SWIG_1(arg1,arg2,arg3,(double const &)*arg4); resultobj = SWIG_Py_Void(); return resultobj; fail: @@ -13638,7 +13792,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "VecDouble_insert", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13657,7 +13811,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; int res = swig::asptr(argv[0], (std::vector< double,std::allocator< double > >**)(0)); _v = SWIG_CheckState(res); if (_v) { @@ -13691,7 +13845,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_insert(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_reserve(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_reserve(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; std::vector< double >::size_type arg2 ; @@ -13720,7 +13874,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_reserve(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_VecDouble_capacity(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_VecDouble_capacity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13743,7 +13897,7 @@ SWIGINTERN PyObject *_wrap_VecDouble_capacity(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_delete_VecDouble(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_VecDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; std::vector< double > *arg1 = (std::vector< double > *) 0 ; void *argp1 = 0 ; @@ -13776,7 +13930,7 @@ SWIGINTERN PyObject *VecDouble_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; bool arg2 ; @@ -13805,7 +13959,7 @@ SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_set(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -13828,7 +13982,7 @@ SWIGINTERN PyObject *_wrap_Params_bSloopSmooth_get(PyObject *self, PyObject *arg } -SWIGINTERN PyObject *_wrap_Params_time_step_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_time_step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; double arg2 ; @@ -13857,7 +14011,7 @@ SWIGINTERN PyObject *_wrap_Params_time_step_set(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_Params_time_step_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_time_step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -13880,7 +14034,7 @@ SWIGINTERN PyObject *_wrap_Params_time_step_get(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_Params_class_threshold_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_class_threshold_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; double arg2 ; @@ -13909,7 +14063,7 @@ SWIGINTERN PyObject *_wrap_Params_class_threshold_set(PyObject *self, PyObject * } -SWIGINTERN PyObject *_wrap_Params_class_threshold_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_class_threshold_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -13932,7 +14086,7 @@ SWIGINTERN PyObject *_wrap_Params_class_threshold_get(PyObject *self, PyObject * } -SWIGINTERN PyObject *_wrap_Params_cloth_resolution_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_cloth_resolution_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; double arg2 ; @@ -13961,7 +14115,7 @@ SWIGINTERN PyObject *_wrap_Params_cloth_resolution_set(PyObject *self, PyObject } -SWIGINTERN PyObject *_wrap_Params_cloth_resolution_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_cloth_resolution_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -13984,7 +14138,7 @@ SWIGINTERN PyObject *_wrap_Params_cloth_resolution_get(PyObject *self, PyObject } -SWIGINTERN PyObject *_wrap_Params_rigidness_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_rigidness_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; int arg2 ; @@ -14013,7 +14167,7 @@ SWIGINTERN PyObject *_wrap_Params_rigidness_set(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_Params_rigidness_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_rigidness_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -14036,7 +14190,7 @@ SWIGINTERN PyObject *_wrap_Params_rigidness_get(PyObject *self, PyObject *args) } -SWIGINTERN PyObject *_wrap_Params_interations_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_interations_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; int arg2 ; @@ -14065,7 +14219,7 @@ SWIGINTERN PyObject *_wrap_Params_interations_set(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_Params_interations_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_Params_interations_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -14088,7 +14242,7 @@ SWIGINTERN PyObject *_wrap_Params_interations_get(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_new_Params(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_new_Params(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *result = 0 ; @@ -14101,7 +14255,7 @@ SWIGINTERN PyObject *_wrap_new_Params(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_delete_Params(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_Params(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; Params *arg1 = (Params *) 0 ; void *argp1 = 0 ; @@ -14134,7 +14288,7 @@ SWIGINTERN PyObject *Params_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *a return SWIG_Python_InitShadowInstance(args); } -SWIGINTERN PyObject *_wrap_new_CSF__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_new_CSF__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; int arg1 ; int val1 ; @@ -14155,7 +14309,7 @@ SWIGINTERN PyObject *_wrap_new_CSF__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyO } -SWIGINTERN PyObject *_wrap_new_CSF__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { +SWIGINTERN PyObject *_wrap_new_CSF__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) { PyObject *resultobj = 0; CSF *result = 0 ; @@ -14180,7 +14334,7 @@ SWIGINTERN PyObject *_wrap_new_CSF(PyObject *self, PyObject *args) { return _wrap_new_CSF__SWIG_1(self, argc, argv); } if (argc == 1) { - int _v = 0; + int _v; { int res = SWIG_AsVal_int(argv[0], NULL); _v = SWIG_CheckState(res); @@ -14199,7 +14353,7 @@ SWIGINTERN PyObject *_wrap_new_CSF(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_delete_CSF(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_delete_CSF(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14221,7 +14375,7 @@ SWIGINTERN PyObject *_wrap_delete_CSF(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; SwigValueWrapper< std::vector< csf::Point,std::allocator< csf::Point > > > arg2 ; @@ -14257,48 +14411,16 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; double *arg2 = (double *) 0 ; int arg3 ; + int arg4 ; void *argp1 = 0 ; int res1 = 0 ; - void *argp2 = 0 ; - int res2 = 0 ; - int val3 ; - int ecode3 = 0 ; - - if ((nobjs < 3) || (nobjs > 3)) SWIG_fail; - res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CSF, 0 | 0 ); - if (!SWIG_IsOK(res1)) { - SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "CSF_setPointCloud" "', argument " "1"" of type '" "CSF *""'"); - } - arg1 = reinterpret_cast< CSF * >(argp1); - res2 = SWIG_ConvertPtr(swig_obj[1], &argp2,SWIGTYPE_p_double, 0 | 0 ); - if (!SWIG_IsOK(res2)) { - SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "CSF_setPointCloud" "', argument " "2"" of type '" "double *""'"); - } - arg2 = reinterpret_cast< double * >(argp2); - ecode3 = SWIG_AsVal_int(swig_obj[2], &val3); - if (!SWIG_IsOK(ecode3)) { - SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "CSF_setPointCloud" "', argument " "3"" of type '" "int""'"); - } - arg3 = static_cast< int >(val3); - (arg1)->setPointCloud(arg2,arg3); - resultobj = SWIG_Py_Void(); - return resultobj; -fail: - return NULL; -} - - -SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_2(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { - PyObject *resultobj = 0; - CSF *arg1 = (CSF *) 0 ; - std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > arg2 ; - void *argp1 = 0 ; - int res1 = 0 ; + PyArrayObject *array2 = NULL ; + int is_new_object2 = 0 ; if ((nobjs < 2) || (nobjs > 2)) SWIG_fail; res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_CSF, 0 | 0 ); @@ -14307,23 +14429,38 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_2(PyObject *self, Py_ssize_t } arg1 = reinterpret_cast< CSF * >(argp1); { - std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *ptr = (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *)0; - int res = swig::asptr(swig_obj[1], &ptr); - if (!SWIG_IsOK(res) || !ptr) { - SWIG_exception_fail(SWIG_ArgError((ptr ? res : SWIG_TypeError)), "in method '" "CSF_setPointCloud" "', argument " "2"" of type '" "std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >""'"); + npy_intp size[2] = { + -1, -1 + }; + array2 = obj_to_array_contiguous_allow_conversion(swig_obj[1], NPY_DOUBLE, + &is_new_object2); + if (!array2 || !require_dimensions(array2, 2) || + !require_size(array2, size, 2)) SWIG_fail; + arg2 = (double*) array_data(array2); + arg3 = (int) array_size(array2,0); + arg4 = (int) array_size(array2,1); + } + (arg1)->setPointCloud(arg2,arg3,arg4); + resultobj = SWIG_Py_Void(); + { + if (is_new_object2 && array2) + { + Py_DECREF(array2); } - arg2 = *ptr; - if (SWIG_IsNewObj(res)) delete ptr; } - (arg1)->setPointCloud(arg2); - resultobj = SWIG_Py_Void(); return resultobj; fail: + { + if (is_new_object2 && array2) + { + Py_DECREF(array2); + } + } return NULL; } -SWIGINTERN PyObject *_wrap_CSF_readPointsFromFile(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_readPointsFromFile(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; std::string arg2 ; @@ -14354,7 +14491,7 @@ SWIGINTERN PyObject *_wrap_CSF_readPointsFromFile(PyObject *self, PyObject *args } -SWIGINTERN PyObject *_wrap_CSF_getPointCloud__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_getPointCloud__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14375,7 +14512,7 @@ SWIGINTERN PyObject *_wrap_CSF_getPointCloud__SWIG_0(PyObject *self, Py_ssize_t } -SWIGINTERN PyObject *_wrap_CSF_getPointCloud__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_getPointCloud__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14405,7 +14542,7 @@ SWIGINTERN PyObject *_wrap_CSF_getPointCloud(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "CSF_getPointCloud", 0, 1, argv))) SWIG_fail; --argc; if (argc == 1) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14414,7 +14551,7 @@ SWIGINTERN PyObject *_wrap_CSF_getPointCloud(PyObject *self, PyObject *args) { } } if (argc == 1) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14432,7 +14569,7 @@ SWIGINTERN PyObject *_wrap_CSF_getPointCloud(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_savePoints(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_savePoints(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; std::vector< int,std::allocator< int > > arg2 ; @@ -14473,7 +14610,7 @@ SWIGINTERN PyObject *_wrap_CSF_savePoints(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_size(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14496,7 +14633,7 @@ SWIGINTERN PyObject *_wrap_CSF_size(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_3(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; csf::PointCloud *arg2 = 0 ; @@ -14529,14 +14666,14 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud__SWIG_3(PyObject *self, Py_ssize_t SWIGINTERN PyObject *_wrap_CSF_setPointCloud(PyObject *self, PyObject *args) { Py_ssize_t argc; - PyObject *argv[4] = { + PyObject *argv[3] = { 0 }; - if (!(argc = SWIG_Python_UnpackTuple(args, "CSF_setPointCloud", 0, 3, argv))) SWIG_fail; + if (!(argc = SWIG_Python_UnpackTuple(args, "CSF_setPointCloud", 0, 2, argv))) SWIG_fail; --argc; if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14549,7 +14686,7 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud(PyObject *self, PyObject *args) { } } if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14558,40 +14695,27 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud(PyObject *self, PyObject *args) { int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_csf__PointCloud, SWIG_POINTER_NO_NULL); _v = SWIG_CheckState(res); if (_v) { - return _wrap_CSF_setPointCloud__SWIG_3(self, argc, argv); + return _wrap_CSF_setPointCloud__SWIG_2(self, argc, argv); } } } if (argc == 2) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); if (_v) { - int res = swig::asptr(argv[1], (std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >**)(0)); - _v = SWIG_CheckState(res); - if (_v) { - return _wrap_CSF_setPointCloud__SWIG_2(self, argc, argv); + { + _v = is_array(argv[1]) || PySequence_Check(argv[1]); } - } - } - if (argc == 3) { - int _v = 0; - void *vptr = 0; - int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); - _v = SWIG_CheckState(res); - if (_v) { - void *vptr = 0; - int res = SWIG_ConvertPtr(argv[1], &vptr, SWIGTYPE_p_double, 0); - _v = SWIG_CheckState(res); if (_v) { - { - int res = SWIG_AsVal_int(argv[2], NULL); - _v = SWIG_CheckState(res); + if (argc <= 2) { + return _wrap_CSF_setPointCloud__SWIG_1(self, argc, argv); } - if (_v) { + if (argc <= 3) { return _wrap_CSF_setPointCloud__SWIG_1(self, argc, argv); } + return _wrap_CSF_setPointCloud__SWIG_1(self, argc, argv); } } } @@ -14600,14 +14724,13 @@ SWIGINTERN PyObject *_wrap_CSF_setPointCloud(PyObject *self, PyObject *args) { SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'CSF_setPointCloud'.\n" " Possible C/C++ prototypes are:\n" " CSF::setPointCloud(std::vector< csf::Point,std::allocator< csf::Point > >)\n" - " CSF::setPointCloud(double *,int)\n" - " CSF::setPointCloud(std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > >)\n" + " CSF::setPointCloud(double *,int,int)\n" " CSF::setPointCloud(csf::PointCloud &)\n"); return 0; } -SWIGINTERN PyObject *_wrap_CSF_do_filtering__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_do_filtering__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; std::vector< int,std::allocator< int > > *arg2 = 0 ; @@ -14657,7 +14780,7 @@ SWIGINTERN PyObject *_wrap_CSF_do_filtering__SWIG_0(PyObject *self, Py_ssize_t n } -SWIGINTERN PyObject *_wrap_CSF_do_filtering__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) { +SWIGINTERN PyObject *_wrap_CSF_do_filtering__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; std::vector< int,std::allocator< int > > *arg2 = 0 ; @@ -14708,7 +14831,7 @@ SWIGINTERN PyObject *_wrap_CSF_do_filtering(PyObject *self, PyObject *args) { if (!(argc = SWIG_Python_UnpackTuple(args, "CSF_do_filtering", 0, 4, argv))) SWIG_fail; --argc; if (argc == 3) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14727,7 +14850,7 @@ SWIGINTERN PyObject *_wrap_CSF_do_filtering(PyObject *self, PyObject *args) { } } if (argc == 4) { - int _v = 0; + int _v; void *vptr = 0; int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CSF, 0); _v = SWIG_CheckState(res); @@ -14761,7 +14884,7 @@ SWIGINTERN PyObject *_wrap_CSF_do_filtering(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_do_cloth_export(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_do_cloth_export(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14784,7 +14907,7 @@ SWIGINTERN PyObject *_wrap_CSF_do_cloth_export(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_params_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_params_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; Params *arg2 = (Params *) 0 ; @@ -14813,7 +14936,7 @@ SWIGINTERN PyObject *_wrap_CSF_params_set(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_params_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_params_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14836,7 +14959,7 @@ SWIGINTERN PyObject *_wrap_CSF_params_get(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_index_set(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_index_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; int arg2 ; @@ -14865,7 +14988,7 @@ SWIGINTERN PyObject *_wrap_CSF_index_set(PyObject *self, PyObject *args) { } -SWIGINTERN PyObject *_wrap_CSF_index_get(PyObject *self, PyObject *args) { +SWIGINTERN PyObject *_wrap_CSF_index_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; CSF *arg1 = (CSF *) 0 ; void *argp1 = 0 ; @@ -14900,6 +15023,7 @@ SWIGINTERN PyObject *CSF_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args } static PyMethodDef SwigMethods[] = { + { "SWIG_PyInstanceMethod_New", SWIG_PyInstanceMethod_New, METH_O, NULL}, { "delete_SwigPyIterator", _wrap_delete_SwigPyIterator, METH_O, NULL}, { "SwigPyIterator_value", _wrap_SwigPyIterator_value, METH_O, NULL}, { "SwigPyIterator_incr", _wrap_SwigPyIterator_incr, METH_VARARGS, NULL}, @@ -15092,6 +15216,10 @@ static PyMethodDef SwigMethods[] = { { NULL, NULL, 0, NULL } }; +static PyMethodDef SwigMethods_proxydocs[] = { + { NULL, NULL, 0, NULL } +}; + /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */ @@ -15101,19 +15229,18 @@ static swig_type_info _swigt__p_allocator_type = {"_p_allocator_type", "allocato static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_csf__PointCloud = {"_p_csf__PointCloud", "csf::PointCloud *", 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_p_PyObject = {"_p_p_PyObject", "PyObject **", 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_float_t = {"_p_std__allocatorT_float_t", "std::vector< float >::allocator_type *|std::allocator< float > *", 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}; -static swig_type_info _swigt__p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t = {"_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t", "std::vector< std::vector< float > >::allocator_type *|std::allocator< std::vector< float,std::allocator< float > > > *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t = {"_p_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t", "std::allocator< std::vector< float,std::allocator< float > > > *|std::vector< std::vector< float > >::allocator_type *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__invalid_argument = {"_p_std__invalid_argument", "std::invalid_argument *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorT_csf__Point_std__allocatorT_csf__Point_t_t = {"_p_std__vectorT_csf__Point_std__allocatorT_csf__Point_t_t", "std::vector< csf::Point,std::allocator< csf::Point > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorT_double_std__allocatorT_double_t_t = {"_p_std__vectorT_double_std__allocatorT_double_t_t", "std::vector< double,std::allocator< double > > *|std::vector< double > *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_std__vectorT_float_std__allocatorT_float_t_t = {"_p_std__vectorT_float_std__allocatorT_float_t_t", "std::vector< float,std::allocator< float > > *|std::vector< float > *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_std__vectorT_float_std__allocatorT_float_t_t = {"_p_std__vectorT_float_std__allocatorT_float_t_t", "std::vector< float > *|std::vector< float,std::allocator< float > > *", 0, 0, (void*)0, 0}; static swig_type_info _swigt__p_std__vectorT_int_std__allocatorT_int_t_t = {"_p_std__vectorT_int_std__allocatorT_int_t_t", "std::vector< int,std::allocator< int > > *|std::vector< int > *", 0, 0, (void*)0, 0}; -static swig_type_info _swigt__p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t = {"_p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t", "std::vector< std::vector< float,std::allocator< float > > > *|std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *|std::vector< std::vector< float > > *", 0, 0, (void*)0, 0}; +static swig_type_info _swigt__p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t = {"_p_std__vectorT_std__vectorT_float_std__allocatorT_float_t_t_std__allocatorT_std__vectorT_float_std__allocatorT_float_t_t_t_t", "std::vector< std::vector< float,std::allocator< float > >,std::allocator< std::vector< float,std::allocator< float > > > > *|std::vector< std::vector< float,std::allocator< float > > > *|std::vector< std::vector< float > > *", 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_value_type = {"_p_value_type", "value_type *", 0, 0, (void*)0, 0}; @@ -15124,7 +15251,6 @@ static swig_type_info *swig_type_initial[] = { &_swigt__p_char, &_swigt__p_csf__PointCloud, &_swigt__p_difference_type, - &_swigt__p_double, &_swigt__p_p_PyObject, &_swigt__p_size_type, &_swigt__p_std__allocatorT_double_t, @@ -15147,7 +15273,6 @@ static swig_cast_info _swigc__p_allocator_type[] = { {&_swigt__p_allocator_type static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_csf__PointCloud[] = { {&_swigt__p_csf__PointCloud, 0, 0, 0},{0, 0, 0, 0}}; static swig_cast_info _swigc__p_difference_type[] = { {&_swigt__p_difference_type, 0, 0, 0},{0, 0, 0, 0}}; -static swig_cast_info _swigc__p_double[] = { {&_swigt__p_double, 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_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}}; @@ -15170,7 +15295,6 @@ static swig_cast_info *swig_cast_initial[] = { _swigc__p_char, _swigc__p_csf__PointCloud, _swigc__p_difference_type, - _swigc__p_double, _swigc__p_p_PyObject, _swigc__p_size_type, _swigc__p_std__allocatorT_double_t, @@ -15248,12 +15372,9 @@ extern "C" { #define SWIGRUNTIME_DEBUG #endif -#ifndef SWIG_INIT_CLIENT_DATA_TYPE -#define SWIG_INIT_CLIENT_DATA_TYPE void * -#endif SWIGRUNTIME void -SWIG_InitializeModule(SWIG_INIT_CLIENT_DATA_TYPE clientdata) { +SWIG_InitializeModule(void *clientdata) { size_t i; swig_module_info *module_head, *iter; int init; @@ -15436,6 +15557,220 @@ SWIG_PropagateClientData(void) { extern "C" { #endif + /* Python-specific SWIG API */ +#define SWIG_newvarlink() SWIG_Python_newvarlink() +#define SWIG_addvarlink(p, name, get_attr, set_attr) SWIG_Python_addvarlink(p, name, get_attr, set_attr) +#define SWIG_InstallConstants(d, constants) SWIG_Python_InstallConstants(d, constants) + + /* ----------------------------------------------------------------------------- + * global variable support code. + * ----------------------------------------------------------------------------- */ + + typedef struct swig_globalvar { + char *name; /* Name of global variable */ + PyObject *(*get_attr)(void); /* Return the current value */ + int (*set_attr)(PyObject *); /* Set the value */ + struct swig_globalvar *next; + } swig_globalvar; + + typedef struct swig_varlinkobject { + PyObject_HEAD + swig_globalvar *vars; + } swig_varlinkobject; + + SWIGINTERN PyObject * + swig_varlink_repr(swig_varlinkobject *SWIGUNUSEDPARM(v)) { +#if PY_VERSION_HEX >= 0x03000000 + return PyUnicode_InternFromString(""); +#else + return PyString_FromString(""); +#endif + } + + SWIGINTERN PyObject * + swig_varlink_str(swig_varlinkobject *v) { +#if PY_VERSION_HEX >= 0x03000000 + PyObject *str = PyUnicode_InternFromString("("); + PyObject *tail; + PyObject *joined; + swig_globalvar *var; + for (var = v->vars; var; var=var->next) { + tail = PyUnicode_FromString(var->name); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; + if (var->next) { + tail = PyUnicode_InternFromString(", "); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; + } + } + tail = PyUnicode_InternFromString(")"); + joined = PyUnicode_Concat(str, tail); + Py_DecRef(str); + Py_DecRef(tail); + str = joined; +#else + PyObject *str = PyString_FromString("("); + swig_globalvar *var; + for (var = v->vars; var; var=var->next) { + PyString_ConcatAndDel(&str,PyString_FromString(var->name)); + if (var->next) PyString_ConcatAndDel(&str,PyString_FromString(", ")); + } + PyString_ConcatAndDel(&str,PyString_FromString(")")); +#endif + return str; + } + + SWIGINTERN void + swig_varlink_dealloc(swig_varlinkobject *v) { + swig_globalvar *var = v->vars; + while (var) { + swig_globalvar *n = var->next; + free(var->name); + free(var); + var = n; + } + } + + SWIGINTERN PyObject * + swig_varlink_getattr(swig_varlinkobject *v, char *n) { + PyObject *res = NULL; + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + res = (*var->get_attr)(); + break; + } + var = var->next; + } + if (res == NULL && !PyErr_Occurred()) { + PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n); + } + return res; + } + + SWIGINTERN int + swig_varlink_setattr(swig_varlinkobject *v, char *n, PyObject *p) { + int res = 1; + swig_globalvar *var = v->vars; + while (var) { + if (strcmp(var->name,n) == 0) { + res = (*var->set_attr)(p); + break; + } + var = var->next; + } + if (res == 1 && !PyErr_Occurred()) { + PyErr_Format(PyExc_AttributeError, "Unknown C global variable '%s'", n); + } + return res; + } + + SWIGINTERN PyTypeObject* + swig_varlink_type(void) { + static char varlink__doc__[] = "Swig var link object"; + static PyTypeObject varlink_type; + static int type_init = 0; + if (!type_init) { + const PyTypeObject tmp = { +#if PY_VERSION_HEX >= 0x03000000 + PyVarObject_HEAD_INIT(NULL, 0) +#else + PyObject_HEAD_INIT(NULL) + 0, /* ob_size */ +#endif + "swigvarlink", /* tp_name */ + sizeof(swig_varlinkobject), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor) swig_varlink_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + (getattrfunc) swig_varlink_getattr, /* tp_getattr */ + (setattrfunc) swig_varlink_setattr, /* tp_setattr */ + 0, /* tp_compare */ + (reprfunc) swig_varlink_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + (reprfunc) swig_varlink_str, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + 0, /* tp_flags */ + varlink__doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* tp_iter -> tp_weaklist */ + 0, /* tp_del */ + 0, /* tp_version_tag */ +#if PY_VERSION_HEX >= 0x03040000 + 0, /* tp_finalize */ +#endif +#if PY_VERSION_HEX >= 0x03080000 + 0, /* tp_vectorcall */ +#endif +#if (PY_VERSION_HEX >= 0x03080000) && (PY_VERSION_HEX < 0x03090000) + 0, /* tp_print */ +#endif +#ifdef COUNT_ALLOCS + 0, /* tp_allocs */ + 0, /* tp_frees */ + 0, /* tp_maxalloc */ + 0, /* tp_prev */ + 0 /* tp_next */ +#endif + }; + varlink_type = tmp; + type_init = 1; + if (PyType_Ready(&varlink_type) < 0) + return NULL; + } + return &varlink_type; + } + + /* Create a variable linking object for use later */ + SWIGINTERN PyObject * + SWIG_Python_newvarlink(void) { + swig_varlinkobject *result = PyObject_NEW(swig_varlinkobject, swig_varlink_type()); + if (result) { + result->vars = 0; + } + return ((PyObject*) result); + } + + SWIGINTERN void + SWIG_Python_addvarlink(PyObject *p, const char *name, PyObject *(*get_attr)(void), int (*set_attr)(PyObject *p)) { + swig_varlinkobject *v = (swig_varlinkobject *) p; + swig_globalvar *gv = (swig_globalvar *) malloc(sizeof(swig_globalvar)); + if (gv) { + size_t size = strlen(name)+1; + gv->name = (char *)malloc(size); + if (gv->name) { + memcpy(gv->name, name, size); + gv->get_attr = get_attr; + gv->set_attr = set_attr; + gv->next = v->vars; + } + } + v->vars = gv; + } + + SWIGINTERN PyObject * + SWIG_globals(void) { + static PyObject *globals = 0; + if (!globals) { + globals = SWIG_newvarlink(); + } + return globals; + } + /* ----------------------------------------------------------------------------- * constants/methods manipulation * ----------------------------------------------------------------------------- */ @@ -15464,12 +15799,15 @@ extern "C" { } } - /* ----------------------------------------------------------------------------- - * Patch %callback methods' docstrings to hold the callback ptrs - * -----------------------------------------------------------------------------*/ + /* -----------------------------------------------------------------------------*/ + /* Fix SwigMethods to carry the callback ptrs when needed */ + /* -----------------------------------------------------------------------------*/ SWIGINTERN void - SWIG_Python_FixMethods(PyMethodDef *methods, const swig_const_info *const_table, swig_type_info **types, swig_type_info **types_initial) { + SWIG_Python_FixMethods(PyMethodDef *methods, + swig_const_info *const_table, + swig_type_info **types, + swig_type_info **types_initial) { size_t i; for (i = 0; methods[i].ml_name; ++i) { const char *c = methods[i].ml_doc; @@ -15477,7 +15815,7 @@ extern "C" { c = strstr(c, "swig_ptr: "); if (c) { int j; - const swig_const_info *ci = 0; + swig_const_info *ci = 0; const char *name = c + 10; for (j = 0; const_table[j].type; ++j) { if (strncmp(const_table[j].name, name, @@ -15509,13 +15847,68 @@ extern "C" { } } + /* ----------------------------------------------------------------------------- + * Method creation and docstring support functions + * ----------------------------------------------------------------------------- */ + + /* ----------------------------------------------------------------------------- + * Function to find the method definition with the correct docstring for the + * proxy module as opposed to the low-level API + * ----------------------------------------------------------------------------- */ + + SWIGINTERN PyMethodDef *SWIG_PythonGetProxyDoc(const char *name) { + /* Find the function in the modified method table */ + size_t offset = 0; + int found = 0; + while (SwigMethods_proxydocs[offset].ml_meth != NULL) { + if (strcmp(SwigMethods_proxydocs[offset].ml_name, name) == 0) { + found = 1; + break; + } + offset++; + } + /* Use the copy with the modified docstring if available */ + return found ? &SwigMethods_proxydocs[offset] : NULL; + } + + /* ----------------------------------------------------------------------------- + * Wrapper of PyInstanceMethod_New() used in Python 3 + * It is exported to the generated module, used for -fastproxy + * ----------------------------------------------------------------------------- */ + + SWIGINTERN PyObject *SWIG_PyInstanceMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) { + if (PyCFunction_Check(func)) { + PyCFunctionObject *funcobj = (PyCFunctionObject *)func; + PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name); + if (ml) + func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module); + } +#if PY_VERSION_HEX >= 0x03000000 + return PyInstanceMethod_New(func); +#else + return PyMethod_New(func, NULL, NULL); +#endif + } + + /* ----------------------------------------------------------------------------- + * Wrapper of PyStaticMethod_New() + * It is exported to the generated module, used for -fastproxy + * ----------------------------------------------------------------------------- */ + + SWIGINTERN PyObject *SWIG_PyStaticMethod_New(PyObject *SWIGUNUSEDPARM(self), PyObject *func) { + if (PyCFunction_Check(func)) { + PyCFunctionObject *funcobj = (PyCFunctionObject *)func; + PyMethodDef *ml = SWIG_PythonGetProxyDoc(funcobj->m_ml->ml_name); + if (ml) + func = PyCFunction_NewEx(ml, funcobj->m_self, funcobj->m_module); + } + return PyStaticMethod_New(func); + } + #ifdef __cplusplus } #endif - - - /* -----------------------------------------------------------------------------* * Partial Init method * -----------------------------------------------------------------------------*/ @@ -15652,6 +16045,9 @@ SWIG_init(void) { SWIG_InstallConstants(d,swig_const_table); + import_array(); + + // thread safe initialization swig::container_owner_attribute(); diff --git a/setup.py b/setup.py index d4a70d4..4b8f592 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,6 @@ import platform from setuptools import setup, Extension +import numpy if platform.system() == "Windows": openmp_args = ["/openmp"] @@ -28,7 +29,7 @@ "src/XYZReader.cpp", ] -include_dirs = ["src/"] +include_dirs = ["src/", numpy.get_include()] csf_module = Extension( name="_CSF", @@ -41,7 +42,7 @@ setup( name="cloth_simulation_filter", - version="1.1.4", + version="1.1.5", author="Jianbo Qi", url="http://ramm.bnu.edu.cn/projects/CSF/", long_description=readme_content, diff --git a/src/CSF.cpp b/src/CSF.cpp index 974baa2..838708f 100644 --- a/src/CSF.cpp +++ b/src/CSF.cpp @@ -65,15 +65,11 @@ void CSF::setPointCloud(std::vector points) { } } -void CSF::setPointCloud(double *points, int rows) { - #define A(i, j) points[i + j * rows] - +void CSF::setPointCloud(double *points, int rows, int cols) { + point_cloud.resize(rows); + #define A(i, j) points[i * cols + j] for (int i = 0; i < rows; i++) { - csf::Point p; - p.x = A(i, 0); - p.y = -A(i, 2); - p.z = A(i, 1); - point_cloud.push_back(p); + point_cloud[i] = {A(i, 0), -A(i, 2) , A(i, 1)}; } } @@ -92,20 +88,6 @@ void CSF::setPointCloud(csf::PointCloud& pc) { } } -void CSF::setPointCloud(std::vector > points) { - point_cloud.resize(points.size()); - int pointCount = static_cast(points.size()); - #ifdef CSF_USE_OPENMP - #pragma omp parallel for - #endif - for (int i = 0; i < pointCount; i++) { - csf::Point las; - las.x = points[i][0]; - las.y = -points[i][2]; - las.z = points[i][1]; - point_cloud[i] = las; - } -} void CSF::readPointsFromFile(std::string filename) { this->point_cloud.resize(0); @@ -118,10 +100,12 @@ Cloth CSF::do_cloth() { std::cout << "[" << this->index << "] Configuring terrain..." << std::endl; csf::Point bbMin, bbMax; point_cloud.computeBoundingBox(bbMin, bbMax); + std::cout << "[" << this->index << "] - bbMin: " << bbMin.x << " " << bbMin.y << " " << bbMin.z << std::endl; + std::cout << "[" << this->index << "] - bbMax: " << bbMax.x << " " << bbMax.y << " " << bbMax.z << std::endl; double cloth_y_height = 0.05; - int clothbuffer_d = 2; + int clothbuffer_d = 2; Vec3 origin_pos( bbMin.x - clothbuffer_d *params.cloth_resolution, bbMax.y + cloth_y_height, diff --git a/src/CSF.h b/src/CSF.h index f4fc333..f0d1f8a 100644 --- a/src/CSF.h +++ b/src/CSF.h @@ -74,10 +74,8 @@ class CSF // set pointcloud from vector void setPointCloud(std::vector points); // set point cloud from a one-dimentional array. it defines a N*3 point cloud by the given rows. - void setPointCloud(double *points, int rows); + void setPointCloud(double *points, int rows, int cols); - // set point cloud for python - void setPointCloud(std::vector > points); // read pointcloud from txt file: (X Y Z) for each line void readPointsFromFile(std::string filename); diff --git a/src/point_cloud.h b/src/point_cloud.h index fc31758..cd85c85 100644 --- a/src/point_cloud.h +++ b/src/point_cloud.h @@ -49,6 +49,7 @@ struct Point { }; Point() : x(0), y(0), z(0) {} + Point(double x, double y, double z) : x(x), y(y), z(z) {} }; class PointCloud : public std::vector{ From ef587d807bbfa259c9bd0d76215c8628976b0026 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Sun, 4 Feb 2024 22:00:25 +0100 Subject: [PATCH 2/6] Force c++11 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 4b8f592..d27cbf2 100644 --- a/setup.py +++ b/setup.py @@ -7,11 +7,11 @@ openmp_linking_args = [] openmp_macro = [("CSF_USE_OPENMP", None)] elif platform.system() == "Linux": - openmp_args = ["-fopenmp"] + openmp_args = ["-fopenmp", "-std=c++11"] openmp_linking_args = ["-fopenmp"] openmp_macro = [("CSF_USE_OPENMP", None)] else: # macOS, macOS clang won't come with openmp - openmp_args = [] + openmp_args = ["-std=c++11"] openmp_linking_args = [] openmp_macro = [] From 68bf852503bbb7d4f2ddd19ee4a1d408dde8ffc0 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Sun, 4 Feb 2024 22:09:22 +0100 Subject: [PATCH 3/6] Update CI --- .github/workflows/wheels.yml | 10 +++++----- pyproject.toml | 5 ++++- setup.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 16b0e5e..81ed6b2 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -14,16 +14,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macOS-11] + os: [ubuntu-22.04, windows-2022, macOS-12] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 # Used to host cibuildwheel - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.12.2 + run: python -m pip install cibuildwheel==2.16.5 - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse @@ -40,11 +40,11 @@ jobs: #Only publish to PyPI when a commit is tagged if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v3 - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: name: wheels path: wheelhouse diff --git a/pyproject.toml b/pyproject.toml index 6afce03..2f85e01 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,6 @@ [build-system] requires = ["wheel","setuptools", "oldest-supported-numpy"] -build-backend = "setuptools.build_meta" \ No newline at end of file +build-backend = "setuptools.build_meta" + +[tool.cibuildwheel] +build = "cp3{8,9,10,11,12}-*" \ No newline at end of file diff --git a/setup.py b/setup.py index d27cbf2..cbccb61 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import numpy if platform.system() == "Windows": - openmp_args = ["/openmp"] + openmp_args = ["/openmp", "/std:c++11"] openmp_linking_args = [] openmp_macro = [("CSF_USE_OPENMP", None)] elif platform.system() == "Linux": From 7b69e06157d8d6e04c63529f376ca1c3c04364de Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Mon, 5 Feb 2024 08:38:45 +0100 Subject: [PATCH 4/6] Restore a function that was actually used by the matlab binding --- src/CSF.cpp | 10 ++++++++++ src/CSF.h | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/CSF.cpp b/src/CSF.cpp index 838708f..5fb04c3 100644 --- a/src/CSF.cpp +++ b/src/CSF.cpp @@ -73,6 +73,16 @@ void CSF::setPointCloud(double *points, int rows, int cols) { } } + + +void CSF::setPointCloud(double *points, int rows) { + #define Mat(i, j) points[i + j * rows] + point_cloud.resize(rows); + for (int i = 0; i < rows; i++) { + point_cloud[i] = {Mat(i, 0), -Mat(i, 2) , Mat(i, 1)}; + } +} + void CSF::setPointCloud(csf::PointCloud& pc) { point_cloud.resize(pc.size()); int pointCount = static_cast(pc.size()); diff --git a/src/CSF.h b/src/CSF.h index f0d1f8a..5ef8d9b 100644 --- a/src/CSF.h +++ b/src/CSF.h @@ -73,9 +73,14 @@ class CSF // set pointcloud from vector void setPointCloud(std::vector points); - // set point cloud from a one-dimentional array. it defines a N*3 point cloud by the given rows. + + // set point cloud from a two-dimentional array. it defines a N*3 point cloud by the given rows. + // it is the method used to set point cloud from python (numpy array) void setPointCloud(double *points, int rows, int cols); + // set point cloud from a one-dimentional array. it defines a N*3 point cloud by the given rows. + // it is the method used to set point cloud from matlab + void setPointCloud(double *points, int rows); // read pointcloud from txt file: (X Y Z) for each line void readPointsFromFile(std::string filename); From 2c15f0c083bccb080b30e4eb86fe1fb24fb99d22 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Wed, 7 Feb 2024 14:50:06 +0100 Subject: [PATCH 5/6] Fix CI build (wheels upload) --- .github/workflows/wheels.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 81ed6b2..34820f0 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 # Used to host cibuildwheel - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 - name: Install cibuildwheel run: python -m pip install cibuildwheel==2.16.5 @@ -28,9 +28,9 @@ jobs: - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: wheels + name: wheels-${{ matrix.os }} path: ./wheelhouse/*.whl publish: @@ -42,11 +42,11 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v3 + - uses: actions/setup-python@v5 - uses: actions/download-artifact@v4 with: - name: wheels + name: wheels-download path: wheelhouse - name: Publish to PyPI From cada0073ac59e7dab8a643c9218820fed1c39312 Mon Sep 17 00:00:00 2001 From: Romain Janvier Date: Wed, 7 Feb 2024 18:35:19 +0100 Subject: [PATCH 6/6] Update wheels.yml --- .github/workflows/wheels.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 34820f0..795ea8d 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -28,9 +28,9 @@ jobs: - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: - name: wheels-${{ matrix.os }} + name: wheels path: ./wheelhouse/*.whl publish: @@ -44,9 +44,9 @@ jobs: - uses: actions/setup-python@v5 - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: - name: wheels-download + name: wheels path: wheelhouse - name: Publish to PyPI @@ -55,7 +55,8 @@ jobs: TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} # construct the source package and upload src and wheels to PiPy run: | - python -m pip install twine - python setup.py sdist + python -m pip install --upgrade pip + python -m pip install twine build + python -m build --sdist twine upload dist/* twine upload wheelhouse/*.whl