diff options
| author | John Glover <j@johnglover.net> | 2012-08-12 17:34:48 +0100 |
|---|---|---|
| committer | John Glover <j@johnglover.net> | 2012-08-12 17:34:48 +0100 |
| commit | d9e5c35b9bbec5649d217ffc929cae7e4ee79f5a (patch) | |
| tree | c5d46e7a8f6c4f2878a08eac05ff73a7114e4b19 | |
| parent | 5d003fd462ad8de027730bc406d8a81ff33e2531 (diff) | |
| download | simpl-d9e5c35b9bbec5649d217ffc929cae7e4ee79f5a.tar.gz simpl-d9e5c35b9bbec5649d217ffc929cae7e4ee79f5a.tar.bz2 simpl-d9e5c35b9bbec5649d217ffc929cae7e4ee79f5a.zip | |
Remove old SWIG modules.
| -rw-r--r-- | setup.py | 19 | ||||
| -rw-r--r-- | simpl/numpy.i | 1581 | ||||
| -rw-r--r-- | simpl/pysms.py | 601 | ||||
| -rw-r--r-- | simpl/pysndobj.py | 197 | ||||
| -rw-r--r-- | simpl/sndobj.i | 58 |
5 files changed, 1 insertions, 2455 deletions
@@ -33,7 +33,6 @@ except ImportError: macros = [] link_args = [] -swig_opts = ['-c++'] include_dirs = ['simpl', 'src/simpl', 'src/sms', 'src/sndobj', 'src/sndobj/rfftw', numpy_include, '/usr/local/include'] libs = ['m', 'fftw3', 'gsl', 'gslcblas'] @@ -76,21 +75,6 @@ sndobj_sources = map(lambda x: 'src/sndobj/' + x, sndobj_sources) sndobj_sources.extend(map(lambda x: 'src/sndobj/rfftw/' + x, fftw_sources)) sources.extend(sndobj_sources) -sndobj_sources.append("simpl/sndobj.i") - -sndobj_macros = [('PYTHON_WRAP', None)] -sndobj_macros.extend(macros) -sndobj_swig_opts = ['-c++', '-DNUMPY'] -sndobj_swig_opts.extend(swig_opts) -sndobj_include_dirs = ['src/sndobj/rfftw', 'src/sndobj'] -sndobj_include_dirs.extend(include_dirs) - -sndobj = Extension("simpl/_simplsndobj", - sources=sndobj_sources, - include_dirs=sndobj_include_dirs, - define_macros=sndobj_macros, - swig_opts=sndobj_swig_opts) - # ----------------------------------------------------------------------------- # SMS # ----------------------------------------------------------------------------- @@ -182,8 +166,7 @@ setup( author_email='j@johnglover.net', platforms=["Linux", "Mac OS-X", "Unix", "Windows"], version='0.3', - ext_modules=[base, peak_detection, partial_tracking, - synthesis, residual, sndobj], + ext_modules=[base, peak_detection, partial_tracking, synthesis, residual], cmdclass={'build_ext': build_ext}, packages=['simpl', 'simpl.plot'] ) diff --git a/simpl/numpy.i b/simpl/numpy.i deleted file mode 100644 index e405d9c..0000000 --- a/simpl/numpy.i +++ /dev/null @@ -1,1581 +0,0 @@ -/* -*- C -*- (not really, but good for syntax highlighting) */ -#ifdef SWIGPYTHON - -%{ -#ifndef SWIG_FILE_WITH_INIT -# define NO_IMPORT_ARRAY -#endif -#include "stdio.h" -#include <numpy/arrayobject.h> -%} - -/**********************************************************************/ - -%fragment("NumPy_Backward_Compatibility", "header") -{ -/* Support older NumPy data type names -*/ -%#if NDARRAY_VERSION < 0x01000000 -%#define NPY_BOOL PyArray_BOOL -%#define NPY_BYTE PyArray_BYTE -%#define NPY_UBYTE PyArray_UBYTE -%#define NPY_SHORT PyArray_SHORT -%#define NPY_USHORT PyArray_USHORT -%#define NPY_INT PyArray_INT -%#define NPY_UINT PyArray_UINT -%#define NPY_LONG PyArray_LONG -%#define NPY_ULONG PyArray_ULONG -%#define NPY_LONGLONG PyArray_LONGLONG -%#define NPY_ULONGLONG PyArray_ULONGLONG -%#define NPY_FLOAT PyArray_FLOAT -%#define NPY_DOUBLE PyArray_DOUBLE -%#define NPY_LONGDOUBLE PyArray_LONGDOUBLE -%#define NPY_CFLOAT PyArray_CFLOAT -%#define NPY_CDOUBLE PyArray_CDOUBLE -%#define NPY_CLONGDOUBLE PyArray_CLONGDOUBLE -%#define NPY_OBJECT PyArray_OBJECT -%#define NPY_STRING PyArray_STRING -%#define NPY_UNICODE PyArray_UNICODE -%#define NPY_VOID PyArray_VOID -%#define NPY_NTYPES PyArray_NTYPES -%#define NPY_NOTYPE PyArray_NOTYPE -%#define NPY_CHAR PyArray_CHAR -%#define NPY_USERDEF PyArray_USERDEF -%#define npy_intp intp - -%#define NPY_MAX_BYTE MAX_BYTE -%#define NPY_MIN_BYTE MIN_BYTE -%#define NPY_MAX_UBYTE MAX_UBYTE -%#define NPY_MAX_SHORT MAX_SHORT -%#define NPY_MIN_SHORT MIN_SHORT -%#define NPY_MAX_USHORT MAX_USHORT -%#define NPY_MAX_INT MAX_INT -%#define NPY_MIN_INT MIN_INT -%#define NPY_MAX_UINT MAX_UINT -%#define NPY_MAX_LONG MAX_LONG -%#define NPY_MIN_LONG MIN_LONG -%#define NPY_MAX_ULONG MAX_ULONG -%#define NPY_MAX_LONGLONG MAX_LONGLONG -%#define NPY_MIN_LONGLONG MIN_LONGLONG -%#define NPY_MAX_ULONGLONG MAX_ULONGLONG -%#define NPY_MAX_INTP MAX_INTP -%#define NPY_MIN_INTP MIN_INTP - -%#define NPY_FARRAY FARRAY -%#define NPY_F_CONTIGUOUS F_CONTIGUOUS -%#endif -} - -/**********************************************************************/ - -/* The following code originally appeared in - * enthought/kiva/agg/src/numeric.i written by Eric Jones. It was - * translated from C++ to C by John Hunter. Bill Spotz has modified - * it to fix some minor bugs, upgrade from Numeric to numpy (all - * versions), add some comments and functionality, and convert from - * direct code insertion to SWIG fragments. - */ - -%fragment("NumPy_Macros", "header") -{ -/* Macros to extract array attributes. - */ -%#define is_array(a) ((a) && PyArray_Check((PyArrayObject *)a)) -%#define array_type(a) (int)(PyArray_TYPE(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_data(a) (((PyArrayObject *)a)->data) -%#define array_is_contiguous(a) (PyArray_ISCONTIGUOUS(a)) -%#define array_is_native(a) (PyArray_ISNOTSWAPPED(a)) -%#define array_is_fortran(a) (PyArray_ISFORTRAN(a)) -} - -/**********************************************************************/ - -%fragment("NumPy_Utilities", "header") -{ - /* Given a PyObject, return a string describing its type. - */ - 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 (PyString_Check( py_obj)) return "string" ; - if (PyInt_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" ; - if (PyFile_Check( py_obj)) return "file" ; - if (PyModule_Check( py_obj)) return "module" ; - if (PyInstance_Check(py_obj)) return "instance" ; - - return "unkown type"; - } - - /* Given a NumPy typecode, return a string describing the type. - */ - char* typecode_string(int typecode) { - static 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. Allow character and byte - * to match. Also allow int and long to match. This is deprecated. - * You should use PyArray_EquivTypenums() instead. - */ - int type_match(int actual_type, int desired_type) { - return PyArray_EquivTypenums(actual_type, desired_type); - } -} - -/**********************************************************************/ - -%fragment("NumPy_Object_to_Array", "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros", - fragment="NumPy_Utilities") -{ - /* 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) - { - char* desired_type = typecode_string(typecode); - 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 - { - char * desired_type = typecode_string(typecode); - 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_FromObject(input, typecode, 0, 0); - /* 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; - } - - /* 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; - } - *is_new_object = is_new1 || is_new2; - return ary1; - } -} - -/**********************************************************************/ - -%fragment("NumPy_Array_Requirements", "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros") -{ - /* 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; - } - 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; - } - 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; - } - } - 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; - int 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; - if (array_is_fortran(ary)) return success; - /* Set the FORTRAN ordered flag */ - ary->flags = NPY_FARRAY; - /* Recompute the strides */ - ary->strides[0] = ary->strides[nd-1]; - for (i=1; i < nd; ++i) - ary->strides[i] = ary->strides[i-1] * array_size(ary,i-1); - return success; - } -} - -/* Combine all NumPy fragments into one for convenience */ -%fragment("NumPy_Fragments", "header", - fragment="NumPy_Backward_Compatibility", - fragment="NumPy_Macros", - fragment="NumPy_Utilities", - fragment="NumPy_Object_to_Array", - fragment="NumPy_Array_Requirements") { } - -/* End John Hunter translation (with modifications by Bill Spotz) - */ - -/* %numpy_typemaps() macro - * - * This macro defines a family of 41 typemaps that allow C arguments - * of the form - * - * (DATA_TYPE IN_ARRAY1[ANY]) - * (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - * (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - * - * (DATA_TYPE IN_ARRAY2[ANY][ANY]) - * (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - * (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - * - * (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - * (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) - * (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) - * - * (DATA_TYPE INPLACE_ARRAY1[ANY]) - * (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - * (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - * - * (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - * (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - * (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - * - * (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - * (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) - * (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - * (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) - * - * (DATA_TYPE ARGOUT_ARRAY1[ANY]) - * (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - * (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - * - * (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - * - * (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - * - * (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) - * (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) - * - * (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) - * (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - * (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) - * - * (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) - * (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - * (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_FARRAY3) - * - * where "DATA_TYPE" is any type supported by the NumPy module, and - * "DIM_TYPE" is any int-like type suitable for specifying dimensions. - * The difference between "ARRAY" typemaps and "FARRAY" typemaps is - * that the "FARRAY" typemaps expect FORTRAN ordering of - * multidimensional arrays. In python, the dimensions will not need - * to be specified (except for the "DATA_TYPE* ARGOUT_ARRAY1" - * typemaps). The IN_ARRAYs can be a numpy array or any sequence that - * can be converted to a numpy array of the specified type. The - * INPLACE_ARRAYs must be numpy arrays of the appropriate type. The - * ARGOUT_ARRAYs will be returned as new numpy arrays of the - * appropriate type. - * - * These typemaps can be applied to existing functions using the - * %apply directive. For example: - * - * %apply (double* IN_ARRAY1, int DIM1) {(double* series, int length)}; - * double prod(double* series, int length); - * - * %apply (int DIM1, int DIM2, double* INPLACE_ARRAY2) - * {(int rows, int cols, double* matrix )}; - * void floor(int rows, int cols, double* matrix, double f); - * - * %apply (double IN_ARRAY3[ANY][ANY][ANY]) - * {(double tensor[2][2][2] )}; - * %apply (double ARGOUT_ARRAY3[ANY][ANY][ANY]) - * {(double low[2][2][2] )}; - * %apply (double ARGOUT_ARRAY3[ANY][ANY][ANY]) - * {(double upp[2][2][2] )}; - * void luSplit(double tensor[2][2][2], - * double low[2][2][2], - * double upp[2][2][2] ); - * - * or directly with - * - * double prod(double* IN_ARRAY1, int DIM1); - * - * void floor(int DIM1, int DIM2, double* INPLACE_ARRAY2, double f); - * - * void luSplit(double IN_ARRAY3[ANY][ANY][ANY], - * double ARGOUT_ARRAY3[ANY][ANY][ANY], - * double ARGOUT_ARRAY3[ANY][ANY][ANY]); - */ - -%define %numpy_typemaps(DATA_TYPE, DATA_TYPECODE, DIM_TYPE) - -/************************/ -/* Input Array Typemaps */ -/************************/ - -/* Typemap suite for (DATA_TYPE IN_ARRAY1[ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY1[ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY1[ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = { $1_dim0 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY1[ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = { -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY1, DIM_TYPE DIM1) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[1] = {-1}; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 1) || - !require_size(array, size, 1)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DATA_TYPE* IN_ARRAY1) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE IN_ARRAY2[ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY2[ANY][ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY2[ANY][ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { $1_dim0, $1_dim1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY2[ANY][ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_ARRAY2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} -%typemap(freearg) - (DATA_TYPE* IN_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[2] = { -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 2) || - !require_size(array, size, 2) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* IN_FARRAY2) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(freearg) - (DATA_TYPE IN_ARRAY3[ANY][ANY][ANY]) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} -%typemap(freearg) - (DATA_TYPE* IN_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* IN_ARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_ARRAY3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3) | !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} -%typemap(freearg) - (DATA_TYPE* IN_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* IN_FARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) -{ - $1 = is_array($input) || PySequence_Check($input); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) - (PyArrayObject* array=NULL, int is_new_object=0) -{ - npy_intp size[3] = { -1, -1, -1 }; - array = obj_to_array_contiguous_allow_conversion($input, DATA_TYPECODE, - &is_new_object); - if (!array || !require_dimensions(array, 3) || - !require_size(array, size, 3) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} -%typemap(freearg) - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* IN_FARRAY3) -{ - if (is_new_object$argnum && array$argnum) - { Py_DECREF(array$argnum); } -} - -/***************************/ -/* In-Place Array Typemaps */ -/***************************/ - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY1[ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY1[ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY1[ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[1] = { $1_dim0 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_size(array, size, 1) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY1, DIM_TYPE DIM1) - (PyArrayObject* array=NULL, int i=1) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = 1; - for (i=0; i < array_numdims(array); ++i) $2 *= array_size(array,i); -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* INPLACE_ARRAY1) - (PyArrayObject* array=NULL, int i=0) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,1) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = 1; - for (i=0; i < array_numdims(array); ++i) $1 *= array_size(array,i); - $2 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY2[ANY][ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[2] = { $1_dim0, $1_dim1 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_size(array, size, 2) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_ARRAY2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) || - !require_native(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_FARRAY2, DIM_TYPE DIM1, DIM_TYPE DIM2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) - || !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DATA_TYPE* INPLACE_FARRAY2) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,2) || !require_contiguous(array) || - !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE INPLACE_ARRAY3[ANY][ANY][ANY]) - (PyArrayObject* array=NULL) -{ - npy_intp size[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_size(array, size, 3) || - !require_contiguous(array) || !require_native(array)) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_ARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) || - !require_native(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* INPLACE_ARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_ARRAY3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) - || !require_native(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} - -/* Typemap suite for (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, - * DIM_TYPE DIM3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DATA_TYPE* INPLACE_FARRAY3, DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) || - !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); - $2 = (DIM_TYPE) array_size(array,0); - $3 = (DIM_TYPE) array_size(array,1); - $4 = (DIM_TYPE) array_size(array,2); -} - -/* Typemap suite for (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, - * DATA_TYPE* INPLACE_FARRAY3) - */ -%typecheck(SWIG_TYPECHECK_DOUBLE_ARRAY, - fragment="NumPy_Macros") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) -{ - $1 = is_array($input) && PyArray_EquivTypenums(array_type($input), - DATA_TYPECODE); -} -%typemap(in, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DIM_TYPE DIM2, DIM_TYPE DIM3, DATA_TYPE* INPLACE_FARRAY3) - (PyArrayObject* array=NULL) -{ - array = obj_to_array_no_conversion($input, DATA_TYPECODE); - if (!array || !require_dimensions(array,3) || !require_contiguous(array) - || !require_native(array) || !require_fortran(array)) SWIG_fail; - $1 = (DIM_TYPE) array_size(array,0); - $2 = (DIM_TYPE) array_size(array,1); - $3 = (DIM_TYPE) array_size(array,2); - $4 = (DATA_TYPE*) array_data(array); -} - -/*************************/ -/* Argout Array Typemaps */ -/*************************/ - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY1[ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY1[ANY]) - (PyObject * array = NULL) -{ - npy_intp dims[1] = { $1_dim0 }; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY1[ANY]) -{ - $result = SWIG_Python_AppendOutput($result,array$argnum); -} - -/* Typemap suite for (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - */ -%typemap(in,numinputs=1, - fragment="NumPy_Fragments") - (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) - (PyObject * array = NULL) -{ - npy_intp dims[1]; - if (!PyInt_Check($input)) - { - char* typestring = pytype_string($input); - PyErr_Format(PyExc_TypeError, - "Int dimension expected. '%s' given.", - typestring); - SWIG_fail; - } - $2 = (DIM_TYPE) PyInt_AsLong($input); - dims[0] = (npy_intp) $2; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = (DATA_TYPE*) array_data(array); -} -%typemap(argout) - (DATA_TYPE* ARGOUT_ARRAY1, DIM_TYPE DIM1) -{ - $result = SWIG_Python_AppendOutput($result,array$argnum); -} - -/* Typemap suite for (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - */ -%typemap(in,numinputs=1, - fragment="NumPy_Fragments") - (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) - (PyObject * array = NULL) -{ - npy_intp dims[1]; - if (!PyInt_Check($input)) - { - char* typestring = pytype_string($input); - PyErr_Format(PyExc_TypeError, - "Int dimension expected. '%s' given.", - typestring); - SWIG_fail; - } - $1 = (DIM_TYPE) PyInt_AsLong($input); - dims[0] = (npy_intp) $1; - array = PyArray_SimpleNew(1, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $2 = (DATA_TYPE*) array_data(array); -} -%typemap(argout) - (DIM_TYPE DIM1, DATA_TYPE* ARGOUT_ARRAY1) -{ - $result = SWIG_Python_AppendOutput($result,array$argnum); -} - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) - (PyObject * array = NULL) -{ - npy_intp dims[2] = { $1_dim0, $1_dim1 }; - array = PyArray_SimpleNew(2, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY2[ANY][ANY]) -{ - $result = SWIG_Python_AppendOutput($result,array$argnum); -} - -/* Typemap suite for (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - */ -%typemap(in,numinputs=0, - fragment="NumPy_Backward_Compatibility,NumPy_Macros") - (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) - (PyObject * array = NULL) -{ - npy_intp dims[3] = { $1_dim0, $1_dim1, $1_dim2 }; - array = PyArray_SimpleNew(3, dims, DATA_TYPECODE); - if (!array) SWIG_fail; - $1 = ($1_ltype) array_data(array); -} -%typemap(argout) - (DATA_TYPE ARGOUT_ARRAY3[ANY][ANY][ANY]) -{ - $result = SWIG_Python_AppendOutput($result,array$argnum); -} - -/*****************************/ -/* Argoutview Array Typemaps */ -/*****************************/ - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1 ) - (DATA_TYPE* data_temp , DIM_TYPE dim_temp) -{ - $1 = &data_temp; - $2 = &dim_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY1, DIM_TYPE* DIM1) -{ - npy_intp dims[1] = { *$2 }; - PyObject * array = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$1)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DATA_TYPE** ARGOUTVIEW_ARRAY1) - (DIM_TYPE dim_temp, DATA_TYPE* data_temp ) -{ - $1 = &dim_temp; - $2 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DATA_TYPE** ARGOUTVIEW_ARRAY1) -{ - npy_intp dims[1] = { *$1 }; - PyObject * array = PyArray_SimpleNewFromData(1, dims, DATA_TYPECODE, (void*)(*$2)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject * array = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEW_ARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_ARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject * array = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1 , DIM_TYPE* DIM2 ) - (DATA_TYPE* data_temp , DIM_TYPE dim1_temp, DIM_TYPE dim2_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DATA_TYPE** ARGOUTVIEW_FARRAY2, DIM_TYPE* DIM1, DIM_TYPE* DIM2) -{ - npy_intp dims[2] = { *$2, *$3 }; - PyObject * obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject * array = (PyArrayObject*) obj; - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1 , DIM_TYPE* DIM2 , DATA_TYPE** ARGOUTVIEW_FARRAY2) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DATA_TYPE* data_temp ) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DATA_TYPE** ARGOUTVIEW_FARRAY2) -{ - npy_intp dims[2] = { *$1, *$2 }; - PyObject * obj = PyArray_SimpleNewFromData(2, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject * array = (PyArrayObject*) obj; - if (!array || !require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - (DATA_TYPE* data_temp, DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DATA_TYPE** ARGOUTVIEW_ARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject * array = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEW_ARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_ARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject * array = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$3)); - if (!array) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,array); -} - -/* Typemap suite for (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, - DIM_TYPE* DIM3) - */ -%typemap(in,numinputs=0) - (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) - (DATA_TYPE* data_temp, DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp) -{ - $1 = &data_temp; - $2 = &dim1_temp; - $3 = &dim2_temp; - $4 = &dim3_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DATA_TYPE** ARGOUTVIEW_FARRAY3, DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3) -{ - npy_intp dims[3] = { *$2, *$3, *$4 }; - PyObject * obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$1)); - PyArrayObject * array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -/* Typemap suite for (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, - DATA_TYPE** ARGOUTVIEW_FARRAY3) - */ -%typemap(in,numinputs=0) - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_FARRAY3) - (DIM_TYPE dim1_temp, DIM_TYPE dim2_temp, DIM_TYPE dim3_temp, DATA_TYPE* data_temp) -{ - $1 = &dim1_temp; - $2 = &dim2_temp; - $3 = &dim3_temp; - $4 = &data_temp; -} -%typemap(argout, - fragment="NumPy_Backward_Compatibility,NumPy_Array_Requirements") - (DIM_TYPE* DIM1, DIM_TYPE* DIM2, DIM_TYPE* DIM3, DATA_TYPE** ARGOUTVIEW_FARRAY3) -{ - npy_intp dims[3] = { *$1, *$2, *$3 }; - PyObject * obj = PyArray_SimpleNewFromData(3, dims, DATA_TYPECODE, (void*)(*$3)); - PyArrayObject * array = (PyArrayObject*) obj; - if (!array || require_fortran(array)) SWIG_fail; - $result = SWIG_Python_AppendOutput($result,obj); -} - -%enddef /* %numpy_typemaps() macro */ -/* *************************************************************** */ - -/* Concrete instances of the %numpy_typemaps() macro: Each invocation - * below applies all of the typemaps above to the specified data type. - */ -%numpy_typemaps(signed char , NPY_BYTE , int) -%numpy_typemaps(unsigned char , NPY_UBYTE , int) -%numpy_typemaps(short , NPY_SHORT , int) -%numpy_typemaps(unsigned short , NPY_USHORT , int) -%numpy_typemaps(int , NPY_INT , int) -%numpy_typemaps(unsigned int , NPY_UINT , int) -%numpy_typemaps(long , NPY_LONG , int) -%numpy_typemaps(unsigned long , NPY_ULONG , int) -%numpy_typemaps(long long , NPY_LONGLONG , int) -%numpy_typemaps(unsigned long long, NPY_ULONGLONG, int) -%numpy_typemaps(float , NPY_FLOAT , int) -%numpy_typemaps(double , NPY_DOUBLE , int) - -/* *************************************************************** - * The follow macro expansion does not work, because C++ bool is 4 - * bytes and NPY_BOOL is 1 byte - * - * %numpy_typemaps(bool, NPY_BOOL, int) - */ - -/* *************************************************************** - * On my Mac, I get the following warning for this macro expansion: - * 'swig/python detected a memory leak of type 'long double *', no destructor found.' - * - * %numpy_typemaps(long double, NPY_LONGDOUBLE, int) - */ - -/* *************************************************************** - * Swig complains about a syntax error for the following macro - * expansions: - * - * %numpy_typemaps(complex float, NPY_CFLOAT , int) - * - * %numpy_typemaps(complex double, NPY_CDOUBLE, int) - * - * %numpy_typemaps(complex long double, NPY_CLONGDOUBLE, int) - */ - -#endif /* SWIGPYTHON */ diff --git a/simpl/pysms.py b/simpl/pysms.py deleted file mode 100644 index 79f9a69..0000000 --- a/simpl/pysms.py +++ /dev/null @@ -1,601 +0,0 @@ -import numpy as np -import simpl -import simpl.simplsms as simplsms - - -class SMSPeakDetection(simpl.PeakDetection): - "Sinusoidal peak detection using SMS" - - def __init__(self): - super(SMSPeakDetection, self).__init__() - simplsms.sms_init() - # analysis parameters - self._analysis_params = simplsms.SMS_AnalParams() - simplsms.sms_initAnalParams(self._analysis_params) - self._analysis_params.iSamplingRate = self.sampling_rate - # set default hop and frame sizes to match those in the parent class - self._analysis_params.iFrameRate = self.sampling_rate / self.hop_size - self._analysis_params.iWindowType = simplsms.SMS_WIN_HAMMING - self._analysis_params.fHighestFreq = 20000 - self._analysis_params.iMaxDelayFrames = 4 - self._analysis_params.analDelay = 0 - self._analysis_params.minGoodFrames = 1 - self._analysis_params.iCleanTracks = 0 - self._analysis_params.iFormat = simplsms.SMS_FORMAT_HP - self._analysis_params.nTracks = self.max_peaks - self._analysis_params.maxPeaks = self.max_peaks - self._analysis_params.nGuides = self.max_peaks - self._analysis_params.preEmphasis = 0 - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - self._peaks = simplsms.SMS_SpectralPeaks(self.max_peaks) - # By default, SMS will change the size of the frames being read - # depending on the detected fundamental frequency (if any) of the - # input sound. To prevent this behaviour (useful when comparing - # different analysis algorithms), set the - # _static_frame_size variable to True - self._static_frame_size = False - - def __del__(self): - simplsms.sms_freeAnalysis(self._analysis_params) - simplsms.sms_freeSpectralPeaks(self._peaks) - simplsms.sms_free() - - # properties - max_frequency = property(lambda self: self.get_max_frequency(), - lambda self, x: self.set_max_frequency(x)) - default_fundamental = property(lambda self: self.get_default_fundamental(), - lambda self, x: self.set_default_fundamental(x)) - max_frame_delay = property(lambda self: self.get_max_frame_delay(), - lambda self, x: self.set_max_frame_delay(x)) - analysis_delay = property(lambda self: self.get_analysis_delay(), - lambda self, x: self.set_analysis_delay(x)) - min_good_frames = property(lambda self: self.get_min_good_frames(), - lambda self, x: self.set_min_good_frames(x)) - min_frequency = property(lambda self: self.get_min_frequency(), - lambda self, x: self.set_min_frequency(x)) - min_peak_amp = property(lambda self: self.get_min_peak_amp(), - lambda self, x: self.set_min_peak_amp(x)) - clean_tracks = property(lambda self: self.get_clean_tracks(), - lambda self, x: self.set_clean_tracks(x)) - format = property(lambda self: self.get_format(), - lambda self, x: self.set_format(x)) - pre_emphasis = property(lambda self: self.get_pre_emphasis(), - lambda self, x: self.set_pre_emphasis(x)) - - def get_max_frequency(self): - return self._analysis_params.fHighestFreq - - def set_max_frequency(self, max_frequency): - self._analysis_params.fHighestFreq = max_frequency - - def get_default_fundamental(self): - return self._analysis_params.fDefaultFundamental - - def set_default_fundamental(self, default_fundamental): - self._analysis_params.fDefaultFundamental = default_fundamental - - def get_max_frame_delay(self): - return self._analysis_params.iMaxDelayFrames - - def set_max_frame_delay(self, max_frame_delay): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iMaxDelayFrames = max_frame_delay - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_analysis_delay(self): - return self._analysis_params.analDelay - - def set_analysis_delay(self, analysis_delay): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.analDelay = analysis_delay - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_min_good_frames(self): - return self._analysis_params.minGoodFrames - - def set_min_good_frames(self, min_good_frames): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.minGoodFrames = min_good_frames - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_min_frequency(self): - return self._analysis_params.fLowestFundamental - - def set_min_frequency(self, min_frequency): - self._analysis_params.fLowestFundamental = min_frequency - self._analysis_params.fLowestFreq = min_frequency - - def get_min_peak_amp(self): - return self._analysis_params.fMinPeakMag - - def set_min_peak_amp(self, min_peak_amp): - self._analysis_params.fMinPeakMag = min_peak_amp - - def get_clean_tracks(self): - return self._analysis_params.iCleanTracks - - def set_clean_tracks(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iCleanTracks = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_format(self): - return self._analysis_params.iFormat - - def set_format(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iFormat = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_pre_emphasis(self): - return self._analysis_params.preEmphasis - - def set_pre_emphasis(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.preEmphasis = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - @property - def hop_size(self): - return super(SMSPeakDetection, self).hop_size - - @hop_size.setter - def hop_size(self, hop_size): - simpl.PeakDetection.hop_size(self, hop_size) - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iFrameRate = self.sampling_rate / hop_size - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_max_peaks(self): - return self._analysis_params.maxPeaks - - def set_max_peaks(self, max_peaks): - simplsms.sms_freeAnalysis(self._analysis_params) - simplsms.sms_freeSpectralPeaks(self._peaks) - # make sure the new max is less than SMS_MAX_NPEAKS - if max_peaks > simplsms.SMS_MAX_NPEAKS: - print "Warning: max peaks (" + str(max_peaks) + ")", - print "set to more than the max. no. peaks possible in libsms." - print " Setting to", simplsms.SMS_MAX_NPEAKS, "instead." - max_peaks = simplsms.SMS_MAX_NPEAKS - # set analysis params - self._max_peaks = max_peaks - self._analysis_params.nTracks = max_peaks - self._analysis_params.maxPeaks = max_peaks - self._analysis_params.nGuides = max_peaks - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - # set peaks list - self._peaks = simplsms.SMS_SpectralPeaks(max_peaks) - - def set_sampling_rate(self, sampling_rate): - self._analysis_params.iSamplingRate = sampling_rate - simplsms.sms_freeAnalysis(self._analysis_params) - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def set_window_size(self, window_size): - self._window_size = window_size - self._analysis_params.iDefaultSizeWindow = window_size - - def get_next_frame_size(self): - return self._analysis_params.sizeNextRead - - def find_peaks_in_frame(self, frame): - "Find and return all spectral peaks in a given frame of audio" - current_peaks = [] - num_peaks = simplsms.sms_findPeaks(frame.audio, - self._analysis_params, - self._peaks) - if num_peaks > 0: - amps = np.zeros(num_peaks, dtype=simpl.dtype) - freqs = np.zeros(num_peaks, dtype=simpl.dtype) - phases = np.zeros(num_peaks, dtype=simpl.dtype) - self._peaks.getFreq(freqs) - self._peaks.getMag(amps) - self._peaks.getPhase(phases) - for i in range(num_peaks): - p = simpl.Peak() - p.amplitude = amps[i] - p.frequency = freqs[i] - p.phase = phases[i] - current_peaks.append(p) - return current_peaks - - def find_peaks(self, audio): - """ - Find and return all spectral peaks in a given audio signal. - If the signal contains more than 1 frame worth of audio, - it will be broken up into separate frames, with a list of - peaks returned for each frame. - """ - # TODO: This hops by frame size rather than hop size in order to - # make sure the results are the same as with libsms. Make sure - # we have the same number of frames as the other algorithms. - self._analysis_params.iSizeSound = len(audio) - self.frames = [] - pos = 0 - # account for SMS analysis delay - # need an extra (max_frame_delay - 1) frames - num_samples = (len(audio) - self.hop_size) + ((self.max_frame_delay - 1) * self.hop_size) - while pos < num_samples: - # get the next frame size - if not self._static_frame_size: - self.frame_size = self.get_next_frame_size() - # get the next frame - frame = simpl.Frame() - frame.size = self.frame_size - frame.audio = audio[pos:pos + self.frame_size] - # find peaks - frame.peaks = self.find_peaks_in_frame(frame) - self.frames.append(frame) - pos += self.frame_size - return self.frames - - -class SMSPartialTracking(simpl.PartialTracking): - "Partial tracking using SMS" - - def __init__(self): - simpl.PartialTracking.__init__(self) - simplsms.sms_init() - self._analysis_params = simplsms.SMS_AnalParams() - simplsms.sms_initAnalParams(self._analysis_params) - self._analysis_params.iSamplingRate = self.sampling_rate - self._analysis_params.fHighestFreq = 20000 - self._analysis_params.iMaxDelayFrames = 4 # libsms minimum - self._analysis_params.analDelay = 0 - self._analysis_params.minGoodFrames = 1 - self._analysis_params.iCleanTracks = 0 - self._analysis_params.iFormat = simplsms.SMS_FORMAT_HP - self._analysis_params.nTracks = self._max_partials - self._analysis_params.nGuides = self._max_partials - self._analysis_params.preEmphasis = 0 - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - self._sms_header = simplsms.SMS_Header() - simplsms.sms_fillHeader(self._sms_header, self._analysis_params, "simpl") - self._analysis_frame = simplsms.SMS_Data() - simplsms.sms_allocFrameH(self._sms_header, self._analysis_frame) - - def __del__(self): - simplsms.sms_freeAnalysis(self._analysis_params) - simplsms.sms_freeFrame(self._analysis_frame) - simplsms.sms_free() - - # properties - max_frequency = property(lambda self: self.get_max_frequency(), - lambda self, x: self.set_max_frequency(x)) - default_fundamental = property(lambda self: self.get_default_fundamental(), - lambda self, x: self.set_default_fundamental(x)) - max_frame_delay = property(lambda self: self.get_max_frame_delay(), - lambda self, x: self.set_max_frame_delay(x)) - analysis_delay = property(lambda self: self.get_analysis_delay(), - lambda self, x: self.set_analysis_delay(x)) - min_good_frames = property(lambda self: self.get_min_good_frames(), - lambda self, x: self.set_min_good_frames(x)) - clean_tracks = property(lambda self: self.get_clean_tracks(), - lambda self, x: self.set_clean_tracks(x)) - format = property(lambda self: self.get_format(), - lambda self, x: self.set_format(x)) - pre_emphasis = property(lambda self: self.get_pre_emphasis(), - lambda self, x: self.set_pre_emphasis(x)) - - def get_max_frequency(self): - return self._analysis_params.fHighestFreq - - def set_max_frequency(self, max_frequency): - self._analysis_params.fHighestFreq = max_frequency - - def get_default_fundamental(self): - return self._analysis_params.fDefaultFundamental - - def set_default_fundamental(self, default_fundamental): - self._analysis_params.fDefaultFundamental = default_fundamental - - def get_max_frame_delay(self): - return self._analysis_params.iMaxDelayFrames - - def set_max_frame_delay(self, max_frame_delay): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iMaxDelayFrames = max_frame_delay - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_analysis_delay(self): - return self._analysis_params.analDelay - - def set_analysis_delay(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.analDelay = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_min_good_frames(self): - return self._analysis_params.minGoodFrames - - def set_min_good_frames(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.minGoodFrames = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_clean_tracks(self): - return self._analysis_params.iCleanTracks - - def set_clean_tracks(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iCleanTracks = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_format(self): - return self._analysis_params.iFormat - - def set_format(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.iFormat = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_pre_emphasis(self): - return self._analysis_params.preEmphasis - - def set_pre_emphasis(self, x): - simplsms.sms_freeAnalysis(self._analysis_params) - self._analysis_params.preEmphasis = x - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - - def get_max_partials(self): - return self._analysis_params.nTracks - - def set_max_partials(self, max_partials): - simplsms.sms_freeAnalysis(self._analysis_params) - simplsms.sms_freeFrame(self._analysis_frame) - self._max_partials = max_partials - self._analysis_params.maxPeaks = max_partials - self._analysis_params.nTracks = max_partials - self._analysis_params.nGuides = max_partials - if simplsms.sms_initAnalysis(self._analysis_params) != 0: - raise Exception("Error allocating memory for analysis_params") - simplsms.sms_fillHeader(self._sms_header, self._analysis_params, "simpl") - simplsms.sms_allocFrameH(self._sms_header, self._analysis_frame) - - def update_partials(self, frame): - "Streamable (real-time) partial-tracking." - # load Peak amplitudes, frequencies and phases into arrays - num_peaks = len(frame.peaks) - amps = np.zeros(num_peaks, dtype=simpl.dtype) - freqs = np.zeros(num_peaks, dtype=simpl.dtype) - phases = np.zeros(num_peaks, dtype=simpl.dtype) - for i in range(num_peaks): - peak = frame.peaks[i] - amps[i] = peak.amplitude - freqs[i] = peak.frequency - phases[i] = peak.phase - # set peaks in SMS_AnalParams structure - simplsms.sms_setPeaks(self._analysis_params, amps, freqs, phases) - # SMS partial tracking - simplsms.sms_findPartials(self._analysis_frame, self._analysis_params) - # read values back into amps, freqs, phases - amps = np.zeros(self.max_partials, dtype=simpl.dtype) - freqs = np.zeros(self.max_partials, dtype=simpl.dtype) - phases = np.zeros(self.max_partials, dtype=simpl.dtype) - self._analysis_frame.getSinAmp(amps) - self._analysis_frame.getSinFreq(freqs) - self._analysis_frame.getSinPhase(phases) - peaks = [] - for i in range(self.max_partials): - p = simpl.Peak() - p.amplitude = amps[i] - p.frequency = freqs[i] - p.phase = phases[i] - peaks.append(p) - return peaks - - def find_partials(self, frames): - """Find partials from the sinusoidal peaks in a list of Frames""" - self.frames = [] - for frame in frames: - frame.partials = self.update_partials(frame) - self.frames.append(frame) - # account for SMS analysis delay - # the first extra (max_frame_delay) frames are blank - if len(self.frames) > (self.max_frame_delay): - self.frames = self.frames[self.max_frame_delay:] - return self.frames - - -class SMSSynthesis(simpl.Synthesis): - "Sinusoidal resynthesis using SMS" - - def __init__(self): - simpl.Synthesis.__init__(self) - simplsms.sms_init() - self._synth_params = simplsms.SMS_SynthParams() - simplsms.sms_initSynthParams(self._synth_params) - self._synth_params.iSamplingRate = self._sampling_rate - self._synth_params.iDetSynthType = simplsms.SMS_DET_SIN - self._synth_params.iSynthesisType = simplsms.SMS_STYPE_DET - self._synth_params.iStochasticType = simplsms.SMS_STOC_NONE - self._synth_params.sizeHop = self._hop_size - self._synth_params.nTracks = self._max_partials - self._synth_params.deEmphasis = 0 - simplsms.sms_initSynth(self._synth_params) - self._current_frame = np.zeros(self._hop_size, dtype=simpl.dtype) - self._analysis_frame = simplsms.SMS_Data() - simplsms.sms_allocFrame(self._analysis_frame, self.max_partials, - self.num_stochastic_coeffs, 1, - self.stochastic_type, 0) - - def __del__(self): - simplsms.sms_freeFrame(self._analysis_frame) - simplsms.sms_freeSynth(self._synth_params) - simplsms.sms_free() - - # properties - synthesis_type = property(lambda self: self.get_synthesis_type(), - lambda self, x: self.set_synthesis_type(x)) - det_synthesis_type = property(lambda self: self.get_det_synthesis_type(), - lambda self, x: self.set_det_synthesis_type(x)) - num_stochastic_coeffs = property(lambda self: self.get_num_stochastic_coeffs(), - lambda self, x: self.set_num_stochastic_coeffs(x)) - stochastic_type = property(lambda self: self.get_stochastic_type(), - lambda self, x: self.set_stochastic_type(x)) - original_sampling_rate = property(lambda self: self.get_original_sampling_rate(), - lambda self, x: self.set_original_sampling_rate(x)) - original_hop_size = property(lambda self: self.get_original_hop_size(), - lambda self, x: self.set_original_hop_size(x)) - - def get_hop_size(self): - return self._synth_params.sizeHop - - def set_hop_size(self, hop_size): - simplsms.sms_freeSynth(self._synth_params) - self._synth_params.sizeHop = hop_size - simplsms.sms_initSynth(self._synth_params) - self._current_frame = np.zeros(hop_size, dtype=simpl.dtype) - - def get_max_partials(self): - return self._synth_params.nTracks - - def set_max_partials(self, max_partials): - simplsms.sms_freeSynth(self._synth_params) - simplsms.sms_freeFrame(self._analysis_frame) - self._synth_params.nTracks = max_partials - simplsms.sms_initSynth(self._synth_params) - simplsms.sms_allocFrame(self._analysis_frame, max_partials, - self.num_stochastic_coeffs, 1, - self.stochastic_type, 0) - - def get_sampling_rate(self): - return self._synth_params.iSamplingRate - - def set_sampling_rate(self, sampling_rate): - self._synth_params.iSamplingRate = sampling_rate - - def get_synthesis_type(self): - return self._synth_params.iSynthesisType - - def set_synthesis_type(self, synthesis_type): - self._synth_params.iSynthesisType = synthesis_type - - def get_det_synthesis_type(self): - return self._synth_params.iDetSynthesisType - - def set_det_synthesis_type(self, det_synthesis_type): - self._synth_params.iDetSynthType = det_synthesis_type - - def get_num_stochastic_coeffs(self): - return self._synth_params.nStochasticCoeff - - def set_num_stochastic_coeffs(self, num_stochastic_coeffs): - self._synth_params.nStochasticCoeff = num_stochastic_coeffs - simplsms.sms_freeFrame(self._analysis_frame) - simplsms.sms_allocFrame(self._analysis_frame, self.max_partials, - num_stochastic_coeffs, 1, - self.stochastic_type, 0) - - def get_stochastic_type(self): - return self._synth_params.iStochasticType - - def set_stochastic_type(self, stochastic_type): - simplsms.sms_freeSynth(self._synth_params) - simplsms.sms_freeFrame(self._analysis_frame) - self._synth_params.iStochasticType = stochastic_type - simplsms.sms_initSynth(self._synth_params) - simplsms.sms_allocFrame(self._analysis_frame, self.max_partials, - self.num_stochastic_coeffs, 1, - stochastic_type, 0) - - def get_original_sampling_rate(self): - return self._synth_params.iOriginalSRate - - def set_original_sampling_rate(self, sampling_rate): - self._synth_params.iOriginalSRate = sampling_rate - - def get_original_hop_size(self): - return self._synth_params.origSizeHop - - def set_original_hop_size(self, hop_size): - self._synth_params.origSizeHop = hop_size - - def synth_frame(self, frame): - "Synthesises a frame of audio" - amps = np.zeros(self.max_partials, dtype=simpl.dtype) - freqs = np.zeros(self.max_partials, dtype=simpl.dtype) - phases = np.zeros(self.max_partials, dtype=simpl.dtype) - num_partials = min(self.max_partials, len(frame.partials)) - for i in range(num_partials): - amps[i] = frame.partials[i].amplitude - freqs[i] = frame.partials[i].frequency - phases[i] = frame.partials[i].phase - self._analysis_frame.setSinAmp(amps) - self._analysis_frame.setSinFreq(freqs) - self._analysis_frame.setSinPha(phases) - simplsms.sms_synthesize(self._analysis_frame, - self._current_frame, - self._synth_params) - return self._current_frame - - -class SMSResidual(simpl.Residual): - "SMS residual component" - - def __init__(self): - simpl.Residual.__init__(self) - simplsms.sms_init() - self._residual_params = simplsms.SMS_ResidualParams() - simplsms.sms_initResidualParams(self._residual_params) - self._residual_params.hopSize = self._hop_size - simplsms.sms_initResidual(self._residual_params) - - def __del__(self): - simplsms.sms_freeResidual(self._residual_params) - simplsms.sms_free() - - def get_hop_size(self): - return self._residual_params.hopSize - - def set_hop_size(self, hop_size): - simplsms.sms_freeResidual(self._residual_params) - self._residual_params.hopSize = hop_size - simplsms.sms_initResidual(self._residual_params) - - def residual_frame(self, synth, original): - "Computes the residual signal for a frame of audio" - simplsms.sms_findResidual(synth, original, self._residual_params) - residual = np.zeros(self._residual_params.hopSize, dtype=simpl.dtype) - self._residual_params.getResidual(residual) - return residual - - def find_residual(self, synth, original): - "Calculate and return the residual signal" - num_frames = len(original) / self.hop_size - residual = np.array([], dtype=simpl.dtype) - sample_offset = 0 - - for i in range(num_frames): - synth_frame = synth[sample_offset:sample_offset + self.hop_size] - original_frame = original[sample_offset:sample_offset + self.hop_size] - residual = np.hstack(( - residual, self.residual_frame(synth_frame, original_frame) - )) - sample_offset += self.hop_size - return residual - - def synth_frame(self, synth, original): - "Calculate and return one frame of the synthesised residual signal" - residual = self.residual_frame(synth, original) - approx = np.zeros(self._residual_params.hopSize, dtype=simpl.dtype) - simplsms.sms_approxResidual(residual, approx, self._residual_params) - return approx diff --git a/simpl/pysndobj.py b/simpl/pysndobj.py deleted file mode 100644 index 97e703a..0000000 --- a/simpl/pysndobj.py +++ /dev/null @@ -1,197 +0,0 @@ -import simpl -import simpl.simplsndobj as simplsndobj -import numpy as np - - -class SndObjPeakDetection(simpl.PeakDetection): - "Sinusoidal peak detection using the SndObj library" - def __init__(self): - super(SndObjPeakDetection, self).__init__() - self._input = simplsndobj.SndObj() - self._input.SetVectorSize(self.frame_size) - self._window = simplsndobj.HammingTable(self.frame_size, 0.5) - self._ifgram = simplsndobj.IFGram(self._window, self._input, 1, - self.frame_size, self.hop_size) - self._threshold = 0.003 - self._analysis = simplsndobj.SinAnal(self._ifgram, self._threshold, - self.max_peaks) - - # properties - threshold = property(lambda self: self.get_threshold(), - lambda self, x: self.set_threshold(x)) - - def set_frame_size(self, frame_size): - "Set the analysis frame size" - self._input.SetVectorSize(frame_size) - if self.window_type == "hamming": - self._window = simplsndobj.HammingTable(frame_size, 0.5) - elif self.window_type >= 0 and self.window_type <= 1: - self._window = simplsndobj.HammingTable(frame_size, self.window_type) - self._ifgram.Connect("window", self._window) - self._ifgram.Set("fft size", frame_size) - self._frame_size = frame_size - - def set_hop_size(self, hop_size): - self._ifgram.Set("hop size", hop_size) - self._hop_size = hop_size - - def set_max_peaks(self, max_peaks): - "Set the maximum number of peaks detected" - self._analysis.Set("max tracks", max_peaks) - self._max_peaks = max_peaks - - def set_window_type(self, window_type): - "Set the analysis window type" - if window_type == "hamming": - self._window = simplsndobj.HammingTable(self.frame_size, 0.5) - elif window_type >= 0 and window_type <= 1: - self._window = simplsndobj.HammingTable(self.frame_size, window_type) - else: - raise Exception("UnknownWindowType") - self._ifgram.Connect("window", self._window) - self._window_type = window_type - - def get_threshold(self): - return self._threshold - - def set_threshold(self, threshold): - self._analysis.Set("threshold", threshold) - self._threshold = threshold - - def find_peaks_in_frame(self, frame): - "Find and return all spectral peaks in a given frame of audio" - peaks = [] - self._input.PushIn(frame.audio) - self._input.DoProcess() - self._ifgram.DoProcess() - num_peaks_found = self._analysis.FindPeaks() - - # loop through analysis output and create peak objects - for i in range(num_peaks_found): - p = simpl.Peak() - p.amplitude = self._analysis.Output(i * 3) - p.frequency = self._analysis.Output((i * 3) + 1) - p.phase = self._analysis.Output((i * 3) + 2) - if not peaks: - peaks.append(p) - else: - if np.abs(p.frequency - peaks[-1].frequency) > self._min_peak_separation: - peaks.append(p) - else: - if p.amplitude > peaks[-1].amplitude: - peaks.remove(peaks[-1]) - peaks.append(p) - return peaks - - -class SndObjPartialTracking(simpl.PartialTracking): - "Partial tracking using the algorithm from the Sound Object Library" - def __init__(self): - simpl.PartialTracking.__init__(self) - self._threshold = 0.003 - self._num_bins = 1025 - self._analysis = simplsndobj.SinAnal( - simplsndobj.SndObj(), self._num_bins, - self._threshold, self.max_partials - ) - - def set_max_partials(self, num_partials): - self._analysis.Set("max tracks", num_partials) - self._max_partials = num_partials - - def update_partials(self, frame): - "Streamable (real-time) partial-tracking." - partials = [] - # load Peak amplitudes, frequencies and phases into arrays - num_peaks = len(frame.peaks) - amps = np.zeros(num_peaks, dtype=simpl.dtype) - freqs = np.zeros(num_peaks, dtype=simpl.dtype) - phases = np.zeros(num_peaks, dtype=simpl.dtype) - for i in range(num_peaks): - peak = frame.peaks[i] - amps[i] = peak.amplitude - freqs[i] = peak.frequency - phases[i] = peak.phase - # set peaks in SndObj SinAnal object - self._analysis.SetPeaks(amps, freqs, phases) - # call SndObj partial tracking - self._analysis.PartialTracking() - # form Partial objects - num_partials = self._analysis.GetTracks() - for i in range(num_partials): - peak = simpl.Peak() - peak.amplitude = self._analysis.Output(i * 3) - peak.frequency = self._analysis.Output((i * 3) + 1) - peak.phase = self._analysis.Output((i * 3) + 2) - partials.append(peak) - for i in range(num_partials, self.max_partials): - peak = simpl.Peak() - partials.append(peak) - return partials - - -class SimplSndObjAnalysisWrapper(simplsndobj.SinAnal): - """An object that takes simpl Peaks and presents them as SndObj analysis - data to the SndObj synthesis objects.""" - def __init__(self): - simplsndobj.SinAnal.__init__(self) - self.partials = [] - - def GetTracks(self): - return len(self.partials) - - def GetTrackID(self, partial_number): - if partial_number < len(self.partials): - return partial_number - else: - # TODO: what should this return if no matching partial found? - return 0 - - def Output(self, position): - peak = int(position) / 3 - if peak > len(self.partials): - # TODO: what should this return if no matching partial found? - return 0.0 - - data_field = int(position) % 3 - if data_field is 0: - return self.partials[peak].amplitude - elif data_field is 1: - return self.partials[peak].frequency - elif data_field is 2: - return self.partials[peak].phase - - -class SndObjSynthesis(simpl.Synthesis): - "Sinusoidal resynthesis using the SndObj library" - def __init__(self, synthesis_type='adsyn'): - simpl.Synthesis.__init__(self) - self._analysis = SimplSndObjAnalysisWrapper() - self._table = simplsndobj.HarmTable(10000, 1, 1, 0.25) - if synthesis_type == 'adsyn': - self._synth = simplsndobj.AdSyn(self._analysis, self.max_partials, - self._table, 1, 1, self.hop_size) - elif synthesis_type == 'sinsyn': - self._synth = simplsndobj.SinSyn(self._analysis, self.max_partials, - self._table, 1, self.hop_size) - else: - raise Exception("UnknownSynthesisType") - self._current_frame = np.zeros(self.hop_size, dtype=np.dtype) - - def set_hop_size(self, hop_size): - self._synth.SetVectorSize(hop_size) - self._hop_size = hop_size - self._current_frame = np.zeros(hop_size, dtype=np.dtype) - - def set_max_partials(self, num_partials): - self._synth.Set('max tracks', num_partials) - self._max_partials = num_partials - - def synth_frame(self, frame): - "Synthesises a frame of audio, given a list of peaks from tracks" - self._analysis.partials = frame.partials - if len(frame.partials) > self._max_partials: - self.max_partials = len(frame.partials) - self._synth.DoProcess() - self._synth.PopOut(self._current_frame) - return self._current_frame diff --git a/simpl/sndobj.i b/simpl/sndobj.i deleted file mode 100644 index 7b13bb3..0000000 --- a/simpl/sndobj.i +++ /dev/null @@ -1,58 +0,0 @@ -%module(directors="1") simplsndobj -%{ - #include "../src/sndobj/SndObj.h" - #include "../src/sndobj/SndIO.h" - #include "../src/sndobj/Table.h" - #include "../src/sndobj/FFT.h" - #include "../src/sndobj/IFFT.h" - #include "../src/sndobj/PVA.h" - #include "../src/sndobj/PVS.h" - #include "../src/sndobj/IFGram.h" - #include "../src/sndobj/SinAnal.h" - #include "../src/sndobj/SinSyn.h" - #include "../src/sndobj/AdSyn.h" - #include "../src/sndobj/ReSyn.h" - #include "../src/sndobj/HarmTable.h" - #include "../src/sndobj/HammingTable.h" - #define SWIG_FILE_WITH_INIT -%} - -%feature("director") SndObj; -%feature("director") SinAnal; - -%include "numpy.i" - -%init -%{ - import_array(); -%} - -%ignore SndObj::SndObj(SndObj &); -%ignore SndObj::operator=(SndObj); - -%apply(double* IN_ARRAY1, int DIM1) {(double* in_vector, int size)}; -%apply(double* INPLACE_ARRAY1, int DIM1) {(double* out_vector, int size)}; -%include "../src/sndobj/SndObj.h" -%clear(double* in_vector, int size); -%clear(double* out_vector, int size); - -%include "../src/sndobj/SndIO.h" -%include "../src/sndobj/Table.h" -%include "../src/sndobj/FFT.h" -%include "../src/sndobj/IFFT.h" -%include "../src/sndobj/PVA.h" -%include "../src/sndobj/PVS.h" -%include "../src/sndobj/IFGram.h" - -%apply (int DIM1, double* IN_ARRAY1) -{ - (int numamps, double* amps), - (int numfreqs, double* freqs), - (int numphases, double* phases) -} -%include "../src/sndobj/SinAnal.h" -%include "../src/sndobj/SinSyn.h" -%include "../src/sndobj/ReSyn.h" -%include "../src/sndobj/AdSyn.h" -%include "../src/sndobj/HarmTable.h" -%include "../src/sndobj/HammingTable.h" |