diff options
Diffstat (limited to 'numpy/random')
| -rw-r--r-- | numpy/random/mtrand/mtrand.c | 2098 | ||||
| -rw-r--r-- | numpy/random/mtrand/mtrand.pyx | 4 | ||||
| -rw-r--r-- | numpy/random/mtrand/numpy.pxi | 2 |
3 files changed, 995 insertions, 1109 deletions
diff --git a/numpy/random/mtrand/mtrand.c b/numpy/random/mtrand/mtrand.c index 516b8baf2..93ff6b993 100644 --- a/numpy/random/mtrand/mtrand.c +++ b/numpy/random/mtrand/mtrand.c @@ -1,18 +1,10 @@ -/* Generated by Pyrex 0.9.4.1 on Fri Jan 19 00:04:52 2007 */ +/* Generated by Pyrex 0.9.5 on Sat Jan 27 20:47:23 2007 */ -#define PY_SSIZE_T_CLEAN #include "Python.h" #include "structmember.h" #ifndef PY_LONG_LONG #define PY_LONG_LONG LONG_LONG #endif -#if PY_VERSION_HEX < 0x02050000 - typedef int Py_ssize_t; - #define PY_SSIZE_T_MAX INT_MAX - #define PY_SSIZE_T_MIN INT_MIN - #define PyInt_FromSsize_t(z) PyInt_FromLong(z) - #define PyInt_AsSsize_t(o) PyInt_AsLong(o) -#endif #ifdef __cplusplus #define __PYX_EXTERN_C extern "C" #else @@ -27,24 +19,8 @@ __PYX_EXTERN_C double pow(double, double); #include "initarray.h" -typedef struct {const char *s; const void **p;} __Pyx_CApiTabEntry; /*proto*/ typedef struct {PyObject **p; char *s;} __Pyx_InternTabEntry; /*proto*/ typedef struct {PyObject **p; char *s; long n;} __Pyx_StringTabEntry; /*proto*/ -static PyObject *__Pyx_UnpackItem(PyObject *, Py_ssize_t); /*proto*/ -static int __Pyx_EndUnpack(PyObject *, Py_ssize_t); /*proto*/ -static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ -static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/ -static PyObject *__Pyx_GetExcValue(void); /*proto*/ -static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ -static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], Py_ssize_t nargs, PyObject **args2, PyObject **kwds2); /*proto*/ -static void __Pyx_WriteUnraisable(char *name); /*proto*/ -static void __Pyx_AddTraceback(char *funcname); /*proto*/ -static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size); /*proto*/ -static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/ -static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/ -static int __Pyx_InitCApi(PyObject *module); /*proto*/ -static int __Pyx_ImportModuleCApi(__Pyx_CApiTabEntry *t); /*proto*/ -static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ static PyObject *__pyx_m; static PyObject *__pyx_b; @@ -52,6 +28,29 @@ static int __pyx_lineno; static char *__pyx_filename; static char **__pyx_f; +static int __Pyx_GetStarArgs(PyObject **args, PyObject **kwds, char *kwd_list[], int nargs, PyObject **args2, PyObject **kwds2); /*proto*/ + +static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/ + +static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/ + +static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb); /*proto*/ + +static PyObject *__Pyx_UnpackItem(PyObject *); /*proto*/ +static int __Pyx_EndUnpack(PyObject *); /*proto*/ + +static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/ + +static PyObject *__Pyx_GetExcValue(void); /*proto*/ + +static int __Pyx_InternStrings(__Pyx_InternTabEntry *t); /*proto*/ + +static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); /*proto*/ + +static PyTypeObject *__Pyx_ImportType(char *module_name, char *class_name, long size); /*proto*/ + +static void __Pyx_AddTraceback(char *funcname); /*proto*/ + /* Declarations from mtrand */ @@ -133,6 +132,7 @@ static PyObject *(__pyx_f_6mtrand_discnmN_array(rk_state (*),long ((*)(rk_state static PyObject *(__pyx_f_6mtrand_discd_array(rk_state (*),long ((*)(rk_state (*),double )),PyObject *,PyArrayObject *)); /*proto*/ static double (__pyx_f_6mtrand_kahan_sum(double (*),long )); /*proto*/ + /* Implementation of mtrand */ @@ -201,11 +201,11 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":129 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":129 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":130 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":130 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -214,7 +214,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":132 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":132 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -226,7 +226,7 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); @@ -234,22 +234,20 @@ static PyObject *__pyx_f_6mtrand_cont0_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":133 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":133 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":134 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":134 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":135 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":135 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":136 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":136 */ (__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":137 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":137 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -297,31 +295,31 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":149 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":150 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":151 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":152 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":152 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":154 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":155 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":155 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":156 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":156 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -330,44 +328,42 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":158 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":158 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":159 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":159 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":160 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":160 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":161 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":161 */ __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_itera)); __pyx_v_itera = ((PyArrayIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":162 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":162 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":163 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":163 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":164 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":164 */ PyArray_ITER_NEXT(__pyx_v_itera); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":166 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -379,7 +375,7 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); @@ -387,45 +383,43 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":167 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":167 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":168 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":169 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":170 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":170 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":171 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":171 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":173 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":173 */ __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":175 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":176 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;} Py_INCREF(__pyx_k60p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k60p); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -435,27 +429,25 @@ static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double (( } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":177 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":177 */ __pyx_5 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":178 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":178 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":179 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":179 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":180 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":181 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":181 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -502,37 +494,37 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":194 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":194 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":195 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":195 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_ob->nd == 0); } if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":196 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":197 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */ __pyx_v_ob_data = ((double (*))__pyx_v_ob->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":198 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":198 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":200 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":200 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":201 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":202 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":202 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 202; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -541,48 +533,46 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":204 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":204 */ __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 204; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":205 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":205 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":206 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":206 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":207 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":207 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":208 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":208 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":209 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":209 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":210 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":210 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":211 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":211 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":213 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":213 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -594,7 +584,7 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5))); @@ -602,45 +592,43 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":214 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":214 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":215 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":216 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":216 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":217 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":217 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":218 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":218 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":220 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */ __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":221 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":222 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":222 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} Py_INCREF(__pyx_k61p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k61p); - __pyx_4 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 222; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -650,33 +638,31 @@ static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double (( } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":223 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":223 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":224 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":225 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":226 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":227 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":227 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":228 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":228 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":229 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":229 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -725,10 +711,10 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":244 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":244 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":245 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_ob->nd == 0); @@ -738,30 +724,30 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( } if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":246 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":246 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":247 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":247 */ __pyx_v_ob_data = ((double (*))__pyx_v_ob->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":248 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */ __pyx_v_oc_data = ((double (*))__pyx_v_oc->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":249 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":249 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":251 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":252 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":252 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":253 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":253 */ __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -770,51 +756,49 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":255 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":255 */ __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":256 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":256 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":257 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":257 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":258 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":258 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":259 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":259 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":260 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":260 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":261 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":261 */ __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":262 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":262 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":263 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":263 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":265 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":265 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -826,7 +810,7 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5))); @@ -834,45 +818,43 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":266 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":266 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":267 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":267 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":268 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":269 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":269 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":270 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":270 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":272 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":272 */ __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_oa),((void (*))__pyx_v_ob),((void (*))__pyx_v_oc)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":274 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":275 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;} Py_INCREF(__pyx_k62p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k62p); - __pyx_4 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 275; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -882,33 +864,31 @@ static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double (( } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":276 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":276 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":277 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":277 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":278 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":279 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */ __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":280 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]),(__pyx_v_ob_data[0]),(__pyx_v_oc_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":281 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":281 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":282 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":282 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -946,11 +926,11 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":290 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":291 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":291 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 291; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -959,7 +939,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":293 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":293 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -969,7 +949,7 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); @@ -977,22 +957,20 @@ static PyObject *__pyx_f_6mtrand_disc0_array(rk_state (*__pyx_v_state),long ((*_ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":294 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":294 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":295 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":295 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":296 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":296 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":297 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":297 */ (__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":298 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":298 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1038,37 +1016,37 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":310 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":310 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":311 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":311 */ __pyx_1 = (__pyx_v_on->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_op->nd == 0); } if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":312 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":312 */ __pyx_v_on_data = ((long (*))__pyx_v_on->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":313 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":313 */ __pyx_v_op_data = ((double (*))__pyx_v_op->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":314 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":314 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":316 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":316 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":317 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":318 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":318 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -1077,48 +1055,46 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":320 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */ __pyx_2 = PyArray_MultiIterNew(2,((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 320; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":321 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":321 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":322 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":323 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":323 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":324 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":324 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":325 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":325 */ __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":326 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":326 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":327 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":327 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":329 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":329 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1128,7 +1104,7 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_4, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 329; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); @@ -1136,45 +1112,43 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":330 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":330 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":331 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":331 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":332 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":332 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":333 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":333 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":334 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":334 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":336 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":336 */ __pyx_4 = PyArray_MultiIterNew(3,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_op)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 336; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":337 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":338 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":338 */ __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} Py_INCREF(__pyx_k63p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k63p); - __pyx_4 = PyObject_Call(__pyx_5, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 338; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -1184,33 +1158,31 @@ static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((* } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":339 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":340 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":341 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":341 */ __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":342 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":342 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_op_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":343 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":344 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":344 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":346 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":346 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1259,10 +1231,10 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":360 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":360 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":361 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":361 */ __pyx_1 = (__pyx_v_on->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_om->nd == 0); @@ -1272,30 +1244,30 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( } if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":362 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":362 */ __pyx_v_scalar = 1; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":363 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":363 */ __pyx_v_on_data = ((long (*))__pyx_v_on->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":364 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */ __pyx_v_om_data = ((long (*))__pyx_v_om->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":365 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":365 */ __pyx_v_oN_data = ((long (*))__pyx_v_oN->data); goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":367 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":368 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":369 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":369 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 369; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -1304,51 +1276,49 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":371 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":371 */ __pyx_2 = PyArray_MultiIterNew(3,((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 371; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":372 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 372; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":373 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":373 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":374 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":374 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":375 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":375 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":376 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":376 */ __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":377 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":377 */ __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":378 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":378 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":379 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":379 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":381 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":381 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1358,7 +1328,7 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_4, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); @@ -1366,45 +1336,43 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":382 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":382 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":383 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":383 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":384 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":384 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":385 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":385 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":386 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":386 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":388 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":388 */ __pyx_4 = PyArray_MultiIterNew(4,((void (*))arrayObject),((void (*))__pyx_v_on),((void (*))__pyx_v_om),((void (*))__pyx_v_oN)); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":390 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":390 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":391 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */ __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;} Py_INCREF(__pyx_k64p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k64p); - __pyx_4 = PyObject_Call(__pyx_5, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -1414,33 +1382,31 @@ static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long (( } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":392 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */ __pyx_3 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_3; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":393 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":394 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":394 */ __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":395 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":395 */ __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":396 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_on_data[0]),(__pyx_v_om_data[0]),(__pyx_v_oN_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":397 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":397 */ PyArray_MultiIter_NEXT(__pyx_v_multi); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":399 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":399 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1488,31 +1454,31 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":411 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":411 */ __pyx_v_scalar = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":412 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":412 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":413 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":413 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":414 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":414 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":416 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":416 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":417 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":418 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":418 */ __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0]))); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -1521,44 +1487,42 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":420 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject)); arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":421 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":421 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":422 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":422 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":423 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":423 */ __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayIterObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_itera)); __pyx_v_itera = ((PyArrayIterObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":424 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":424 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":425 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(((double (*))__pyx_v_itera->dataptr)[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":426 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":426 */ PyArray_ITER_NEXT(__pyx_v_itera); - __pyx_L5:; } - __pyx_L6:; } __pyx_L4:; goto __pyx_L3; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":428 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":428 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1568,7 +1532,7 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 428; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); @@ -1576,45 +1540,43 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":429 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":429 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":430 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":430 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":431 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":431 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":432 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":432 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":433 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":433 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0])); - __pyx_L8:; } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":435 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":435 */ __pyx_3 = PyArray_MultiIterNew(2,((void (*))arrayObject),((void (*))__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 435; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayMultiIterObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_multi)); __pyx_v_multi = ((PyArrayMultiIterObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":436 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":436 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":437 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;} Py_INCREF(__pyx_k65p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k65p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -1624,27 +1586,25 @@ static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*_ } __pyx_L10:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":438 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":438 */ __pyx_5 = __pyx_v_multi->size; for (__pyx_v_i = 0; __pyx_v_i < __pyx_5; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":439 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":440 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,(__pyx_v_oa_data[0])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":441 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":441 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - __pyx_L11:; } - __pyx_L12:; } __pyx_L7:; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":442 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":442 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1674,38 +1634,33 @@ static double __pyx_f_6mtrand_kahan_sum(double (*__pyx_v_darr),long __pyx_v_n) { long __pyx_v_i; double __pyx_r; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":447 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */ __pyx_v_sum = (__pyx_v_darr[0]); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":448 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":448 */ __pyx_v_c = 0.0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":449 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":449 */ for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":450 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */ __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":451 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":451 */ __pyx_v_t = (__pyx_v_sum + __pyx_v_y); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":452 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */ __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":453 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":453 */ __pyx_v_sum = __pyx_v_t; - __pyx_L2:; } - __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":454 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":454 */ __pyx_r = __pyx_v_sum; goto __pyx_L0; __pyx_r = 0; - goto __pyx_L0; - __pyx_L1:; - __Pyx_WriteUnraisable("mtrand.kahan_sum"); __pyx_L0:; return __pyx_r; } @@ -1723,15 +1678,15 @@ static int __pyx_f_6mtrand_11RandomState___init__(PyObject *__pyx_v_self, PyObje Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":477 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":477 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state )))); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":479 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":479 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;} Py_INCREF(__pyx_v_seed); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_seed); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 479; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -1755,23 +1710,19 @@ static void __pyx_f_6mtrand_11RandomState___dealloc__(PyObject *__pyx_v_self) { int __pyx_1; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":482 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":482 */ __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":483 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":483 */ PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":484 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":484 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = 0; goto __pyx_L2; } __pyx_L2:; - goto __pyx_L0; - __pyx_L1:; - __Pyx_AddTraceback("mtrand.RandomState.__dealloc__"); - __pyx_L0:; Py_DECREF(__pyx_v_self); } @@ -1796,11 +1747,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_seed); arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":498 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */ __pyx_1 = __pyx_v_seed == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":499 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":499 */ __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } @@ -1808,7 +1759,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;} Py_INCREF(__pyx_v_seed); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_seed); - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; goto __pyx_L1;} @@ -1817,21 +1768,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyOb Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":501 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":501 */ __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_seed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; goto __pyx_L1;} rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":503 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":503 */ __pyx_3 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 503; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":504 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":504 */ init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long (*))arrayObject_obj->data),(arrayObject_obj->dimensions[0])); } __pyx_L2:; @@ -1868,7 +1819,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":513 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":513 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1879,7 +1830,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3); __pyx_1 = 0; __pyx_3 = 0; - __pyx_1 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); @@ -1887,10 +1838,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_get_state(PyObject *__pyx_v_self, arrayObject_state = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":514 */ - memcpy(((void (*))arrayObject_state->data),((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,(624 * (sizeof(long )))); + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":514 */ + memcpy(((void (*))arrayObject_state->data),((void (*))((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),(624 * (sizeof(long )))); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":515 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":515 */ __pyx_3 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} Py_INCREF(__pyx_n_MT19937); @@ -1945,7 +1896,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None); __pyx_v_key = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":526 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */ __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 526; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -1953,17 +1904,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, __pyx_v_algorithm_name = __pyx_2; __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":527 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":527 */ if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} __pyx_3 = __pyx_3 != 0; if (__pyx_3) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":528 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} Py_INCREF(__pyx_k68p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k68p); - __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -1973,38 +1924,40 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":529 */ - __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} - __pyx_2 = __Pyx_UnpackItem(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":529 */ + __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_4 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} Py_DECREF(__pyx_v_key); - __pyx_v_key = __pyx_2; - __pyx_2 = 0; - __pyx_4 = __Pyx_UnpackItem(__pyx_1, 1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} - __pyx_3 = PyInt_AsLong(__pyx_4); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} - Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_v_pos = __pyx_3; - if (__Pyx_EndUnpack(__pyx_1, 2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + __pyx_v_key = __pyx_4; + __pyx_4 = 0; + __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + __pyx_3 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_v_pos = __pyx_3; + if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":530 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":530 */ __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":531 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":531 */ __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624); if (__pyx_3) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":532 */ - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":532 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} Py_INCREF(__pyx_k69p); - PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k69p); - __pyx_4 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k69p); + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; goto __pyx_L1;} @@ -2012,10 +1965,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":533 */ - memcpy(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key,((void (*))arrayObject_obj->data),(624 * (sizeof(long )))); + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":533 */ + memcpy(((void (*))((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->key),((void (*))arrayObject_obj->data),(624 * (sizeof(long )))); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":534 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":534 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos; __pyx_r = Py_None; Py_INCREF(Py_None); @@ -2040,19 +1993,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se PyObject *__pyx_r; PyObject *__pyx_1 = 0; PyObject *__pyx_2 = 0; - PyObject *__pyx_3 = 0; static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":538 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":538 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;} - __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;} - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 538; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_r = __pyx_3; - __pyx_3 = 0; + __pyx_r = __pyx_2; + __pyx_2 = 0; goto __pyx_L0; __pyx_r = Py_None; Py_INCREF(Py_None); @@ -2060,7 +2010,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState___getstate__(PyObject *__pyx_v_se __pyx_L1:; Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_2); - Py_XDECREF(__pyx_3); __Pyx_AddTraceback("mtrand.RandomState.__getstate__"); __pyx_r = 0; __pyx_L0:; @@ -2080,12 +2029,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState___setstate__(PyObject *__pyx_v_se Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":541 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":541 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} Py_INCREF(__pyx_v_state); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_state); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2114,12 +2063,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self PyObject *__pyx_2 = 0; PyObject *__pyx_3 = 0; PyObject *__pyx_4 = 0; - PyObject *__pyx_5 = 0; static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":544 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":544 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -2127,17 +2075,15 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} - __pyx_4 = PyTuple_New(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} - __pyx_5 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2); - PyTuple_SET_ITEM(__pyx_3, 2, __pyx_5); + PyTuple_SET_ITEM(__pyx_3, 2, __pyx_4); __pyx_1 = 0; __pyx_2 = 0; - __pyx_5 = 0; + __pyx_4 = 0; __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -2149,7 +2095,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState___reduce__(PyObject *__pyx_v_self Py_XDECREF(__pyx_2); Py_XDECREF(__pyx_3); Py_XDECREF(__pyx_4); - Py_XDECREF(__pyx_5); __Pyx_AddTraceback("mtrand.RandomState.__reduce__"); __pyx_r = 0; __pyx_L0:; @@ -2169,7 +2114,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_sample(PyObject *__pyx_v_s Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":552 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":552 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_double,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2199,7 +2144,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_tomaxint(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":559 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":559 */ __pyx_1 = __pyx_f_6mtrand_disc0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_long,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 559; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2250,43 +2195,43 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":574 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":574 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":575 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":575 */ __pyx_v_lo = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":576 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":576 */ __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 576; goto __pyx_L1;} __pyx_v_hi = __pyx_2; goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":578 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */ __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 578; goto __pyx_L1;} __pyx_v_lo = __pyx_2; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":579 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":579 */ __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 579; goto __pyx_L1;} __pyx_v_hi = __pyx_2; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":581 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":581 */ __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":582 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":582 */ __pyx_1 = (__pyx_v_diff < 0); if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":583 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":583 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;} Py_INCREF(__pyx_k70p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k70p); - __pyx_5 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 583; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_5, 0, 0); @@ -2296,11 +2241,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":585 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":585 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":586 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":586 */ __pyx_3 = PyLong_FromUnsignedLong((rk_interval(__pyx_v_diff,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state) + __pyx_v_lo)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 586; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; @@ -2309,7 +2254,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":588 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":588 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;} __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -2319,7 +2264,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_Call(__pyx_5, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); @@ -2327,22 +2272,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, P arrayObject = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":589 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":589 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":590 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":590 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":591 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":592 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */ (__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":593 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":593 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -2379,22 +2322,22 @@ static PyObject *__pyx_f_6mtrand_11RandomState_bytes(PyObject *__pyx_v_self, PyO Py_INCREF(__pyx_v_self); __pyx_v_bytestring = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":601 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":601 */ __pyx_v_bytes = PyMem_Malloc(__pyx_v_length); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":602 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */ rk_fill(__pyx_v_bytes,__pyx_v_length,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":603 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":603 */ __pyx_1 = PyString_FromStringAndSize(((char (*))__pyx_v_bytes),__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;} Py_DECREF(__pyx_v_bytestring); __pyx_v_bytestring = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":604 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":604 */ PyMem_Free(__pyx_v_bytes); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":605 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":605 */ Py_INCREF(__pyx_v_bytestring); __pyx_r = __pyx_v_bytestring; goto __pyx_L0; @@ -2441,21 +2384,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_temp = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":616 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":616 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 616; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_olow)); __pyx_v_olow = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":617 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":617 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 617; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_ohigh)); __pyx_v_ohigh = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":618 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_subtract); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -2464,24 +2407,24 @@ static PyObject *__pyx_f_6mtrand_11RandomState_uniform(PyObject *__pyx_v_self, P PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_ohigh)); Py_INCREF(((PyObject *)__pyx_v_olow)); PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_olow)); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_temp); __pyx_v_temp = __pyx_3; __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":619 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":619 */ Py_INCREF(__pyx_v_temp); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":621 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":621 */ __pyx_2 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 621; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_odiff)); __pyx_v_odiff = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":622 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":622 */ __pyx_1 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_olow,__pyx_v_odiff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2531,12 +2474,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb } Py_INCREF(__pyx_v_self); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":635 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":635 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} Py_INCREF(__pyx_v_args); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} @@ -2546,28 +2489,26 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rand(PyObject *__pyx_v_self, PyOb Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":636 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":636 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} - __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 636; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_r = __pyx_1; - __pyx_1 = 0; + __pyx_r = __pyx_3; + __pyx_3 = 0; goto __pyx_L0; goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":638 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} - __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} - __pyx_1 = PyDict_New(); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} - if (PyDict_SetItem(__pyx_1, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} - __pyx_5 = PyEval_CallObjectWithKeywords(__pyx_2, __pyx_3, __pyx_1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":638 */ + __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + __pyx_3 = PyDict_New(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + if (PyDict_SetItem(__pyx_3, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + __pyx_5 = PyEval_CallObjectWithKeywords(__pyx_1, __pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -2610,12 +2551,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO } Py_INCREF(__pyx_v_self); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":650 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":650 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;} Py_INCREF(__pyx_v_args); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 650; goto __pyx_L1;} @@ -2625,29 +2566,27 @@ static PyObject *__pyx_f_6mtrand_11RandomState_randn(PyObject *__pyx_v_self, PyO Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":651 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":651 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;} - __pyx_3 = PyTuple_New(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;} - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 651; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_r = __pyx_1; - __pyx_1 = 0; + __pyx_r = __pyx_3; + __pyx_3 = 0; goto __pyx_L0; goto __pyx_L2; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":653 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":653 */ + __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} Py_INCREF(__pyx_v_args); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_args); - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_args); + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_r = __pyx_1; - __pyx_1 = 0; + __pyx_r = __pyx_3; + __pyx_3 = 0; goto __pyx_L0; } __pyx_L2:; @@ -2688,16 +2627,16 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v Py_INCREF(__pyx_v_high); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":662 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":662 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":663 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":663 */ Py_INCREF(__pyx_v_low); Py_DECREF(__pyx_v_high); __pyx_v_high = __pyx_v_low; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":664 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":664 */ __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; goto __pyx_L1;} Py_DECREF(__pyx_v_low); __pyx_v_low = __pyx_2; @@ -2706,7 +2645,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":665 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":665 */ __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;} __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;} __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;} @@ -2718,7 +2657,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_random_integers(PyObject *__pyx_v Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_3, 2, __pyx_v_size); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_r = __pyx_4; @@ -2753,7 +2692,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_normal(PyObject *__pyx_v Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":673 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":673 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gauss,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 673; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -2804,21 +2743,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":682 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":682 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 682; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":683 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 683; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":684 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -2831,25 +2770,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 684; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":685 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":685 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;} Py_INCREF(__pyx_k72p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k72p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -2859,7 +2798,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":686 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":686 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -2914,21 +2853,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":695 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":695 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":696 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":696 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_ob)); __pyx_v_ob = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":698 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":698 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -2941,25 +2880,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 698; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":699 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":699 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} Py_INCREF(__pyx_k73p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k73p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -2969,7 +2908,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":700 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":700 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -2982,25 +2921,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ob)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":701 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":701 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;} Py_INCREF(__pyx_k74p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k74p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3010,7 +2949,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyOb } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":702 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":702 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_oa,__pyx_v_ob); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3060,14 +2999,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":710 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":710 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 710; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":711 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3080,25 +3019,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":712 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":712 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;} Py_INCREF(__pyx_k75p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k75p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3108,7 +3047,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":713 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":713 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -3143,7 +3082,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_exponential(PyObject *__ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":720 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":720 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_exponential,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 720; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -3185,14 +3124,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ Py_INCREF(__pyx_v_size); __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":728 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 728; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oshape)); __pyx_v_oshape = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":729 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3205,25 +3144,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 729; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":730 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;} Py_INCREF(__pyx_k76p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k76p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 730; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3233,7 +3172,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_ } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":731 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":731 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_oshape); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -3287,21 +3226,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":740 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oshape)); __pyx_v_oshape = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":741 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":741 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":742 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3314,25 +3253,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":743 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":743 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_INCREF(__pyx_k77p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k77p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3342,7 +3281,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":744 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -3355,25 +3294,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":745 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":745 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_INCREF(__pyx_k78p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k78p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3383,7 +3322,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyO } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":746 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":746 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_oshape,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3438,21 +3377,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":755 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 755; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odfnum)); __pyx_v_odfnum = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":756 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 756; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odfden)); __pyx_v_odfden = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":757 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":757 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3465,25 +3404,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":758 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;} Py_INCREF(__pyx_k79p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k79p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3493,7 +3432,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":759 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":759 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -3506,25 +3445,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 759; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":760 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} Py_INCREF(__pyx_k80p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k80p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3534,7 +3473,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObjec } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":761 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":761 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 761; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -3597,28 +3536,28 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":771 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":771 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 771; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odfnum)); __pyx_v_odfnum = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":772 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":772 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 772; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odfden)); __pyx_v_odfden = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":773 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":773 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 773; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_ononc)); __pyx_v_ononc = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":775 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":775 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3631,25 +3570,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 775; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":776 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":776 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;} Py_INCREF(__pyx_k81p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k81p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3659,7 +3598,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":777 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":777 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -3672,25 +3611,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":778 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":778 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;} Py_INCREF(__pyx_k82p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k82p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 778; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3700,7 +3639,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":779 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":779 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -3713,25 +3652,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 779; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":780 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":780 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;} Py_INCREF(__pyx_k83p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k83p); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 780; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3741,7 +3680,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_se } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":781 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":781 */ __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_odfnum,__pyx_v_odfden,__pyx_v_ononc); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 781; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -3792,14 +3731,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":790 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":791 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":791 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3812,25 +3751,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":792 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} Py_INCREF(__pyx_k84p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k84p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3840,7 +3779,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":793 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":793 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -3893,21 +3832,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":802 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":802 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 802; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":803 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_ononc)); __pyx_v_ononc = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":804 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -3920,25 +3859,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 804; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":805 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;} Py_INCREF(__pyx_k85p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k85p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 805; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3948,7 +3887,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":806 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":806 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -3961,25 +3900,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":807 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} Py_INCREF(__pyx_k86p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k86p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 807; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -3989,7 +3928,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__ } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":808 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":808 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_odf,__pyx_v_ononc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -4026,7 +3965,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_cauchy(PyObject *__pyx_v Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":816 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":816 */ __pyx_1 = __pyx_f_6mtrand_cont0_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_cauchy,__pyx_v_size); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -4068,14 +4007,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":824 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":824 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":825 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":825 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4088,25 +4027,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 825; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":826 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":826 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} Py_INCREF(__pyx_k87p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k87p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 826; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4116,7 +4055,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":827 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":827 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_odf); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 827; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4167,21 +4106,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":837 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_omu)); __pyx_v_omu = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":838 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":838 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_okappa)); __pyx_v_okappa = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":839 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4194,25 +4133,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_okappa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":840 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;} Py_INCREF(__pyx_k88p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k88p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4222,7 +4161,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":841 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":841 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_omu,__pyx_v_okappa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4271,14 +4210,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":849 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":849 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 849; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":850 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":850 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4291,25 +4230,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":851 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":851 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;} Py_INCREF(__pyx_k89p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k89p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 851; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4319,7 +4258,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":852 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":852 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 852; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4365,7 +4304,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":860 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":860 */ __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4374,7 +4313,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P __pyx_v_oa = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":861 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4387,25 +4326,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":862 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":862 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} Py_INCREF(__pyx_k90p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k90p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4415,7 +4354,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":863 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":863 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4460,7 +4399,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":871 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */ __pyx_1 = PyFloat_FromDouble(__pyx_v_a); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;} __pyx_2 = PyArray_FROM_OTF(__pyx_1,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4469,7 +4408,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO __pyx_v_oa = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":872 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4482,25 +4421,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":873 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":873 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} Py_INCREF(__pyx_k91p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k91p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4510,7 +4449,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyO } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":874 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":874 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4562,21 +4501,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":883 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":884 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":884 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 884; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":885 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":885 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4589,25 +4528,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 885; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":886 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":886 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;} Py_INCREF(__pyx_k92p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k92p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 886; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4617,7 +4556,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":887 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":887 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 887; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4672,21 +4611,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":896 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":896 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 896; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":897 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":898 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":898 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4699,25 +4638,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":899 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;} Py_INCREF(__pyx_k93p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k93p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4727,7 +4666,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, Py } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":900 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":900 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4782,21 +4721,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":909 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":909 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":910 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":910 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 910; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":911 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":911 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4809,25 +4748,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":912 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;} Py_INCREF(__pyx_k94p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k94p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4837,7 +4776,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":913 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":913 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_oloc,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 913; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4892,21 +4831,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":927 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_omean)); __pyx_v_omean = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":928 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":928 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_osigma)); __pyx_v_osigma = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":929 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -4919,25 +4858,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_osigma)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":930 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":930 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_INCREF(__pyx_k95p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k95p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -4947,7 +4886,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":931 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":931 */ __pyx_4 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_omean,__pyx_v_osigma); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -4997,14 +4936,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":939 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 939; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":940 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":940 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5017,25 +4956,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 940; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":941 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":941 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} Py_INCREF(__pyx_k96p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k96p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 941; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5045,7 +4984,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":942 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":942 */ __pyx_4 = __pyx_f_6mtrand_cont1_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_oscale); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -5098,21 +5037,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":951 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_omean)); __pyx_v_omean = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":952 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":952 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;} if (!__Pyx_TypeTest(__pyx_1, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 952; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":953 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5125,25 +5064,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_omean)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":954 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":954 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} Py_INCREF(__pyx_k97p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k97p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5163,25 +5102,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":956 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} Py_INCREF(__pyx_k98p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k98p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5191,7 +5130,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":957 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":957 */ __pyx_2 = __pyx_f_6mtrand_cont2_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_omean,__pyx_v_oscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -5255,28 +5194,28 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":968 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":968 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oleft)); __pyx_v_oleft = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":969 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":969 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 969; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_omode)); __pyx_v_omode = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":970 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":970 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 970; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oright)); __pyx_v_oright = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":972 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5288,25 +5227,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_oleft)); Py_INCREF(((PyObject *)__pyx_v_omode)); PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_omode)); - __pyx_4 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":973 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":973 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} Py_INCREF(__pyx_k99p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k99p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5316,7 +5255,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":974 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5328,25 +5267,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_omode)); Py_INCREF(((PyObject *)__pyx_v_oright)); PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_oright)); - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":975 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":975 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;} Py_INCREF(__pyx_k100p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k100p); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5356,7 +5295,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":976 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5368,25 +5307,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self PyTuple_SET_ITEM(__pyx_1, 0, ((PyObject *)__pyx_v_oleft)); Py_INCREF(((PyObject *)__pyx_v_oright)); PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_oright)); - __pyx_4 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":977 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":977 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;} Py_INCREF(__pyx_k101p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k101p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5396,7 +5335,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":978 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":978 */ __pyx_1 = __pyx_f_6mtrand_cont3_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_oleft,__pyx_v_omode,__pyx_v_oright); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -5455,21 +5394,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":989 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":989 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_on)); __pyx_v_on = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":990 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":990 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":991 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":991 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5482,25 +5421,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_n); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 991; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":992 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;} Py_INCREF(__pyx_k102p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k102p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5510,7 +5449,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":993 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -5523,25 +5462,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 993; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":994 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;} Py_INCREF(__pyx_k103p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k103p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 994; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5551,7 +5490,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":995 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":995 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -5564,25 +5503,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":996 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;} Py_INCREF(__pyx_k104p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k104p); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5592,7 +5531,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":997 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":997 */ __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -5649,21 +5588,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1006 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1006 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_on)); __pyx_v_on = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1007 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1007 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1007; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1008 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1008 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5676,25 +5615,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_n); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1008; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1009 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1009 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;} Py_INCREF(__pyx_k105p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k105p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5704,7 +5643,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1010 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1010 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -5717,25 +5656,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1011 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1011 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;} Py_INCREF(__pyx_k106p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k106p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5745,7 +5684,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1012 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1012 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -5758,25 +5697,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_1, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_Call(__pyx_4, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_1); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1012; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1013 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;} __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;} Py_INCREF(__pyx_k107p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k107p); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_4, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1013; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5786,7 +5725,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1014 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1014 */ __pyx_1 = __pyx_f_6mtrand_discnp_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_on,__pyx_v_op); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1014; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; @@ -5836,14 +5775,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P Py_INCREF(__pyx_v_size); __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1023 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1023 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_olam)); __pyx_v_olam = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1024 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5856,25 +5795,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_olam)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1025 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1025 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_INCREF(__pyx_k108p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k108p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5884,7 +5823,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, P } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1026 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1026 */ __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_olam); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -5931,14 +5870,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1034 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1034 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1035 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -5951,25 +5890,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1036 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;} Py_INCREF(__pyx_k109p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k109p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1036; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -5979,7 +5918,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyOb } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1037 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1037 */ __pyx_4 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_oa); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -6028,14 +5967,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1046 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1046 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1047 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -6048,25 +5987,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1048 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1048 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;} Py_INCREF(__pyx_k110p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k110p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6076,7 +6015,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1049 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1049 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -6089,25 +6028,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1049; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1050 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1050 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} Py_INCREF(__pyx_k111p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k111p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6117,7 +6056,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1051 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1051 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1051; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -6181,28 +6120,28 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1067 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_ongood)); __pyx_v_ongood = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1068 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1068 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_onbad)); __pyx_v_onbad = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1069 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_onsample)); __pyx_v_onsample = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1070 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1070 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -6215,25 +6154,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_ongood)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1071 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1071 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;} Py_INCREF(__pyx_k112p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k112p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6243,7 +6182,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1072 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1072 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -6256,25 +6195,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_onbad)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1073 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1073 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;} Py_INCREF(__pyx_k113p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k113p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6284,7 +6223,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1074 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1074 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -6299,7 +6238,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ongood)); Py_INCREF(((PyObject *)__pyx_v_onbad)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_onbad)); - __pyx_6 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} + __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} @@ -6307,25 +6246,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ Py_INCREF(((PyObject *)__pyx_v_onsample)); PyTuple_SET_ITEM(__pyx_1, 1, ((PyObject *)__pyx_v_onsample)); __pyx_6 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2); __pyx_2 = 0; - __pyx_3 = PyObject_Call(__pyx_4, __pyx_6, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; __pyx_5 = PyObject_IsTrue(__pyx_3); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1074; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1075 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1075 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;} Py_INCREF(__pyx_k114p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k114p); - __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1075; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); @@ -6335,7 +6274,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1076 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1076 */ __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; @@ -6348,25 +6287,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ PyTuple_SET_ITEM(__pyx_6, 0, ((PyObject *)__pyx_v_onsample)); PyTuple_SET_ITEM(__pyx_6, 1, __pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_Call(__pyx_2, __pyx_6, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_1); __pyx_1 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1077 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1077 */ __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;} Py_INCREF(__pyx_k115p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k115p); - __pyx_3 = PyObject_Call(__pyx_6, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_6, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6376,7 +6315,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_ } __pyx_L5:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1078 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1078 */ __pyx_4 = __pyx_f_6mtrand_discnmN_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_ongood,__pyx_v_onbad,__pyx_v_onsample); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1078; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; @@ -6430,14 +6369,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1087 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */ __pyx_1 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1088 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1088 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -6450,25 +6389,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_4, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_4 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1089 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} Py_INCREF(__pyx_k116p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k116p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6478,7 +6417,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1090 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1090 */ __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; @@ -6491,25 +6430,25 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyObject_IsTrue(__pyx_2); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1091 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */ __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} Py_INCREF(__pyx_k117p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k117p); - __pyx_3 = PyObject_Call(__pyx_4, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6519,7 +6458,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1092 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1092 */ __pyx_2 = __pyx_f_6mtrand_discd_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_op); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1092; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; @@ -6583,7 +6522,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p PyObject *__pyx_3 = 0; int __pyx_4; PyObject *__pyx_5 = 0; - Py_ssize_t __pyx_6; static char *__pyx_argnames[] = {"mean","cov","size",0}; __pyx_v_size = __pyx_k58; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "OO|O", __pyx_argnames, &__pyx_v_mean, &__pyx_v_cov, &__pyx_v_size)) return 0; @@ -6599,39 +6537,39 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_v_s = Py_None; Py_INCREF(Py_None); __pyx_v_v = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1113 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} Py_INCREF(__pyx_v_mean); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_mean); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_mean); __pyx_v_mean = __pyx_3; __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1114 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1114 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} Py_INCREF(__pyx_v_cov); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_cov); - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_v_cov); __pyx_v_cov = __pyx_2; __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1115 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1115 */ __pyx_4 = __pyx_v_size == Py_None; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1116 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1116 */ __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; goto __pyx_L1;} Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_1; @@ -6640,20 +6578,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1118 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1118 */ Py_INCREF(__pyx_v_size); Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_v_size; } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1119 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1119 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; goto __pyx_L1;} @@ -6663,12 +6601,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1120 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1120 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;} Py_INCREF(__pyx_k118p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k118p); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1120; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); @@ -6678,13 +6616,13 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1121 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1121 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_1, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_1 = PyInt_FromLong(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1121; goto __pyx_L1;} @@ -6710,12 +6648,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1122 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1122 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;} Py_INCREF(__pyx_k119p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k119p); - __pyx_1 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_1, 0, 0); @@ -6725,7 +6663,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L4:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1123 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1123 */ __pyx_5 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;} __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; goto __pyx_L1;} @@ -6742,12 +6680,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1124 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1124 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;} Py_INCREF(__pyx_k120p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k120p); - __pyx_2 = PyObject_Call(__pyx_1, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_2, 0, 0); @@ -6757,7 +6695,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L5:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1126 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1126 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} @@ -6765,14 +6703,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_1); __pyx_1 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_5, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __pyx_4 = PyObject_IsTrue(__pyx_2); if (__pyx_4 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1126; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_4) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1127 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */ __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1127; goto __pyx_L1;} Py_INCREF(__pyx_v_shape); PyList_SET_ITEM(__pyx_1, 0, __pyx_v_shape); @@ -6783,20 +6721,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p } __pyx_L6:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1128 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1128 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} - __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} + __pyx_5 = PySequence_GetSlice(__pyx_v_shape, 0, 0x7fffffff); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_1 = PyObject_Call(__pyx_3, __pyx_2, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_final_shape); __pyx_v_final_shape = __pyx_1; __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1129 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1129 */ __pyx_5 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} @@ -6806,12 +6744,12 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); __pyx_1 = 0; - __pyx_2 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1133 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1133 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n_standard_normal); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_multiply); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} @@ -6821,20 +6759,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_final_shape); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_x); __pyx_v_x = __pyx_5; __pyx_5 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1134 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1134 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -6844,20 +6782,20 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape); - __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_5 = PyInt_FromLong(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} __pyx_3 = PyNumber_Subtract(__pyx_1, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_6 = PyInt_AsSsize_t(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} + __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PySequence_GetSlice(__pyx_v_final_shape, 0, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} + __pyx_1 = PySequence_GetSlice(__pyx_v_final_shape, 0, __pyx_4); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_5, 0, __pyx_1); __pyx_1 = 0; - __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __pyx_1 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; goto __pyx_L1;} @@ -6873,7 +6811,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1143 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1143 */ __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;} Py_INCREF(__pyx_n_svd); PyList_SET_ITEM(__pyx_2, 0, __pyx_n_svd); @@ -6885,82 +6823,84 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__p __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1145 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1145 */ __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} Py_INCREF(__pyx_v_cov); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_cov); - __pyx_2 = PyObject_Call(__pyx_v_svd, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_v_svd, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = __Pyx_UnpackItem(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} + __pyx_3 = PyObject_GetIter(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_5 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} Py_DECREF(__pyx_v_u); - __pyx_v_u = __pyx_3; - __pyx_3 = 0; - __pyx_5 = __Pyx_UnpackItem(__pyx_2, 1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} - Py_DECREF(__pyx_v_s); - __pyx_v_s = __pyx_5; + __pyx_v_u = __pyx_5; __pyx_5 = 0; - __pyx_1 = __Pyx_UnpackItem(__pyx_2, 2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} - Py_DECREF(__pyx_v_v); - __pyx_v_v = __pyx_1; + __pyx_1 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} + Py_DECREF(__pyx_v_s); + __pyx_v_s = __pyx_1; __pyx_1 = 0; - if (__Pyx_EndUnpack(__pyx_2, 3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1146 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_dot); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + __pyx_2 = __Pyx_UnpackItem(__pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} + Py_DECREF(__pyx_v_v); + __pyx_v_v = __pyx_2; + __pyx_2 = 0; + if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_sqrt); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - Py_INCREF(__pyx_v_s); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_s); - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1146 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_5, __pyx_n_dot); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + Py_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_sqrt); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + Py_INCREF(__pyx_v_s); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_s); + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyNumber_Multiply(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); + Py_DECREF(__pyx_5); __pyx_5 = 0; + __pyx_3 = PyNumber_Multiply(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_3); Py_INCREF(__pyx_v_v); - PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_v); - __pyx_2 = 0; - __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_v); + __pyx_3 = 0; + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1146; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_v_x); - __pyx_v_x = __pyx_1; - __pyx_1 = 0; + __pyx_v_x = __pyx_2; + __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1149 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1149 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_add); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_5 = PyTuple_New(3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} Py_INCREF(__pyx_v_mean); - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_mean); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_mean); Py_INCREF(__pyx_v_x); - PyTuple_SET_ITEM(__pyx_3, 1, __pyx_v_x); + PyTuple_SET_ITEM(__pyx_5, 1, __pyx_v_x); Py_INCREF(__pyx_v_x); - PyTuple_SET_ITEM(__pyx_3, 2, __pyx_v_x); - __pyx_1 = PyObject_Call(__pyx_5, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} - Py_DECREF(__pyx_5); __pyx_5 = 0; - Py_DECREF(__pyx_3); __pyx_3 = 0; + PyTuple_SET_ITEM(__pyx_5, 2, __pyx_v_x); + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1149; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + Py_DECREF(__pyx_5); __pyx_5 = 0; + Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1150 */ - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */ + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); - PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_final_shape); - __pyx_3 = PyObject_Call(__pyx_2, __pyx_5, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_5); __pyx_5 = 0; - if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_final_shape); + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_1); __pyx_1 = 0; + if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1150; goto __pyx_L1;} + Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1151 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1151 */ Py_INCREF(__pyx_v_x); __pyx_r = __pyx_v_x; goto __pyx_L0; @@ -7029,38 +6969,38 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel __pyx_v_shape = Py_None; Py_INCREF(Py_None); __pyx_v_multin = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1169 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1169 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;} Py_INCREF(__pyx_v_pvals); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_pvals); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_4 = PyInt_AsLong(__pyx_3); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1169; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_v_d = __pyx_4; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1170 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1170 */ __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1170; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); Py_DECREF(((PyObject *)arrayObject_parr)); arrayObject_parr = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1171 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1171 */ __pyx_v_pix = ((double (*))arrayObject_parr->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1173 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */ __pyx_5 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > 1.0); if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1174 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1174 */ __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;} Py_INCREF(__pyx_k123p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k123p); - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_1, 0, 0); @@ -7070,11 +7010,11 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1176 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1176 */ __pyx_5 = __pyx_v_size == Py_None; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1177 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1177 */ __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;} __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); @@ -7088,7 +7028,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} @@ -7097,7 +7037,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1179 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1179 */ __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} Py_INCREF(__pyx_v_size); @@ -7111,7 +7051,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1181 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1181 */ __pyx_1 = PyInt_FromLong(__pyx_v_d); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); @@ -7124,7 +7064,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1183 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */ __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -7134,78 +7074,75 @@ static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_sel PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_shape); PyTuple_SET_ITEM(__pyx_1, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_Call(__pyx_2, __pyx_1, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_multin); __pyx_v_multin = __pyx_3; __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1184 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */ Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_multin))); Py_DECREF(((PyObject *)arrayObject_mnarr)); arrayObject_mnarr = ((PyArrayObject *)__pyx_v_multin); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1185 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1185 */ __pyx_v_mnix = ((long (*))arrayObject_mnarr->data); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1186 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1186 */ __pyx_v_i = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1187 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1187 */ while (1) { - __pyx_L4:; __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr)); if (!__pyx_5) break; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1188 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */ __pyx_v_Sum = 1.0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1189 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1189 */ __pyx_v_dn = __pyx_v_n; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1190 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1190 */ __pyx_4 = (__pyx_v_d - 1); for (__pyx_v_j = 0; __pyx_v_j < __pyx_4; ++__pyx_v_j) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1191 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1191 */ (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)]) = rk_binomial(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,__pyx_v_dn,((__pyx_v_pix[__pyx_v_j]) / __pyx_v_Sum)); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1192 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */ __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)])); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1193 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1193 */ __pyx_5 = (__pyx_v_dn <= 0); if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1194 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1194 */ goto __pyx_L7; goto __pyx_L8; } __pyx_L8:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1195 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1195 */ __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j])); - __pyx_L6:; } __pyx_L7:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1196 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1196 */ __pyx_5 = (__pyx_v_dn > 0); if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1197 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1197 */ (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn; goto __pyx_L9; } __pyx_L9:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1199 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1199 */ __pyx_v_i = (__pyx_v_i + __pyx_v_d); } - __pyx_L5:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1201 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1201 */ Py_INCREF(__pyx_v_multin); __pyx_r = __pyx_v_multin; goto __pyx_L0; @@ -7246,18 +7183,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P PyObject *__pyx_3 = 0; long __pyx_4; int __pyx_5; - PyObject *__pyx_6 = 0; static char *__pyx_argnames[] = {"x",0}; 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); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1212 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1212 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} @@ -7268,10 +7204,10 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_i = __pyx_4; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1213 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1213 */ /*try:*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1214 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1214 */ __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} @@ -7279,7 +7215,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} @@ -7292,32 +7228,31 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_XDECREF(__pyx_1); __pyx_1 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1215 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */ /*except:*/ { __Pyx_AddTraceback("mtrand.shuffle"); __pyx_3 = __Pyx_GetExcValue(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1216 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1216 */ __pyx_v_j = 0; goto __pyx_L3; } __pyx_L3:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1218 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1218 */ __pyx_5 = (__pyx_v_j == 0); if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1220 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1220 */ while (1) { - __pyx_L5:; __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1221 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1221 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1222 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1222 */ __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; @@ -7328,118 +7263,109 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1223 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */ __pyx_v_i = (__pyx_v_i - 1); } - __pyx_L6:; goto __pyx_L4; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1226 */ - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_hasattr); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} - __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} - __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} - PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1226 */ + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_hasattr); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); Py_INCREF(__pyx_n_copy); - PyTuple_SET_ITEM(__pyx_3, 1, __pyx_n_copy); - __pyx_1 = 0; - __pyx_1 = PyObject_Call(__pyx_2, __pyx_3, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; + PyTuple_SET_ITEM(__pyx_1, 1, __pyx_n_copy); + __pyx_2 = 0; + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_5 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_copy = __pyx_5; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1227 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1227 */ __pyx_5 = __pyx_v_copy; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1228 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1228 */ while (1) { - __pyx_L8:; __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1229 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1229 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1230 */ - __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} - __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} - Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1230 */ + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} - __pyx_3 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_copy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} - __pyx_6 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} if (PyObject_SetItem(__pyx_v_x, __pyx_1, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - Py_DECREF(__pyx_6); __pyx_6 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1231 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1231 */ __pyx_v_i = (__pyx_v_i - 1); } - __pyx_L9:; goto __pyx_L7; } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1233 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1233 */ while (1) { - __pyx_L10:; __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1234 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1234 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1235 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1235 */ __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = PySequence_GetSlice(__pyx_3, 0, PY_SSIZE_T_MAX); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_6 = PyInt_FromLong(__pyx_v_i); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_3 = PySequence_GetSlice(__pyx_1, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = PyInt_FromLong(__pyx_v_i); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_6, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - Py_DECREF(__pyx_6); __pyx_6 = 0; + __pyx_3 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_1, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_1 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + __pyx_2 = PyInt_FromLong(__pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1236 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1236 */ __pyx_v_i = (__pyx_v_i - 1); } - __pyx_L11:; } __pyx_L7:; } @@ -7451,7 +7377,6 @@ static PyObject *__pyx_f_6mtrand_11RandomState_shuffle(PyObject *__pyx_v_self, P Py_XDECREF(__pyx_1); Py_XDECREF(__pyx_2); Py_XDECREF(__pyx_3); - Py_XDECREF(__pyx_6); __Pyx_AddTraceback("mtrand.RandomState.shuffle"); __pyx_r = 0; __pyx_L0:; @@ -7480,7 +7405,7 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel Py_INCREF(__pyx_v_x); __pyx_v_arr = Py_None; Py_INCREF(Py_None); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1244 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1244 */ __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} @@ -7496,21 +7421,21 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_3); __pyx_3 = 0; - __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1245 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1245 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_arange); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_arr); @@ -7520,14 +7445,14 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel } /*else*/ { - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1247 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1247 */ __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_4 = PyObject_Call(__pyx_1, __pyx_2, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_arr); @@ -7536,17 +7461,17 @@ static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_sel } __pyx_L2:; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1248 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1248 */ __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;} __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;} Py_INCREF(__pyx_v_arr); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_arr); - __pyx_2 = PyObject_Call(__pyx_3, __pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1248; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1249 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */ Py_INCREF(__pyx_v_arr); __pyx_r = __pyx_v_arr; goto __pyx_L0; @@ -7718,12 +7643,10 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { static PyObject *__pyx_tp_new_6mtrand_RandomState(PyTypeObject *t, PyObject *a, PyObject *k) { PyObject *o = (*t->tp_alloc)(t, 0); - struct __pyx_obj_6mtrand_RandomState *p = (struct __pyx_obj_6mtrand_RandomState *)o; return o; } 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); @@ -7737,13 +7660,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; } @@ -7958,37 +7878,37 @@ PyMODINIT_FUNC initmtrand(void) { if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 456; goto __pyx_L1;} __pyx_ptype_6mtrand_RandomState = &__pyx_type_6mtrand_RandomState; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":119 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":119 */ import_array(); - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":121 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":121 */ __pyx_1 = __Pyx_Import(__pyx_n_numpy, 0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;} if (PyObject_SetAttr(__pyx_m, __pyx_n__sp, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":476 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":476 */ Py_INCREF(Py_None); __pyx_k2 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":486 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":486 */ Py_INCREF(Py_None); __pyx_k3 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":547 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":547 */ Py_INCREF(Py_None); __pyx_k4 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":554 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":554 */ Py_INCREF(Py_None); __pyx_k5 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":561 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":561 */ Py_INCREF(Py_None); __pyx_k6 = Py_None; Py_INCREF(Py_None); __pyx_k7 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":607 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":607 */ __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 607; goto __pyx_L1;} __pyx_k8 = __pyx_1; __pyx_1 = 0; @@ -7998,17 +7918,17 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k10 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":655 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":655 */ Py_INCREF(Py_None); __pyx_k11 = Py_None; Py_INCREF(Py_None); __pyx_k12 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":668 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":668 */ Py_INCREF(Py_None); __pyx_k13 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":675 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":675 */ __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 675; goto __pyx_L1;} __pyx_k14 = __pyx_3; __pyx_3 = 0; @@ -8018,73 +7938,73 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k16 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":688 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":688 */ Py_INCREF(Py_None); __pyx_k17 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":704 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":704 */ __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; goto __pyx_L1;} __pyx_k18 = __pyx_5; __pyx_5 = 0; Py_INCREF(Py_None); __pyx_k19 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":715 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":715 */ Py_INCREF(Py_None); __pyx_k20 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":722 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":722 */ Py_INCREF(Py_None); __pyx_k21 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":733 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":733 */ __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;} __pyx_k22 = __pyx_6; __pyx_6 = 0; Py_INCREF(Py_None); __pyx_k23 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":748 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":748 */ Py_INCREF(Py_None); __pyx_k24 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":763 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":763 */ Py_INCREF(Py_None); __pyx_k25 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":784 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":784 */ Py_INCREF(Py_None); __pyx_k26 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":795 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":795 */ Py_INCREF(Py_None); __pyx_k27 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":811 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":811 */ Py_INCREF(Py_None); __pyx_k28 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":818 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":818 */ Py_INCREF(Py_None); __pyx_k29 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":829 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":829 */ Py_INCREF(Py_None); __pyx_k30 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":843 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":843 */ Py_INCREF(Py_None); __pyx_k31 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":854 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":854 */ Py_INCREF(Py_None); __pyx_k32 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":865 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":865 */ Py_INCREF(Py_None); __pyx_k33 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":876 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":876 */ __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} __pyx_k34 = __pyx_7; __pyx_7 = 0; @@ -8094,7 +8014,7 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k36 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":889 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":889 */ __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; goto __pyx_L1;} __pyx_k37 = __pyx_9; __pyx_9 = 0; @@ -8104,7 +8024,7 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k39 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":902 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":902 */ __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; goto __pyx_L1;} __pyx_k40 = __pyx_11; __pyx_11 = 0; @@ -8114,7 +8034,7 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k42 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":915 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":915 */ __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;} __pyx_k43 = __pyx_13; __pyx_13 = 0; @@ -8124,376 +8044,374 @@ PyMODINIT_FUNC initmtrand(void) { Py_INCREF(Py_None); __pyx_k45 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":933 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":933 */ __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 933; goto __pyx_L1;} __pyx_k46 = __pyx_15; __pyx_15 = 0; Py_INCREF(Py_None); __pyx_k47 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":944 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":944 */ Py_INCREF(Py_None); __pyx_k48 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":959 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":959 */ Py_INCREF(Py_None); __pyx_k49 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":982 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":982 */ Py_INCREF(Py_None); __pyx_k50 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":999 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":999 */ Py_INCREF(Py_None); __pyx_k51 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1017 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1017 */ __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1017; goto __pyx_L1;} __pyx_k52 = __pyx_16; __pyx_16 = 0; Py_INCREF(Py_None); __pyx_k53 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1028 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1028 */ Py_INCREF(Py_None); __pyx_k54 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1039 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1039 */ Py_INCREF(Py_None); __pyx_k55 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1053 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1053 */ Py_INCREF(Py_None); __pyx_k56 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1081 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1081 */ Py_INCREF(Py_None); __pyx_k57 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1095 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1095 */ Py_INCREF(Py_None); __pyx_k58 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ Py_INCREF(Py_None); __pyx_k59 = Py_None; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1251 */ - __pyx_17 = PyTuple_New(0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} - __pyx_18 = PyObject_Call(((PyObject*)__pyx_ptype_6mtrand_RandomState), __pyx_17, 0); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1251 */ + __pyx_17 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; - if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} - Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1252 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1252 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1253 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1253 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1254 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1254 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1255 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1255 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1256 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1256 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1257 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1257 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1258 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1258 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1259 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1259 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1260 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1260 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1261 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1261 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1262 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1262 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1263 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1263 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1264 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1264 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1265 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1265 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1266 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1266 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1267 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1267 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1268 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1268 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1269 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1269 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1270 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1270 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1270; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1271 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1271 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1271; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1272 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1272 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1272; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1273 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1273 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1273; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1274 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1274 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1274; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1275 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1275 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1276 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1276 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1276; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1277 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1277 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1278 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1278 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1279 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1279 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1280 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1280 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1281 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1281 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1281; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1282 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1282 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1283 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1283 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1284 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1284 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1284; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1285 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1285 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1287 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1287 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1288 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1288 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1289 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1289 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1290 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1290 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1291 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1291 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1292 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1292 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1293 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1293 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1295 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1295 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1296 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1296 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1298 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1298 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1299 */ + /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1299 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;} __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; @@ -8537,7 +8455,7 @@ static int __Pyx_GetStarArgs( PyObject **args, PyObject **kwds, char *kwd_list[], - Py_ssize_t nargs, + int nargs, PyObject **args2, PyObject **kwds2) { @@ -8597,8 +8515,12 @@ static int __Pyx_GetStarArgs( bad: Py_XDECREF(args1); Py_XDECREF(kwds1); - Py_XDECREF(*args2); - Py_XDECREF(*kwds2); + if (*args2) { + Py_XDECREF(*args2); + } + if (*kwds2) { + Py_XDECREF(*kwds2); + } return -1; } @@ -8669,55 +8591,28 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb) { Py_INCREF(type); Py_DECREF(tmp); } - if (PyString_CheckExact(type)) { - /* Raising builtin string is deprecated but still allowed -- - * do nothing. Raising an instance of a new-style str - * subclass is right out. */ + if (PyString_Check(type)) { if (PyErr_Warn(PyExc_DeprecationWarning, - "raising a string exception is deprecated")) - goto raise_error; + "raising a string exception is deprecated")) + goto raise_error; } else if (PyType_Check(type) || PyClass_Check(type)) - ; /* PyErr_NormalizeException(&type, &value, &tb); */ - else if (PyInstance_Check(type)) { + ; /*PyErr_NormalizeException(&type, &value, &tb);*/ + else { /* Raising an instance. The value should be a dummy. */ if (value != Py_None) { PyErr_SetString(PyExc_TypeError, - "instance exception may not have a separate value"); + "instance exception may not have a separate value"); goto raise_error; } - else { - /* Normalize to raise <class>, <instance> */ - Py_DECREF(value); - value = type; + /* Normalize to raise <class>, <instance> */ + Py_DECREF(value); + value = type; + if (PyInstance_Check(type)) type = (PyObject*) ((PyInstanceObject*)type)->in_class; - Py_INCREF(type); - } - } - else if (PyType_IsSubtype(type->ob_type, (PyTypeObject*)PyExc_Exception)) { - /* Raising a new-style object (in Py2.5). - The value should be a dummy. */ - if (value != Py_None) { - PyErr_SetString(PyExc_TypeError, - "instance exception may not have a separate value"); - goto raise_error; - } - else { - /* Normalize to raise <class>, <instance> */ - Py_DECREF(value); - value = type; - type = (PyObject*) type->ob_type; - Py_INCREF(type); - } - } - else { - /* Not something you can raise. You get an exception - anyway, just not what you specified :-) */ - PyErr_Format(PyExc_TypeError, - "exceptions must be classes, instances, or " - "strings (deprecated), not %s", - type->ob_type->tp_name); - goto raise_error; + else + type = (PyObject*) type->ob_type; + Py_INCREF(type); } PyErr_Restore(type, value, tb); return; @@ -8728,39 +8623,30 @@ raise_error: return; } -static void __Pyx_WriteUnraisable(char *name) { - PyObject *old_exc, *old_val, *old_tb; - PyObject *ctx; - PyErr_Fetch(&old_exc, &old_val, &old_tb); - ctx = PyString_FromString(name); - PyErr_Restore(old_exc, old_val, old_tb); - if (!ctx) - ctx = Py_None; - PyErr_WriteUnraisable(ctx); -} - static void __Pyx_UnpackError(void) { PyErr_SetString(PyExc_ValueError, "unpack sequence of wrong size"); } -static PyObject *__Pyx_UnpackItem(PyObject *seq, Py_ssize_t i) { - PyObject *item; - if (!(item = PySequence_GetItem(seq, i))) { - if (PyErr_ExceptionMatches(PyExc_IndexError)) - __Pyx_UnpackError(); - } - return item; +static PyObject *__Pyx_UnpackItem(PyObject *iter) { + PyObject *item; + if (!(item = PyIter_Next(iter))) { + if (!PyErr_Occurred()) + __Pyx_UnpackError(); + } + return item; } -static int __Pyx_EndUnpack(PyObject *seq, Py_ssize_t i) { - PyObject *item; - if (item = PySequence_GetItem(seq, i)) { - Py_DECREF(item); - __Pyx_UnpackError(); - return -1; - } - PyErr_Clear(); - return 0; +static int __Pyx_EndUnpack(PyObject *iter) { + PyObject *item; + if ((item = PyIter_Next(iter))) { + Py_DECREF(item); + __Pyx_UnpackError(); + return -1; + } + else if (!PyErr_Occurred()) + return 0; + else + return -1; } static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) { diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index b55658496..5ec3249d0 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -511,7 +511,7 @@ cdef class RandomState: """ cdef ndarray state "arrayObject_state" state = <ndarray>_sp.empty(624, int) - memcpy(<void*>(state.data), self.internal_state.key, 624*sizeof(long)) + memcpy(<void*>(state.data), <void*>(self.internal_state.key), 624*sizeof(long)) return ('MT19937', state, self.internal_state.pos) def set_state(self, state): @@ -530,7 +530,7 @@ cdef class RandomState: obj = <ndarray>PyArray_ContiguousFromObject(key, NPY_LONG, 1, 1) if obj.dimensions[0] != 624: raise ValueError("state must be 624 longs") - memcpy(self.internal_state.key, <void*>(obj.data), 624*sizeof(long)) + memcpy(<void*>(self.internal_state.key), <void*>(obj.data), 624*sizeof(long)) self.internal_state.pos = pos # Pickling support: diff --git a/numpy/random/mtrand/numpy.pxi b/numpy/random/mtrand/numpy.pxi index 6d762c165..11cb8fac9 100644 --- a/numpy/random/mtrand/numpy.pxi +++ b/numpy/random/mtrand/numpy.pxi @@ -95,7 +95,7 @@ cdef extern from "numpy/arrayobject.h": cdef int numiter cdef npy_intp size, index cdef int nd - cdef npy_intp dimensions[NPY_MAXDIMS] + cdef npy_intp *dimensions cdef void **iters object PyArray_ZEROS(int ndims, npy_intp* dims, NPY_TYPES type_num, int fortran) |