diff options
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/random/mtrand/mtrand.c | 276 |
1 files changed, 116 insertions, 160 deletions
diff --git a/numpy/random/mtrand/mtrand.c b/numpy/random/mtrand/mtrand.c index d0507ec23..407e8b881 100644 --- a/numpy/random/mtrand/mtrand.c +++ b/numpy/random/mtrand/mtrand.c @@ -1,16 +1,10 @@ -/* Generated by Pyrex 0.9.4.1 on Mon Jun 12 14:22:41 2006 */ +/* Generated by Pyrex 0.9.3.1 on Thu Jun 29 03:46:57 2006 */ #include "Python.h" #include "structmember.h" #ifndef PY_LONG_LONG #define PY_LONG_LONG LONG_LONG #endif -#ifdef __cplusplus -#define __PYX_EXTERN_C extern "C" -#else -#define __PYX_EXTERN_C extern -#endif -__PYX_EXTERN_C double pow(double, double); #include "string.h" #include "math.h" #include "numpy/arrayobject.h" @@ -37,10 +31,11 @@ static PyObject *__pyx_m; static PyObject *__pyx_b; static int __pyx_lineno; static char *__pyx_filename; -static char **__pyx_f; +staticforward char **__pyx_f; /* Declarations from mtrand */ +staticforward PyTypeObject __pyx_type_6mtrand_RandomState; struct __pyx_obj_6mtrand_RandomState { PyObject_HEAD @@ -184,7 +179,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":128 */ __pyx_1 = __pyx_v_size == Py_None; @@ -214,7 +209,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); + Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -230,9 +225,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":135 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":136 */ Py_INCREF(((PyObject *)arrayObject)); @@ -241,7 +234,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -266,7 +259,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":144 */ __pyx_1 = __pyx_v_size == Py_None; @@ -296,7 +289,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); + Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -312,9 +305,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":151 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":152 */ Py_INCREF(((PyObject *)arrayObject)); @@ -323,7 +314,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -348,7 +339,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":161 */ __pyx_1 = __pyx_v_size == Py_None; @@ -378,7 +369,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); + Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -394,9 +385,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":168 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":169 */ Py_INCREF(((PyObject *)arrayObject)); @@ -405,7 +394,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -430,7 +419,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":179 */ __pyx_1 = __pyx_v_size == Py_None; @@ -460,7 +449,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); + Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -476,9 +465,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":186 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":187 */ Py_INCREF(((PyObject *)arrayObject)); @@ -487,7 +474,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -514,7 +501,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":195 */ __pyx_1 = __pyx_v_size == Py_None; @@ -542,7 +529,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); + Py_INCREF(((PyObject *)__pyx_2)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -558,9 +545,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":202 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":203 */ Py_INCREF(((PyObject *)arrayObject)); @@ -569,7 +554,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -594,7 +579,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":211 */ __pyx_1 = __pyx_v_size == Py_None; @@ -622,7 +607,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 214; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); + Py_INCREF(((PyObject *)__pyx_2)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -638,9 +623,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":218 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":219 */ Py_INCREF(((PyObject *)arrayObject)); @@ -649,7 +632,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -674,7 +657,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":228 */ __pyx_1 = __pyx_v_size == Py_None; @@ -702,7 +685,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); + Py_INCREF(((PyObject *)__pyx_2)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -718,9 +701,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":235 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":236 */ Py_INCREF(((PyObject *)arrayObject)); @@ -729,7 +710,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -754,7 +735,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":244 */ __pyx_1 = __pyx_v_size == Py_None; @@ -782,7 +763,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 247; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); + Py_INCREF(((PyObject *)__pyx_2)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -798,9 +779,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":251 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); - __pyx_L3:; } - __pyx_L4:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":252 */ Py_INCREF(((PyObject *)arrayObject)); @@ -809,7 +788,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -851,9 +830,7 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) { /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":263 */ __pyx_v_sum = __pyx_v_t; - __pyx_L2:; } - __pyx_L3:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":264 */ __pyx_r = __pyx_v_sum; @@ -861,7 +838,6 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) { __pyx_r = 0; goto __pyx_L0; - __pyx_L1:; __Pyx_WriteUnraisable("mtrand.kahan_sum"); __pyx_L0:; return __pyx_r; @@ -926,7 +902,6 @@ static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self) { __pyx_L2:; goto __pyx_L0; - __pyx_L1:; __Pyx_AddTraceback("mtrand.RandomState.__dealloc__"); __pyx_L0:; Py_DECREF(__pyx_v_self); @@ -951,7 +926,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_seed)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); - arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject_obj = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_obj); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":308 */ __pyx_1 = __pyx_v_seed == Py_None; @@ -975,7 +950,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb if (__pyx_1) { /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":311 */ - __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; goto __pyx_L1;} + __pyx_5 = PyLong_AsUnsignedLong(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; goto __pyx_L1;} rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } @@ -983,7 +958,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":313 */ __pyx_3 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_seed,PyArray_LONG,1,1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 313; goto __pyx_L1;} - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); + Py_INCREF(((PyObject *)__pyx_3)); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -993,7 +968,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -1023,7 +998,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject_state = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_state); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":323 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;} @@ -1039,7 +1014,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); + Py_INCREF(((PyObject *)__pyx_1)); Py_DECREF(((PyObject *)arrayObject_state)); arrayObject_state = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1060,7 +1035,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1100,9 +1075,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_state); - arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None); - __pyx_v_key = Py_None; Py_INCREF(Py_None); + arrayObject_obj = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_obj); + __pyx_v_algorithm_name = Py_None; Py_INCREF(__pyx_v_algorithm_name); + __pyx_v_key = Py_None; Py_INCREF(__pyx_v_key); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":336 */ __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;} @@ -1147,7 +1122,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":340 */ __pyx_4 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_key,PyArray_LONG,1,1)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 340; goto __pyx_L1;} - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); + Py_INCREF(((PyObject *)__pyx_4)); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -1177,7 +1152,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":344 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1214,7 +1189,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se __pyx_3 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1249,7 +1224,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___setstate__(PyObject *__pyx_v_se Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1301,7 +1276,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self __pyx_3 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1334,7 +1309,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_sample(PyObject *__pyx_v_s __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1364,7 +1339,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self, __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1407,7 +1382,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_low); Py_INCREF(__pyx_v_high); Py_INCREF(__pyx_v_size); - arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + arrayObject = (void *)Py_None; Py_INCREF((PyObject *) arrayObject); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":384 */ __pyx_1 = __pyx_v_high == Py_None; @@ -1481,7 +1456,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 398; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); + Py_INCREF(((PyObject *)__pyx_3)); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -1497,9 +1472,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":402 */ (__pyx_v_array_data[__pyx_v_i]) = (__pyx_v_lo + ((long )rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state))); - __pyx_L5:; } - __pyx_L6:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":403 */ Py_INCREF(((PyObject *)arrayObject)); @@ -1508,7 +1481,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P } __pyx_L4:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_3); @@ -1534,9 +1507,9 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO PyObject *__pyx_r; PyObject *__pyx_1 = 0; static char *__pyx_argnames[] = {"length",0}; - if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "I", __pyx_argnames, &__pyx_v_length)) return 0; + if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "i", __pyx_argnames, &__pyx_v_length)) return 0; Py_INCREF(__pyx_v_self); - __pyx_v_bytestring = Py_None; Py_INCREF(Py_None); + __pyx_v_bytestring = Py_None; Py_INCREF(__pyx_v_bytestring); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":411 */ __pyx_v_bytes = PyMem_Malloc(__pyx_v_length); @@ -1558,7 +1531,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO __pyx_r = __pyx_v_bytestring; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1592,7 +1565,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1671,7 +1644,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1749,7 +1722,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO } __pyx_L2:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1822,7 +1795,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v __pyx_4 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -1856,7 +1829,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_normal(PyObject *__pyx_v __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -1916,7 +1889,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -1994,7 +1967,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2054,7 +2027,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2086,7 +2059,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__ __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -2143,7 +2116,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2222,7 +2195,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2300,7 +2273,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2397,7 +2370,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2456,7 +2429,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2534,7 +2507,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2566,7 +2539,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v __pyx_1 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -2623,7 +2596,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2683,7 +2656,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2742,7 +2715,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2801,7 +2774,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2860,7 +2833,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2922,7 +2895,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -2984,7 +2957,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3046,7 +3019,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3108,7 +3081,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3168,7 +3141,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3246,7 +3219,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3343,7 +3316,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3439,7 +3412,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3535,7 +3508,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3595,7 +3568,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3654,7 +3627,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3731,7 +3704,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3846,7 +3819,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3923,7 +3896,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, __pyx_2 = 0; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_2); @@ -3986,13 +3959,13 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_INCREF(__pyx_v_mean); Py_INCREF(__pyx_v_cov); Py_INCREF(__pyx_v_size); - __pyx_v_shape = Py_None; Py_INCREF(Py_None); - __pyx_v_final_shape = Py_None; Py_INCREF(Py_None); - __pyx_v_x = Py_None; Py_INCREF(Py_None); - __pyx_v_svd = Py_None; Py_INCREF(Py_None); - __pyx_v_u = Py_None; Py_INCREF(Py_None); - __pyx_v_s = Py_None; Py_INCREF(Py_None); - __pyx_v_v = Py_None; Py_INCREF(Py_None); + __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape); + __pyx_v_final_shape = Py_None; Py_INCREF(__pyx_v_final_shape); + __pyx_v_x = Py_None; Py_INCREF(__pyx_v_x); + __pyx_v_svd = Py_None; Py_INCREF(__pyx_v_svd); + __pyx_v_u = Py_None; Py_INCREF(__pyx_v_u); + __pyx_v_s = Py_None; Py_INCREF(__pyx_v_s); + __pyx_v_v = Py_None; Py_INCREF(__pyx_v_v); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":816 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} @@ -4360,7 +4333,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_r = __pyx_v_x; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -4419,10 +4392,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_pvals); Py_INCREF(__pyx_v_size); - arrayObject_parr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - arrayObject_mnarr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - __pyx_v_shape = Py_None; Py_INCREF(Py_None); - __pyx_v_multin = Py_None; Py_INCREF(Py_None); + arrayObject_parr = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_parr); + arrayObject_mnarr = (void *)Py_None; Py_INCREF((PyObject *) arrayObject_mnarr); + __pyx_v_shape = Py_None; Py_INCREF(__pyx_v_shape); + __pyx_v_multin = Py_None; Py_INCREF(__pyx_v_multin); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":872 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} @@ -4438,7 +4411,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":873 */ __pyx_1 = ((PyObject *)PyArray_ContiguousFromObject(__pyx_v_pvals,PyArray_DOUBLE,1,1)); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); + Py_INCREF(((PyObject *)__pyx_1)); Py_DECREF(((PyObject *)arrayObject_parr)); arrayObject_parr = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4537,7 +4510,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel __pyx_3 = 0; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":887 */ - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin))); + Py_INCREF(((PyObject *)__pyx_v_multin)); Py_DECREF(((PyObject *)arrayObject_mnarr)); arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin); @@ -4549,7 +4522,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":890 */ while (1) { - __pyx_L4:; __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr)); if (!__pyx_5) break; @@ -4581,7 +4553,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":898 */ __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j])); - __pyx_L6:; } __pyx_L7:; @@ -4598,14 +4569,13 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":902 */ __pyx_v_i = (__pyx_v_i + __pyx_v_d); } - __pyx_L5:; /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":904 */ Py_INCREF(__pyx_v_multin); __pyx_r = __pyx_v_multin; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -4659,7 +4629,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":916 */ while (1) { - __pyx_L2:; __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; @@ -4685,9 +4654,8 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":919 */ __pyx_v_i = (__pyx_v_i - 1); } - __pyx_L3:; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -4717,7 +4685,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_x)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_x); - __pyx_v_arr = Py_None; Py_INCREF(Py_None); + __pyx_v_arr = Py_None; Py_INCREF(__pyx_v_arr); /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":927 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} @@ -4781,7 +4749,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel __pyx_r = __pyx_v_arr; goto __pyx_L0; - __pyx_r = Py_None; Py_INCREF(Py_None); + __pyx_r = Py_None; Py_INCREF(__pyx_r); goto __pyx_L0; __pyx_L1:; Py_XDECREF(__pyx_1); @@ -4937,7 +4905,6 @@ static PyObject *__pyx_tp_new_6mtrand_RandomState(PyTypeObject *t, PyObject *a, } static void __pyx_tp_dealloc_6mtrand_RandomState(PyObject *o) { - struct __pyx_obj_6mtrand_RandomState *p = (struct __pyx_obj_6mtrand_RandomState *)o; { PyObject *etype, *eval, *etb; PyErr_Fetch(&etype, &eval, &etb); @@ -4951,13 +4918,10 @@ static void __pyx_tp_dealloc_6mtrand_RandomState(PyObject *o) { } static int __pyx_tp_traverse_6mtrand_RandomState(PyObject *o, visitproc v, void *a) { - int e; - struct __pyx_obj_6mtrand_RandomState *p = (struct __pyx_obj_6mtrand_RandomState *)o; return 0; } static int __pyx_tp_clear_6mtrand_RandomState(PyObject *o) { - struct __pyx_obj_6mtrand_RandomState *p = (struct __pyx_obj_6mtrand_RandomState *)o; return 0; } @@ -5081,7 +5045,7 @@ static PyBufferProcs __pyx_tp_as_buffer_RandomState = { 0, /*bf_getcharbuffer*/ }; -PyTypeObject __pyx_type_6mtrand_RandomState = { +statichere PyTypeObject __pyx_type_6mtrand_RandomState = { PyObject_HEAD_INIT(0) 0, /*ob_size*/ "mtrand.RandomState", /*tp_name*/ @@ -5102,7 +5066,7 @@ PyTypeObject __pyx_type_6mtrand_RandomState = { 0, /*tp_getattro*/ 0, /*tp_setattro*/ &__pyx_tp_as_buffer_RandomState, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ + Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_BASETYPE, /*tp_flags*/ "Container for the Mersenne Twister PRNG.\n\n Constructor\n -----------\n RandomState(seed=None): initializes the PRNG with the given seed. See the\n seed() method for details.\n\n Distribution Methods\n -----------------\n RandomState exposes a number of methods for generating random numbers drawn\n from a variety of probability distributions. In addition to the\n distribution-specific arguments, each method takes a keyword argument\n size=None. If size is None, then a single value is generated and returned.\n If size is an integer, then a 1-D numpy array filled with generated values\n is returned. If size is a tuple, then a numpy array with that shape is\n filled and returned.\n ", /*tp_doc*/ __pyx_tp_traverse_6mtrand_RandomState, /*tp_traverse*/ __pyx_tp_clear_6mtrand_RandomState, /*tp_clear*/ @@ -5134,13 +5098,10 @@ static struct PyMethodDef __pyx_methods[] = { {0, 0, 0, 0} }; -static void __pyx_init_filenames(void); /*proto*/ - -PyMODINIT_FUNC initmtrand(void); /*proto*/ -PyMODINIT_FUNC initmtrand(void) { +DL_EXPORT(void) initmtrand(void); /*proto*/ +DL_EXPORT(void) initmtrand(void) { PyObject *__pyx_1 = 0; PyObject *__pyx_2 = 0; - __pyx_init_filenames(); __pyx_m = Py_InitModule4("mtrand", __pyx_methods, 0, 0, PYTHON_API_VERSION); if (!__pyx_m) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; goto __pyx_L1;}; __pyx_b = PyImport_AddModule("__builtin__"); @@ -5674,13 +5635,10 @@ static char *__pyx_filenames[] = { "mtrand.pyx", "numpy.pxi", }; +statichere char **__pyx_f = __pyx_filenames; /* Runtime support code */ -static void __pyx_init_filenames(void) { - __pyx_f = __pyx_filenames; -} - static int __Pyx_GetStarArgs( PyObject **args, PyObject **kwds, @@ -5745,10 +5703,8 @@ static int __Pyx_GetStarArgs( bad: Py_XDECREF(args1); Py_XDECREF(kwds1); - if (*args2) - Py_XDECREF(*args2); - if (*kwds2) - Py_XDECREF(*kwds2); + Py_XDECREF(*args2); + Py_XDECREF(*kwds2); return -1; } @@ -5871,23 +5827,23 @@ static void __Pyx_UnpackError(void) { } static PyObject *__Pyx_UnpackItem(PyObject *seq, int i) { - PyObject *item; - if (!(item = PySequence_GetItem(seq, i))) { + PyObject *item = PySequence_GetItem(seq, i); + if (!item) { if (PyErr_ExceptionMatches(PyExc_IndexError)) - __Pyx_UnpackError(); + __Pyx_UnpackError(); } return item; } static int __Pyx_EndUnpack(PyObject *seq, int i) { - PyObject *item; - if (item = PySequence_GetItem(seq, i)) { + PyObject *item = PySequence_GetItem(seq, i); + if (item) { Py_DECREF(item); __Pyx_UnpackError(); return -1; } PyErr_Clear(); - return 0; + return 0; } static int __Pyx_InternStrings(__Pyx_InternTabEntry *t) { |