From a8631fbf73ff40fc83abc0ab459970ac2e82cf0f Mon Sep 17 00:00:00 2001
From: Florent Jaillet <florent.jaillet@lis-lab.fr>
Date: Mon, 16 Apr 2018 11:01:44 +0200
Subject: [PATCH] Updating the C files generated by Cython
---
ltfatpy/comp/comp_dct.c | 322 ++++++++--------
ltfatpy/comp/comp_dst.c | 322 ++++++++--------
ltfatpy/comp/comp_gabdual_long.c | 256 ++++++-------
ltfatpy/comp/comp_gabtight_long.c | 258 ++++++-------
ltfatpy/comp/comp_isepdgt.c | 444 +++++++++++-----------
ltfatpy/comp/comp_isepdgtreal.c | 462 +++++++++++------------
ltfatpy/comp/comp_pgauss.c | 114 +++---
ltfatpy/comp/comp_sepdgt.c | 600 +++++++++++++++---------------
ltfatpy/comp/comp_sepdgtreal.c | 436 +++++++++++-----------
9 files changed, 1607 insertions(+), 1607 deletions(-)
diff --git a/ltfatpy/comp/comp_dct.c b/ltfatpy/comp/comp_dct.c
index 22c8596..3be0ac9 100644
--- a/ltfatpy/comp/comp_dct.c
+++ b/ltfatpy/comp/comp_dct.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1821,7 +1821,7 @@ static PyObject *__pyx_tuple__18;
static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
-/* "ltfatpy/comp/comp_dct.pyx":71
+/* "ltfatpy/comp/comp_dct.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dct_cd(const double complex[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1836,7 +1836,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_cd(__Pyx_memviewslice
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_dct_cd", 0);
- /* "ltfatpy/comp/comp_dct.pyx":74
+ /* "ltfatpy/comp/comp_dct.pyx":78
* const ltfatInt W, const dct_kind kind, double complex[:] out):
* """ Internal function, do not use it """
* dct_cd(& f[0], L, W, & out[0], kind) # <<<<<<<<<<<<<<
@@ -1847,7 +1847,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_cd(__Pyx_memviewslice
__pyx_t_2 = 0;
dct_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), __pyx_v_L, __pyx_v_W, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))), __pyx_v_kind);
- /* "ltfatpy/comp/comp_dct.pyx":71
+ /* "ltfatpy/comp/comp_dct.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dct_cd(const double complex[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1862,7 +1862,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_cd(__Pyx_memviewslice
return __pyx_r;
}
-/* "ltfatpy/comp/comp_dct.pyx":80
+/* "ltfatpy/comp/comp_dct.pyx":84
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dct_d(const double[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1877,7 +1877,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_d(__Pyx_memviewslice
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_dct_d", 0);
- /* "ltfatpy/comp/comp_dct.pyx":83
+ /* "ltfatpy/comp/comp_dct.pyx":87
* const ltfatInt W, const dct_kind kind, double[:] out):
* """ Internal function, do not use it """
* dct_d(&f[0], L, W, & out[0], kind) # <<<<<<<<<<<<<<
@@ -1888,7 +1888,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_d(__Pyx_memviewslice
__pyx_t_2 = 0;
dct_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), __pyx_v_L, __pyx_v_W, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))), __pyx_v_kind);
- /* "ltfatpy/comp/comp_dct.pyx":80
+ /* "ltfatpy/comp/comp_dct.pyx":84
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dct_d(const double[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1903,7 +1903,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_d(__Pyx_memviewslice
return __pyx_r;
}
-/* "ltfatpy/comp/comp_dct.pyx":89
+/* "ltfatpy/comp/comp_dct.pyx":93
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_dct(f, type): # <<<<<<<<<<<<<<
@@ -1936,66 +1936,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__Pyx_RefNannySetupContext("comp_dct", 0);
__Pyx_INCREF(__pyx_v_f);
- /* "ltfatpy/comp/comp_dct.pyx":98
+ /* "ltfatpy/comp/comp_dct.pyx":102
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L4_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L4_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_dct.pyx":99
+ /* "ltfatpy/comp/comp_dct.pyx":103
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4")
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 99, __pyx_L1_error)
+ __PYX_ERR(0, 103, __pyx_L1_error)
- /* "ltfatpy/comp/comp_dct.pyx":98
+ /* "ltfatpy/comp/comp_dct.pyx":102
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2004,7 +2004,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dct.pyx":100
+ /* "ltfatpy/comp/comp_dct.pyx":104
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}: # <<<<<<<<<<<<<<
@@ -2013,32 +2013,32 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
__Pyx_INCREF(__pyx_v_type);
__pyx_t_2 = __pyx_v_type;
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_4, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_4, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L7_bool_binop_done:;
@@ -2046,20 +2046,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_t_5 = (__pyx_t_1 != 0);
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dct.pyx":101
+ /* "ltfatpy/comp/comp_dct.pyx":105
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4") # <<<<<<<<<<<<<<
*
* dct_type = {1: DCTI, 2: DCTII, 3: DCTIII, 4: DCTIV}
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 101, __pyx_L1_error)
+ __PYX_ERR(0, 105, __pyx_L1_error)
- /* "ltfatpy/comp/comp_dct.pyx":100
+ /* "ltfatpy/comp/comp_dct.pyx":104
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}: # <<<<<<<<<<<<<<
@@ -2068,89 +2068,89 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dct.pyx":103
+ /* "ltfatpy/comp/comp_dct.pyx":107
* raise TypeError("type should be 1, 2, 3 or 4")
*
* dct_type = {1: DCTI, 2: DCTII, 3: DCTIII, 4: DCTIV} # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTI); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTI); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_1, __pyx_t_3) < 0) __PYX_ERR(0, 103, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_1, __pyx_t_3) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_2, __pyx_t_3) < 0) __PYX_ERR(0, 103, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_2, __pyx_t_3) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTIII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTIII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_3, __pyx_t_3) < 0) __PYX_ERR(0, 103, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_3, __pyx_t_3) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_4, __pyx_t_3) < 0) __PYX_ERR(0, 103, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_4, __pyx_t_3) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_dct_type = ((PyObject*)__pyx_t_2);
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":105
+ /* "ltfatpy/comp/comp_dct.pyx":109
* dct_type = {1: DCTI, 2: DCTII, 3: DCTIII, 4: DCTIV}
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dct.pyx":106
+ /* "ltfatpy/comp/comp_dct.pyx":110
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dct.pyx":107
+ /* "ltfatpy/comp/comp_dct.pyx":111
* if f.ndim > 1:
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1)) # <<<<<<<<<<<<<<
* L = f.shape[0]
* W = f.shape[1]
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_f);
__Pyx_GIVEREF(__pyx_v_f);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_f);
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2158,12 +2158,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2171,7 +2171,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__Pyx_DECREF_SET(__pyx_v_f, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":106
+ /* "ltfatpy/comp/comp_dct.pyx":110
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
@@ -2180,58 +2180,58 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dct.pyx":108
+ /* "ltfatpy/comp/comp_dct.pyx":112
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0] # <<<<<<<<<<<<<<
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F')
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_dct.pyx":109
+ /* "ltfatpy/comp/comp_dct.pyx":113
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
* W = f.shape[1] # <<<<<<<<<<<<<<
* f_combined = f.reshape(L * W, order='F')
* else:
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_v_W = __pyx_t_8;
- /* "ltfatpy/comp/comp_dct.pyx":110
+ /* "ltfatpy/comp/comp_dct.pyx":114
* L = f.shape[0]
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F') # <<<<<<<<<<<<<<
* else:
* L = f.shape[0]
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 110, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2239,7 +2239,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_v_f_combined = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":105
+ /* "ltfatpy/comp/comp_dct.pyx":109
* dct_type = {1: DCTI, 2: DCTII, 3: DCTIII, 4: DCTIV}
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
@@ -2249,7 +2249,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
goto __pyx_L11;
}
- /* "ltfatpy/comp/comp_dct.pyx":112
+ /* "ltfatpy/comp/comp_dct.pyx":116
* f_combined = f.reshape(L * W, order='F')
* else:
* L = f.shape[0] # <<<<<<<<<<<<<<
@@ -2257,16 +2257,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
* f_combined = f
*/
/*else*/ {
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_dct.pyx":113
+ /* "ltfatpy/comp/comp_dct.pyx":117
* else:
* L = f.shape[0]
* W = 1 # <<<<<<<<<<<<<<
@@ -2275,7 +2275,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
__pyx_v_W = 1;
- /* "ltfatpy/comp/comp_dct.pyx":114
+ /* "ltfatpy/comp/comp_dct.pyx":118
* L = f.shape[0]
* W = 1
* f_combined = f # <<<<<<<<<<<<<<
@@ -2287,59 +2287,59 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
}
__pyx_L11:;
- /* "ltfatpy/comp/comp_dct.pyx":116
+ /* "ltfatpy/comp/comp_dct.pyx":120
* f_combined = f
*
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
* res = np.ndarray((L * W), dtype=np.float64)
* comp_dct_d(f_combined, L, W, dct_type[type], res)
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dct.pyx":117
+ /* "ltfatpy/comp/comp_dct.pyx":121
*
* if f.dtype.type == np.float64:
* res = np.ndarray((L * W), dtype=np.float64) # <<<<<<<<<<<<<<
* comp_dct_d(f_combined, L, W, dct_type[type], res)
* else:
*/
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 117, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2347,7 +2347,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_v_res = __pyx_t_6;
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":118
+ /* "ltfatpy/comp/comp_dct.pyx":122
* if f.dtype.type == np.float64:
* res = np.ndarray((L * W), dtype=np.float64)
* comp_dct_d(f_combined, L, W, dct_type[type], res) # <<<<<<<<<<<<<<
@@ -2355,14 +2355,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
* res = np.ndarray((L * W), dtype=np.complex128)
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 118, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_dct_type, __pyx_v_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_dct_type, __pyx_v_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_t_6)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_t_6)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_res);
- if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 118, __pyx_L1_error)
- __pyx_t_6 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_d(__pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_6 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_d(__pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2372,7 +2372,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_t_11.data = NULL;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":116
+ /* "ltfatpy/comp/comp_dct.pyx":120
* f_combined = f
*
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -2382,7 +2382,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
goto __pyx_L13;
}
- /* "ltfatpy/comp/comp_dct.pyx":120
+ /* "ltfatpy/comp/comp_dct.pyx":124
* comp_dct_d(f_combined, L, W, dct_type[type], res)
* else:
* res = np.ndarray((L * W), dtype=np.complex128) # <<<<<<<<<<<<<<
@@ -2390,28 +2390,28 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
* if W > 1:
*/
/*else*/ {
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 120, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2419,7 +2419,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_v_res = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":121
+ /* "ltfatpy/comp/comp_dct.pyx":125
* else:
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dct_cd(f_combined, L, W, dct_type[type], res) # <<<<<<<<<<<<<<
@@ -2427,14 +2427,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
* res = np.reshape(res, (L, W), order='F')
*/
__pyx_t_12 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 121, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyDict_GetItem(__pyx_v_dct_type, __pyx_v_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 121, __pyx_L1_error)
+ if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyDict_GetItem(__pyx_v_dct_type, __pyx_v_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_t_7)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dct_kind(__pyx_t_7)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 121, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_cd(__pyx_t_12, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_13); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 121, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct_cd(__pyx_t_12, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_13); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_12, 1);
__pyx_t_12.memview = NULL;
@@ -2446,7 +2446,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
}
__pyx_L13:;
- /* "ltfatpy/comp/comp_dct.pyx":122
+ /* "ltfatpy/comp/comp_dct.pyx":126
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dct_cd(f_combined, L, W, dct_type[type], res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2456,22 +2456,22 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_t_5 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dct.pyx":123
+ /* "ltfatpy/comp/comp_dct.pyx":127
* comp_dct_cd(f_combined, L, W, dct_type[type], res)
* if W > 1:
* res = np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
* return res
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_7);
@@ -2479,7 +2479,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);
__pyx_t_7 = 0;
__pyx_t_3 = 0;
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2487,10 +2487,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 123, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 123, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2498,7 +2498,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__Pyx_DECREF_SET(__pyx_v_res, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dct.pyx":122
+ /* "ltfatpy/comp/comp_dct.pyx":126
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dct_cd(f_combined, L, W, dct_type[type], res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2507,7 +2507,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dct.pyx":124
+ /* "ltfatpy/comp/comp_dct.pyx":128
* if W > 1:
* res = np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2517,7 +2517,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(PyObject *__pyx_v_f,
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_dct.pyx":89
+ /* "ltfatpy/comp/comp_dct.pyx":93
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_dct(f, type): # <<<<<<<<<<<<<<
@@ -2577,11 +2577,11 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_8comp_dct_1comp_dct(PyObject *__pyx_sel
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_type)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_dct", 1, 2, 2, 1); __PYX_ERR(0, 89, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_dct", 1, 2, 2, 1); __PYX_ERR(0, 93, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_dct") < 0)) __PYX_ERR(0, 89, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_dct") < 0)) __PYX_ERR(0, 93, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
goto __pyx_L5_argtuple_error;
@@ -2594,7 +2594,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_8comp_dct_1comp_dct(PyObject *__pyx_sel
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_dct", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 89, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_dct", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 93, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_dct.comp_dct", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2613,7 +2613,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_8comp_dct_comp_dct(CYTHON_UNUSED PyObje
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_dct", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(__pyx_v_f, __pyx_v_type, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 89, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_8comp_dct_comp_dct(__pyx_v_f, __pyx_v_type, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15053,8 +15053,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 99, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 111, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15070,25 +15070,25 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_dct.pyx":99
+ /* "ltfatpy/comp/comp_dct.pyx":103
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_dct.pyx":101
+ /* "ltfatpy/comp/comp_dct.pyx":105
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4") # <<<<<<<<<<<<<<
*
* dct_type = {1: DCTI, 2: DCTII, 3: DCTIII, 4: DCTIV}
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_type_should_be_1_2_3_or_4); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_type_should_be_1_2_3_or_4); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
@@ -15440,22 +15440,22 @@ PyMODINIT_FUNC PyInit_comp_dct(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_dct.pyx":61
+ /* "ltfatpy/comp/comp_dct.pyx":65
* from __future__ import print_function, division
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dct_kind, dct_cd, dct_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 61, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 65, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 61, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 65, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_dct.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_dst.c b/ltfatpy/comp/comp_dst.c
index 9a7c8c9..90e9168 100644
--- a/ltfatpy/comp/comp_dst.c
+++ b/ltfatpy/comp/comp_dst.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1821,7 +1821,7 @@ static PyObject *__pyx_tuple__18;
static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
-/* "ltfatpy/comp/comp_dst.pyx":72
+/* "ltfatpy/comp/comp_dst.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dst_cd(const double complex[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1836,7 +1836,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_cd(__Pyx_memviewslice
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_dst_cd", 0);
- /* "ltfatpy/comp/comp_dst.pyx":75
+ /* "ltfatpy/comp/comp_dst.pyx":79
* const ltfatInt W, const dst_kind kind, double complex[:] out):
* """ Internal function, do not use it """
* dst_cd(&f[0], L, W, &out[0], kind) # <<<<<<<<<<<<<<
@@ -1847,7 +1847,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_cd(__Pyx_memviewslice
__pyx_t_2 = 0;
dst_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), __pyx_v_L, __pyx_v_W, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))), __pyx_v_kind);
- /* "ltfatpy/comp/comp_dst.pyx":72
+ /* "ltfatpy/comp/comp_dst.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dst_cd(const double complex[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1862,7 +1862,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_cd(__Pyx_memviewslice
return __pyx_r;
}
-/* "ltfatpy/comp/comp_dst.pyx":81
+/* "ltfatpy/comp/comp_dst.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dst_d(const double[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1877,7 +1877,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_d(__Pyx_memviewslice
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_dst_d", 0);
- /* "ltfatpy/comp/comp_dst.pyx":84
+ /* "ltfatpy/comp/comp_dst.pyx":88
* const ltfatInt W, const dst_kind kind, double[:] out):
* """ Internal function, do not use it """
* dst_d(&f[0], L, W, &out[0], kind) # <<<<<<<<<<<<<<
@@ -1888,7 +1888,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_d(__Pyx_memviewslice
__pyx_t_2 = 0;
dst_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), __pyx_v_L, __pyx_v_W, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))), __pyx_v_kind);
- /* "ltfatpy/comp/comp_dst.pyx":81
+ /* "ltfatpy/comp/comp_dst.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dst_d(const double[:] f, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1903,7 +1903,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_d(__Pyx_memviewslice
return __pyx_r;
}
-/* "ltfatpy/comp/comp_dst.pyx":90
+/* "ltfatpy/comp/comp_dst.pyx":94
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_dst(f, type): # <<<<<<<<<<<<<<
@@ -1936,66 +1936,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__Pyx_RefNannySetupContext("comp_dst", 0);
__Pyx_INCREF(__pyx_v_f);
- /* "ltfatpy/comp/comp_dst.pyx":99
+ /* "ltfatpy/comp/comp_dst.pyx":103
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L4_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L4_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_dst.pyx":100
+ /* "ltfatpy/comp/comp_dst.pyx":104
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4")
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 100, __pyx_L1_error)
+ __PYX_ERR(0, 104, __pyx_L1_error)
- /* "ltfatpy/comp/comp_dst.pyx":99
+ /* "ltfatpy/comp/comp_dst.pyx":103
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2004,7 +2004,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dst.pyx":101
+ /* "ltfatpy/comp/comp_dst.pyx":105
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}: # <<<<<<<<<<<<<<
@@ -2013,32 +2013,32 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
__Pyx_INCREF(__pyx_v_type);
__pyx_t_2 = __pyx_v_type;
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_4, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_4, Py_NE); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L7_bool_binop_done:;
@@ -2046,20 +2046,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_t_5 = (__pyx_t_1 != 0);
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dst.pyx":102
+ /* "ltfatpy/comp/comp_dst.pyx":106
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4") # <<<<<<<<<<<<<<
*
* dst_type = {1: DSTI, 2: DSTII, 3: DSTIII, 4: DSTIV}
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 102, __pyx_L1_error)
+ __PYX_ERR(0, 106, __pyx_L1_error)
- /* "ltfatpy/comp/comp_dst.pyx":101
+ /* "ltfatpy/comp/comp_dst.pyx":105
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}: # <<<<<<<<<<<<<<
@@ -2068,89 +2068,89 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dst.pyx":104
+ /* "ltfatpy/comp/comp_dst.pyx":108
* raise TypeError("type should be 1, 2, 3 or 4")
*
* dst_type = {1: DSTI, 2: DSTII, 3: DSTIII, 4: DSTIV} # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTI); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTI); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_1, __pyx_t_3) < 0) __PYX_ERR(0, 104, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_1, __pyx_t_3) < 0) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_2, __pyx_t_3) < 0) __PYX_ERR(0, 104, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_2, __pyx_t_3) < 0) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTIII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTIII); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_3, __pyx_t_3) < 0) __PYX_ERR(0, 104, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_3, __pyx_t_3) < 0) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTIV); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_e_7ltfatpy_4comp_5ltfat_DSTIV); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_2, __pyx_int_4, __pyx_t_3) < 0) __PYX_ERR(0, 104, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_int_4, __pyx_t_3) < 0) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_dst_type = ((PyObject*)__pyx_t_2);
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":106
+ /* "ltfatpy/comp/comp_dst.pyx":110
* dst_type = {1: DSTI, 2: DSTII, 3: DSTIII, 4: DSTIV}
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dst.pyx":107
+ /* "ltfatpy/comp/comp_dst.pyx":111
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dst.pyx":108
+ /* "ltfatpy/comp/comp_dst.pyx":112
* if f.ndim > 1:
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1)) # <<<<<<<<<<<<<<
* L = f.shape[0]
* W = f.shape[1]
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_f);
__Pyx_GIVEREF(__pyx_v_f);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_f);
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2158,12 +2158,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 108, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2171,7 +2171,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__Pyx_DECREF_SET(__pyx_v_f, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":107
+ /* "ltfatpy/comp/comp_dst.pyx":111
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
@@ -2180,58 +2180,58 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dst.pyx":109
+ /* "ltfatpy/comp/comp_dst.pyx":113
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0] # <<<<<<<<<<<<<<
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F')
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_dst.pyx":110
+ /* "ltfatpy/comp/comp_dst.pyx":114
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
* W = f.shape[1] # <<<<<<<<<<<<<<
* f_combined = f.reshape(L * W, order='F')
* else:
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_v_W = __pyx_t_8;
- /* "ltfatpy/comp/comp_dst.pyx":111
+ /* "ltfatpy/comp/comp_dst.pyx":115
* L = f.shape[0]
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F') # <<<<<<<<<<<<<<
* else:
* L = f.shape[0]
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 111, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2239,7 +2239,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_v_f_combined = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":106
+ /* "ltfatpy/comp/comp_dst.pyx":110
* dst_type = {1: DSTI, 2: DSTII, 3: DSTIII, 4: DSTIV}
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
@@ -2249,7 +2249,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
goto __pyx_L11;
}
- /* "ltfatpy/comp/comp_dst.pyx":113
+ /* "ltfatpy/comp/comp_dst.pyx":117
* f_combined = f.reshape(L * W, order='F')
* else:
* L = f.shape[0] # <<<<<<<<<<<<<<
@@ -2257,16 +2257,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
* f_combined = f
*/
/*else*/ {
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_dst.pyx":114
+ /* "ltfatpy/comp/comp_dst.pyx":118
* else:
* L = f.shape[0]
* W = 1 # <<<<<<<<<<<<<<
@@ -2275,7 +2275,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
__pyx_v_W = 1;
- /* "ltfatpy/comp/comp_dst.pyx":115
+ /* "ltfatpy/comp/comp_dst.pyx":119
* L = f.shape[0]
* W = 1
* f_combined = f # <<<<<<<<<<<<<<
@@ -2287,59 +2287,59 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
}
__pyx_L11:;
- /* "ltfatpy/comp/comp_dst.pyx":117
+ /* "ltfatpy/comp/comp_dst.pyx":121
* f_combined = f
*
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
* res = np.ndarray((L * W), dtype=np.float64)
* comp_dst_d(f_combined, L, W, dst_type[type], res)
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_EQ); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dst.pyx":118
+ /* "ltfatpy/comp/comp_dst.pyx":122
*
* if f.dtype.type == np.float64:
* res = np.ndarray((L * W), dtype=np.float64) # <<<<<<<<<<<<<<
* comp_dst_d(f_combined, L, W, dst_type[type], res)
* else:
*/
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 118, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2347,7 +2347,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_v_res = __pyx_t_6;
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":119
+ /* "ltfatpy/comp/comp_dst.pyx":123
* if f.dtype.type == np.float64:
* res = np.ndarray((L * W), dtype=np.float64)
* comp_dst_d(f_combined, L, W, dst_type[type], res) # <<<<<<<<<<<<<<
@@ -2355,14 +2355,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
* res = np.ndarray((L * W), dtype=np.complex128)
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 119, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_dst_type, __pyx_v_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 119, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyDict_GetItem(__pyx_v_dst_type, __pyx_v_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 123, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dst_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_t_6)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dst_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_t_6)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 123, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_res);
- if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 119, __pyx_L1_error)
- __pyx_t_6 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_d(__pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 119, __pyx_L1_error)
+ if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_6 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_d(__pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_11); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 123, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2372,7 +2372,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_t_11.data = NULL;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":117
+ /* "ltfatpy/comp/comp_dst.pyx":121
* f_combined = f
*
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -2382,7 +2382,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
goto __pyx_L13;
}
- /* "ltfatpy/comp/comp_dst.pyx":121
+ /* "ltfatpy/comp/comp_dst.pyx":125
* comp_dst_d(f_combined, L, W, dst_type[type], res)
* else:
* res = np.ndarray((L * W), dtype=np.complex128) # <<<<<<<<<<<<<<
@@ -2390,28 +2390,28 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
* if W > 1:
*/
/*else*/ {
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 121, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2419,7 +2419,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_v_res = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":122
+ /* "ltfatpy/comp/comp_dst.pyx":126
* else:
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dst_cd(f_combined, L, W, dst_type[type], res) # <<<<<<<<<<<<<<
@@ -2427,14 +2427,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
* res = np.reshape(res, (L, W), order='F')
*/
__pyx_t_12 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 122, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyDict_GetItem(__pyx_v_dst_type, __pyx_v_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 122, __pyx_L1_error)
+ if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyDict_GetItem(__pyx_v_dst_type, __pyx_v_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dst_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_t_7)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_10 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dst_kind)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dst_kind(__pyx_t_7)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 122, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_cd(__pyx_t_12, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_13); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 122, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst_cd(__pyx_t_12, __pyx_v_L, __pyx_v_W, __pyx_t_10, __pyx_t_13); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_12, 1);
__pyx_t_12.memview = NULL;
@@ -2446,7 +2446,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
}
__pyx_L13:;
- /* "ltfatpy/comp/comp_dst.pyx":123
+ /* "ltfatpy/comp/comp_dst.pyx":127
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dst_cd(f_combined, L, W, dst_type[type], res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2456,22 +2456,22 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_t_5 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_5) {
- /* "ltfatpy/comp/comp_dst.pyx":124
+ /* "ltfatpy/comp/comp_dst.pyx":128
* comp_dst_cd(f_combined, L, W, dst_type[type], res)
* if W > 1:
* res = np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
* return res
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_7);
@@ -2479,7 +2479,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_t_3);
__pyx_t_7 = 0;
__pyx_t_3 = 0;
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2487,10 +2487,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 124, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2498,7 +2498,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__Pyx_DECREF_SET(__pyx_v_res, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_dst.pyx":123
+ /* "ltfatpy/comp/comp_dst.pyx":127
* res = np.ndarray((L * W), dtype=np.complex128)
* comp_dst_cd(f_combined, L, W, dst_type[type], res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2507,7 +2507,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
*/
}
- /* "ltfatpy/comp/comp_dst.pyx":125
+ /* "ltfatpy/comp/comp_dst.pyx":129
* if W > 1:
* res = np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2517,7 +2517,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(PyObject *__pyx_v_f,
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_dst.pyx":90
+ /* "ltfatpy/comp/comp_dst.pyx":94
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_dst(f, type): # <<<<<<<<<<<<<<
@@ -2577,11 +2577,11 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_8comp_dst_1comp_dst(PyObject *__pyx_sel
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_type)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_dst", 1, 2, 2, 1); __PYX_ERR(0, 90, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_dst", 1, 2, 2, 1); __PYX_ERR(0, 94, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_dst") < 0)) __PYX_ERR(0, 90, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_dst") < 0)) __PYX_ERR(0, 94, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
goto __pyx_L5_argtuple_error;
@@ -2594,7 +2594,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_8comp_dst_1comp_dst(PyObject *__pyx_sel
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_dst", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 90, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_dst", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 94, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_dst.comp_dst", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2613,7 +2613,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_8comp_dst_comp_dst(CYTHON_UNUSED PyObje
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_dst", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(__pyx_v_f, __pyx_v_type, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 90, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_8comp_dst_comp_dst(__pyx_v_f, __pyx_v_type, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 94, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15053,8 +15053,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 100, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 112, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15070,25 +15070,25 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_dst.pyx":100
+ /* "ltfatpy/comp/comp_dst.pyx":104
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_dst.pyx":102
+ /* "ltfatpy/comp/comp_dst.pyx":106
* raise TypeError("f data should be numpy.float64 or complex128")
* if type not in {1, 2, 3, 4}:
* raise TypeError("type should be 1, 2, 3 or 4") # <<<<<<<<<<<<<<
*
* dst_type = {1: DSTI, 2: DSTII, 3: DSTIII, 4: DSTIV}
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_type_should_be_1_2_3_or_4); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_type_should_be_1_2_3_or_4); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
@@ -15440,22 +15440,22 @@ PyMODINIT_FUNC PyInit_comp_dst(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_dst.pyx":62
+ /* "ltfatpy/comp/comp_dst.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dst_kind, dst_cd, dst_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_dst.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_gabdual_long.c b/ltfatpy/comp/comp_gabdual_long.c
index bbea9b8..9255f53 100644
--- a/ltfatpy/comp/comp_gabdual_long.c
+++ b/ltfatpy/comp/comp_gabdual_long.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1786,7 +1786,7 @@ static PyObject *__pyx_tuple__18;
static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
-/* "ltfatpy/comp/comp_gabdual_long.pyx":70
+/* "ltfatpy/comp/comp_gabdual_long.pyx":74
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabdual_long_d(const double[:] g, const ltfatInt L, const ltfatInt R, # <<<<<<<<<<<<<<
@@ -1801,7 +1801,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_d(
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_gabdual_long_d", 0);
- /* "ltfatpy/comp/comp_gabdual_long.pyx":73
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":77
* const ltfatInt a, const ltfatInt M, double[:] out):
* """ Internal function, do not use it """
* gabdual_long_d(&g[0], L, R, a, M, &out[0]) # <<<<<<<<<<<<<<
@@ -1812,7 +1812,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_d(
__pyx_t_2 = 0;
gabdual_long_d((&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_1 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_R, __pyx_v_a, __pyx_v_M, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_gabdual_long.pyx":70
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":74
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabdual_long_d(const double[:] g, const ltfatInt L, const ltfatInt R, # <<<<<<<<<<<<<<
@@ -1827,7 +1827,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_d(
return __pyx_r;
}
-/* "ltfatpy/comp/comp_gabdual_long.pyx":79
+/* "ltfatpy/comp/comp_gabdual_long.pyx":83
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabdual_long_cd(const double complex[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1842,7 +1842,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_cd
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_gabdual_long_cd", 0);
- /* "ltfatpy/comp/comp_gabdual_long.pyx":83
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":87
* double complex[:] out):
* """ Internal function, do not use it """
* gabdual_long_cd(&g[0], L, R, a, M, &out[0]) # <<<<<<<<<<<<<<
@@ -1853,7 +1853,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_cd
__pyx_t_2 = 0;
gabdual_long_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_1 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_R, __pyx_v_a, __pyx_v_M, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_gabdual_long.pyx":79
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":83
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabdual_long_cd(const double complex[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1868,7 +1868,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_cd
return __pyx_r;
}
-/* "ltfatpy/comp/comp_gabdual_long.pyx":89
+/* "ltfatpy/comp/comp_gabdual_long.pyx":93
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_gabdual_long(g, a, M): # <<<<<<<<<<<<<<
@@ -1901,66 +1901,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__Pyx_memviewslice __pyx_t_15 = { 0, 0, { 0 }, { 0 }, { 0 } };
__Pyx_RefNannySetupContext("comp_gabdual_long", 0);
- /* "ltfatpy/comp/comp_gabdual_long.pyx":97
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":101
* .. seealso:: :func:`~ltfatpy.gabor.gabdual.gabdual`
* """
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("g data should be numpy.float64 or numpy.complex128")
*
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L4_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L4_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_gabdual_long.pyx":98
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":102
* """
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or numpy.complex128") # <<<<<<<<<<<<<<
*
* cdef ltfatInt L = g.shape[0]
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 98, __pyx_L1_error)
+ __PYX_ERR(0, 102, __pyx_L1_error)
- /* "ltfatpy/comp/comp_gabdual_long.pyx":97
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":101
* .. seealso:: :func:`~ltfatpy.gabor.gabdual.gabdual`
* """
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -1969,23 +1969,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
*/
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":100
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":104
* raise TypeError("g data should be numpy.float64 or numpy.complex128")
*
* cdef ltfatInt L = g.shape[0] # <<<<<<<<<<<<<<
* cdef ltfatInt R = 1
* if g.ndim > 1:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_L = __pyx_t_6;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":101
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":105
*
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1 # <<<<<<<<<<<<<<
@@ -1994,50 +1994,50 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
*/
__pyx_v_R = 1;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":102
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":106
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.")
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_gabdual_long.pyx":103
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":107
* cdef ltfatInt R = 1
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1]
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_gabdual_long.pyx":104
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":108
* if g.ndim > 1:
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.") # <<<<<<<<<<<<<<
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F')
*/
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_Raise(__pyx_t_3, 0, 0, 0);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __PYX_ERR(0, 104, __pyx_L1_error)
+ __PYX_ERR(0, 108, __pyx_L1_error)
- /* "ltfatpy/comp/comp_gabdual_long.pyx":103
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":107
* cdef ltfatInt R = 1
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -2046,42 +2046,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
*/
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":105
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":109
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1] # <<<<<<<<<<<<<<
* g_combined = g.reshape(L*R, order='F')
* else:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_R = __pyx_t_6;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":106
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":110
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F') # <<<<<<<<<<<<<<
* else:
* g_combined = g
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 106, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 106, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -2089,7 +2089,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_v_g_combined = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":102
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":106
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2099,7 +2099,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
goto __pyx_L6;
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":108
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":112
* g_combined = g.reshape(L*R, order='F')
* else:
* g_combined = g # <<<<<<<<<<<<<<
@@ -2112,23 +2112,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
}
__pyx_L6:;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":110
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":114
* g_combined = g
*
* if np.issubdtype(g.dtype, np.float64): # <<<<<<<<<<<<<<
* res = np.ndarray((L * R), dtype=np.float64)
* comp_gabdual_long_d(g_combined, L, R, a, M, res)
*/
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_2 = NULL;
@@ -2146,7 +2146,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_4)) {
PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_t_3, __pyx_t_8};
- __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2156,7 +2156,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) {
PyObject *__pyx_temp[3] = {__pyx_t_2, __pyx_t_3, __pyx_t_8};
- __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -2164,7 +2164,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
} else
#endif
{
- __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_10 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_10);
if (__pyx_t_2) {
__Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_2); __pyx_t_2 = NULL;
@@ -2175,44 +2175,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_9, __pyx_t_8);
__pyx_t_3 = 0;
__pyx_t_8 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
}
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_gabdual_long.pyx":111
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":115
*
* if np.issubdtype(g.dtype, np.float64):
* res = np.ndarray((L * R), dtype=np.float64) # <<<<<<<<<<<<<<
* comp_gabdual_long_d(g_combined, L, R, a, M, res)
* else:
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_10 = PyTuple_New(1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_10 = PyTuple_New(1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_10);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_3) < 0) __PYX_ERR(0, 111, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_3) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_10, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -2220,7 +2220,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_v_res = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":112
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":116
* if np.issubdtype(g.dtype, np.float64):
* res = np.ndarray((L * R), dtype=np.float64)
* comp_gabdual_long_d(g_combined, L, R, a, M, res) # <<<<<<<<<<<<<<
@@ -2228,12 +2228,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
* res = np.ndarray((L * R), dtype=np.complex128)
*/
__pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 112, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_12 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
+ if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_12 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 116, __pyx_L1_error)
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 112, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_d(__pyx_t_11, __pyx_v_L, __pyx_v_R, __pyx_t_6, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_3 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_d(__pyx_t_11, __pyx_v_L, __pyx_v_R, __pyx_t_6, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__PYX_XDEC_MEMVIEW(&__pyx_t_11, 1);
__pyx_t_11.memview = NULL;
@@ -2243,7 +2243,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_t_13.data = NULL;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":110
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":114
* g_combined = g
*
* if np.issubdtype(g.dtype, np.float64): # <<<<<<<<<<<<<<
@@ -2253,7 +2253,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
goto __pyx_L8;
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":114
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":118
* comp_gabdual_long_d(g_combined, L, R, a, M, res)
* else:
* res = np.ndarray((L * R), dtype=np.complex128) # <<<<<<<<<<<<<<
@@ -2261,28 +2261,28 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
*
*/
/*else*/ {
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_10 = PyTuple_New(1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_10 = PyTuple_New(1); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_10);
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_complex128); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_complex128); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_8) < 0) __PYX_ERR(0, 114, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_8) < 0) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_10, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_10, __pyx_t_3); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -2290,7 +2290,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_v_res = __pyx_t_8;
__pyx_t_8 = 0;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":115
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":119
* else:
* res = np.ndarray((L * R), dtype=np.complex128)
* comp_gabdual_long_cd(g_combined, L, R, a, M, res) # <<<<<<<<<<<<<<
@@ -2298,12 +2298,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
* if R == 1:
*/
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 115, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_12 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_12 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 119, __pyx_L1_error)
__pyx_t_15 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 115, __pyx_L1_error)
- __pyx_t_8 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_cd(__pyx_t_14, __pyx_v_L, __pyx_v_R, __pyx_t_12, __pyx_t_6, __pyx_t_15); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 115, __pyx_L1_error)
+ if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_8 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long_cd(__pyx_t_14, __pyx_v_L, __pyx_v_R, __pyx_t_12, __pyx_t_6, __pyx_t_15); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__PYX_XDEC_MEMVIEW(&__pyx_t_14, 1);
__pyx_t_14.memview = NULL;
@@ -2315,7 +2315,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
}
__pyx_L8:;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":117
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":121
* comp_gabdual_long_cd(g_combined, L, R, a, M, res)
*
* if R == 1: # <<<<<<<<<<<<<<
@@ -2325,7 +2325,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_t_1 = ((__pyx_v_R == 1) != 0);
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_gabdual_long.pyx":118
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":122
*
* if R == 1:
* return res # <<<<<<<<<<<<<<
@@ -2337,7 +2337,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_gabdual_long.pyx":117
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":121
* comp_gabdual_long_cd(g_combined, L, R, a, M, res)
*
* if R == 1: # <<<<<<<<<<<<<<
@@ -2346,18 +2346,18 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
*/
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":120
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":124
* return res
* else:
* return res.reshape(R, L) # <<<<<<<<<<<<<<
*/
/*else*/ {
__Pyx_XDECREF(__pyx_r);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_res, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_res, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_10 = __Pyx_PyInt_FromSize_t(__pyx_v_R); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_10 = __Pyx_PyInt_FromSize_t(__pyx_v_R); if (unlikely(!__pyx_t_10)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_10);
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__pyx_t_4 = NULL;
__pyx_t_9 = 0;
@@ -2374,7 +2374,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_t_10, __pyx_t_7};
- __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -2384,7 +2384,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[3] = {__pyx_t_4, __pyx_t_10, __pyx_t_7};
- __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-__pyx_t_9, 2+__pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
@@ -2392,7 +2392,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
} else
#endif
{
- __pyx_t_2 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2+__pyx_t_9); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
if (__pyx_t_4) {
__Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); __pyx_t_4 = NULL;
@@ -2403,7 +2403,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
PyTuple_SET_ITEM(__pyx_t_2, 1+__pyx_t_9, __pyx_t_7);
__pyx_t_10 = 0;
__pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
}
@@ -2413,7 +2413,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(Py
goto __pyx_L0;
}
- /* "ltfatpy/comp/comp_gabdual_long.pyx":89
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":93
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_gabdual_long(g, a, M): # <<<<<<<<<<<<<<
@@ -2474,16 +2474,16 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_17comp_gabdual_long_1comp_gabdual_long(
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, 1); __PYX_ERR(0, 89, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, 1); __PYX_ERR(0, 93, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_M)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, 2); __PYX_ERR(0, 89, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, 2); __PYX_ERR(0, 93, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_gabdual_long") < 0)) __PYX_ERR(0, 89, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_gabdual_long") < 0)) __PYX_ERR(0, 93, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 3) {
goto __pyx_L5_argtuple_error;
@@ -2498,7 +2498,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_17comp_gabdual_long_1comp_gabdual_long(
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 89, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabdual_long", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 93, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_gabdual_long.comp_gabdual_long", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2517,7 +2517,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(C
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_gabdual_long", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(__pyx_v_g, __pyx_v_a, __pyx_v_M, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 89, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_17comp_gabdual_long_comp_gabdual_long(__pyx_v_g, __pyx_v_a, __pyx_v_M, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -14958,7 +14958,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 102, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -14975,25 +14975,25 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_gabdual_long.pyx":98
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":102
* """
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or numpy.complex128") # <<<<<<<<<<<<<<
*
* cdef ltfatInt L = g.shape[0]
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_gabdual_long.pyx":104
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":108
* if g.ndim > 1:
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.") # <<<<<<<<<<<<<<
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F')
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_dimensions_should_be_1_or_2); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_dimensions_should_be_1_or_2); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
@@ -15343,22 +15343,22 @@ PyMODINIT_FUNC PyInit_comp_gabdual_long(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_gabdual_long.pyx":62
+ /* "ltfatpy/comp/comp_gabdual_long.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, gabdual_long_d, gabdual_long_cd
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_gabdual_long.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_gabtight_long.c b/ltfatpy/comp/comp_gabtight_long.c
index 6960c06..69c40ee 100644
--- a/ltfatpy/comp/comp_gabtight_long.c
+++ b/ltfatpy/comp/comp_gabtight_long.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1793,7 +1793,7 @@ static PyObject *__pyx_tuple__18;
static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
-/* "ltfatpy/comp/comp_gabtight_long.pyx":72
+/* "ltfatpy/comp/comp_gabtight_long.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabtight_long_real(const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1808,7 +1808,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_gabtight_long_real", 0);
- /* "ltfatpy/comp/comp_gabtight_long.pyx":76
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":80
* const ltfatInt M, double[:] out):
* """ Internal function, do not use it """
* gabtight_long_d(&g[0], L, R, a, M, &out[0]) # <<<<<<<<<<<<<<
@@ -1819,7 +1819,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
__pyx_t_2 = 0;
gabtight_long_d((&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_1 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_R, __pyx_v_a, __pyx_v_M, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_gabtight_long.pyx":72
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabtight_long_real(const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1834,7 +1834,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
return __pyx_r;
}
-/* "ltfatpy/comp/comp_gabtight_long.pyx":82
+/* "ltfatpy/comp/comp_gabtight_long.pyx":86
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabtight_long_cmplx(const double complex[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1849,7 +1849,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
Py_ssize_t __pyx_t_2;
__Pyx_RefNannySetupContext("comp_gabtight_long_cmplx", 0);
- /* "ltfatpy/comp/comp_gabtight_long.pyx":86
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":90
* const ltfatInt M, double complex[:] out):
* """ Internal function, do not use it """
* gabtight_long_cd(&g[0], L, R, a, M, &out[0]) # <<<<<<<<<<<<<<
@@ -1860,7 +1860,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
__pyx_t_2 = 0;
gabtight_long_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_1 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_R, __pyx_v_a, __pyx_v_M, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_2 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_gabtight_long.pyx":82
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":86
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_gabtight_long_cmplx(const double complex[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1875,7 +1875,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_
return __pyx_r;
}
-/* "ltfatpy/comp/comp_gabtight_long.pyx":88
+/* "ltfatpy/comp/comp_gabtight_long.pyx":92
* gabtight_long_cd(&g[0], L, R, a, M, &out[0])
*
* cpdef comp_gabtight_long(g, a, M): # <<<<<<<<<<<<<<
@@ -1908,23 +1908,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
PyObject *__pyx_t_15 = NULL;
__Pyx_RefNannySetupContext("comp_gabtight_long", 0);
- /* "ltfatpy/comp/comp_gabtight_long.pyx":96
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":100
* .. seealso:: :func:`~ltfatpy.gabor.gabtight.gabtight`
* """
* cdef ltfatInt L = g.shape[0] # <<<<<<<<<<<<<<
* cdef ltfatInt R = 1
* if g.ndim > 1:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_L = __pyx_t_3;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":97
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":101
* """
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1 # <<<<<<<<<<<<<<
@@ -1933,50 +1933,50 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
*/
__pyx_v_R = 1;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":98
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":102
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.")
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_gabtight_long.pyx":99
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":103
* cdef ltfatInt R = 1
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1]
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 99, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 103, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_gabtight_long.pyx":100
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":104
* if g.ndim > 1:
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.") # <<<<<<<<<<<<<<
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F')
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 100, __pyx_L1_error)
+ __PYX_ERR(0, 104, __pyx_L1_error)
- /* "ltfatpy/comp/comp_gabtight_long.pyx":99
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":103
* cdef ltfatInt R = 1
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -1985,42 +1985,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
*/
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":101
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":105
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1] # <<<<<<<<<<<<<<
* g_combined = g.reshape(L*R, order='F')
* else:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_2, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_2, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v_R = __pyx_t_3;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":102
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":106
* raise TypeError("g dimensions should be 1 or 2.")
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F') # <<<<<<<<<<<<<<
* else:
* g_combined = g
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_GIVEREF(__pyx_t_2);
PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);
__pyx_t_2 = 0;
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 102, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 102, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
@@ -2028,7 +2028,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_v_g_combined = __pyx_t_6;
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":98
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":102
* cdef ltfatInt L = g.shape[0]
* cdef ltfatInt R = 1
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2038,7 +2038,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
goto __pyx_L3;
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":104
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":108
* g_combined = g.reshape(L*R, order='F')
* else:
* g_combined = g # <<<<<<<<<<<<<<
@@ -2051,23 +2051,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
}
__pyx_L3:;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":106
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":110
* g_combined = g
*
* if np.issubdtype(g.dtype, np.float64): # <<<<<<<<<<<<<<
* gd = np.ndarray((L * R), dtype=np.float64)
* comp_gabtight_long_real(g_combined, L, R, a, M, gd)
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_1 = NULL;
@@ -2085,7 +2085,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_5)) {
PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_t_2, __pyx_t_7};
- __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2095,7 +2095,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_5)) {
PyObject *__pyx_temp[3] = {__pyx_t_1, __pyx_t_2, __pyx_t_7};
- __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyCFunction_FastCall(__pyx_t_5, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2103,7 +2103,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
} else
#endif
{
- __pyx_t_9 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_9 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_9);
if (__pyx_t_1) {
__Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_1); __pyx_t_1 = NULL;
@@ -2114,44 +2114,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_8, __pyx_t_7);
__pyx_t_2 = 0;
__pyx_t_7 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
}
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_gabtight_long.pyx":107
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":111
*
* if np.issubdtype(g.dtype, np.float64):
* gd = np.ndarray((L * R), dtype=np.float64) # <<<<<<<<<<<<<<
* comp_gabtight_long_real(g_combined, L, R, a, M, gd)
* elif np.issubdtype(g.dtype, np.complex128):
*/
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_9 = PyTuple_New(1); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_9);
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 107, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_9, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
@@ -2159,7 +2159,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_v_gd = __pyx_t_2;
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":108
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":112
* if np.issubdtype(g.dtype, np.float64):
* gd = np.ndarray((L * R), dtype=np.float64)
* comp_gabtight_long_real(g_combined, L, R, a, M, gd) # <<<<<<<<<<<<<<
@@ -2167,12 +2167,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
* gd = np.ndarray((L * R), dtype=np.complex128)
*/
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 108, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
__pyx_t_12 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_gd);
- if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 108, __pyx_L1_error)
- __pyx_t_2 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_real(__pyx_t_10, __pyx_v_L, __pyx_v_R, __pyx_t_3, __pyx_t_11, __pyx_t_12); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 108, __pyx_L1_error)
+ if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_2 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_real(__pyx_t_10, __pyx_v_L, __pyx_v_R, __pyx_t_3, __pyx_t_11, __pyx_t_12); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__PYX_XDEC_MEMVIEW(&__pyx_t_10, 1);
__pyx_t_10.memview = NULL;
@@ -2182,7 +2182,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_t_12.data = NULL;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":106
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":110
* g_combined = g
*
* if np.issubdtype(g.dtype, np.float64): # <<<<<<<<<<<<<<
@@ -2192,23 +2192,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
goto __pyx_L5;
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":109
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":113
* gd = np.ndarray((L * R), dtype=np.float64)
* comp_gabtight_long_real(g_combined, L, R, a, M, gd)
* elif np.issubdtype(g.dtype, np.complex128): # <<<<<<<<<<<<<<
* gd = np.ndarray((L * R), dtype=np.complex128)
* comp_gabtight_long_cmplx(g_combined, L, R, a, M, gd)
*/
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_issubdtype); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_9);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__pyx_t_5 = NULL;
@@ -2226,7 +2226,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_9)) {
PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_t_6, __pyx_t_7};
- __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2236,7 +2236,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_9)) {
PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_t_6, __pyx_t_7};
- __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_9, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2244,7 +2244,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
} else
#endif
{
- __pyx_t_1 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
if (__pyx_t_5) {
__Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_5); __pyx_t_5 = NULL;
@@ -2255,44 +2255,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
PyTuple_SET_ITEM(__pyx_t_1, 1+__pyx_t_8, __pyx_t_7);
__pyx_t_6 = 0;
__pyx_t_7 = 0;
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
}
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_gabtight_long.pyx":110
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":114
* comp_gabtight_long_real(g_combined, L, R, a, M, gd)
* elif np.issubdtype(g.dtype, np.complex128):
* gd = np.ndarray((L * R), dtype=np.complex128) # <<<<<<<<<<<<<<
* comp_gabtight_long_cmplx(g_combined, L, R, a, M, gd)
* else:
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_9 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_9);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_R)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_GIVEREF(__pyx_t_2);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
__pyx_t_2 = 0;
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 110, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_9, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2300,7 +2300,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_v_gd = __pyx_t_6;
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":111
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":115
* elif np.issubdtype(g.dtype, np.complex128):
* gd = np.ndarray((L * R), dtype=np.complex128)
* comp_gabtight_long_cmplx(g_combined, L, R, a, M, gd) # <<<<<<<<<<<<<<
@@ -2308,12 +2308,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
* raise TypeError("g data should be numpy.float64 or numpy.complex128")
*/
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 111, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 111, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 111, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_3 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_gd);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 111, __pyx_L1_error)
- __pyx_t_6 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_cmplx(__pyx_t_13, __pyx_v_L, __pyx_v_R, __pyx_t_11, __pyx_t_3, __pyx_t_14); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_6 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long_cmplx(__pyx_t_13, __pyx_v_L, __pyx_v_R, __pyx_t_11, __pyx_t_3, __pyx_t_14); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__PYX_XDEC_MEMVIEW(&__pyx_t_13, 1);
__pyx_t_13.memview = NULL;
@@ -2323,7 +2323,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_t_14.data = NULL;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":109
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":113
* gd = np.ndarray((L * R), dtype=np.float64)
* comp_gabtight_long_real(g_combined, L, R, a, M, gd)
* elif np.issubdtype(g.dtype, np.complex128): # <<<<<<<<<<<<<<
@@ -2333,7 +2333,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
goto __pyx_L5;
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":113
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":117
* comp_gabtight_long_cmplx(g_combined, L, R, a, M, gd)
* else:
* raise TypeError("g data should be numpy.float64 or numpy.complex128") # <<<<<<<<<<<<<<
@@ -2341,15 +2341,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
* if R == 1:
*/
/*else*/ {
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_Raise(__pyx_t_6, 0, 0, 0);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __PYX_ERR(0, 113, __pyx_L1_error)
+ __PYX_ERR(0, 117, __pyx_L1_error)
}
__pyx_L5:;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":115
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":119
* raise TypeError("g data should be numpy.float64 or numpy.complex128")
*
* if R == 1: # <<<<<<<<<<<<<<
@@ -2359,7 +2359,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_t_4 = ((__pyx_v_R == 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_gabtight_long.pyx":116
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":120
*
* if R == 1:
* return gd # <<<<<<<<<<<<<<
@@ -2371,7 +2371,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
__pyx_r = __pyx_v_gd;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_gabtight_long.pyx":115
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":119
* raise TypeError("g data should be numpy.float64 or numpy.complex128")
*
* if R == 1: # <<<<<<<<<<<<<<
@@ -2380,18 +2380,18 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
*/
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":118
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":122
* return gd
* else:
* return gd.reshape(R, L).transpose() # <<<<<<<<<<<<<<
*/
/*else*/ {
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_gd, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_gd, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_9 = __Pyx_PyInt_FromSize_t(__pyx_v_R); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_9 = __Pyx_PyInt_FromSize_t(__pyx_v_R); if (unlikely(!__pyx_t_9)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_9);
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__pyx_t_5 = NULL;
__pyx_t_8 = 0;
@@ -2408,7 +2408,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_1)) {
PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_t_9, __pyx_t_7};
- __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
@@ -2418,7 +2418,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_1)) {
PyObject *__pyx_temp[3] = {__pyx_t_5, __pyx_t_9, __pyx_t_7};
- __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_1, __pyx_temp+1-__pyx_t_8, 2+__pyx_t_8); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
@@ -2426,7 +2426,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
} else
#endif
{
- __pyx_t_15 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_15 = PyTuple_New(2+__pyx_t_8); if (unlikely(!__pyx_t_15)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_15);
if (__pyx_t_5) {
__Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_15, 0, __pyx_t_5); __pyx_t_5 = NULL;
@@ -2437,12 +2437,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
PyTuple_SET_ITEM(__pyx_t_15, 1+__pyx_t_8, __pyx_t_7);
__pyx_t_9 = 0;
__pyx_t_7 = 0;
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_15, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_15, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
}
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_transpose); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_transpose); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_2 = NULL;
@@ -2456,10 +2456,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
}
}
if (__pyx_t_2) {
- __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
} else {
- __pyx_t_6 = __Pyx_PyObject_CallNoArg(__pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_CallNoArg(__pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
}
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2468,7 +2468,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(
goto __pyx_L0;
}
- /* "ltfatpy/comp/comp_gabtight_long.pyx":88
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":92
* gabtight_long_cd(&g[0], L, R, a, M, &out[0])
*
* cpdef comp_gabtight_long(g, a, M): # <<<<<<<<<<<<<<
@@ -2530,16 +2530,16 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_18comp_gabtight_long_1comp_gabtight_lon
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, 1); __PYX_ERR(0, 88, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, 1); __PYX_ERR(0, 92, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_M)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, 2); __PYX_ERR(0, 88, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, 2); __PYX_ERR(0, 92, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_gabtight_long") < 0)) __PYX_ERR(0, 88, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_gabtight_long") < 0)) __PYX_ERR(0, 92, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 3) {
goto __pyx_L5_argtuple_error;
@@ -2554,7 +2554,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_18comp_gabtight_long_1comp_gabtight_lon
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 88, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_gabtight_long", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 92, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_gabtight_long.comp_gabtight_long", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2573,7 +2573,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_gabtight_long", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(__pyx_v_g, __pyx_v_a, __pyx_v_M, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 88, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_18comp_gabtight_long_comp_gabtight_long(__pyx_v_g, __pyx_v_a, __pyx_v_M, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 92, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15014,7 +15014,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 104, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15031,25 +15031,25 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_gabtight_long.pyx":100
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":104
* if g.ndim > 1:
* if g.ndim > 2:
* raise TypeError("g dimensions should be 1 or 2.") # <<<<<<<<<<<<<<
* R = g.shape[1]
* g_combined = g.reshape(L*R, order='F')
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_g_dimensions_should_be_1_or_2); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_g_dimensions_should_be_1_or_2); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_gabtight_long.pyx":113
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":117
* comp_gabtight_long_cmplx(g_combined, L, R, a, M, gd)
* else:
* raise TypeError("g data should be numpy.float64 or numpy.complex128") # <<<<<<<<<<<<<<
*
* if R == 1:
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
@@ -15399,22 +15399,22 @@ PyMODINIT_FUNC PyInit_comp_gabtight_long(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_gabtight_long.pyx":62
+ /* "ltfatpy/comp/comp_gabtight_long.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, gabtight_long_d, gabtight_long_cd
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_gabtight_long.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_isepdgt.c b/ltfatpy/comp/comp_isepdgt.c
index 3e39c4f..1956119 100644
--- a/ltfatpy/comp/comp_isepdgt.c
+++ b/ltfatpy/comp/comp_isepdgt.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1809,7 +1809,7 @@ static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
static PyObject *__pyx_tuple__21;
-/* "ltfatpy/comp/comp_isepdgt.pyx":71
+/* "ltfatpy/comp/comp_isepdgt.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgt_long_d(const double complex[:] coef, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1825,7 +1825,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_long_d(__Pyx_me
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_idgt_long_d", 0);
- /* "ltfatpy/comp/comp_isepdgt.pyx":75
+ /* "ltfatpy/comp/comp_isepdgt.pyx":79
* const dgt_phasetype ptype, double complex[:] out):
* """ Internal function, do not use it """
* idgt_long_d(& coef[0], & g[0], L, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1837,7 +1837,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_long_d(__Pyx_me
__pyx_t_3 = 0;
idgt_long_d((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_coef.data + __pyx_t_1 * __pyx_v_coef.strides[0]) )))), (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_isepdgt.pyx":71
+ /* "ltfatpy/comp/comp_isepdgt.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgt_long_d(const double complex[:] coef, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1852,7 +1852,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_long_d(__Pyx_me
return __pyx_r;
}
-/* "ltfatpy/comp/comp_isepdgt.pyx":81
+/* "ltfatpy/comp/comp_isepdgt.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgt_fb_d(const double complex[:] coef, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1868,7 +1868,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_fb_d(__Pyx_memv
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_idgt_fb_d", 0);
- /* "ltfatpy/comp/comp_isepdgt.pyx":86
+ /* "ltfatpy/comp/comp_isepdgt.pyx":90
* double complex[:] out):
* """ Internal function, do not use it """
* idgt_fb_d(& coef[0], & g[0], L, gl, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1880,7 +1880,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_fb_d(__Pyx_memv
__pyx_t_3 = 0;
idgt_fb_d((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_coef.data + __pyx_t_1 * __pyx_v_coef.strides[0]) )))), (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_isepdgt.pyx":81
+ /* "ltfatpy/comp/comp_isepdgt.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgt_fb_d(const double complex[:] coef, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1895,7 +1895,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_fb_d(__Pyx_memv
return __pyx_r;
}
-/* "ltfatpy/comp/comp_isepdgt.pyx":92
+/* "ltfatpy/comp/comp_isepdgt.pyx":96
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_isepdgt(coef, g, a, pt): # <<<<<<<<<<<<<<
@@ -1930,42 +1930,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_INCREF(__pyx_v_coef);
__Pyx_INCREF(__pyx_v_g);
- /* "ltfatpy/comp/comp_isepdgt.pyx":100
+ /* "ltfatpy/comp/comp_isepdgt.pyx":104
* .. seealso:: :func:`~ltfatpy.gabor.idgt.idgt`
* """
* if (coef.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* coef = coef.astype(np.complex128)
* if (g.dtype.type != np.complex128):
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":101
+ /* "ltfatpy/comp/comp_isepdgt.pyx":105
* """
* if (coef.dtype.type != np.complex128):
* coef = coef.astype(np.complex128) # <<<<<<<<<<<<<<
* if (g.dtype.type != np.complex128):
* g = g.astype(np.complex128)
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_astype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_astype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_2 = NULL;
@@ -1979,14 +1979,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
}
}
if (!__pyx_t_2) {
- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_1);
} else {
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[2] = {__pyx_t_2, __pyx_t_5};
- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
@@ -1995,20 +1995,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[2] = {__pyx_t_2, __pyx_t_5};
- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
} else
#endif
{
- __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1+1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2); __pyx_t_2 = NULL;
__Pyx_GIVEREF(__pyx_t_5);
PyTuple_SET_ITEM(__pyx_t_6, 0+1, __pyx_t_5);
__pyx_t_5 = 0;
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
}
@@ -2017,7 +2017,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_DECREF_SET(__pyx_v_coef, __pyx_t_1);
__pyx_t_1 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":100
+ /* "ltfatpy/comp/comp_isepdgt.pyx":104
* .. seealso:: :func:`~ltfatpy.gabor.idgt.idgt`
* """
* if (coef.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2026,42 +2026,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":102
+ /* "ltfatpy/comp/comp_isepdgt.pyx":106
* if (coef.dtype.type != np.complex128):
* coef = coef.astype(np.complex128)
* if (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* g = g.astype(np.complex128)
*
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_6, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_6, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":103
+ /* "ltfatpy/comp/comp_isepdgt.pyx":107
* coef = coef.astype(np.complex128)
* if (g.dtype.type != np.complex128):
* g = g.astype(np.complex128) # <<<<<<<<<<<<<<
*
* if pt != 0 and pt != 1:
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_astype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_astype); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_t_3 = NULL;
@@ -2075,14 +2075,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
}
}
if (!__pyx_t_3) {
- __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_GOTREF(__pyx_t_1);
} else {
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_6)) {
PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_t_5};
- __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
@@ -2091,20 +2091,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_6)) {
PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_t_5};
- __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_6, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
} else
#endif
{
- __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3); __pyx_t_3 = NULL;
__Pyx_GIVEREF(__pyx_t_5);
PyTuple_SET_ITEM(__pyx_t_2, 0+1, __pyx_t_5);
__pyx_t_5 = 0;
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
}
@@ -2113,7 +2113,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_1);
__pyx_t_1 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":102
+ /* "ltfatpy/comp/comp_isepdgt.pyx":106
* if (coef.dtype.type != np.complex128):
* coef = coef.astype(np.complex128)
* if (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2122,42 +2122,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":105
+ /* "ltfatpy/comp/comp_isepdgt.pyx":109
* g = g.astype(np.complex128)
*
* if pt != 0 and pt != 1: # <<<<<<<<<<<<<<
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
*/
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_0, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_0, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_7) {
} else {
__pyx_t_4 = __pyx_t_7;
goto __pyx_L6_bool_binop_done;
}
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_7;
__pyx_L6_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":106
+ /* "ltfatpy/comp/comp_isepdgt.pyx":110
*
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 106, __pyx_L1_error)
+ __PYX_ERR(0, 110, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgt.pyx":105
+ /* "ltfatpy/comp/comp_isepdgt.pyx":109
* g = g.astype(np.complex128)
*
* if pt != 0 and pt != 1: # <<<<<<<<<<<<<<
@@ -2166,48 +2166,48 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":107
+ /* "ltfatpy/comp/comp_isepdgt.pyx":111
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3: # <<<<<<<<<<<<<<
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1]
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_LE); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_LE); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
if (!__pyx_t_7) {
} else {
__pyx_t_4 = __pyx_t_7;
goto __pyx_L9_bool_binop_done;
}
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_6, __pyx_int_3, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_6, __pyx_int_3, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_7;
__pyx_L9_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":108
+ /* "ltfatpy/comp/comp_isepdgt.pyx":112
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.") # <<<<<<<<<<<<<<
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 108, __pyx_L1_error)
+ __PYX_ERR(0, 112, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgt.pyx":107
+ /* "ltfatpy/comp/comp_isepdgt.pyx":111
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3: # <<<<<<<<<<<<<<
@@ -2216,74 +2216,74 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":109
+ /* "ltfatpy/comp/comp_isepdgt.pyx":113
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1] # <<<<<<<<<<<<<<
* cdef ltfatInt L = N * a
* cdef ltfatInt M = coef.shape[0]
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_N = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":110
+ /* "ltfatpy/comp/comp_isepdgt.pyx":114
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a # <<<<<<<<<<<<<<
* cdef ltfatInt M = coef.shape[0]
* cdef ltfatInt W = coef.size // (M * N)
*/
- __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = PyNumber_Multiply(__pyx_t_6, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_1 = PyNumber_Multiply(__pyx_t_6, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":111
+ /* "ltfatpy/comp/comp_isepdgt.pyx":115
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
* cdef ltfatInt M = coef.shape[0] # <<<<<<<<<<<<<<
* cdef ltfatInt W = coef.size // (M * N)
* if W > 1 and coef.ndim == 2:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_M = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":112
+ /* "ltfatpy/comp/comp_isepdgt.pyx":116
* cdef ltfatInt L = N * a
* cdef ltfatInt M = coef.shape[0]
* cdef ltfatInt W = coef.size // (M * N) # <<<<<<<<<<<<<<
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = __Pyx_PyInt_FromSize_t((__pyx_v_M * __pyx_v_N)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t((__pyx_v_M * __pyx_v_N)); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_W = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":113
+ /* "ltfatpy/comp/comp_isepdgt.pyx":117
* cdef ltfatInt M = coef.shape[0]
* cdef ltfatInt W = coef.size // (M * N)
* if W > 1 and coef.ndim == 2: # <<<<<<<<<<<<<<
@@ -2296,31 +2296,31 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_4 = __pyx_t_7;
goto __pyx_L12_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_2, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_2, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_7;
__pyx_L12_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":114
+ /* "ltfatpy/comp/comp_isepdgt.pyx":118
* cdef ltfatInt W = coef.size // (M * N)
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.") # <<<<<<<<<<<<<<
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2)
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 114, __pyx_L1_error)
+ __PYX_ERR(0, 118, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgt.pyx":113
+ /* "ltfatpy/comp/comp_isepdgt.pyx":117
* cdef ltfatInt M = coef.shape[0]
* cdef ltfatInt W = coef.size // (M * N)
* if W > 1 and coef.ndim == 2: # <<<<<<<<<<<<<<
@@ -2329,7 +2329,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":115
+ /* "ltfatpy/comp/comp_isepdgt.pyx":119
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3: # <<<<<<<<<<<<<<
@@ -2342,38 +2342,38 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_4 = __pyx_t_7;
goto __pyx_L15_bool_binop_done;
}
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_1, __pyx_int_3, 3, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_1, __pyx_int_3, 3, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_7 < 0)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_4 = __pyx_t_7;
__pyx_L15_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":116
+ /* "ltfatpy/comp/comp_isepdgt.pyx":120
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2) # <<<<<<<<<<<<<<
*
* coef = coef.reshape(coef.size, order='F')
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_coef);
__Pyx_GIVEREF(__pyx_v_coef);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_coef);
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_axis, __pyx_int_2) < 0) __PYX_ERR(0, 116, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 116, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_axis, __pyx_int_2) < 0) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2381,7 +2381,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_DECREF_SET(__pyx_v_coef, __pyx_t_5);
__pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":115
+ /* "ltfatpy/comp/comp_isepdgt.pyx":119
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3: # <<<<<<<<<<<<<<
@@ -2390,26 +2390,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":118
+ /* "ltfatpy/comp/comp_isepdgt.pyx":122
* coef = np.squeeze(coef, axis=2)
*
* coef = coef.reshape(coef.size, order='F') # <<<<<<<<<<<<<<
*
* cdef ltfatInt gl = g.shape[0]
*/
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_reshape); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_reshape); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 118, __pyx_L1_error)
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_5, __pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2417,77 +2417,77 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_DECREF_SET(__pyx_v_coef, __pyx_t_1);
__pyx_t_1 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":120
+ /* "ltfatpy/comp/comp_isepdgt.pyx":124
* coef = coef.reshape(coef.size, order='F')
*
* cdef ltfatInt gl = g.shape[0] # <<<<<<<<<<<<<<
*
* if g.ndim > 1:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_gl = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":122
+ /* "ltfatpy/comp/comp_isepdgt.pyx":126
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_6, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_6, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":123
+ /* "ltfatpy/comp/comp_isepdgt.pyx":127
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = PyObject_RichCompare(__pyx_t_1, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_6 = PyObject_RichCompare(__pyx_t_1, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":124
+ /* "ltfatpy/comp/comp_isepdgt.pyx":128
* if g.ndim > 1:
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1)) # <<<<<<<<<<<<<<
* if g.ndim == 2:
* gl = gl * g.shape[1]
*/
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_g);
__Pyx_GIVEREF(__pyx_v_g);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_g);
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_3 = __Pyx_PyInt_SubtractObjC(__pyx_t_5, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_SubtractObjC(__pyx_t_5, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2495,12 +2495,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_3) < 0) __PYX_ERR(0, 124, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_3) < 0) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2508,7 +2508,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_3);
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":123
+ /* "ltfatpy/comp/comp_isepdgt.pyx":127
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -2517,45 +2517,45 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":125
+ /* "ltfatpy/comp/comp_isepdgt.pyx":129
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2: # <<<<<<<<<<<<<<
* gl = gl * g.shape[1]
* g = g(gl, order='F')
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_3, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_3, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":126
+ /* "ltfatpy/comp/comp_isepdgt.pyx":130
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2:
* gl = gl * g.shape[1] # <<<<<<<<<<<<<<
* g = g(gl, order='F')
* res = np.ndarray((L * W), dtype=np.complex128)
*/
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = PyNumber_Multiply(__pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_3 = PyNumber_Multiply(__pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_gl = __pyx_t_8;
- /* "ltfatpy/comp/comp_isepdgt.pyx":125
+ /* "ltfatpy/comp/comp_isepdgt.pyx":129
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2: # <<<<<<<<<<<<<<
@@ -2564,31 +2564,31 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":127
+ /* "ltfatpy/comp/comp_isepdgt.pyx":131
* if g.ndim == 2:
* gl = gl * g.shape[1]
* g = g(gl, order='F') # <<<<<<<<<<<<<<
* res = np.ndarray((L * W), dtype=np.complex128)
* if gl < L:
*/
- __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 127, __pyx_L1_error)
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_v_g, __pyx_t_6, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_v_g, __pyx_t_6, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_2);
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":122
+ /* "ltfatpy/comp/comp_isepdgt.pyx":126
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2597,35 +2597,35 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":128
+ /* "ltfatpy/comp/comp_isepdgt.pyx":132
* gl = gl * g.shape[1]
* g = g(gl, order='F')
* res = np.ndarray((L * W), dtype=np.complex128) # <<<<<<<<<<<<<<
* if gl < L:
* comp_idgt_fb_d(coef, g, L, gl, W, a, M, pt, res)
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_GIVEREF(__pyx_t_2);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_2);
__pyx_t_2 = 0;
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 128, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2633,7 +2633,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_v_res = __pyx_t_5;
__pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":129
+ /* "ltfatpy/comp/comp_isepdgt.pyx":133
* g = g(gl, order='F')
* res = np.ndarray((L * W), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2643,7 +2643,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_4 = ((__pyx_v_gl < __pyx_v_L) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":130
+ /* "ltfatpy/comp/comp_isepdgt.pyx":134
* res = np.ndarray((L * W), dtype=np.complex128)
* if gl < L:
* comp_idgt_fb_d(coef, g, L, gl, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2651,14 +2651,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
* return np.reshape(res, (L, W), order='F')
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_coef);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 130, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 130, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 130, __pyx_L1_error)
- __pyx_t_5 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_v_M, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 130, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_5 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_v_M, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2671,7 +2671,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_13.data = NULL;
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":131
+ /* "ltfatpy/comp/comp_isepdgt.pyx":135
* if gl < L:
* comp_idgt_fb_d(coef, g, L, gl, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2681,7 +2681,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_4 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":132
+ /* "ltfatpy/comp/comp_isepdgt.pyx":136
* comp_idgt_fb_d(coef, g, L, gl, W, a, M, pt, res)
* if W > 1:
* return np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
@@ -2689,16 +2689,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
* comp_idgt_long_d(coef, g, L, W, a, M, pt, res)
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_reshape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_5 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_5);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_5);
@@ -2706,7 +2706,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_6);
__pyx_t_5 = 0;
__pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2714,10 +2714,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 132, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, __pyx_t_3); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_5 = 0;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":131
+ /* "ltfatpy/comp/comp_isepdgt.pyx":135
* if gl < L:
* comp_idgt_fb_d(coef, g, L, gl, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2735,7 +2735,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":133
+ /* "ltfatpy/comp/comp_isepdgt.pyx":137
* if W > 1:
* return np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2747,7 +2747,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":129
+ /* "ltfatpy/comp/comp_isepdgt.pyx":133
* g = g(gl, order='F')
* res = np.ndarray((L * W), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2756,7 +2756,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":134
+ /* "ltfatpy/comp/comp_isepdgt.pyx":138
* return np.reshape(res, (L, W), order='F')
* return res
* comp_idgt_long_d(coef, g, L, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2764,14 +2764,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
* return np.reshape(res, (L, W), order='F')
*/
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_coef);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_5 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_long_d(__pyx_t_13, __pyx_t_10, __pyx_v_L, __pyx_v_W, __pyx_t_11, __pyx_v_M, __pyx_t_12, __pyx_t_9); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_5 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_idgt_long_d(__pyx_t_13, __pyx_t_10, __pyx_v_L, __pyx_v_W, __pyx_t_11, __pyx_v_M, __pyx_t_12, __pyx_t_9); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__PYX_XDEC_MEMVIEW(&__pyx_t_13, 1);
__pyx_t_13.memview = NULL;
@@ -2784,7 +2784,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_9.data = NULL;
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":135
+ /* "ltfatpy/comp/comp_isepdgt.pyx":139
* return res
* comp_idgt_long_d(coef, g, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2794,23 +2794,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_4 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgt.pyx":136
+ /* "ltfatpy/comp/comp_isepdgt.pyx":140
* comp_idgt_long_d(coef, g, L, W, a, M, pt, res)
* if W > 1:
* return np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
* return res
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_5 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_5);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_5);
@@ -2818,7 +2818,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_6);
__pyx_t_5 = 0;
__pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2826,10 +2826,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__Pyx_GIVEREF(__pyx_t_2);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_2);
__pyx_t_2 = 0;
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 136, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2838,7 +2838,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_t_5 = 0;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":135
+ /* "ltfatpy/comp/comp_isepdgt.pyx":139
* return res
* comp_idgt_long_d(coef, g, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2847,7 +2847,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
*/
}
- /* "ltfatpy/comp/comp_isepdgt.pyx":137
+ /* "ltfatpy/comp/comp_isepdgt.pyx":141
* if W > 1:
* return np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2857,7 +2857,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(PyObject *__
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgt.pyx":92
+ /* "ltfatpy/comp/comp_isepdgt.pyx":96
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_isepdgt(coef, g, a, pt): # <<<<<<<<<<<<<<
@@ -2919,21 +2919,21 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_12comp_isepdgt_1comp_isepdgt(PyObject *
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_g)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 1); __PYX_ERR(0, 92, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 1); __PYX_ERR(0, 96, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 2); __PYX_ERR(0, 92, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 2); __PYX_ERR(0, 96, __pyx_L3_error)
}
case 3:
if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_pt)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 3); __PYX_ERR(0, 92, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, 3); __PYX_ERR(0, 96, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_isepdgt") < 0)) __PYX_ERR(0, 92, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_isepdgt") < 0)) __PYX_ERR(0, 96, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 4) {
goto __pyx_L5_argtuple_error;
@@ -2950,7 +2950,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_12comp_isepdgt_1comp_isepdgt(PyObject *
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 92, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgt", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 96, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_isepdgt.comp_isepdgt", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2969,7 +2969,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(CYTHON_UNUS
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_isepdgt", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(__pyx_v_coef, __pyx_v_g, __pyx_v_a, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 92, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_12comp_isepdgt_comp_isepdgt(__pyx_v_coef, __pyx_v_g, __pyx_v_a, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 96, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15413,8 +15413,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 106, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 128, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15430,36 +15430,36 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_isepdgt.pyx":106
+ /* "ltfatpy/comp/comp_isepdgt.pyx":110
*
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_isepdgt.pyx":108
+ /* "ltfatpy/comp/comp_isepdgt.pyx":112
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.") # <<<<<<<<<<<<<<
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
- /* "ltfatpy/comp/comp_isepdgt.pyx":114
+ /* "ltfatpy/comp/comp_isepdgt.pyx":118
* cdef ltfatInt W = coef.size // (M * N)
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.") # <<<<<<<<<<<<<<
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2)
*/
- __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a_2); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a_2); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__3);
__Pyx_GIVEREF(__pyx_tuple__3);
@@ -15810,22 +15810,22 @@ PyMODINIT_FUNC PyInit_comp_isepdgt(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_isepdgt.pyx":62
+ /* "ltfatpy/comp/comp_isepdgt.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dgt_phasetype, idgt_fb_d, idgt_long_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_isepdgt.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_isepdgtreal.c b/ltfatpy/comp/comp_isepdgtreal.c
index b9eb930..521f673 100644
--- a/ltfatpy/comp/comp_isepdgtreal.c
+++ b/ltfatpy/comp/comp_isepdgtreal.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1833,7 +1833,7 @@ static PyObject *__pyx_tuple__21;
static PyObject *__pyx_tuple__22;
static PyObject *__pyx_tuple__23;
-/* "ltfatpy/comp/comp_isepdgtreal.pyx":71
+/* "ltfatpy/comp/comp_isepdgtreal.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgtreal_long_d(const double complex[:] coef, const double[:] g, # <<<<<<<<<<<<<<
@@ -1849,7 +1849,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_long_d(
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_idgtreal_long_d", 0);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":75
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":79
* const dgt_phasetype ptype, double[:] out):
* """ Internal function, do not use it """
* idgtreal_long_d(&coef[0], &g[0], L, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1861,7 +1861,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_long_d(
__pyx_t_3 = 0;
idgtreal_long_d((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_coef.data + __pyx_t_1 * __pyx_v_coef.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":71
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":75
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgtreal_long_d(const double complex[:] coef, const double[:] g, # <<<<<<<<<<<<<<
@@ -1876,7 +1876,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_long_d(
return __pyx_r;
}
-/* "ltfatpy/comp/comp_isepdgtreal.pyx":81
+/* "ltfatpy/comp/comp_isepdgtreal.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgtreal_fb_d(const double complex[:] coef, const double[:] g, # <<<<<<<<<<<<<<
@@ -1892,7 +1892,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_fb_d(__
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_idgtreal_fb_d", 0);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":85
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":89
* const int M, const dgt_phasetype ptype, double[:] out):
* """ Internal function, do not use it """
* idgtreal_fb_d(&coef[0], &g[0], L, gl, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1904,7 +1904,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_fb_d(__
__pyx_t_3 = 0;
idgtreal_fb_d((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_coef.data + __pyx_t_1 * __pyx_v_coef.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":81
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_idgtreal_fb_d(const double complex[:] coef, const double[:] g, # <<<<<<<<<<<<<<
@@ -1919,7 +1919,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_fb_d(__
return __pyx_r;
}
-/* "ltfatpy/comp/comp_isepdgtreal.pyx":91
+/* "ltfatpy/comp/comp_isepdgtreal.pyx":95
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_isepdgtreal(coef, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -1957,44 +1957,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_INCREF(__pyx_v_coef);
__Pyx_INCREF(__pyx_v_g);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":100
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":104
* """
*
* if (coef.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("coef data should be numpy.complex128")
* if (g.dtype.type != np.float64):
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 100, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":101
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":105
*
* if (coef.dtype.type != np.complex128):
* raise TypeError("coef data should be numpy.complex128") # <<<<<<<<<<<<<<
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 101, __pyx_L1_error)
+ __PYX_ERR(0, 105, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":100
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":104
* """
*
* if (coef.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2003,44 +2003,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":102
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":106
* if (coef.dtype.type != np.complex128):
* raise TypeError("coef data should be numpy.complex128")
* if (g.dtype.type != np.float64): # <<<<<<<<<<<<<<
* raise TypeError("g data should be numpy.float64")
* if pt != 0 and pt != 1:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 102, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":103
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":107
* raise TypeError("coef data should be numpy.complex128")
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64") # <<<<<<<<<<<<<<
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 103, __pyx_L1_error)
+ __PYX_ERR(0, 107, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":102
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":106
* if (coef.dtype.type != np.complex128):
* raise TypeError("coef data should be numpy.complex128")
* if (g.dtype.type != np.float64): # <<<<<<<<<<<<<<
@@ -2049,42 +2049,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":104
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":108
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64")
* if pt != 0 and pt != 1: # <<<<<<<<<<<<<<
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
*/
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_0, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_0, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_4 = __pyx_t_5;
goto __pyx_L6_bool_binop_done;
}
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_int_1, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_5;
__pyx_L6_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":105
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":109
* raise TypeError("g data should be numpy.float64")
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 105, __pyx_L1_error)
+ __PYX_ERR(0, 109, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":104
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":108
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64")
* if pt != 0 and pt != 1: # <<<<<<<<<<<<<<
@@ -2093,48 +2093,48 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":106
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":110
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3: # <<<<<<<<<<<<<<
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1]
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_LE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_LE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (!__pyx_t_5) {
} else {
__pyx_t_4 = __pyx_t_5;
goto __pyx_L9_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_3, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_5;
__pyx_L9_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":107
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":111
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.") # <<<<<<<<<<<<<<
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__4, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 107, __pyx_L1_error)
+ __PYX_ERR(0, 111, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":106
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":110
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3: # <<<<<<<<<<<<<<
@@ -2143,97 +2143,97 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":108
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":112
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1] # <<<<<<<<<<<<<<
* cdef ltfatInt L = N * a
* cdef ltfatInt M2 = coef.shape[0]
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_N = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":109
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":113
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a # <<<<<<<<<<<<<<
* cdef ltfatInt M2 = coef.shape[0]
* if M2 != (M//2 + 1):
*/
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyNumber_Multiply(__pyx_t_2, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_1 = PyNumber_Multiply(__pyx_t_2, __pyx_v_a); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 109, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v_L = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":110
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":114
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
* cdef ltfatInt M2 = coef.shape[0] # <<<<<<<<<<<<<<
* if M2 != (M//2 + 1):
* raise TypeError("Mismatch between the specified number of channels " +
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_shape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_M2 = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":111
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":115
* cdef ltfatInt L = N * a
* cdef ltfatInt M2 = coef.shape[0]
* if M2 != (M//2 + 1): # <<<<<<<<<<<<<<
* raise TypeError("Mismatch between the specified number of channels " +
* "and the size of the input coefficients.")
*/
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_M2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_M2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = __Pyx_PyInt_FloorDivideObjC(__pyx_v_M, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FloorDivideObjC(__pyx_v_M, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyInt_AddObjC(__pyx_t_1, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_AddObjC(__pyx_t_1, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":112
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":116
* cdef ltfatInt M2 = coef.shape[0]
* if M2 != (M//2 + 1):
* raise TypeError("Mismatch between the specified number of channels " + # <<<<<<<<<<<<<<
* "and the size of the input coefficients.")
* cdef ltfatInt W = coef.size // (M2 * N)
*/
- __pyx_t_1 = PyNumber_Add(__pyx_kp_s_Mismatch_between_the_specified_n, __pyx_kp_s_and_the_size_of_the_input_coeffi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_1 = PyNumber_Add(__pyx_kp_s_Mismatch_between_the_specified_n, __pyx_kp_s_and_the_size_of_the_input_coeffi); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 112, __pyx_L1_error)
+ __PYX_ERR(0, 116, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":111
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":115
* cdef ltfatInt L = N * a
* cdef ltfatInt M2 = coef.shape[0]
* if M2 != (M//2 + 1): # <<<<<<<<<<<<<<
@@ -2242,26 +2242,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":114
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":118
* raise TypeError("Mismatch between the specified number of channels " +
* "and the size of the input coefficients.")
* cdef ltfatInt W = coef.size // (M2 * N) # <<<<<<<<<<<<<<
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_M2 * __pyx_v_N)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_M2 * __pyx_v_N)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_W = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":115
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":119
* "and the size of the input coefficients.")
* cdef ltfatInt W = coef.size // (M2 * N)
* if W > 1 and coef.ndim == 2: # <<<<<<<<<<<<<<
@@ -2274,31 +2274,31 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_4 = __pyx_t_5;
goto __pyx_L13_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_EqObjC(__pyx_t_2, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_EqObjC(__pyx_t_2, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_t_4 = __pyx_t_5;
__pyx_L13_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":116
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":120
* cdef ltfatInt W = coef.size // (M2 * N)
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.") # <<<<<<<<<<<<<<
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2)
*/
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_Raise(__pyx_t_3, 0, 0, 0);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __PYX_ERR(0, 116, __pyx_L1_error)
+ __PYX_ERR(0, 120, __pyx_L1_error)
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":115
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":119
* "and the size of the input coefficients.")
* cdef ltfatInt W = coef.size // (M2 * N)
* if W > 1 and coef.ndim == 2: # <<<<<<<<<<<<<<
@@ -2307,7 +2307,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":117
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":121
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3: # <<<<<<<<<<<<<<
@@ -2320,38 +2320,38 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_4 = __pyx_t_5;
goto __pyx_L16_bool_binop_done;
}
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_3, __pyx_int_3, 3, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_3, __pyx_int_3, 3, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_4 = __pyx_t_5;
__pyx_L16_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":118
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":122
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2) # <<<<<<<<<<<<<<
*
* coef_combined = coef.reshape(coef.size, order='F')
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_coef);
__Pyx_GIVEREF(__pyx_v_coef);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_coef);
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 118, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_axis, __pyx_int_2) < 0) __PYX_ERR(0, 118, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 118, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_axis, __pyx_int_2) < 0) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 122, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2359,7 +2359,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_DECREF_SET(__pyx_v_coef, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":117
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":121
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.")
* if W == 1 and coef.ndim == 3: # <<<<<<<<<<<<<<
@@ -2368,26 +2368,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":120
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":124
* coef = np.squeeze(coef, axis=2)
*
* coef_combined = coef.reshape(coef.size, order='F') # <<<<<<<<<<<<<<
*
* cdef ltfatInt gl = g.shape[0]
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_coef, __pyx_n_s_size); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 120, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 120, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 120, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2395,77 +2395,77 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_v_coef_combined = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":122
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":126
* coef_combined = coef.reshape(coef.size, order='F')
*
* cdef ltfatInt gl = g.shape[0] # <<<<<<<<<<<<<<
*
* if g.ndim > 1:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_1); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_v_gl = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":124
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":128
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":125
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":129
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":126
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":130
* if g.ndim > 1:
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1)) # <<<<<<<<<<<<<<
* if g.ndim == 2:
* gl = gl * g.shape[1]
*/
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_INCREF(__pyx_v_g);
__Pyx_GIVEREF(__pyx_v_g);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_g);
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_8 = __Pyx_PyInt_SubtractObjC(__pyx_t_7, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_SubtractObjC(__pyx_t_7, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2473,12 +2473,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_GIVEREF(__pyx_t_8);
PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_8);
__pyx_t_8 = 0;
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_7, NULL); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_8) < 0) __PYX_ERR(0, 126, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_8) < 0) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2486,7 +2486,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_8);
__pyx_t_8 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":125
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":129
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -2495,45 +2495,45 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":127
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":131
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2: # <<<<<<<<<<<<<<
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F')
*/
- __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_8, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_8, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":128
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":132
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2:
* gl = gl * g.shape[1] # <<<<<<<<<<<<<<
* g_combined = g.reshape(gl, order='F')
* else:
*/
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
- __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_8, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_8, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- __pyx_t_8 = PyNumber_Multiply(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_8 = PyNumber_Multiply(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_8); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_As_size_t(__pyx_t_8); if (unlikely((__pyx_t_6 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
__pyx_v_gl = __pyx_t_6;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":127
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":131
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if g.ndim == 2: # <<<<<<<<<<<<<<
@@ -2542,26 +2542,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":129
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":133
* if g.ndim == 2:
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F') # <<<<<<<<<<<<<<
* else:
* g_combined = g
*/
- __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
- __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 129, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 129, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_8, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2569,7 +2569,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_v_g_combined = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":124
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":128
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2579,7 +2579,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
goto __pyx_L18;
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":131
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":135
* g_combined = g.reshape(gl, order='F')
* else:
* g_combined = g # <<<<<<<<<<<<<<
@@ -2592,35 +2592,35 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
}
__pyx_L18:;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":132
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":136
* else:
* g_combined = g
* res = np.ndarray((L * W), dtype=np.float64) # <<<<<<<<<<<<<<
* if gl < L:
* comp_idgtreal_fb_d(coef_combined, g_combined, L, gl, W, a, M, pt, res)
*/
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_8)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_8);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_8, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2628,7 +2628,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_v_res = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":133
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":137
* g_combined = g
* res = np.ndarray((L * W), dtype=np.float64)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2638,7 +2638,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_4 = ((__pyx_v_gl < __pyx_v_L) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":134
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":138
* res = np.ndarray((L * W), dtype=np.float64)
* if gl < L:
* comp_idgtreal_fb_d(coef_combined, g_combined, L, gl, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2646,15 +2646,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
* return np.reshape(res, (L, W), order='F')
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_coef_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_res);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_t_12, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_t_12, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2667,7 +2667,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_14.data = NULL;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":135
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":139
* if gl < L:
* comp_idgtreal_fb_d(coef_combined, g_combined, L, gl, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2677,7 +2677,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_4 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":136
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":140
* comp_idgtreal_fb_d(coef_combined, g_combined, L, gl, W, a, M, pt, res)
* if W > 1:
* return np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
@@ -2685,16 +2685,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
* comp_idgtreal_long_d(coef_combined, g_combined, L, W, a, M, pt, res)
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_7);
@@ -2702,7 +2702,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_2);
__pyx_t_7 = 0;
__pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2710,10 +2710,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2722,7 +2722,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_7 = 0;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":135
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":139
* if gl < L:
* comp_idgtreal_fb_d(coef_combined, g_combined, L, gl, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2731,7 +2731,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":137
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":141
* if W > 1:
* return np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2743,7 +2743,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":133
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":137
* g_combined = g
* res = np.ndarray((L * W), dtype=np.float64)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2752,7 +2752,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":138
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":142
* return np.reshape(res, (L, W), order='F')
* return res
* comp_idgtreal_long_d(coef_combined, g_combined, L, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2760,15 +2760,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
* return np.reshape(res, (L, W), order='F')
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_coef_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 142, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
- __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 142, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_res);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_long_d(__pyx_t_9, __pyx_t_14, __pyx_v_L, __pyx_v_W, __pyx_t_12, __pyx_t_11, __pyx_t_13, __pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_idgtreal_long_d(__pyx_t_9, __pyx_t_14, __pyx_v_L, __pyx_v_W, __pyx_t_12, __pyx_t_11, __pyx_t_13, __pyx_t_10); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2781,7 +2781,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_10.data = NULL;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":139
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":143
* return res
* comp_idgtreal_long_d(coef_combined, g_combined, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2791,23 +2791,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_4 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":140
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":144
* comp_idgtreal_long_d(coef_combined, g_combined, L, W, a, M, pt, res)
* if W > 1:
* return np.reshape(res, (L, W), order='F') # <<<<<<<<<<<<<<
* return res
*/
__Pyx_XDECREF(__pyx_r);
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7);
@@ -2815,7 +2815,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);
__pyx_t_7 = 0;
__pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2823,10 +2823,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 140, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 144, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2835,7 +2835,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_t_7 = 0;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":139
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":143
* return res
* comp_idgtreal_long_d(coef_combined, g_combined, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2844,7 +2844,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
*/
}
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":141
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":145
* if W > 1:
* return np.reshape(res, (L, W), order='F')
* return res # <<<<<<<<<<<<<<
@@ -2854,7 +2854,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(PyOb
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":91
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":95
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_isepdgtreal(coef, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -2920,26 +2920,26 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_16comp_isepdgtreal_1comp_isepdgtreal(Py
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_g)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 1); __PYX_ERR(0, 91, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 1); __PYX_ERR(0, 95, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 2); __PYX_ERR(0, 91, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 2); __PYX_ERR(0, 95, __pyx_L3_error)
}
case 3:
if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_M)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 3); __PYX_ERR(0, 91, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 3); __PYX_ERR(0, 95, __pyx_L3_error)
}
case 4:
if (likely((values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_pt)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 4); __PYX_ERR(0, 91, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, 4); __PYX_ERR(0, 95, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_isepdgtreal") < 0)) __PYX_ERR(0, 91, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_isepdgtreal") < 0)) __PYX_ERR(0, 95, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 5) {
goto __pyx_L5_argtuple_error;
@@ -2958,7 +2958,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_16comp_isepdgtreal_1comp_isepdgtreal(Py
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 91, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_isepdgtreal", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 95, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_isepdgtreal.comp_isepdgtreal", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2977,7 +2977,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(CYT
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_isepdgtreal", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(__pyx_v_coef, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 91, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_16comp_isepdgtreal_comp_isepdgtreal(__pyx_v_coef, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 95, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15426,8 +15426,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 101, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 130, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15443,58 +15443,58 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":101
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":105
*
* if (coef.dtype.type != np.complex128):
* raise TypeError("coef data should be numpy.complex128") # <<<<<<<<<<<<<<
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_coef_data_should_be_numpy_comple); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_coef_data_should_be_numpy_comple); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 105, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":103
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":107
* raise TypeError("coef data should be numpy.complex128")
* if (g.dtype.type != np.float64):
* raise TypeError("g data should be numpy.float64") # <<<<<<<<<<<<<<
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":105
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":109
* raise TypeError("g data should be numpy.float64")
* if pt != 0 and pt != 1:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.")
*/
- __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__3);
__Pyx_GIVEREF(__pyx_tuple__3);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":107
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":111
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
* if coef.ndim <= 1 or coef.ndim > 3:
* raise TypeError("Dimensions of dgt coefficients array must be 2 or 3.") # <<<<<<<<<<<<<<
* cdef ltfatInt N = coef.shape[1]
* cdef ltfatInt L = N * a
*/
- __pyx_tuple__4 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_tuple__4 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a); if (unlikely(!__pyx_tuple__4)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__4);
__Pyx_GIVEREF(__pyx_tuple__4);
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":116
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":120
* cdef ltfatInt W = coef.size // (M2 * N)
* if W > 1 and coef.ndim == 2:
* raise TypeError("Dimensions of dgt coefficients array do not fit.") # <<<<<<<<<<<<<<
* if W == 1 and coef.ndim == 3:
* coef = np.squeeze(coef, axis=2)
*/
- __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a_2); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 116, __pyx_L1_error)
+ __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_s_Dimensions_of_dgt_coefficients_a_2); if (unlikely(!__pyx_tuple__5)) __PYX_ERR(0, 120, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__5);
__Pyx_GIVEREF(__pyx_tuple__5);
@@ -15845,22 +15845,22 @@ PyMODINIT_FUNC PyInit_comp_isepdgtreal(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_isepdgtreal.pyx":62
+ /* "ltfatpy/comp/comp_isepdgtreal.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dgt_phasetype, idgtreal_fb_d, idgtreal_long_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_isepdgtreal.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_pgauss.c b/ltfatpy/comp/comp_pgauss.c
index a4f5d66..0546995 100644
--- a/ltfatpy/comp/comp_pgauss.c
+++ b/ltfatpy/comp/comp_pgauss.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -818,7 +818,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dst_kind {
};
struct __pyx_opt_args_7ltfatpy_4comp_11comp_pgauss_comp_pgauss;
-/* "ltfatpy/comp/comp_pgauss.pyx":86
+/* "ltfatpy/comp/comp_pgauss.pyx":90
* pgauss_cmplx_d(L, w, c_t, c_f, & out[0])
*
* cpdef comp_pgauss(L, w=1.0, c_t=0, c_f=0): # <<<<<<<<<<<<<<
@@ -1799,7 +1799,7 @@ static PyObject *__pyx_tuple__16;
static PyObject *__pyx_tuple__17;
static PyObject *__pyx_tuple__18;
-/* "ltfatpy/comp/comp_pgauss.pyx":72
+/* "ltfatpy/comp/comp_pgauss.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_pgauss_real(ltfatInt L, double w, double c_t, # <<<<<<<<<<<<<<
@@ -1813,7 +1813,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_real(__pyx_t_7
Py_ssize_t __pyx_t_1;
__Pyx_RefNannySetupContext("comp_pgauss_real", 0);
- /* "ltfatpy/comp/comp_pgauss.pyx":75
+ /* "ltfatpy/comp/comp_pgauss.pyx":79
* double[:] out):
* """ Internal function, do not use it """
* pgauss_d(L, w, c_t, & out[0]) # <<<<<<<<<<<<<<
@@ -1823,7 +1823,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_real(__pyx_t_7
__pyx_t_1 = 0;
pgauss_d(__pyx_v_L, __pyx_v_w, __pyx_v_c_t, (&(*((double *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_1 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_pgauss.pyx":72
+ /* "ltfatpy/comp/comp_pgauss.pyx":76
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_pgauss_real(ltfatInt L, double w, double c_t, # <<<<<<<<<<<<<<
@@ -1838,7 +1838,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_real(__pyx_t_7
return __pyx_r;
}
-/* "ltfatpy/comp/comp_pgauss.pyx":81
+/* "ltfatpy/comp/comp_pgauss.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_pgauss_cplx(ltfatInt L, double w, double c_t, # <<<<<<<<<<<<<<
@@ -1852,7 +1852,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_cplx(__pyx_t_7
Py_ssize_t __pyx_t_1;
__Pyx_RefNannySetupContext("comp_pgauss_cplx", 0);
- /* "ltfatpy/comp/comp_pgauss.pyx":84
+ /* "ltfatpy/comp/comp_pgauss.pyx":88
* double c_f, double complex[:] out):
* """ Internal function, do not use it """
* pgauss_cmplx_d(L, w, c_t, c_f, & out[0]) # <<<<<<<<<<<<<<
@@ -1862,7 +1862,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_cplx(__pyx_t_7
__pyx_t_1 = 0;
pgauss_cmplx_d(__pyx_v_L, __pyx_v_w, __pyx_v_c_t, __pyx_v_c_f, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_1 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_pgauss.pyx":81
+ /* "ltfatpy/comp/comp_pgauss.pyx":85
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_pgauss_cplx(ltfatInt L, double w, double c_t, # <<<<<<<<<<<<<<
@@ -1877,7 +1877,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_cplx(__pyx_t_7
return __pyx_r;
}
-/* "ltfatpy/comp/comp_pgauss.pyx":86
+/* "ltfatpy/comp/comp_pgauss.pyx":90
* pgauss_cmplx_d(L, w, c_t, c_f, & out[0])
*
* cpdef comp_pgauss(L, w=1.0, c_t=0, c_f=0): # <<<<<<<<<<<<<<
@@ -1918,46 +1918,46 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
}
}
- /* "ltfatpy/comp/comp_pgauss.pyx":92
+ /* "ltfatpy/comp/comp_pgauss.pyx":96
* :func:`~ltfatpy.fourier.pgauss.pgauss` instead.
* """
* if c_f == 0: # <<<<<<<<<<<<<<
* out = np.ndarray((L), dtype=np.float64)
* comp_pgauss_real(L, w, c_t, out)
*/
- __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_v_c_f, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 92, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_v_c_f, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 96, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 92, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_2 < 0)) __PYX_ERR(0, 96, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_2) {
- /* "ltfatpy/comp/comp_pgauss.pyx":93
+ /* "ltfatpy/comp/comp_pgauss.pyx":97
* """
* if c_f == 0:
* out = np.ndarray((L), dtype=np.float64) # <<<<<<<<<<<<<<
* comp_pgauss_real(L, w, c_t, out)
* return out
*/
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_INCREF(__pyx_v_L);
__Pyx_GIVEREF(__pyx_v_L);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_L);
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 93, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 93, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 97, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -1965,26 +1965,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
__pyx_v_out = __pyx_t_6;
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_pgauss.pyx":94
+ /* "ltfatpy/comp/comp_pgauss.pyx":98
* if c_f == 0:
* out = np.ndarray((L), dtype=np.float64)
* comp_pgauss_real(L, w, c_t, out) # <<<<<<<<<<<<<<
* return out
* out = np.ndarray((L), dtype=np.complex128)
*/
- __pyx_t_7 = __Pyx_PyInt_As_size_t(__pyx_v_L); if (unlikely((__pyx_t_7 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 94, __pyx_L1_error)
- __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_w); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 94, __pyx_L1_error)
- __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_v_c_t); if (unlikely((__pyx_t_9 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 94, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_As_size_t(__pyx_v_L); if (unlikely((__pyx_t_7 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_w); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_v_c_t); if (unlikely((__pyx_t_9 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 98, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_out);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 94, __pyx_L1_error)
- __pyx_t_6 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_real(__pyx_t_7, __pyx_t_8, __pyx_t_9, __pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 94, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 98, __pyx_L1_error)
+ __pyx_t_6 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_real(__pyx_t_7, __pyx_t_8, __pyx_t_9, __pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 98, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__PYX_XDEC_MEMVIEW(&__pyx_t_10, 1);
__pyx_t_10.memview = NULL;
__pyx_t_10.data = NULL;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_pgauss.pyx":95
+ /* "ltfatpy/comp/comp_pgauss.pyx":99
* out = np.ndarray((L), dtype=np.float64)
* comp_pgauss_real(L, w, c_t, out)
* return out # <<<<<<<<<<<<<<
@@ -1996,7 +1996,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
__pyx_r = __pyx_v_out;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_pgauss.pyx":92
+ /* "ltfatpy/comp/comp_pgauss.pyx":96
* :func:`~ltfatpy.fourier.pgauss.pgauss` instead.
* """
* if c_f == 0: # <<<<<<<<<<<<<<
@@ -2005,33 +2005,33 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_pgauss.pyx":96
+ /* "ltfatpy/comp/comp_pgauss.pyx":100
* comp_pgauss_real(L, w, c_t, out)
* return out
* out = np.ndarray((L), dtype=np.complex128) # <<<<<<<<<<<<<<
* comp_pgauss_cplx(L, w, c_t, c_f, out)
* return out
*/
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_L);
__Pyx_GIVEREF(__pyx_v_L);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_L);
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 96, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2039,26 +2039,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
__pyx_v_out = __pyx_t_5;
__pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_pgauss.pyx":97
+ /* "ltfatpy/comp/comp_pgauss.pyx":101
* return out
* out = np.ndarray((L), dtype=np.complex128)
* comp_pgauss_cplx(L, w, c_t, c_f, out) # <<<<<<<<<<<<<<
* return out
*/
- __pyx_t_7 = __Pyx_PyInt_As_size_t(__pyx_v_L); if (unlikely((__pyx_t_7 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 97, __pyx_L1_error)
- __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_v_w); if (unlikely((__pyx_t_9 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 97, __pyx_L1_error)
- __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_c_t); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 97, __pyx_L1_error)
- __pyx_t_11 = __pyx_PyFloat_AsDouble(__pyx_v_c_f); if (unlikely((__pyx_t_11 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 97, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_As_size_t(__pyx_v_L); if (unlikely((__pyx_t_7 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_9 = __pyx_PyFloat_AsDouble(__pyx_v_w); if (unlikely((__pyx_t_9 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_8 = __pyx_PyFloat_AsDouble(__pyx_v_c_t); if (unlikely((__pyx_t_8 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_11 = __pyx_PyFloat_AsDouble(__pyx_v_c_f); if (unlikely((__pyx_t_11 == (double)-1) && PyErr_Occurred())) __PYX_ERR(0, 101, __pyx_L1_error)
__pyx_t_12 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_out);
- if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 97, __pyx_L1_error)
- __pyx_t_5 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_cplx(__pyx_t_7, __pyx_t_9, __pyx_t_8, __pyx_t_11, __pyx_t_12); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 97, __pyx_L1_error)
+ if (unlikely(!__pyx_t_12.memview)) __PYX_ERR(0, 101, __pyx_L1_error)
+ __pyx_t_5 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss_cplx(__pyx_t_7, __pyx_t_9, __pyx_t_8, __pyx_t_11, __pyx_t_12); if (unlikely(!__pyx_t_5)) __PYX_ERR(0, 101, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_5);
__PYX_XDEC_MEMVIEW(&__pyx_t_12, 1);
__pyx_t_12.memview = NULL;
__pyx_t_12.data = NULL;
__Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
- /* "ltfatpy/comp/comp_pgauss.pyx":98
+ /* "ltfatpy/comp/comp_pgauss.pyx":102
* out = np.ndarray((L), dtype=np.complex128)
* comp_pgauss_cplx(L, w, c_t, c_f, out)
* return out # <<<<<<<<<<<<<<
@@ -2068,7 +2068,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(PyObject *__py
__pyx_r = __pyx_v_out;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_pgauss.pyx":86
+ /* "ltfatpy/comp/comp_pgauss.pyx":90
* pgauss_cmplx_d(L, w, c_t, c_f, & out[0])
*
* cpdef comp_pgauss(L, w=1.0, c_t=0, c_f=0): # <<<<<<<<<<<<<<
@@ -2144,7 +2144,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_11comp_pgauss_1comp_pgauss(PyObject *__
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_pgauss") < 0)) __PYX_ERR(0, 86, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_pgauss") < 0)) __PYX_ERR(0, 90, __pyx_L3_error)
}
} else {
switch (PyTuple_GET_SIZE(__pyx_args)) {
@@ -2163,7 +2163,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_11comp_pgauss_1comp_pgauss(PyObject *__
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_pgauss", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 86, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_pgauss", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 90, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_pgauss.comp_pgauss", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2187,7 +2187,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(CYTHON_UNUSED
__pyx_t_2.w = __pyx_v_w;
__pyx_t_2.c_t = __pyx_v_c_t;
__pyx_t_2.c_f = __pyx_v_c_f;
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(__pyx_v_L, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 86, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_11comp_pgauss_comp_pgauss(__pyx_v_L, 0, &__pyx_t_2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 90, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -14985,22 +14985,22 @@ PyMODINIT_FUNC PyInit_comp_pgauss(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_pgauss.pyx":64
+ /* "ltfatpy/comp/comp_pgauss.pyx":68
* from cython.view cimport array as cvarray
* from libc.stdlib cimport malloc, free
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, pgauss_d, pgauss_cmplx_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 64, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 68, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 64, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 68, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_pgauss.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_sepdgt.c b/ltfatpy/comp/comp_sepdgt.c
index 8714cb8..efe847f 100644
--- a/ltfatpy/comp/comp_sepdgt.c
+++ b/ltfatpy/comp/comp_sepdgt.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1823,7 +1823,7 @@ static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
static PyObject *__pyx_tuple__21;
-/* "ltfatpy/comp/comp_sepdgt.pyx":73
+/* "ltfatpy/comp/comp_sepdgt.pyx":77
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_long_cd(const double complex[:] f, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1839,7 +1839,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_cd(__Pyx_mem
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgt_long_cd", 0);
- /* "ltfatpy/comp/comp_sepdgt.pyx":78
+ /* "ltfatpy/comp/comp_sepdgt.pyx":82
* double complex[:] out):
* """ Internal function, do not use it """
* dgt_long_cd(&f[0], &g[0], L, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1851,7 +1851,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_cd(__Pyx_mem
__pyx_t_3 = 0;
dgt_long_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgt.pyx":73
+ /* "ltfatpy/comp/comp_sepdgt.pyx":77
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_long_cd(const double complex[:] f, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1866,7 +1866,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_cd(__Pyx_mem
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgt.pyx":84
+/* "ltfatpy/comp/comp_sepdgt.pyx":88
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_long_d(const double[:] f, const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1882,7 +1882,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_d(__Pyx_memv
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgt_long_d", 0);
- /* "ltfatpy/comp/comp_sepdgt.pyx":88
+ /* "ltfatpy/comp/comp_sepdgt.pyx":92
* const dgt_phasetype ptype, double complex[:] out):
* """ Internal function, do not use it """
* dgt_long_d(&f[0], &g[0], L, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1894,7 +1894,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_d(__Pyx_memv
__pyx_t_3 = 0;
dgt_long_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgt.pyx":84
+ /* "ltfatpy/comp/comp_sepdgt.pyx":88
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_long_d(const double[:] f, const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1909,7 +1909,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_d(__Pyx_memv
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgt.pyx":95
+/* "ltfatpy/comp/comp_sepdgt.pyx":99
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_fb_d(const double[:] f, const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1925,7 +1925,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_d(__Pyx_memvie
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgt_fb_d", 0);
- /* "ltfatpy/comp/comp_sepdgt.pyx":100
+ /* "ltfatpy/comp/comp_sepdgt.pyx":104
* double complex[:] out):
* """ Internal function, do not use it """
* dgt_fb_d(&f[0], &g[0], L, gl, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1937,7 +1937,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_d(__Pyx_memvie
__pyx_t_3 = 0;
dgt_fb_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgt.pyx":95
+ /* "ltfatpy/comp/comp_sepdgt.pyx":99
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_fb_d(const double[:] f, const double[:] g, const ltfatInt L, # <<<<<<<<<<<<<<
@@ -1952,7 +1952,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_d(__Pyx_memvie
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgt.pyx":107
+/* "ltfatpy/comp/comp_sepdgt.pyx":111
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_fb_cd(const double complex[:] f, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1968,7 +1968,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_cd(__Pyx_memvi
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgt_fb_cd", 0);
- /* "ltfatpy/comp/comp_sepdgt.pyx":112
+ /* "ltfatpy/comp/comp_sepdgt.pyx":116
* const dgt_phasetype ptype, double complex[:] out):
* """ Internal function, do not use it """
* dgt_fb_cd(&f[0], &g[0], L, gl, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1980,7 +1980,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_cd(__Pyx_memvi
__pyx_t_3 = 0;
dgt_fb_cd((&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgt.pyx":107
+ /* "ltfatpy/comp/comp_sepdgt.pyx":111
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgt_fb_cd(const double complex[:] f, const double complex[:] g, # <<<<<<<<<<<<<<
@@ -1995,7 +1995,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_cd(__Pyx_memvi
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgt.pyx":119
+/* "ltfatpy/comp/comp_sepdgt.pyx":123
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_sepdgt(f, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -2033,66 +2033,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_INCREF(__pyx_v_f);
__Pyx_INCREF(__pyx_v_g);
- /* "ltfatpy/comp/comp_sepdgt.pyx":126
+ /* "ltfatpy/comp/comp_sepdgt.pyx":130
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("f data should be numpy.float64 or complex128")
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L4_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L4_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":127
+ /* "ltfatpy/comp/comp_sepdgt.pyx":131
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128")
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 127, __pyx_L1_error)
+ __PYX_ERR(0, 131, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgt.pyx":126
+ /* "ltfatpy/comp/comp_sepdgt.pyx":130
* """
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2101,66 +2101,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":128
+ /* "ltfatpy/comp/comp_sepdgt.pyx":132
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
* raise TypeError("g data should be numpy.float64 or complex128")
* if (f.dtype.type != g.dtype.type):
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L7_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 128, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 132, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L7_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":129
+ /* "ltfatpy/comp/comp_sepdgt.pyx":133
* raise TypeError("f data should be numpy.float64 or complex128")
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if (f.dtype.type != g.dtype.type):
* if f.dtype.type == np.float64:
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 129, __pyx_L1_error)
+ __PYX_ERR(0, 133, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgt.pyx":128
+ /* "ltfatpy/comp/comp_sepdgt.pyx":132
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128")
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128): # <<<<<<<<<<<<<<
@@ -2169,66 +2169,66 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":130
+ /* "ltfatpy/comp/comp_sepdgt.pyx":134
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128")
* if (f.dtype.type != g.dtype.type): # <<<<<<<<<<<<<<
* if f.dtype.type == np.float64:
* f = f.astype(np.complex128)
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_4, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":131
+ /* "ltfatpy/comp/comp_sepdgt.pyx":135
* raise TypeError("g data should be numpy.float64 or complex128")
* if (f.dtype.type != g.dtype.type):
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
* f = f.astype(np.complex128)
* if g.dtype.type == np.float64:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_4, __pyx_t_3, Py_EQ); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":132
+ /* "ltfatpy/comp/comp_sepdgt.pyx":136
* if (f.dtype.type != g.dtype.type):
* if f.dtype.type == np.float64:
* f = f.astype(np.complex128) # <<<<<<<<<<<<<<
* if g.dtype.type == np.float64:
* g = g.astype(np.complex128)
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_astype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_astype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_t_4 = NULL;
@@ -2242,14 +2242,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
}
if (!__pyx_t_4) {
- __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_GOTREF(__pyx_t_2);
} else {
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_t_6};
- __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2258,20 +2258,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_3)) {
PyObject *__pyx_temp[2] = {__pyx_t_4, __pyx_t_6};
- __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_3, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
} else
#endif
{
- __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_7 = PyTuple_New(1+1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4); __pyx_t_4 = NULL;
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_7, 0+1, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_7, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
}
@@ -2280,7 +2280,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_DECREF_SET(__pyx_v_f, __pyx_t_2);
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":131
+ /* "ltfatpy/comp/comp_sepdgt.pyx":135
* raise TypeError("g data should be numpy.float64 or complex128")
* if (f.dtype.type != g.dtype.type):
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -2289,42 +2289,42 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":133
+ /* "ltfatpy/comp/comp_sepdgt.pyx":137
* if f.dtype.type == np.float64:
* f = f.astype(np.complex128)
* if g.dtype.type == np.float64: # <<<<<<<<<<<<<<
* g = g.astype(np.complex128)
* if pt != FREQINV and pt != TIMEINV:
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_7, Py_EQ); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_t_7, Py_EQ); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 133, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 137, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":134
+ /* "ltfatpy/comp/comp_sepdgt.pyx":138
* f = f.astype(np.complex128)
* if g.dtype.type == np.float64:
* g = g.astype(np.complex128) # <<<<<<<<<<<<<<
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_astype); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_astype); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_t_3 = NULL;
@@ -2338,14 +2338,14 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
}
if (!__pyx_t_3) {
- __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_CallOneArg(__pyx_t_7, __pyx_t_6); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_GOTREF(__pyx_t_2);
} else {
#if CYTHON_FAST_PYCALL
if (PyFunction_Check(__pyx_t_7)) {
PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_t_6};
- __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2354,20 +2354,20 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
#if CYTHON_FAST_PYCCALL
if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) {
PyObject *__pyx_temp[2] = {__pyx_t_3, __pyx_t_6};
- __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-1, 1+1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
} else
#endif
{
- __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_4 = PyTuple_New(1+1); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = NULL;
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_4, 0+1, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_4, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
}
@@ -2376,7 +2376,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_2);
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":133
+ /* "ltfatpy/comp/comp_sepdgt.pyx":137
* if f.dtype.type == np.float64:
* f = f.astype(np.complex128)
* if g.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -2385,7 +2385,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":130
+ /* "ltfatpy/comp/comp_sepdgt.pyx":134
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128")
* if (f.dtype.type != g.dtype.type): # <<<<<<<<<<<<<<
@@ -2394,48 +2394,48 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":135
+ /* "ltfatpy/comp/comp_sepdgt.pyx":139
* if g.dtype.type == np.float64:
* g = g.astype(np.complex128)
* if pt != FREQINV and pt != TIMEINV: # <<<<<<<<<<<<<<
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
*/
- __pyx_t_2 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_FREQINV); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_FREQINV); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_7 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_1 = __pyx_t_5;
goto __pyx_L13_bool_binop_done;
}
- __pyx_t_7 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_7, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_7, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 135, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 139, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_t_1 = __pyx_t_5;
__pyx_L13_bool_binop_done:;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":136
+ /* "ltfatpy/comp/comp_sepdgt.pyx":140
* g = g.astype(np.complex128)
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_Raise(__pyx_t_2, 0, 0, 0);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __PYX_ERR(0, 136, __pyx_L1_error)
+ __PYX_ERR(0, 140, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgt.pyx":135
+ /* "ltfatpy/comp/comp_sepdgt.pyx":139
* if g.dtype.type == np.float64:
* g = g.astype(np.complex128)
* if pt != FREQINV and pt != TIMEINV: # <<<<<<<<<<<<<<
@@ -2444,61 +2444,61 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":138
+ /* "ltfatpy/comp/comp_sepdgt.pyx":142
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_7 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":139
+ /* "ltfatpy/comp/comp_sepdgt.pyx":143
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 139, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 143, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_7, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 139, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_7, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 143, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 139, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 143, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":140
+ /* "ltfatpy/comp/comp_sepdgt.pyx":144
* if f.ndim > 1:
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1)) # <<<<<<<<<<<<<<
* L = f.shape[0]
* W = f.shape[1]
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_f);
__Pyx_GIVEREF(__pyx_v_f);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_f);
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2506,12 +2506,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_3) < 0) __PYX_ERR(0, 140, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_axis, __pyx_t_3) < 0) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2519,7 +2519,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_DECREF_SET(__pyx_v_f, __pyx_t_3);
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":139
+ /* "ltfatpy/comp/comp_sepdgt.pyx":143
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
@@ -2528,58 +2528,58 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":141
+ /* "ltfatpy/comp/comp_sepdgt.pyx":145
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0] # <<<<<<<<<<<<<<
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F')
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 141, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 145, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 141, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 145, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 141, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 145, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":142
+ /* "ltfatpy/comp/comp_sepdgt.pyx":146
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
* W = f.shape[1] # <<<<<<<<<<<<<<
* f_combined = f.reshape(L * W, order='F')
* else:
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 146, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_4, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 146, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_3); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 146, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_W = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":143
+ /* "ltfatpy/comp/comp_sepdgt.pyx":147
* L = f.shape[0]
* W = f.shape[1]
* f_combined = f.reshape(L * W, order='F') # <<<<<<<<<<<<<<
* else:
* L = f.shape[0]
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 143, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 147, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 143, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 147, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 143, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 147, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 143, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 147, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 143, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 143, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 147, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_4); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 147, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2587,7 +2587,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_v_f_combined = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":138
+ /* "ltfatpy/comp/comp_sepdgt.pyx":142
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
@@ -2597,7 +2597,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L15;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":145
+ /* "ltfatpy/comp/comp_sepdgt.pyx":149
* f_combined = f.reshape(L * W, order='F')
* else:
* L = f.shape[0] # <<<<<<<<<<<<<<
@@ -2605,16 +2605,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
* f_combined = f
*/
/*else*/ {
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 145, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 149, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 145, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 149, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 145, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_4); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 149, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":146
+ /* "ltfatpy/comp/comp_sepdgt.pyx":150
* else:
* L = f.shape[0]
* W = 1 # <<<<<<<<<<<<<<
@@ -2623,7 +2623,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
__pyx_v_W = 1;
- /* "ltfatpy/comp/comp_sepdgt.pyx":147
+ /* "ltfatpy/comp/comp_sepdgt.pyx":151
* L = f.shape[0]
* W = 1
* f_combined = f # <<<<<<<<<<<<<<
@@ -2635,77 +2635,77 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
__pyx_L15:;
- /* "ltfatpy/comp/comp_sepdgt.pyx":149
+ /* "ltfatpy/comp/comp_sepdgt.pyx":153
* f_combined = f
*
* cdef ltfatInt gl = g.shape[0] # <<<<<<<<<<<<<<
*
* if g.ndim > 1:
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 149, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 153, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 149, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_4, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 153, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 149, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 153, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_v_gl = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":151
+ /* "ltfatpy/comp/comp_sepdgt.pyx":155
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 151, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 155, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = PyObject_RichCompare(__pyx_t_7, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 151, __pyx_L1_error)
+ __pyx_t_4 = PyObject_RichCompare(__pyx_t_7, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 155, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 151, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 155, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":152
+ /* "ltfatpy/comp/comp_sepdgt.pyx":156
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2:
*/
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 152, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 156, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = PyObject_RichCompare(__pyx_t_4, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 152, __pyx_L1_error)
+ __pyx_t_7 = PyObject_RichCompare(__pyx_t_4, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 156, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 152, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_7); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 156, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":153
+ /* "ltfatpy/comp/comp_sepdgt.pyx":157
* if g.ndim > 1:
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1)) # <<<<<<<<<<<<<<
* if f.ndim == 2:
* gl = gl * g.shape[1]
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_INCREF(__pyx_v_g);
__Pyx_GIVEREF(__pyx_v_g);
PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_v_g);
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyInt_SubtractObjC(__pyx_t_3, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_SubtractObjC(__pyx_t_3, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2713,12 +2713,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_6) < 0) __PYX_ERR(0, 153, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_axis, __pyx_t_6) < 0) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 153, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_7, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 157, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
@@ -2726,7 +2726,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_6);
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":152
+ /* "ltfatpy/comp/comp_sepdgt.pyx":156
*
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -2735,45 +2735,45 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":154
+ /* "ltfatpy/comp/comp_sepdgt.pyx":158
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2: # <<<<<<<<<<<<<<
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F')
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 154, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 158, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_6, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 154, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_EqObjC(__pyx_t_6, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 158, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 154, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 158, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":155
+ /* "ltfatpy/comp/comp_sepdgt.pyx":159
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2:
* gl = gl * g.shape[1] # <<<<<<<<<<<<<<
* g_combined = g.reshape(gl, order='F')
* else:
*/
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 155, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 159, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 159, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_6, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 155, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_6, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 159, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyNumber_Multiply(__pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 155, __pyx_L1_error)
+ __pyx_t_6 = PyNumber_Multiply(__pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 159, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 155, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 159, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_gl = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":154
+ /* "ltfatpy/comp/comp_sepdgt.pyx":158
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2: # <<<<<<<<<<<<<<
@@ -2782,26 +2782,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":156
+ /* "ltfatpy/comp/comp_sepdgt.pyx":160
* if f.ndim == 2:
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F') # <<<<<<<<<<<<<<
* else:
* g_combined = g
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 156, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 160, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 156, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 160, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 156, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 160, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 156, __pyx_L1_error)
+ __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 160, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 156, __pyx_L1_error)
- __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 156, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 160, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 160, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2809,7 +2809,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_v_g_combined = __pyx_t_4;
__pyx_t_4 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":151
+ /* "ltfatpy/comp/comp_sepdgt.pyx":155
* cdef ltfatInt gl = g.shape[0]
*
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2819,7 +2819,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L17;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":158
+ /* "ltfatpy/comp/comp_sepdgt.pyx":162
* g_combined = g.reshape(gl, order='F')
* else:
* g_combined = g # <<<<<<<<<<<<<<
@@ -2832,63 +2832,63 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
__pyx_L17:;
- /* "ltfatpy/comp/comp_sepdgt.pyx":160
+ /* "ltfatpy/comp/comp_sepdgt.pyx":164
* g_combined = g
*
* cdef ltfatInt N = L//a # <<<<<<<<<<<<<<
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128)
* if gl < L:
*/
- __pyx_t_4 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 160, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 164, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- __pyx_t_7 = PyNumber_FloorDivide(__pyx_t_4, __pyx_v_a); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 160, __pyx_L1_error)
+ __pyx_t_7 = PyNumber_FloorDivide(__pyx_t_4, __pyx_v_a); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 164, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 160, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_t_7); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 164, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_v_N = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgt.pyx":161
+ /* "ltfatpy/comp/comp_sepdgt.pyx":165
*
* cdef ltfatInt N = L//a
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128) # <<<<<<<<<<<<<<
* if gl < L:
* if f.dtype.type == np.float64:
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = PyNumber_Multiply(__pyx_v_M, __pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_2 = PyNumber_Multiply(__pyx_v_M, __pyx_t_7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_FromSize_t(__pyx_v_L); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = PyNumber_FloorDivide(__pyx_t_7, __pyx_v_a); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_6 = PyNumber_FloorDivide(__pyx_t_7, __pyx_v_a); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = PyNumber_Multiply(__pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_7 = PyNumber_Multiply(__pyx_t_2, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_7 = PyDict_New(); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_complex128); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_3) < 0) __PYX_ERR(0, 161, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_7, __pyx_n_s_dtype, __pyx_t_3) < 0) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 161, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_6, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 165, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2896,7 +2896,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_v_res = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":162
+ /* "ltfatpy/comp/comp_sepdgt.pyx":166
* cdef ltfatInt N = L//a
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2906,31 +2906,31 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_t_1 = ((__pyx_v_gl < __pyx_v_L) != 0);
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":163
+ /* "ltfatpy/comp/comp_sepdgt.pyx":167
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128)
* if gl < L:
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
* comp_dgt_fb_d(f_combined, g_combined, L, gl, W, a, M, pt, res)
* else:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_type); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_float64); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_7, __pyx_t_6, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_7, __pyx_t_6, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 163, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 167, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":164
+ /* "ltfatpy/comp/comp_sepdgt.pyx":168
* if gl < L:
* if f.dtype.type == np.float64:
* comp_dgt_fb_d(f_combined, g_combined, L, gl, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2938,15 +2938,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
* comp_dgt_fb_cd(f_combined, g_combined, L, gl, W, a, M, pt, res)
*/
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 164, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 168, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 164, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 164, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 164, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 164, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 168, __pyx_L1_error)
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 164, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_8, __pyx_t_11, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 164, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_d(__pyx_t_9, __pyx_t_10, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_8, __pyx_t_11, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__PYX_XDEC_MEMVIEW(&__pyx_t_9, 1);
__pyx_t_9.memview = NULL;
@@ -2959,7 +2959,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_t_13.data = NULL;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":163
+ /* "ltfatpy/comp/comp_sepdgt.pyx":167
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128)
* if gl < L:
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -2969,7 +2969,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L21;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":166
+ /* "ltfatpy/comp/comp_sepdgt.pyx":170
* comp_dgt_fb_d(f_combined, g_combined, L, gl, W, a, M, pt, res)
* else:
* comp_dgt_fb_cd(f_combined, g_combined, L, gl, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -2978,15 +2978,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
/*else*/ {
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 166, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 170, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 166, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 166, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 166, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 166, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 170, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 170, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 170, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 170, __pyx_L1_error)
__pyx_t_15 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 166, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_cd(__pyx_t_13, __pyx_t_14, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_t_8, __pyx_t_12, __pyx_t_15); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 166, __pyx_L1_error)
+ if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 170, __pyx_L1_error)
+ __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_fb_cd(__pyx_t_13, __pyx_t_14, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_11, __pyx_t_8, __pyx_t_12, __pyx_t_15); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 170, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__PYX_XDEC_MEMVIEW(&__pyx_t_13, 1);
__pyx_t_13.memview = NULL;
@@ -3001,7 +3001,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
__pyx_L21:;
- /* "ltfatpy/comp/comp_sepdgt.pyx":162
+ /* "ltfatpy/comp/comp_sepdgt.pyx":166
* cdef ltfatInt N = L//a
* res = np.ndarray((M * W * (L // a)), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -3011,7 +3011,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L20;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":168
+ /* "ltfatpy/comp/comp_sepdgt.pyx":172
* comp_dgt_fb_cd(f_combined, g_combined, L, gl, W, a, M, pt, res)
* else:
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -3019,24 +3019,24 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
* else:
*/
/*else*/ {
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_type); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_float64); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_6, __pyx_t_7, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_6, __pyx_t_7, Py_EQ); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 168, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_1 < 0)) __PYX_ERR(0, 172, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":169
+ /* "ltfatpy/comp/comp_sepdgt.pyx":173
* else:
* if f.dtype.type == np.float64:
* comp_dgt_long_d(f_combined, g_combined, L, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -3044,15 +3044,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
* comp_dgt_long_cd(f_combined, g_combined, L, W, a, M, pt, res)
*/
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 169, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 173, __pyx_L1_error)
__pyx_t_9 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 169, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 169, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 169, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 169, __pyx_L1_error)
+ if (unlikely(!__pyx_t_9.memview)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 173, __pyx_L1_error)
__pyx_t_15 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 169, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_d(__pyx_t_10, __pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_8, __pyx_t_11, __pyx_t_12, __pyx_t_15); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 169, __pyx_L1_error)
+ if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_d(__pyx_t_10, __pyx_t_9, __pyx_v_L, __pyx_v_W, __pyx_t_8, __pyx_t_11, __pyx_t_12, __pyx_t_15); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__PYX_XDEC_MEMVIEW(&__pyx_t_10, 1);
__pyx_t_10.memview = NULL;
@@ -3065,7 +3065,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_t_15.data = NULL;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":168
+ /* "ltfatpy/comp/comp_sepdgt.pyx":172
* comp_dgt_fb_cd(f_combined, g_combined, L, gl, W, a, M, pt, res)
* else:
* if f.dtype.type == np.float64: # <<<<<<<<<<<<<<
@@ -3075,7 +3075,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L22;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":171
+ /* "ltfatpy/comp/comp_sepdgt.pyx":175
* comp_dgt_long_d(f_combined, g_combined, L, W, a, M, pt, res)
* else:
* comp_dgt_long_cd(f_combined, g_combined, L, W, a, M, pt, res) # <<<<<<<<<<<<<<
@@ -3084,15 +3084,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
*/
/*else*/ {
__pyx_t_15 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 171, __pyx_L1_error)
+ if (unlikely(!__pyx_t_15.memview)) __PYX_ERR(0, 175, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 171, __pyx_L1_error)
- __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 171, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 171, __pyx_L1_error)
- __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 171, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_11 = __Pyx_PyInt_As_size_t(__pyx_v_a); if (unlikely((__pyx_t_11 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_size_t(__pyx_v_M); if (unlikely((__pyx_t_8 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_12 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 175, __pyx_L1_error)
__pyx_t_13 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 171, __pyx_L1_error)
- __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_cd(__pyx_t_15, __pyx_t_14, __pyx_v_L, __pyx_v_W, __pyx_t_11, __pyx_t_8, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 171, __pyx_L1_error)
+ if (unlikely(!__pyx_t_13.memview)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_3 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_dgt_long_cd(__pyx_t_15, __pyx_t_14, __pyx_v_L, __pyx_v_W, __pyx_t_11, __pyx_t_8, __pyx_t_12, __pyx_t_13); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 175, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__PYX_XDEC_MEMVIEW(&__pyx_t_15, 1);
__pyx_t_15.memview = NULL;
@@ -3109,7 +3109,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
__pyx_L20:;
- /* "ltfatpy/comp/comp_sepdgt.pyx":172
+ /* "ltfatpy/comp/comp_sepdgt.pyx":176
* else:
* comp_dgt_long_cd(f_combined, g_combined, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -3119,23 +3119,23 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_t_1 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_1) {
- /* "ltfatpy/comp/comp_sepdgt.pyx":173
+ /* "ltfatpy/comp/comp_sepdgt.pyx":177
* comp_dgt_long_cd(f_combined, g_combined, L, W, a, M, pt, res)
* if W > 1:
* res = np.reshape(res, (M, N, W), order='F') # <<<<<<<<<<<<<<
* else:
* res = np.reshape(res, (M, N), order='F')
*/
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_FromSize_t(__pyx_v_W); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_4 = PyTuple_New(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_4 = PyTuple_New(3); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_INCREF(__pyx_v_M);
__Pyx_GIVEREF(__pyx_v_M);
@@ -3146,7 +3146,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_t_6);
__pyx_t_3 = 0;
__pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -3154,10 +3154,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_GIVEREF(__pyx_t_4);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4);
__pyx_t_4 = 0;
- __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 173, __pyx_L1_error)
+ __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
- if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 173, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 173, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 177, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_6, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 177, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -3165,7 +3165,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_DECREF_SET(__pyx_v_res, __pyx_t_3);
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":172
+ /* "ltfatpy/comp/comp_sepdgt.pyx":176
* else:
* comp_dgt_long_cd(f_combined, g_combined, L, W, a, M, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -3175,21 +3175,21 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
goto __pyx_L23;
}
- /* "ltfatpy/comp/comp_sepdgt.pyx":175
+ /* "ltfatpy/comp/comp_sepdgt.pyx":179
* res = np.reshape(res, (M, N, W), order='F')
* else:
* res = np.reshape(res, (M, N), order='F') # <<<<<<<<<<<<<<
* return res
*/
/*else*/ {
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_reshape); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_4);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_FromSize_t(__pyx_v_N); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_v_M);
__Pyx_GIVEREF(__pyx_v_M);
@@ -3197,7 +3197,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -3205,10 +3205,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 175, __pyx_L1_error)
+ __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 175, __pyx_L1_error)
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 175, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 179, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 179, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -3218,7 +3218,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
}
__pyx_L23:;
- /* "ltfatpy/comp/comp_sepdgt.pyx":176
+ /* "ltfatpy/comp/comp_sepdgt.pyx":180
* else:
* res = np.reshape(res, (M, N), order='F')
* return res # <<<<<<<<<<<<<<
@@ -3228,7 +3228,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(PyObject *__py
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_sepdgt.pyx":119
+ /* "ltfatpy/comp/comp_sepdgt.pyx":123
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_sepdgt(f, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -3296,26 +3296,26 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_11comp_sepdgt_1comp_sepdgt(PyObject *__
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_g)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 1); __PYX_ERR(0, 119, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 1); __PYX_ERR(0, 123, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 2); __PYX_ERR(0, 119, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 2); __PYX_ERR(0, 123, __pyx_L3_error)
}
case 3:
if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_M)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 3); __PYX_ERR(0, 119, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 3); __PYX_ERR(0, 123, __pyx_L3_error)
}
case 4:
if (likely((values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_pt)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 4); __PYX_ERR(0, 119, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, 4); __PYX_ERR(0, 123, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_sepdgt") < 0)) __PYX_ERR(0, 119, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_sepdgt") < 0)) __PYX_ERR(0, 123, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 5) {
goto __pyx_L5_argtuple_error;
@@ -3334,7 +3334,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_11comp_sepdgt_1comp_sepdgt(PyObject *__
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 119, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgt", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 123, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_sepdgt.comp_sepdgt", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -3353,7 +3353,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(CYTHON_UNUSED
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_sepdgt", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(__pyx_v_f, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_11comp_sepdgt_comp_sepdgt(__pyx_v_f, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 123, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15799,8 +15799,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 127, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 144, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15816,36 +15816,36 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_sepdgt.pyx":127
+ /* "ltfatpy/comp/comp_sepdgt.pyx":131
* cdef ltfatInt L, W
* if (f.dtype.type != np.float64) and (f.dtype.type != np.complex128):
* raise TypeError("f data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_sepdgt.pyx":129
+ /* "ltfatpy/comp/comp_sepdgt.pyx":133
* raise TypeError("f data should be numpy.float64 or complex128")
* if (g.dtype.type != np.float64) and (g.dtype.type != np.complex128):
* raise TypeError("g data should be numpy.float64 or complex128") # <<<<<<<<<<<<<<
* if (f.dtype.type != g.dtype.type):
* if f.dtype.type == np.float64:
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 129, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64_o); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 133, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
- /* "ltfatpy/comp/comp_sepdgt.pyx":136
+ /* "ltfatpy/comp/comp_sepdgt.pyx":140
* g = g.astype(np.complex128)
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 136, __pyx_L1_error)
+ __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__3);
__Pyx_GIVEREF(__pyx_tuple__3);
@@ -16195,22 +16195,22 @@ PyMODINIT_FUNC PyInit_comp_sepdgt(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_sepdgt.pyx":62
+ /* "ltfatpy/comp/comp_sepdgt.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dgt_phasetype, dgt_long_cd, dgt_long_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
/* "ltfatpy/comp/comp_sepdgt.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
diff --git a/ltfatpy/comp/comp_sepdgtreal.c b/ltfatpy/comp/comp_sepdgtreal.c
index ac83815..7bc8e37 100644
--- a/ltfatpy/comp/comp_sepdgtreal.c
+++ b/ltfatpy/comp/comp_sepdgtreal.c
@@ -750,7 +750,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int;
#endif
-/* "ltfat.pxd":57
+/* "ltfat.pxd":61
* TIMEINV = 1
*
* ctypedef size_t ltfatInt # <<<<<<<<<<<<<<
@@ -777,7 +777,7 @@ struct __pyx_MemviewEnum_obj;
struct __pyx_memoryview_obj;
struct __pyx_memoryviewslice_obj;
-/* "ltfat.pxd":53
+/* "ltfat.pxd":57
*
*
* cdef enum dgt_phasetype: # <<<<<<<<<<<<<<
@@ -789,7 +789,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype {
__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV = 1
};
-/* "ltfat.pxd":60
+/* "ltfat.pxd":64
*
* # Values extracted from fftw3.h
* cdef enum dct_kind: # <<<<<<<<<<<<<<
@@ -803,7 +803,7 @@ enum __pyx_t_7ltfatpy_4comp_5ltfat_dct_kind {
__pyx_e_7ltfatpy_4comp_5ltfat_DCTIV = 6
};
-/* "ltfat.pxd":67
+/* "ltfat.pxd":71
*
* # Values extracted from fftw3.h
* cdef enum dst_kind: # <<<<<<<<<<<<<<
@@ -1830,7 +1830,7 @@ static PyObject *__pyx_tuple__19;
static PyObject *__pyx_tuple__20;
static PyObject *__pyx_tuple__21;
-/* "ltfatpy/comp/comp_sepdgtreal.pyx":73
+/* "ltfatpy/comp/comp_sepdgtreal.pyx":77
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgtreal_long_d(const double[:] f, const double[:] g, const int L, # <<<<<<<<<<<<<<
@@ -1846,7 +1846,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_long_d(__
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgtreal_long_d", 0);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":77
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":81
* const dgt_phasetype ptype, double complex[:] out):
* """ Internal function, do not use it """
* dgtreal_long_d(&f[0], &g[0], L, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1858,7 +1858,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_long_d(__
__pyx_t_3 = 0;
dgtreal_long_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":73
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":77
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgtreal_long_d(const double[:] f, const double[:] g, const int L, # <<<<<<<<<<<<<<
@@ -1873,7 +1873,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_long_d(__
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgtreal.pyx":84
+/* "ltfatpy/comp/comp_sepdgtreal.pyx":88
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgtreal_fb_d(const double[:] f, const double[:] g, const int L, # <<<<<<<<<<<<<<
@@ -1889,7 +1889,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_fb_d(__Py
Py_ssize_t __pyx_t_3;
__Pyx_RefNannySetupContext("comp_dgtreal_fb_d", 0);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":89
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":93
* double complex[:] out):
* """ Internal function, do not use it """
* dgtreal_fb_d(&f[0], &g[0], L, gl, W, a, M, ptype, &out[0]) # <<<<<<<<<<<<<<
@@ -1901,7 +1901,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_fb_d(__Py
__pyx_t_3 = 0;
dgtreal_fb_d((&(*((double *) ( /* dim=0 */ (__pyx_v_f.data + __pyx_t_1 * __pyx_v_f.strides[0]) )))), (&(*((double *) ( /* dim=0 */ (__pyx_v_g.data + __pyx_t_2 * __pyx_v_g.strides[0]) )))), __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_v_a, __pyx_v_M, __pyx_v_ptype, (&(*((__pyx_t_double_complex *) ( /* dim=0 */ (__pyx_v_out.data + __pyx_t_3 * __pyx_v_out.strides[0]) )))));
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":84
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":88
* # assume no negative indexing.
* @cython.wraparound(False)
* cdef comp_dgtreal_fb_d(const double[:] f, const double[:] g, const int L, # <<<<<<<<<<<<<<
@@ -1916,7 +1916,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_fb_d(__Py
return __pyx_r;
}
-/* "ltfatpy/comp/comp_sepdgtreal.pyx":96
+/* "ltfatpy/comp/comp_sepdgtreal.pyx":100
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_sepdgtreal(f, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -1954,44 +1954,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_INCREF(__pyx_v_f);
__Pyx_INCREF(__pyx_v_g);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":103
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":107
* """
* cdef int L, W
* if f.dtype.type != np.float64: # <<<<<<<<<<<<<<
* raise TypeError("f data should be numpy.float64")
* if g.dtype.type != np.float64:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_t_3, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 103, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":104
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":108
* cdef int L, W
* if f.dtype.type != np.float64:
* raise TypeError("f data should be numpy.float64") # <<<<<<<<<<<<<<
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 104, __pyx_L1_error)
+ __PYX_ERR(0, 108, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":103
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":107
* """
* cdef int L, W
* if f.dtype.type != np.float64: # <<<<<<<<<<<<<<
@@ -2000,44 +2000,44 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":105
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":109
* if f.dtype.type != np.float64:
* raise TypeError("f data should be numpy.float64")
* if g.dtype.type != np.float64: # <<<<<<<<<<<<<<
* raise TypeError("g data should be numpy.float64")
* if pt != FREQINV and pt != TIMEINV:
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_dtype); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_type); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_float64); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_3, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 105, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 109, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":106
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":110
* raise TypeError("f data should be numpy.float64")
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64") # <<<<<<<<<<<<<<
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 106, __pyx_L1_error)
+ __PYX_ERR(0, 110, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":105
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":109
* if f.dtype.type != np.float64:
* raise TypeError("f data should be numpy.float64")
* if g.dtype.type != np.float64: # <<<<<<<<<<<<<<
@@ -2046,48 +2046,48 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":107
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":111
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64")
* if pt != FREQINV and pt != TIMEINV: # <<<<<<<<<<<<<<
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
*/
- __pyx_t_1 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_FREQINV); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_FREQINV); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_1, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_1, Py_NE); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_5) {
} else {
__pyx_t_4 = __pyx_t_5;
goto __pyx_L6_bool_binop_done;
}
- __pyx_t_2 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_From_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_e_7ltfatpy_4comp_5ltfat_TIMEINV); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_v_pt, __pyx_t_2, Py_NE); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 107, __pyx_L1_error)
+ __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_5 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__pyx_t_4 = __pyx_t_5;
__pyx_L6_bool_binop_done:;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":108
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":112
* raise TypeError("g data should be numpy.float64")
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_Raise(__pyx_t_1, 0, 0, 0);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __PYX_ERR(0, 108, __pyx_L1_error)
+ __PYX_ERR(0, 112, __pyx_L1_error)
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":107
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":111
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64")
* if pt != FREQINV and pt != TIMEINV: # <<<<<<<<<<<<<<
@@ -2096,61 +2096,61 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":110
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":114
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
*/
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_1, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 110, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 114, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":111
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":115
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_1 = PyObject_RichCompare(__pyx_t_2, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 111, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 115, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":112
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":116
* if f.ndim > 1:
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1)) # <<<<<<<<<<<<<<
* L = f.shape[0]
* W = f.shape[1]
*/
- __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_INCREF(__pyx_v_f);
__Pyx_GIVEREF(__pyx_v_f);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_f);
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_SubtractObjC(__pyx_t_6, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2158,12 +2158,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);
__pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_6, NULL); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 112, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_axis, __pyx_t_7) < 0) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 116, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2171,7 +2171,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_DECREF_SET(__pyx_v_f, __pyx_t_7);
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":111
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":115
*
* if f.ndim > 1:
* if f.ndim > 2: # <<<<<<<<<<<<<<
@@ -2180,58 +2180,58 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":113
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":117
* if f.ndim > 2:
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0] # <<<<<<<<<<<<<<
* W = f.shape[1]
* f_combined = f.reshape(L*W, order='F')
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_7, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 113, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 117, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":114
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":118
* f = np.squeeze(f, axis=range(2, f.ndim-1))
* L = f.shape[0]
* W = f.shape[1] # <<<<<<<<<<<<<<
* f_combined = f.reshape(L*W, order='F')
* else:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetItemInt(__pyx_t_3, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_7); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 114, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_7); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 118, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__pyx_v_W = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":115
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":119
* L = f.shape[0]
* W = f.shape[1]
* f_combined = f.reshape(L*W, order='F') # <<<<<<<<<<<<<<
* else:
* L = f.shape[0]
*/
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_reshape); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_L * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 115, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 115, __pyx_L1_error)
- __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 115, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 119, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 119, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2239,7 +2239,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_v_f_combined = __pyx_t_2;
__pyx_t_2 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":110
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":114
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*
* if f.ndim > 1: # <<<<<<<<<<<<<<
@@ -2249,7 +2249,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
goto __pyx_L8;
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":117
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":121
* f_combined = f.reshape(L*W, order='F')
* else:
* L = f.shape[0] # <<<<<<<<<<<<<<
@@ -2257,16 +2257,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
* f_combined = f
*/
/*else*/ {
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_shape); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetItemInt(__pyx_t_2, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 117, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 121, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_L = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":118
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":122
* else:
* L = f.shape[0]
* W = 1 # <<<<<<<<<<<<<<
@@ -2275,7 +2275,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
__pyx_v_W = 1;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":119
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":123
* L = f.shape[0]
* W = 1
* f_combined = f # <<<<<<<<<<<<<<
@@ -2287,77 +2287,77 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
}
__pyx_L8:;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":121
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":125
* f_combined = f
*
* cdef ltfatInt gl = g.shape[0] # <<<<<<<<<<<<<<
* if g.ndim > 1:
* if g.ndim > 2:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_3, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_9 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_9 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 121, __pyx_L1_error)
+ __pyx_t_9 = __Pyx_PyInt_As_size_t(__pyx_t_2); if (unlikely((__pyx_t_9 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 125, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_gl = __pyx_t_9;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":122
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":126
*
* cdef ltfatInt gl = g.shape[0]
* if g.ndim > 1: # <<<<<<<<<<<<<<
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
*/
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_int_1, Py_GT); __Pyx_XGOTREF(__pyx_t_3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 122, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 126, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":123
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":127
* cdef ltfatInt gl = g.shape[0]
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2:
*/
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_2 = PyObject_RichCompare(__pyx_t_3, __pyx_int_2, Py_GT); __Pyx_XGOTREF(__pyx_t_2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 123, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 127, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":124
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":128
* if g.ndim > 1:
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1)) # <<<<<<<<<<<<<<
* if f.ndim == 2:
* gl = gl * g.shape[1]
*/
- __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_squeeze); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_g);
__Pyx_GIVEREF(__pyx_v_g);
PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_g);
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_ndim); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyInt_SubtractObjC(__pyx_t_7, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_SubtractObjC(__pyx_t_7, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_INCREF(__pyx_int_2);
__Pyx_GIVEREF(__pyx_int_2);
@@ -2365,12 +2365,12 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_6);
__pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_axis, __pyx_t_6) < 0) __PYX_ERR(0, 124, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_axis, __pyx_t_6) < 0) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 124, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 128, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2378,7 +2378,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_DECREF_SET(__pyx_v_g, __pyx_t_6);
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":123
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":127
* cdef ltfatInt gl = g.shape[0]
* if g.ndim > 1:
* if g.ndim > 2: # <<<<<<<<<<<<<<
@@ -2387,45 +2387,45 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":125
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":129
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2: # <<<<<<<<<<<<<<
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F')
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_f, __pyx_n_s_ndim); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_6, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_6, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 125, __pyx_L1_error)
+ __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_4 < 0)) __PYX_ERR(0, 129, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":126
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":130
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2:
* gl = gl * g.shape[1] # <<<<<<<<<<<<<<
* g_combined = g.reshape(gl, order='F')
* else:
*/
- __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_shape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_6, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_GetItemInt(__pyx_t_6, 1, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyNumber_Multiply(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_6 = PyNumber_Multiply(__pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_9 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 126, __pyx_L1_error)
+ __pyx_t_9 = __Pyx_PyInt_As_size_t(__pyx_t_6); if (unlikely((__pyx_t_9 == (size_t)-1) && PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__pyx_v_gl = __pyx_t_9;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":125
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":129
* if g.ndim > 2:
* g = np.squeeze(g, axis=range(2, g.ndim-1))
* if f.ndim == 2: # <<<<<<<<<<<<<<
@@ -2434,26 +2434,26 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":127
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":131
* if f.ndim == 2:
* gl = gl * g.shape[1]
* g_combined = g.reshape(gl, order='F') # <<<<<<<<<<<<<<
* else:
* g_combined = g
*/
- __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_v_g, __pyx_n_s_reshape); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FromSize_t(__pyx_v_gl); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_GIVEREF(__pyx_t_2);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
__pyx_t_2 = 0;
- __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 127, __pyx_L1_error)
+ __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 127, __pyx_L1_error)
- __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 127, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_1, __pyx_t_2); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -2461,7 +2461,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_v_g_combined = __pyx_t_3;
__pyx_t_3 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":122
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":126
*
* cdef ltfatInt gl = g.shape[0]
* if g.ndim > 1: # <<<<<<<<<<<<<<
@@ -2471,7 +2471,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
goto __pyx_L10;
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":129
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":133
* g_combined = g.reshape(gl, order='F')
* else:
* g_combined = g # <<<<<<<<<<<<<<
@@ -2484,76 +2484,76 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
}
__pyx_L10:;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":130
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":134
* else:
* g_combined = g
* cdef int N = L//a # <<<<<<<<<<<<<<
* cdef int M2 = M // 2 + 1
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128)
*/
- __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_L); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_L); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_3, __pyx_v_a); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_2 = PyNumber_FloorDivide(__pyx_t_3, __pyx_v_a); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 130, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_2); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__pyx_v_N = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":131
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":135
* g_combined = g
* cdef int N = L//a
* cdef int M2 = M // 2 + 1 # <<<<<<<<<<<<<<
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128)
* if gl < L:
*/
- __pyx_t_2 = __Pyx_PyInt_FloorDivideObjC(__pyx_v_M, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_FloorDivideObjC(__pyx_v_M, __pyx_int_2, 2, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = __Pyx_PyInt_AddObjC(__pyx_t_2, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_AddObjC(__pyx_t_2, __pyx_int_1, 1, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 131, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_3); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 135, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__pyx_v_M2 = __pyx_t_8;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":132
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":136
* cdef int N = L//a
* cdef int M2 = M // 2 + 1
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128) # <<<<<<<<<<<<<<
* if gl < L:
* comp_dgtreal_fb_d(f_combined, g_combined, L, gl, W, a, M, M2, pt, res)
*/
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ndarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_M2 * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyInt_From_int((__pyx_v_M2 * __pyx_v_W)); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_L); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_L); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_6 = PyNumber_FloorDivide(__pyx_t_1, __pyx_v_a); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_6 = PyNumber_FloorDivide(__pyx_t_1, __pyx_v_a); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = PyNumber_Multiply(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_1 = PyNumber_Multiply(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_complex128); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 132, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_7) < 0) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 132, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
@@ -2561,7 +2561,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_v_res = __pyx_t_7;
__pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":133
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":137
* cdef int M2 = M // 2 + 1
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2571,7 +2571,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_t_4 = ((__pyx_v_gl < __pyx_v_L) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":134
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":138
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128)
* if gl < L:
* comp_dgtreal_fb_d(f_combined, g_combined, L, gl, W, a, M, M2, pt, res) # <<<<<<<<<<<<<<
@@ -2579,15 +2579,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
* comp_dgtreal_long_d(f_combined, g_combined, L, W, a, M, M2, pt, res)
*/
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 138, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 134, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_fb_d(__pyx_t_10, __pyx_t_11, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_8, __pyx_t_12, __pyx_v_M2, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 134, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_fb_d(__pyx_t_10, __pyx_t_11, __pyx_v_L, __pyx_v_gl, __pyx_v_W, __pyx_t_8, __pyx_t_12, __pyx_v_M2, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_10, 1);
__pyx_t_10.memview = NULL;
@@ -2600,7 +2600,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_t_14.data = NULL;
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":133
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":137
* cdef int M2 = M // 2 + 1
* res = np.ndarray((M2 * W * (L // a)), dtype=np.complex128)
* if gl < L: # <<<<<<<<<<<<<<
@@ -2610,7 +2610,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
goto __pyx_L13;
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":136
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":140
* comp_dgtreal_fb_d(f_combined, g_combined, L, gl, W, a, M, M2, pt, res)
* else:
* comp_dgtreal_long_d(f_combined, g_combined, L, W, a, M, M2, pt, res) # <<<<<<<<<<<<<<
@@ -2619,15 +2619,15 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
*/
/*else*/ {
__pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_f_combined);
- if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 136, __pyx_L1_error)
+ if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(0, 140, __pyx_L1_error)
__pyx_t_10 = __Pyx_PyObject_to_MemoryviewSlice_ds_double(__pyx_v_g_combined);
- if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 136, __pyx_L1_error)
+ if (unlikely(!__pyx_t_10.memview)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_v_a); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_v_M); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_13 = ((enum __pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype)__Pyx_PyInt_As_enum____pyx_t_7ltfatpy_4comp_5ltfat_dgt_phasetype(__pyx_v_pt)); if (unlikely(PyErr_Occurred())) __PYX_ERR(0, 140, __pyx_L1_error)
__pyx_t_14 = __Pyx_PyObject_to_MemoryviewSlice_ds___pyx_t_double_complex(__pyx_v_res);
- if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 136, __pyx_L1_error)
- __pyx_t_7 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_long_d(__pyx_t_11, __pyx_t_10, __pyx_v_L, __pyx_v_W, __pyx_t_12, __pyx_t_8, __pyx_v_M2, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 136, __pyx_L1_error)
+ if (unlikely(!__pyx_t_14.memview)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_7 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_dgtreal_long_d(__pyx_t_11, __pyx_t_10, __pyx_v_L, __pyx_v_W, __pyx_t_12, __pyx_t_8, __pyx_v_M2, __pyx_t_13, __pyx_t_14); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 140, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
__PYX_XDEC_MEMVIEW(&__pyx_t_11, 1);
__pyx_t_11.memview = NULL;
@@ -2642,7 +2642,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
}
__pyx_L13:;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":137
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":141
* else:
* comp_dgtreal_long_d(f_combined, g_combined, L, W, a, M, M2, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2652,25 +2652,25 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_t_4 = ((__pyx_v_W > 1) != 0);
if (__pyx_t_4) {
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":138
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":142
* comp_dgtreal_long_d(f_combined, g_combined, L, W, a, M, M2, pt, res)
* if W > 1:
* res = np.reshape(res, (M2, N, W), order='F') # <<<<<<<<<<<<<<
* else:
* res = np.reshape(res, (M2, N), order='F')
*/
- __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_7, __pyx_n_s_reshape); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
- __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_M2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_M2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_7);
- __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_N); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_N); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_W); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_GIVEREF(__pyx_t_7);
PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_7);
@@ -2681,7 +2681,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_t_7 = 0;
__pyx_t_6 = 0;
__pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2689,10 +2689,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_GIVEREF(__pyx_t_3);
PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3);
__pyx_t_3 = 0;
- __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 138, __pyx_L1_error)
+ __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
- if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 138, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 138, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 142, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, __pyx_t_3); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 142, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2700,7 +2700,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_DECREF_SET(__pyx_v_res, __pyx_t_6);
__pyx_t_6 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":137
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":141
* else:
* comp_dgtreal_long_d(f_combined, g_combined, L, W, a, M, M2, pt, res)
* if W > 1: # <<<<<<<<<<<<<<
@@ -2710,7 +2710,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
goto __pyx_L14;
}
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":140
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":144
* res = np.reshape(res, (M2, N, W), order='F')
* else:
* res = np.reshape(res, (M2, N), order='F') # <<<<<<<<<<<<<<
@@ -2718,16 +2718,16 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
* return res
*/
/*else*/ {
- __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_3);
__Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
- __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_M2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_M2); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
- __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_N); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_PyInt_From_int(__pyx_v_N); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
- __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_GIVEREF(__pyx_t_6);
PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_6);
@@ -2735,7 +2735,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_2);
__pyx_t_6 = 0;
__pyx_t_2 = 0;
- __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_INCREF(__pyx_v_res);
__Pyx_GIVEREF(__pyx_v_res);
@@ -2743,10 +2743,10 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__Pyx_GIVEREF(__pyx_t_1);
PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1);
__pyx_t_1 = 0;
- __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 140, __pyx_L1_error)
+ __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 140, __pyx_L1_error)
- __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 140, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_order, __pyx_n_s_F) < 0) __PYX_ERR(0, 144, __pyx_L1_error)
+ __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(0, 144, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_6);
__Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -2756,7 +2756,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
}
__pyx_L14:;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":142
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":146
* res = np.reshape(res, (M2, N), order='F')
*
* return res # <<<<<<<<<<<<<<
@@ -2766,7 +2766,7 @@ static PyObject *__pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(PyObje
__pyx_r = __pyx_v_res;
goto __pyx_L0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":96
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":100
* # assume no negative indexing.
* @cython.wraparound(False)
* cpdef comp_sepdgtreal(f, g, a, M, pt): # <<<<<<<<<<<<<<
@@ -2832,26 +2832,26 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_15comp_sepdgtreal_1comp_sepdgtreal(PyOb
case 1:
if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_g)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 1); __PYX_ERR(0, 96, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 1); __PYX_ERR(0, 100, __pyx_L3_error)
}
case 2:
if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 2); __PYX_ERR(0, 96, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 2); __PYX_ERR(0, 100, __pyx_L3_error)
}
case 3:
if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_M)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 3); __PYX_ERR(0, 96, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 3); __PYX_ERR(0, 100, __pyx_L3_error)
}
case 4:
if (likely((values[4] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_pt)) != 0)) kw_args--;
else {
- __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 4); __PYX_ERR(0, 96, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, 4); __PYX_ERR(0, 100, __pyx_L3_error)
}
}
if (unlikely(kw_args > 0)) {
- if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_sepdgtreal") < 0)) __PYX_ERR(0, 96, __pyx_L3_error)
+ if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "comp_sepdgtreal") < 0)) __PYX_ERR(0, 100, __pyx_L3_error)
}
} else if (PyTuple_GET_SIZE(__pyx_args) != 5) {
goto __pyx_L5_argtuple_error;
@@ -2870,7 +2870,7 @@ static PyObject *__pyx_pw_7ltfatpy_4comp_15comp_sepdgtreal_1comp_sepdgtreal(PyOb
}
goto __pyx_L4_argument_unpacking_done;
__pyx_L5_argtuple_error:;
- __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 96, __pyx_L3_error)
+ __Pyx_RaiseArgtupleInvalid("comp_sepdgtreal", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(0, 100, __pyx_L3_error)
__pyx_L3_error:;
__Pyx_AddTraceback("ltfatpy.comp.comp_sepdgtreal.comp_sepdgtreal", __pyx_clineno, __pyx_lineno, __pyx_filename);
__Pyx_RefNannyFinishContext();
@@ -2889,7 +2889,7 @@ static PyObject *__pyx_pf_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(CYTHO
PyObject *__pyx_t_1 = NULL;
__Pyx_RefNannySetupContext("comp_sepdgtreal", 0);
__Pyx_XDECREF(__pyx_r);
- __pyx_t_1 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(__pyx_v_f, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 96, __pyx_L1_error)
+ __pyx_t_1 = __pyx_f_7ltfatpy_4comp_15comp_sepdgtreal_comp_sepdgtreal(__pyx_v_f, __pyx_v_g, __pyx_v_a, __pyx_v_M, __pyx_v_pt, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 100, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__pyx_r = __pyx_t_1;
__pyx_t_1 = 0;
@@ -15335,8 +15335,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
{0, 0, 0, 0, 0, 0, 0}
};
static int __Pyx_InitCachedBuiltins(void) {
- __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 104, __pyx_L1_error)
- __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 112, __pyx_L1_error)
+ __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) __PYX_ERR(0, 116, __pyx_L1_error)
__pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) __PYX_ERR(1, 131, __pyx_L1_error)
__pyx_builtin_MemoryError = __Pyx_GetBuiltinName(__pyx_n_s_MemoryError); if (!__pyx_builtin_MemoryError) __PYX_ERR(1, 146, __pyx_L1_error)
__pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) __PYX_ERR(1, 149, __pyx_L1_error)
@@ -15352,36 +15352,36 @@ static int __Pyx_InitCachedConstants(void) {
__Pyx_RefNannyDeclarations
__Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":104
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":108
* cdef int L, W
* if f.dtype.type != np.float64:
* raise TypeError("f data should be numpy.float64") # <<<<<<<<<<<<<<
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64")
*/
- __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 104, __pyx_L1_error)
+ __pyx_tuple_ = PyTuple_Pack(1, __pyx_kp_s_f_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple_)) __PYX_ERR(0, 108, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple_);
__Pyx_GIVEREF(__pyx_tuple_);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":106
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":110
* raise TypeError("f data should be numpy.float64")
* if g.dtype.type != np.float64:
* raise TypeError("g data should be numpy.float64") # <<<<<<<<<<<<<<
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)")
*/
- __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 106, __pyx_L1_error)
+ __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_g_data_should_be_numpy_float64); if (unlikely(!__pyx_tuple__2)) __PYX_ERR(0, 110, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__2);
__Pyx_GIVEREF(__pyx_tuple__2);
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":108
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":112
* raise TypeError("g data should be numpy.float64")
* if pt != FREQINV and pt != TIMEINV:
* raise TypeError("pt should be 0 (FREQINV) or 1 (TIMEINV)") # <<<<<<<<<<<<<<
*
* if f.ndim > 1:
*/
- __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 108, __pyx_L1_error)
+ __pyx_tuple__3 = PyTuple_Pack(1, __pyx_kp_s_pt_should_be_0_FREQINV_or_1_TIME); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(0, 112, __pyx_L1_error)
__Pyx_GOTREF(__pyx_tuple__3);
__Pyx_GIVEREF(__pyx_tuple__3);
@@ -15732,43 +15732,43 @@ PyMODINIT_FUNC PyInit_comp_sepdgtreal(void)
if (__Pyx_patch_abc() < 0) __PYX_ERR(0, 1, __pyx_L1_error)
#endif
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":62
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":66
*
* import cython
* import numpy as np # <<<<<<<<<<<<<<
*
* from ltfat cimport ltfatInt, dgt_phasetype, dgtreal_fb_d, dgtreal_long_d
*/
- __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 62, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_Import(__pyx_n_s_numpy, 0, -1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 62, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- /* "ltfatpy/comp/comp_sepdgtreal.pyx":66
+ /* "ltfatpy/comp/comp_sepdgtreal.pyx":70
* from ltfat cimport ltfatInt, dgt_phasetype, dgtreal_fb_d, dgtreal_long_d
* from ltfatpy.comp.ltfat cimport TIMEINV, FREQINV
* from numpy import int64 # <<<<<<<<<<<<<<
*
*
*/
- __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
+ __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 70, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
__Pyx_INCREF(__pyx_n_s_int64);
__Pyx_GIVEREF(__pyx_n_s_int64);
PyList_SET_ITEM(__pyx_t_1, 0, __pyx_n_s_int64);
- __pyx_t_2 = __Pyx_Import(__pyx_n_s_numpy, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 66, __pyx_L1_error)
+ __pyx_t_2 = __Pyx_Import(__pyx_n_s_numpy, __pyx_t_1, -1); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 70, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
- __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_int64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 66, __pyx_L1_error)
+ __pyx_t_1 = __Pyx_ImportFrom(__pyx_t_2, __pyx_n_s_int64); if (unlikely(!__pyx_t_1)) __PYX_ERR(0, 70, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_1);
- if (PyDict_SetItem(__pyx_d, __pyx_n_s_int64, __pyx_t_1) < 0) __PYX_ERR(0, 66, __pyx_L1_error)
+ if (PyDict_SetItem(__pyx_d, __pyx_n_s_int64, __pyx_t_1) < 0) __PYX_ERR(0, 70, __pyx_L1_error)
__Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
__Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
/* "ltfatpy/comp/comp_sepdgtreal.pyx":1
* # -*- coding: utf-8 -*- # <<<<<<<<<<<<<<
* # ######### COPYRIGHT #########
- * #
+ * # Credits
*/
__pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 1, __pyx_L1_error)
__Pyx_GOTREF(__pyx_t_2);
--
GitLab