From numpy-svn at scipy.org Thu Feb 1 15:33:58 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 14:33:58 -0600 (CST) Subject: [Numpy-svn] r3528 - trunk/numpy/doc Message-ID: <20070201203358.B01AC39C0F4@new.scipy.org> Author: oliphant Date: 2007-02-01 14:32:21 -0600 (Thu, 01 Feb 2007) New Revision: 3528 Added: trunk/numpy/doc/HOWTO_DOCUMENT.txt Log: Add a HOWTO_DOCUMENT.txt for documentation standardization Added: trunk/numpy/doc/HOWTO_DOCUMENT.txt =================================================================== --- trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-01 00:26:25 UTC (rev 3527) +++ trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-01 20:32:21 UTC (rev 3528) @@ -0,0 +1,104 @@ + +Both NumPy and SciPy follow a convention for docstrings that provide +for some consistency while also allowing epydoc to produce +nicely-formatted reference guides. + +The docstring format uses reST syntax as interpreted by epydoc +(which should understand how to process some of our conventions at +some point) + +Here is an example: + +""" +one-line summary or signature + +Several sentences providing an extended description + +:Parameters: + var1 : type information + Explanation + var2 : type information + Explanation + long_variable_name : + Explanation + +:Returns: + named : type + Explanation + list : + Explanation + of : + Explanation + outputs : + even more explaining + +:OtherParameters: + only_seldom_used_keywords : type + Explanation + common_parametrs_listed_above : type + Explanation + +:SeeAlso: + - otherfunc : relationship (optional) + - newfunc : relationship (optional) + + +Notes +----- + +Notes about the implementation algorithm (if needed). + +This can have multiple paragraphs as can all sections. + +Examples +-------- + +examples in doctest format + +>>> a=[1,2,3] +>>> [x + 3 for x in a] +[4,5,6] +""" + +Comments: + +1) The first line of the signature should **not** copy the signature. +If the function is written in C, then this first line should be the +signature. If the function signature is generic (uses *args or **kwds), +then a function signature can be included + +2) Use optional in the "type" field for parameters that are +non-keyword optional for C-functions. + +3) The OtherParameters section is for functions taking a lot of keywords +which are not always used or neeeded and whose description would clutter +then main purpose of the function. + +4) The See Also section can list additional related functions. The +purpose of this section is to direct users to other functions they may +not be aware of or have easy means to discover (i.e. by looking at the +docstring of the module). Thus, repeating functions that are in the +same module is not useful and can create a cluttered document. Please +use judgement when listing additional functions. Routines that +provide additional information in their docstrings for this function are +useful to include here. + +5) The Notes section can contain algorithmic information if that is useful. + +6) The Examples section is strongly encouraged. The examples can provide a mini-tutorial as well as additional regression testing. + + +Common reST concepts: + +For paragraphs, indentation is significant and indicates indentation +in the output. New paragraphs are marked with blank line. + +Use *italics*, **bold**, and ``courier`` if needed in any explanations +(but not for variable names and doctest code or multi-line code) + +Use :lm:eqn for in-line math in latex format (remember to use the +raw-format for your text string or escape any '\' symbols). Use :m:eqn +for non-latex math. + +A more extensive example of reST markup can be found here: +http://docutils.sourceforge.net/docs/user/rst/demo.txt \ No newline at end of file From numpy-svn at scipy.org Thu Feb 1 15:34:25 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 14:34:25 -0600 (CST) Subject: [Numpy-svn] r3529 - trunk/numpy/doc Message-ID: <20070201203425.504B239C0F4@new.scipy.org> Author: oliphant Date: 2007-02-01 14:34:23 -0600 (Thu, 01 Feb 2007) New Revision: 3529 Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt Log: Add new-line to end of file. Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt =================================================================== --- trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-01 20:32:21 UTC (rev 3528) +++ trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-01 20:34:23 UTC (rev 3529) @@ -101,4 +101,4 @@ for non-latex math. A more extensive example of reST markup can be found here: -http://docutils.sourceforge.net/docs/user/rst/demo.txt \ No newline at end of file +http://docutils.sourceforge.net/docs/user/rst/demo.txt From numpy-svn at scipy.org Thu Feb 1 15:34:58 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 14:34:58 -0600 (CST) Subject: [Numpy-svn] r3530 - trunk/numpy/lib Message-ID: <20070201203458.526C839C0F4@new.scipy.org> Author: oliphant Date: 2007-02-01 14:34:56 -0600 (Thu, 01 Feb 2007) New Revision: 3530 Modified: trunk/numpy/lib/type_check.py trunk/numpy/lib/ufunclike.py Log: Allow matrices to pass through more functions. Modified: trunk/numpy/lib/type_check.py =================================================================== --- trunk/numpy/lib/type_check.py 2007-02-01 20:34:23 UTC (rev 3529) +++ trunk/numpy/lib/type_check.py 2007-02-01 20:34:56 UTC (rev 3530) @@ -6,7 +6,8 @@ 'common_type'] import numpy.core.numeric as _nx -from numpy.core.numeric import asarray, array, isnan, obj2sctype, zeros +from numpy.core.numeric import asarray, asanyarray, array, isnan, \ + obj2sctype, zeros from ufunclike import isneginf, isposinf _typecodes_by_elsize = 'GDFgdfQqLlIiHhBb?' @@ -45,22 +46,21 @@ dtype = _nx.obj2sctype(dtype) if not issubclass(dtype, _nx.inexact): dtype = _nx.float_ - a = asarray(a,dtype=dtype) - return a + return asanyarray(a,dtype=dtype) def real(val): """Return the real part of val. Useful if val maybe a scalar or an array. """ - return asarray(val).real + return asanyarray(val).real def imag(val): """Return the imaginary part of val. Useful if val maybe a scalar or an array. """ - return asarray(val).imag + return asanyarray(val).imag def iscomplex(x): """Return a boolean array where elements are True if that element @@ -68,7 +68,7 @@ For scalars, return a boolean. """ - ax = asarray(x) + ax = asanyarray(x) if issubclass(ax.dtype.type, _nx.complexfloating): return ax.imag != 0 res = zeros(ax.shape, bool) @@ -105,7 +105,7 @@ def nan_to_num(x): """ - Replaces NaN's with 0 and infinities with large numbers + Returns a copy of replacing NaN's with 0 and Infs with large numbers The following mappings are applied: NaN -> 0 @@ -118,10 +118,12 @@ t = obj2sctype(type(x)) if issubclass(t, _nx.complexfloating): y = nan_to_num(x.real) + 1j * nan_to_num(x.imag) - elif issubclass(t, _nx.integer): - y = array(x) else: - y = array(x) + try: + y = x.copy() + except AttributeError: + y = array(x) + if not issubclass(t, _nx.integer): if not y.shape: y = array([x]) scalar = True @@ -146,7 +148,7 @@ "Close enough" is defined as tol*(machine epsilon of a's element type). """ - a = asarray(a) + a = asanyarray(a) if not issubclass(a.dtype.type, _nx.complexfloating): return a if tol > 1: Modified: trunk/numpy/lib/ufunclike.py =================================================================== --- trunk/numpy/lib/ufunclike.py 2007-02-01 20:34:23 UTC (rev 3529) +++ trunk/numpy/lib/ufunclike.py 2007-02-01 20:34:56 UTC (rev 3530) @@ -5,13 +5,13 @@ __all__ = ['fix', 'isneginf', 'isposinf', 'log2'] import numpy.core.numeric as nx -from numpy.core.numeric import asarray, empty, isinf, signbit +from numpy.core.numeric import asarray, empty, isinf, signbit, asanyarray import numpy.core.umath as umath def fix(x, y=None): """ Round x to nearest integer towards zero. """ - x = asarray(x) + x = asanyarray(x) if y is None: y = nx.floor(x) else: @@ -49,7 +49,7 @@ If y is an array, the result replaces the contents of y. """ - x = asarray(x) + x = asanyarray(x) if y is None: y = umath.log(x) else: From numpy-svn at scipy.org Thu Feb 1 16:14:17 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 15:14:17 -0600 (CST) Subject: [Numpy-svn] r3531 - in trunk: . numpy/random/mtrand Message-ID: <20070201211417.2E08D39C26A@new.scipy.org> Author: oliphant Date: 2007-02-01 15:14:12 -0600 (Thu, 01 Feb 2007) New Revision: 3531 Modified: trunk/THANKS.txt trunk/numpy/random/mtrand/mtrand.c trunk/numpy/random/mtrand/mtrand.pyx Log: Added dirichlet random number generator to NumPy Modified: trunk/THANKS.txt =================================================================== --- trunk/THANKS.txt 2007-02-01 20:34:56 UTC (rev 3530) +++ trunk/THANKS.txt 2007-02-01 21:14:12 UTC (rev 3531) @@ -34,3 +34,4 @@ Valgrind expertise. Stefan van der Walt for documentation, bug-fixes and regression-tests. Andrew Straw for help with http://www.scipy.org, documentation, and testing. +David Cournapeau for documentation, bug-fixes, and code contributions. Modified: trunk/numpy/random/mtrand/mtrand.c =================================================================== --- trunk/numpy/random/mtrand/mtrand.c 2007-02-01 20:34:56 UTC (rev 3530) +++ trunk/numpy/random/mtrand/mtrand.c 2007-02-01 21:14:12 UTC (rev 3531) @@ -1,4 +1,4 @@ -/* Generated by Pyrex 0.9.5 on Sat Jan 27 20:47:23 2007 */ +/* Generated by Pyrex 0.9.5.1a on Thu Feb 1 14:12:28 2007 */ #include "Python.h" #include "structmember.h" @@ -122,6 +122,7 @@ static PyObject *__pyx_k57; static PyObject *__pyx_k58; static PyObject *__pyx_k59; +static PyObject *__pyx_k60; static PyObject *(__pyx_f_6mtrand_cont0_array(rk_state (*),double ((*)(rk_state (*))),PyObject *)); /*proto*/ static PyObject *(__pyx_f_6mtrand_cont1_array(rk_state (*),double ((*)(rk_state (*),double )),PyObject *,PyArrayObject *)); /*proto*/ static PyObject *(__pyx_f_6mtrand_cont2_array(rk_state (*),double ((*)(rk_state (*),double ,double )),PyObject *,PyArrayObject *,PyArrayObject *)); /*proto*/ @@ -181,6 +182,7 @@ static PyObject *__pyx_n_logseries; static PyObject *__pyx_n_multivariate_normal; static PyObject *__pyx_n_multinomial; +static PyObject *__pyx_n_dirichlet; static PyObject *__pyx_n_shuffle; static PyObject *__pyx_n_permutation; static PyObject *__pyx_n_numpy; @@ -201,11 +203,11 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":129 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":129 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":130 */ + /* "/home/oliphant/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 +216,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":132 */ + /* "/home/oliphant/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; @@ -234,20 +236,20 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":133 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":133 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":134 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":134 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":135 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":135 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":136 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":136 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":137 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":137 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -270,9 +272,9 @@ static PyObject *__pyx_n_ValueError; -static PyObject *__pyx_k60p; +static PyObject *__pyx_k61p; -static char (__pyx_k60[]) = "size is not compatible with inputs"; +static char (__pyx_k61[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_cont1_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) { double (*__pyx_v_array_data); @@ -295,31 +297,31 @@ __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":149 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":150 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":151 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":152 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":152 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":154 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":155 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":155 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":156 */ + /* "/home/oliphant/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; @@ -328,33 +330,33 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":158 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":159 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":159 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":160 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":160 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":161 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":162 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":162 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":163 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":164 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":164 */ PyArray_ITER_NEXT(__pyx_v_itera); } } @@ -363,7 +365,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */ + /* "/home/oliphant/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; @@ -383,42 +385,42 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":167 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":167 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":168 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":169 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":170 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":170 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":171 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":173 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":175 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k61p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k61p); __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; @@ -429,17 +431,17 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":177 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":178 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":178 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":179 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":180 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); } } @@ -447,7 +449,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":181 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":181 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -469,9 +471,9 @@ return __pyx_r; } -static PyObject *__pyx_k61p; +static PyObject *__pyx_k62p; -static char (__pyx_k61[]) = "size is not compatible with inputs"; +static char (__pyx_k62[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_cont2_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob) { double (*__pyx_v_array_data); @@ -494,37 +496,37 @@ arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":194 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":194 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":195 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":196 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":197 */ __pyx_v_ob_data = ((double (*))__pyx_v_ob->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":198 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":198 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":200 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":200 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":201 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":202 */ + /* "/home/oliphant/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; @@ -533,37 +535,37 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":204 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":205 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":206 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":206 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":207 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":208 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":208 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":209 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":209 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":210 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":211 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":211 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -572,7 +574,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":213 */ + /* "/home/oliphant/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; @@ -592,42 +594,42 @@ arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":214 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":214 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":215 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":216 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":216 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":217 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":217 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":218 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":221 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":222 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k62p); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k62p); __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; @@ -638,23 +640,23 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":223 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":224 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":225 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":227 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":227 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":228 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":228 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); } } @@ -662,7 +664,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":229 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":229 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -684,9 +686,9 @@ return __pyx_r; } -static PyObject *__pyx_k62p; +static PyObject *__pyx_k63p; -static char (__pyx_k62[]) = "size is not compatible with inputs"; +static char (__pyx_k63[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_cont3_array(rk_state (*__pyx_v_state),double ((*__pyx_v_func)(rk_state (*),double ,double ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa,PyArrayObject *__pyx_v_ob,PyArrayObject *__pyx_v_oc) { double (*__pyx_v_array_data); @@ -711,10 +713,10 @@ arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":244 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":244 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":245 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_ob->nd == 0); @@ -724,30 +726,30 @@ } if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":246 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":246 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":247 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":247 */ __pyx_v_ob_data = ((double (*))__pyx_v_ob->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":248 */ __pyx_v_oc_data = ((double (*))__pyx_v_oc->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":249 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":249 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":251 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":252 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":252 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":253 */ + /* "/home/oliphant/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; @@ -756,40 +758,40 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":255 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":256 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":257 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":257 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":258 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":259 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":259 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":260 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":260 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":261 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":261 */ __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":262 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":263 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":263 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -798,7 +800,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":265 */ + /* "/home/oliphant/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; @@ -818,42 +820,42 @@ arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":266 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":266 */ __pyx_v_array_data = ((double (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":267 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":267 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":268 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":269 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":269 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":270 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":272 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":274 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k63p); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k63p); __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; @@ -864,23 +866,23 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":276 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":277 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":277 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":278 */ __pyx_v_ob_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":279 */ __pyx_v_oc_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":281 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":281 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -888,7 +890,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":282 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":282 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -926,11 +928,11 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":290 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":291 */ + /* "/home/oliphant/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; @@ -939,7 +941,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":293 */ + /* "/home/oliphant/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; @@ -957,20 +959,20 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":294 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":294 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":295 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":295 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":296 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":296 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":297 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":297 */ (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":298 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":298 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -991,9 +993,9 @@ return __pyx_r; } -static PyObject *__pyx_k63p; +static PyObject *__pyx_k64p; -static char (__pyx_k63[]) = "size is not compatible with inputs"; +static char (__pyx_k64[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_discnp_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_op) { long (*__pyx_v_array_data); @@ -1016,37 +1018,37 @@ arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":310 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":310 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":311 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":312 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":312 */ __pyx_v_on_data = ((long (*))__pyx_v_on->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":313 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":313 */ __pyx_v_op_data = ((double (*))__pyx_v_op->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":314 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":314 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":316 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":316 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":317 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":318 */ + /* "/home/oliphant/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; @@ -1055,37 +1057,37 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":321 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":322 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":323 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":324 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":324 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":325 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":325 */ __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":326 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":327 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":327 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -1094,7 +1096,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":329 */ + /* "/home/oliphant/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; @@ -1112,42 +1114,42 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":330 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":330 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":331 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":331 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":332 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":332 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":333 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":333 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":334 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":336 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":337 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":338 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k64p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k64p); __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; @@ -1158,23 +1160,23 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":340 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":341 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":341 */ __pyx_v_op_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":342 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":343 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":344 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":344 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); } } @@ -1182,7 +1184,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":346 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":346 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1204,9 +1206,9 @@ return __pyx_r; } -static PyObject *__pyx_k64p; +static PyObject *__pyx_k65p; -static char (__pyx_k64[]) = "size is not compatible with inputs"; +static char (__pyx_k65[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_discnmN_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),long ,long ,long )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_on,PyArrayObject *__pyx_v_om,PyArrayObject *__pyx_v_oN) { long (*__pyx_v_array_data); @@ -1231,10 +1233,10 @@ arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":360 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":360 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":361 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":361 */ __pyx_1 = (__pyx_v_on->nd == 0); if (__pyx_1) { __pyx_1 = (__pyx_v_om->nd == 0); @@ -1244,30 +1246,30 @@ } if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":362 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":362 */ __pyx_v_scalar = 1; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":363 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":363 */ __pyx_v_on_data = ((long (*))__pyx_v_on->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":364 */ __pyx_v_om_data = ((long (*))__pyx_v_om->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":365 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":365 */ __pyx_v_oN_data = ((long (*))__pyx_v_oN->data); goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":367 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":368 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":369 */ + /* "/home/oliphant/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; @@ -1276,40 +1278,40 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":371 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":373 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":373 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":374 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":375 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":375 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":376 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":376 */ __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":377 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":377 */ __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":378 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":379 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":379 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -1318,7 +1320,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":381 */ + /* "/home/oliphant/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; @@ -1336,42 +1338,42 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":382 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":382 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":383 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":383 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":384 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":384 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":385 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":385 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":386 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":388 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":390 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":390 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k65p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k65p); __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; @@ -1382,23 +1384,23 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":393 */ __pyx_v_on_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":394 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":394 */ __pyx_v_om_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":395 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":395 */ __pyx_v_oN_data = ((long (*))PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":397 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":397 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } @@ -1406,7 +1408,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":399 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":399 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1429,9 +1431,9 @@ return __pyx_r; } -static PyObject *__pyx_k65p; +static PyObject *__pyx_k66p; -static char (__pyx_k65[]) = "size is not compatible with inputs"; +static char (__pyx_k66[]) = "size is not compatible with inputs"; static PyObject *__pyx_f_6mtrand_discd_array(rk_state (*__pyx_v_state),long ((*__pyx_v_func)(rk_state (*),double )),PyObject *__pyx_v_size,PyArrayObject *__pyx_v_oa) { long (*__pyx_v_array_data); @@ -1454,31 +1456,31 @@ __pyx_v_multi = ((PyArrayMultiIterObject *)Py_None); Py_INCREF(Py_None); __pyx_v_itera = ((PyArrayIterObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":411 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":411 */ __pyx_v_scalar = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":412 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":412 */ __pyx_1 = (__pyx_v_oa->nd == 0); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":413 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":413 */ __pyx_v_oa_data = ((double (*))__pyx_v_oa->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":414 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":414 */ __pyx_v_scalar = 1; goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":416 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":416 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":417 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":418 */ + /* "/home/oliphant/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; @@ -1487,33 +1489,33 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":421 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":421 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":422 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":422 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":423 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":424 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":424 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":426 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":426 */ PyArray_ITER_NEXT(__pyx_v_itera); } } @@ -1522,7 +1524,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":428 */ + /* "/home/oliphant/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; @@ -1540,42 +1542,42 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":429 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":429 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":430 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":430 */ __pyx_1 = __pyx_v_scalar; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":431 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":431 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":432 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":432 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":433 */ + /* "/home/oliphant/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])); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":435 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":436 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":436 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k66p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k66p); __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; @@ -1586,17 +1588,17 @@ } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":438 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":439 */ __pyx_v_oa_data = ((double (*))PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */ + /* "/home/oliphant/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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":441 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":441 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); } } @@ -1604,7 +1606,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":442 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":442 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1634,29 +1636,29 @@ long __pyx_v_i; double __pyx_r; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":447 */ __pyx_v_sum = (__pyx_v_darr[0]); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":448 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":448 */ __pyx_v_c = 0.0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":449 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":449 */ for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":450 */ __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":451 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":451 */ __pyx_v_t = (__pyx_v_sum + __pyx_v_y); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":452 */ __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":453 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":453 */ __pyx_v_sum = __pyx_v_t; } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":454 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":454 */ __pyx_r = __pyx_v_sum; goto __pyx_L0; @@ -1678,10 +1680,10 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":477 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":477 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = ((rk_state (*))PyMem_Malloc((sizeof(rk_state )))); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":479 */ + /* "/home/oliphant/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); @@ -1710,15 +1712,15 @@ int __pyx_1; Py_INCREF(__pyx_v_self); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":482 */ - __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != 0); + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":482 */ + __pyx_1 = (((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state != NULL); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":483 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":483 */ PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":484 */ - ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = 0; + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":484 */ + ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = NULL; goto __pyx_L2; } __pyx_L2:; @@ -1747,11 +1749,11 @@ Py_INCREF(__pyx_v_seed); arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":498 */ __pyx_1 = __pyx_v_seed == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":499 */ + /* "/home/oliphant/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; } @@ -1768,21 +1770,21 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":501 */ + /* "/home/oliphant/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*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":503 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":504 */ + /* "/home/oliphant/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:; @@ -1819,7 +1821,7 @@ Py_INCREF(__pyx_v_self); arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":513 */ + /* "/home/oliphant/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; @@ -1838,10 +1840,10 @@ arrayObject_state = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":514 */ + /* "/home/oliphant/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 )))); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":515 */ + /* "/home/oliphant/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); @@ -1869,11 +1871,11 @@ return __pyx_r; } -static PyObject *__pyx_k68p; static PyObject *__pyx_k69p; +static PyObject *__pyx_k70p; -static char (__pyx_k68[]) = "algorithm must be 'MT19937'"; -static char (__pyx_k69[]) = "state must be 624 longs"; +static char (__pyx_k69[]) = "algorithm must be 'MT19937'"; +static char (__pyx_k70[]) = "state must be 624 longs"; static PyObject *__pyx_f_6mtrand_11RandomState_set_state(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_set_state[] = "Set the state from a tuple.\n \n state = (\'MT19937\', int key[624], int pos)\n \n set_state(state)\n "; @@ -1896,7 +1898,7 @@ __pyx_v_algorithm_name = Py_None; Py_INCREF(Py_None); __pyx_v_key = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */ + /* "/home/oliphant/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; @@ -1904,16 +1906,16 @@ __pyx_v_algorithm_name = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":527 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k69p); + 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 = 528; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1924,7 +1926,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":529 */ + /* "/home/oliphant/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; @@ -1939,22 +1941,22 @@ if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 529; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":530 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":531 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":531 */ __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624); if (__pyx_3) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":532 */ + /* "/home/oliphant/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_2, 0, __pyx_k69p); + Py_INCREF(__pyx_k70p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k70p); __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; @@ -1965,10 +1967,10 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":533 */ + /* "/home/oliphant/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 )))); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":534 */ + /* "/home/oliphant/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); @@ -1997,7 +1999,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":538 */ + /* "/home/oliphant/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 = 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; @@ -2029,7 +2031,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_state); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":541 */ + /* "/home/oliphant/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); @@ -2067,7 +2069,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":544 */ + /* "/home/oliphant/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; @@ -2114,7 +2116,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":552 */ + /* "/home/oliphant/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; @@ -2144,7 +2146,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":559 */ + /* "/home/oliphant/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; @@ -2162,9 +2164,9 @@ return __pyx_r; } -static PyObject *__pyx_k70p; +static PyObject *__pyx_k71p; -static char (__pyx_k70[]) = "low >= high"; +static char (__pyx_k71[]) = "low >= high"; static PyObject *__pyx_f_6mtrand_11RandomState_randint(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_randint[] = "Return random integers x such that low <= x < high.\n\n randint(low, high=None, size=None) -> random values\n\n If high is None, then 0 <= x < low.\n "; @@ -2195,42 +2197,42 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":574 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":574 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":575 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":575 */ __pyx_v_lo = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":576 */ + /* "/home/oliphant/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*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":579 */ + /* "/home/oliphant/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:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":581 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":581 */ __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":582 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":582 */ __pyx_1 = (__pyx_v_diff < 0); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":583 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k71p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k71p); __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; @@ -2241,11 +2243,11 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":585 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":585 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":586 */ + /* "/home/oliphant/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; @@ -2254,7 +2256,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":588 */ + /* "/home/oliphant/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; @@ -2272,20 +2274,20 @@ arrayObject = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":589 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":589 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":590 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":590 */ __pyx_v_array_data = ((long (*))arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":591 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */ + /* "/home/oliphant/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))); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":593 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":593 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -2322,22 +2324,22 @@ Py_INCREF(__pyx_v_self); __pyx_v_bytestring = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":601 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":601 */ __pyx_v_bytes = PyMem_Malloc(__pyx_v_length); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */ + /* "/home/oliphant/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); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":603 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":604 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":604 */ PyMem_Free(__pyx_v_bytes); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":605 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":605 */ Py_INCREF(__pyx_v_bytestring); __pyx_r = __pyx_v_bytestring; goto __pyx_L0; @@ -2384,21 +2386,21 @@ __pyx_v_odiff = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_temp = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":616 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":617 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */ + /* "/home/oliphant/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; @@ -2414,17 +2416,17 @@ __pyx_v_temp = __pyx_3; __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":619 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":619 */ Py_INCREF(__pyx_v_temp); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":621 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":622 */ + /* "/home/oliphant/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; @@ -2474,7 +2476,7 @@ } Py_INCREF(__pyx_v_self); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":635 */ + /* "/home/oliphant/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); @@ -2489,7 +2491,7 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":636 */ + /* "/home/oliphant/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 = 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; @@ -2500,7 +2502,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":638 */ + /* "/home/oliphant/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;} @@ -2551,7 +2553,7 @@ } Py_INCREF(__pyx_v_self); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":650 */ + /* "/home/oliphant/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); @@ -2566,7 +2568,7 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":651 */ + /* "/home/oliphant/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 = 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; @@ -2577,7 +2579,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":653 */ + /* "/home/oliphant/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); @@ -2627,16 +2629,16 @@ Py_INCREF(__pyx_v_high); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":662 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":662 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":663 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":663 */ Py_INCREF(__pyx_v_low); Py_DECREF(__pyx_v_high); __pyx_v_high = __pyx_v_low; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":664 */ + /* "/home/oliphant/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; @@ -2645,7 +2647,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":665 */ + /* "/home/oliphant/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;} @@ -2692,7 +2694,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":673 */ + /* "/home/oliphant/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; @@ -2713,9 +2715,9 @@ static PyObject *__pyx_n_any; static PyObject *__pyx_n_less_equal; -static PyObject *__pyx_k72p; +static PyObject *__pyx_k73p; -static char (__pyx_k72[]) = "scale <= 0"; +static char (__pyx_k73[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_normal[] = "Normal distribution (mean=loc, stdev=scale).\n\n normal(loc=0.0, scale=1.0, size=None) -> random values\n "; @@ -2743,21 +2745,21 @@ __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":682 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */ + /* "/home/oliphant/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; @@ -2783,11 +2785,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":685 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k73p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k73p); __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; @@ -2798,7 +2800,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":686 */ + /* "/home/oliphant/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; @@ -2823,11 +2825,11 @@ return __pyx_r; } -static PyObject *__pyx_k73p; static PyObject *__pyx_k74p; +static PyObject *__pyx_k75p; -static char (__pyx_k73[]) = "a <= 0"; -static char (__pyx_k74[]) = "b <= 0"; +static char (__pyx_k74[]) = "a <= 0"; +static char (__pyx_k75[]) = "b <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_beta(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_beta[] = "Beta distribution over [0, 1].\n\n beta(a, b, size=None) -> random values\n "; @@ -2853,21 +2855,21 @@ __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ob = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":695 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":696 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":698 */ + /* "/home/oliphant/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; @@ -2893,11 +2895,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":699 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k74p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k74p); __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; @@ -2908,7 +2910,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":700 */ + /* "/home/oliphant/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; @@ -2934,11 +2936,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":701 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k75p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k75p); __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; @@ -2949,7 +2951,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":702 */ + /* "/home/oliphant/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; @@ -2974,9 +2976,9 @@ return __pyx_r; } -static PyObject *__pyx_k75p; +static PyObject *__pyx_k76p; -static char (__pyx_k75[]) = "scale <= 0"; +static char (__pyx_k76[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_exponential(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_exponential[] = "Exponential distribution.\n\n exponential(scale=1.0, size=None) -> random values\n "; @@ -2999,14 +3001,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":710 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */ + /* "/home/oliphant/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; @@ -3032,11 +3034,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":712 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k76p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k76p); __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; @@ -3047,7 +3049,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":713 */ + /* "/home/oliphant/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; @@ -3082,7 +3084,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":720 */ + /* "/home/oliphant/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; @@ -3100,9 +3102,9 @@ return __pyx_r; } -static PyObject *__pyx_k76p; +static PyObject *__pyx_k77p; -static char (__pyx_k76[]) = "shape <= 0"; +static char (__pyx_k77[]) = "shape <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_standard_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_standard_gamma[] = "Standard Gamma distribution.\n\n standard_gamma(shape, size=None) -> random values\n "; @@ -3124,14 +3126,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */ + /* "/home/oliphant/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; @@ -3157,11 +3159,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k77p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k77p); __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; @@ -3172,7 +3174,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":731 */ + /* "/home/oliphant/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; @@ -3195,11 +3197,11 @@ return __pyx_r; } -static PyObject *__pyx_k77p; static PyObject *__pyx_k78p; +static PyObject *__pyx_k79p; -static char (__pyx_k77[]) = "shape <= 0"; -static char (__pyx_k78[]) = "scale <= 0"; +static char (__pyx_k78[]) = "shape <= 0"; +static char (__pyx_k79[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_gamma(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_gamma[] = "Gamma distribution.\n\n gamma(shape, scale=1.0, size=None) -> random values\n "; @@ -3226,21 +3228,21 @@ __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":741 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */ + /* "/home/oliphant/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; @@ -3266,11 +3268,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":743 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k78p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k78p); __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; @@ -3281,7 +3283,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */ + /* "/home/oliphant/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; @@ -3307,11 +3309,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":745 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k79p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k79p); __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; @@ -3322,7 +3324,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":746 */ + /* "/home/oliphant/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; @@ -3347,11 +3349,11 @@ return __pyx_r; } -static PyObject *__pyx_k79p; static PyObject *__pyx_k80p; +static PyObject *__pyx_k81p; -static char (__pyx_k79[]) = "dfnum <= 0"; -static char (__pyx_k80[]) = "dfden <= 0"; +static char (__pyx_k80[]) = "dfnum <= 0"; +static char (__pyx_k81[]) = "dfden <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_f[] = "F distribution.\n\n f(dfnum, dfden, size=None) -> random values\n "; @@ -3377,21 +3379,21 @@ __pyx_v_odfnum = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":757 */ + /* "/home/oliphant/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; @@ -3417,11 +3419,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k80p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k80p); __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; @@ -3432,7 +3434,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":759 */ + /* "/home/oliphant/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; @@ -3458,11 +3460,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k81p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k81p); __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; @@ -3473,7 +3475,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":761 */ + /* "/home/oliphant/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; @@ -3500,13 +3502,13 @@ static PyObject *__pyx_n_less; -static PyObject *__pyx_k81p; static PyObject *__pyx_k82p; static PyObject *__pyx_k83p; +static PyObject *__pyx_k84p; -static char (__pyx_k81[]) = "dfnum <= 1"; -static char (__pyx_k82[]) = "dfden <= 0"; -static char (__pyx_k83[]) = "nonc < 0"; +static char (__pyx_k82[]) = "dfnum <= 1"; +static char (__pyx_k83[]) = "dfden <= 0"; +static char (__pyx_k84[]) = "nonc < 0"; static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_f(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_noncentral_f[] = "Noncentral F distribution.\n\n noncentral_f(dfnum, dfden, nonc, size=None) -> random values\n "; @@ -3536,28 +3538,28 @@ __pyx_v_odfden = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":771 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":772 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":773 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":775 */ + /* "/home/oliphant/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; @@ -3583,11 +3585,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":776 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k82p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k82p); __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; @@ -3598,7 +3600,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":777 */ + /* "/home/oliphant/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; @@ -3624,11 +3626,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":778 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k83p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k83p); __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; @@ -3639,7 +3641,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":779 */ + /* "/home/oliphant/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; @@ -3665,11 +3667,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":780 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k84p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k84p); __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; @@ -3680,7 +3682,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":781 */ + /* "/home/oliphant/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; @@ -3707,9 +3709,9 @@ return __pyx_r; } -static PyObject *__pyx_k84p; +static PyObject *__pyx_k85p; -static char (__pyx_k84[]) = "df <= 0"; +static char (__pyx_k85[]) = "df <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_chisquare[] = "Chi^2 distribution.\n\n chisquare(df, size=None) -> random values\n "; @@ -3731,14 +3733,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":791 */ + /* "/home/oliphant/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; @@ -3764,11 +3766,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k85p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k85p); __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; @@ -3779,7 +3781,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":793 */ + /* "/home/oliphant/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; @@ -3802,11 +3804,11 @@ return __pyx_r; } -static PyObject *__pyx_k85p; static PyObject *__pyx_k86p; +static PyObject *__pyx_k87p; -static char (__pyx_k85[]) = "df <= 1"; -static char (__pyx_k86[]) = "nonc < 0"; +static char (__pyx_k86[]) = "df <= 1"; +static char (__pyx_k87[]) = "nonc < 0"; static PyObject *__pyx_f_6mtrand_11RandomState_noncentral_chisquare(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_noncentral_chisquare[] = "Noncentral Chi^2 distribution.\n\n noncentral_chisquare(df, nonc, size=None) -> random values\n "; @@ -3832,21 +3834,21 @@ __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_ononc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":802 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */ + /* "/home/oliphant/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; @@ -3872,11 +3874,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k86p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k86p); __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; @@ -3887,7 +3889,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":806 */ + /* "/home/oliphant/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; @@ -3913,11 +3915,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k87p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k87p); __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; @@ -3928,7 +3930,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":808 */ + /* "/home/oliphant/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; @@ -3965,7 +3967,7 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":816 */ + /* "/home/oliphant/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; @@ -3983,9 +3985,9 @@ return __pyx_r; } -static PyObject *__pyx_k87p; +static PyObject *__pyx_k88p; -static char (__pyx_k87[]) = "df <= 0"; +static char (__pyx_k88[]) = "df <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_standard_t(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_standard_t[] = "Standard Student\'s t distribution with df degrees of freedom.\n\n standard_t(df, size=None)\n "; @@ -4007,14 +4009,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":824 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":825 */ + /* "/home/oliphant/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; @@ -4040,11 +4042,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":826 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k88p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k88p); __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; @@ -4055,7 +4057,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":827 */ + /* "/home/oliphant/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; @@ -4078,9 +4080,9 @@ return __pyx_r; } -static PyObject *__pyx_k88p; +static PyObject *__pyx_k89p; -static char (__pyx_k88[]) = "kappa < 0"; +static char (__pyx_k89[]) = "kappa < 0"; static PyObject *__pyx_f_6mtrand_11RandomState_vonmises(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_vonmises[] = "von Mises circular distribution with mode mu and dispersion parameter\n kappa on [-pi, pi].\n\n vonmises(mu, kappa, size=None)\n "; @@ -4106,21 +4108,21 @@ __pyx_v_omu = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_okappa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":838 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */ + /* "/home/oliphant/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; @@ -4146,11 +4148,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k89p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k89p); __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; @@ -4161,7 +4163,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":841 */ + /* "/home/oliphant/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; @@ -4186,9 +4188,9 @@ return __pyx_r; } -static PyObject *__pyx_k89p; +static PyObject *__pyx_k90p; -static char (__pyx_k89[]) = "a <= 0"; +static char (__pyx_k90[]) = "a <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_pareto(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_pareto[] = "Pareto distribution.\n\n pareto(a, size=None)\n "; @@ -4210,14 +4212,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":849 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":850 */ + /* "/home/oliphant/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; @@ -4243,11 +4245,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":851 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k90p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k90p); __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; @@ -4258,7 +4260,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":852 */ + /* "/home/oliphant/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; @@ -4281,9 +4283,9 @@ return __pyx_r; } -static PyObject *__pyx_k90p; +static PyObject *__pyx_k91p; -static char (__pyx_k90[]) = "a <= 0"; +static char (__pyx_k91[]) = "a <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_weibull(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_weibull[] = "Weibull distribution.\n\n weibull(a, size=None)\n "; @@ -4304,7 +4306,7 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":860 */ + /* "/home/oliphant/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; @@ -4313,7 +4315,7 @@ __pyx_v_oa = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */ + /* "/home/oliphant/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; @@ -4339,11 +4341,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":862 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k91p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k91p); __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; @@ -4354,7 +4356,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":863 */ + /* "/home/oliphant/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; @@ -4376,9 +4378,9 @@ return __pyx_r; } -static PyObject *__pyx_k91p; +static PyObject *__pyx_k92p; -static char (__pyx_k91[]) = "a <= 0"; +static char (__pyx_k92[]) = "a <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_power(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_power[] = "Power distribution.\n\n power(a, size=None)\n "; @@ -4399,7 +4401,7 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */ + /* "/home/oliphant/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; @@ -4408,7 +4410,7 @@ __pyx_v_oa = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */ + /* "/home/oliphant/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; @@ -4434,11 +4436,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":873 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k92p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k92p); __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; @@ -4449,7 +4451,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":874 */ + /* "/home/oliphant/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; @@ -4471,9 +4473,9 @@ return __pyx_r; } -static PyObject *__pyx_k92p; +static PyObject *__pyx_k93p; -static char (__pyx_k92[]) = "scale <= 0"; +static char (__pyx_k93[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_laplace(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_laplace[] = "Laplace distribution.\n \n laplace(loc=0.0, scale=1.0, size=None)\n "; @@ -4501,21 +4503,21 @@ __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":884 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":885 */ + /* "/home/oliphant/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; @@ -4541,11 +4543,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":886 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k93p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k93p); __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; @@ -4556,7 +4558,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":887 */ + /* "/home/oliphant/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; @@ -4581,9 +4583,9 @@ return __pyx_r; } -static PyObject *__pyx_k93p; +static PyObject *__pyx_k94p; -static char (__pyx_k93[]) = "scale <= 0"; +static char (__pyx_k94[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_gumbel(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_gumbel[] = "Gumbel distribution.\n \n gumbel(loc=0.0, scale=1.0, size=None)\n "; @@ -4611,21 +4613,21 @@ __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":896 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":898 */ + /* "/home/oliphant/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; @@ -4651,11 +4653,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k94p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k94p); __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; @@ -4666,7 +4668,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":900 */ + /* "/home/oliphant/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; @@ -4691,9 +4693,9 @@ return __pyx_r; } -static PyObject *__pyx_k94p; +static PyObject *__pyx_k95p; -static char (__pyx_k94[]) = "scale <= 0"; +static char (__pyx_k95[]) = "scale <= 0"; static PyObject *__pyx_f_6mtrand_11RandomState_logistic(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_logistic[] = "Logistic distribution.\n \n logistic(loc=0.0, scale=1.0, size=None)\n "; @@ -4721,21 +4723,21 @@ __pyx_v_oloc = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":909 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":910 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":911 */ + /* "/home/oliphant/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; @@ -4761,11 +4763,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k95p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k95p); __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; @@ -4776,7 +4778,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":913 */ + /* "/home/oliphant/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; @@ -4801,9 +4803,9 @@ return __pyx_r; } -static PyObject *__pyx_k95p; +static PyObject *__pyx_k96p; -static char (__pyx_k95[]) = "sigma <= 0.0"; +static char (__pyx_k96[]) = "sigma <= 0.0"; static PyObject *__pyx_f_6mtrand_11RandomState_lognormal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_lognormal[] = "Log-normal distribution.\n \n Note that the mean parameter is not the mean of this distribution, but \n the underlying normal distribution.\n \n lognormal(mean, sigma) <=> exp(normal(mean, sigma))\n \n lognormal(mean=0.0, sigma=1.0, size=None)\n "; @@ -4831,21 +4833,21 @@ __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_osigma = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":928 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */ + /* "/home/oliphant/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; @@ -4871,11 +4873,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":930 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k96p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k96p); __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; @@ -4886,7 +4888,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":931 */ + /* "/home/oliphant/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; @@ -4911,9 +4913,9 @@ return __pyx_r; } -static PyObject *__pyx_k96p; +static PyObject *__pyx_k97p; -static char (__pyx_k96[]) = "scale <= 0.0"; +static char (__pyx_k97[]) = "scale <= 0.0"; static PyObject *__pyx_f_6mtrand_11RandomState_rayleigh(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_rayleigh[] = "Rayleigh distribution.\n \n rayleigh(scale=1.0, size=None)\n "; @@ -4936,14 +4938,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":940 */ + /* "/home/oliphant/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; @@ -4969,11 +4971,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":941 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k97p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k97p); __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; @@ -4984,7 +4986,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":942 */ + /* "/home/oliphant/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; @@ -5007,11 +5009,11 @@ return __pyx_r; } -static PyObject *__pyx_k97p; static PyObject *__pyx_k98p; +static PyObject *__pyx_k99p; -static char (__pyx_k97[]) = "mean <= 0.0"; -static char (__pyx_k98[]) = "scale <= 0.0"; +static char (__pyx_k98[]) = "mean <= 0.0"; +static char (__pyx_k99[]) = "scale <= 0.0"; static PyObject *__pyx_f_6mtrand_11RandomState_wald(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_wald[] = "Wald (inverse Gaussian) distribution.\n \n wald(mean, scale, size=None)\n "; @@ -5037,21 +5039,21 @@ __pyx_v_omean = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":952 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */ + /* "/home/oliphant/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; @@ -5077,11 +5079,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":954 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k98p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k98p); __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; @@ -5115,11 +5117,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k99p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k99p); __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; @@ -5130,7 +5132,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":957 */ + /* "/home/oliphant/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; @@ -5158,13 +5160,13 @@ static PyObject *__pyx_n_greater; static PyObject *__pyx_n_equal; -static PyObject *__pyx_k99p; static PyObject *__pyx_k100p; static PyObject *__pyx_k101p; +static PyObject *__pyx_k102p; -static char (__pyx_k99[]) = "left > mode"; -static char (__pyx_k100[]) = "mode > right"; -static char (__pyx_k101[]) = "left == right"; +static char (__pyx_k100[]) = "left > mode"; +static char (__pyx_k101[]) = "mode > right"; +static char (__pyx_k102[]) = "left == right"; static PyObject *__pyx_f_6mtrand_11RandomState_triangular(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_triangular[] = "Triangular distribution starting at left, peaking at mode, and \n ending at right (left <= mode <= right).\n \n triangular(left, mode, right, size=None)\n "; @@ -5194,28 +5196,28 @@ __pyx_v_omode = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_oright = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":968 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":969 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":970 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */ + /* "/home/oliphant/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; @@ -5240,11 +5242,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":973 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k100p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k100p); __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; @@ -5255,7 +5257,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */ + /* "/home/oliphant/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; @@ -5280,11 +5282,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":975 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k101p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k101p); __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; @@ -5295,7 +5297,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */ + /* "/home/oliphant/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; @@ -5320,11 +5322,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":977 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k102p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k102p); __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; @@ -5335,7 +5337,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":978 */ + /* "/home/oliphant/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; @@ -5362,13 +5364,13 @@ return __pyx_r; } -static PyObject *__pyx_k102p; static PyObject *__pyx_k103p; static PyObject *__pyx_k104p; +static PyObject *__pyx_k105p; -static char (__pyx_k102[]) = "n <= 0"; -static char (__pyx_k103[]) = "p < 0"; -static char (__pyx_k104[]) = "p > 1"; +static char (__pyx_k103[]) = "n <= 0"; +static char (__pyx_k104[]) = "p < 0"; +static char (__pyx_k105[]) = "p > 1"; static PyObject *__pyx_f_6mtrand_11RandomState_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_binomial[] = "Binomial distribution of n trials and p probability of success.\n\n binomial(n, p, size=None) -> random values\n "; @@ -5394,21 +5396,21 @@ __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":989 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":990 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":991 */ + /* "/home/oliphant/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; @@ -5434,11 +5436,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k103p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k103p); __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; @@ -5449,7 +5451,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */ + /* "/home/oliphant/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; @@ -5475,11 +5477,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k104p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k104p); __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; @@ -5490,7 +5492,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":995 */ + /* "/home/oliphant/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; @@ -5516,11 +5518,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k105p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k105p); __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; @@ -5531,7 +5533,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":997 */ + /* "/home/oliphant/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; @@ -5556,13 +5558,13 @@ return __pyx_r; } -static PyObject *__pyx_k105p; static PyObject *__pyx_k106p; static PyObject *__pyx_k107p; +static PyObject *__pyx_k108p; -static char (__pyx_k105[]) = "n <= 0"; -static char (__pyx_k106[]) = "p < 0"; -static char (__pyx_k107[]) = "p > 1"; +static char (__pyx_k106[]) = "n <= 0"; +static char (__pyx_k107[]) = "p < 0"; +static char (__pyx_k108[]) = "p > 1"; static PyObject *__pyx_f_6mtrand_11RandomState_negative_binomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_negative_binomial[] = "Negative Binomial distribution.\n\n negative_binomial(n, p, size=None) -> random values\n "; @@ -5588,21 +5590,21 @@ __pyx_v_on = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1006 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1007 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1008 */ + /* "/home/oliphant/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; @@ -5628,11 +5630,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1009 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k106p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k106p); __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; @@ -5643,7 +5645,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1010 */ + /* "/home/oliphant/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; @@ -5669,11 +5671,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1011 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k107p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k107p); __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; @@ -5684,7 +5686,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1012 */ + /* "/home/oliphant/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; @@ -5710,11 +5712,11 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k108p); + PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k108p); __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; @@ -5725,7 +5727,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1014 */ + /* "/home/oliphant/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; @@ -5750,9 +5752,9 @@ return __pyx_r; } -static PyObject *__pyx_k108p; +static PyObject *__pyx_k109p; -static char (__pyx_k108[]) = "lam < 0"; +static char (__pyx_k109[]) = "lam < 0"; static PyObject *__pyx_f_6mtrand_11RandomState_poisson(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_poisson[] = "Poisson distribution.\n\n poisson(lam=1.0, size=None) -> random values\n "; @@ -5775,14 +5777,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1023 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */ + /* "/home/oliphant/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; @@ -5808,11 +5810,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1025 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k109p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k109p); __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; @@ -5823,7 +5825,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1026 */ + /* "/home/oliphant/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; @@ -5846,9 +5848,9 @@ return __pyx_r; } -static PyObject *__pyx_k109p; +static PyObject *__pyx_k110p; -static char (__pyx_k109[]) = "a <= 1.0"; +static char (__pyx_k110[]) = "a <= 1.0"; static PyObject *__pyx_f_6mtrand_11RandomState_zipf(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_zipf[] = "Zipf distribution.\n \n zipf(a, size=None)\n "; @@ -5870,14 +5872,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1034 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */ + /* "/home/oliphant/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; @@ -5903,11 +5905,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k110p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k110p); __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; @@ -5918,7 +5920,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1037 */ + /* "/home/oliphant/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; @@ -5941,11 +5943,11 @@ return __pyx_r; } -static PyObject *__pyx_k110p; static PyObject *__pyx_k111p; +static PyObject *__pyx_k112p; -static char (__pyx_k110[]) = "p < 0.0"; -static char (__pyx_k111[]) = "p > 1.0"; +static char (__pyx_k111[]) = "p < 0.0"; +static char (__pyx_k112[]) = "p > 1.0"; static PyObject *__pyx_f_6mtrand_11RandomState_geometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_geometric[] = "Geometric distribution with p being the probability of \"success\" on\n an individual trial.\n \n geometric(p, size=None)\n "; @@ -5967,14 +5969,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1046 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */ + /* "/home/oliphant/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; @@ -6000,11 +6002,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1048 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k111p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k111p); __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; @@ -6015,7 +6017,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1049 */ + /* "/home/oliphant/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; @@ -6041,11 +6043,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1050 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k112p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k112p); __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; @@ -6056,7 +6058,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1051 */ + /* "/home/oliphant/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; @@ -6081,15 +6083,15 @@ static PyObject *__pyx_n_add; -static PyObject *__pyx_k112p; static PyObject *__pyx_k113p; static PyObject *__pyx_k114p; static PyObject *__pyx_k115p; +static PyObject *__pyx_k116p; -static char (__pyx_k112[]) = "ngood < 1"; -static char (__pyx_k113[]) = "nbad < 1"; -static char (__pyx_k114[]) = "ngood + nbad < nsample"; -static char (__pyx_k115[]) = "nsample < 1"; +static char (__pyx_k113[]) = "ngood < 1"; +static char (__pyx_k114[]) = "nbad < 1"; +static char (__pyx_k115[]) = "ngood + nbad < nsample"; +static char (__pyx_k116[]) = "nsample < 1"; static PyObject *__pyx_f_6mtrand_11RandomState_hypergeometric(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_hypergeometric[] = "Hypergeometric distribution.\n \n Consider an urn with ngood \"good\" balls and nbad \"bad\" balls. If one \n were to draw nsample balls from the urn without replacement, then \n the hypergeometric distribution describes the distribution of \"good\" \n balls in the sample.\n \n hypergeometric(ngood, nbad, nsample, size=None) \n "; @@ -6120,28 +6122,28 @@ __pyx_v_onbad = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); __pyx_v_onsample = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1068 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1070 */ + /* "/home/oliphant/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; @@ -6167,11 +6169,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1071 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k113p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k113p); __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; @@ -6182,7 +6184,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1072 */ + /* "/home/oliphant/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; @@ -6208,11 +6210,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1073 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k114p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k114p); __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; @@ -6223,7 +6225,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1074 */ + /* "/home/oliphant/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; @@ -6259,11 +6261,11 @@ Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1075 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k115p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k115p); __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; @@ -6274,7 +6276,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1076 */ + /* "/home/oliphant/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; @@ -6300,11 +6302,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1077 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k116p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k116p); __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; @@ -6315,7 +6317,7 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1078 */ + /* "/home/oliphant/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; @@ -6343,11 +6345,11 @@ return __pyx_r; } -static PyObject *__pyx_k116p; static PyObject *__pyx_k117p; +static PyObject *__pyx_k118p; -static char (__pyx_k116[]) = "p < 0.0"; -static char (__pyx_k117[]) = "p > 1.0"; +static char (__pyx_k117[]) = "p < 0.0"; +static char (__pyx_k118[]) = "p > 1.0"; static PyObject *__pyx_f_6mtrand_11RandomState_logseries(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_logseries[] = "Logarithmic series distribution.\n \n logseries(p, size=None)\n "; @@ -6369,14 +6371,14 @@ Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1088 */ + /* "/home/oliphant/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; @@ -6402,11 +6404,11 @@ Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k117p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k117p); __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; @@ -6417,7 +6419,7 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1090 */ + /* "/home/oliphant/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; @@ -6443,11 +6445,11 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k118p); + PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k118p); __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; @@ -6458,7 +6460,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1092 */ + /* "/home/oliphant/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; @@ -6493,15 +6495,15 @@ static PyObject *__pyx_n_sqrt; static PyObject *__pyx_n_tuple; -static PyObject *__pyx_k118p; static PyObject *__pyx_k119p; static PyObject *__pyx_k120p; static PyObject *__pyx_k121p; +static PyObject *__pyx_k122p; -static char (__pyx_k118[]) = "mean must be 1 dimensional"; -static char (__pyx_k119[]) = "cov must be 2 dimensional and square"; -static char (__pyx_k120[]) = "mean and cov must have same length"; -static char (__pyx_k121[]) = "numpy.dual"; +static char (__pyx_k119[]) = "mean must be 1 dimensional"; +static char (__pyx_k120[]) = "cov must be 2 dimensional and square"; +static char (__pyx_k121[]) = "mean and cov must have same length"; +static char (__pyx_k122[]) = "numpy.dual"; static PyObject *__pyx_f_6mtrand_11RandomState_multivariate_normal(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_multivariate_normal[] = "Return an array containing multivariate normally distributed random numbers\n with specified mean and covariance.\n\n multivariate_normal(mean, cov) -> random values\n multivariate_normal(mean, cov, [m, n, ...]) -> random values\n\n mean must be a 1 dimensional array. cov must be a square two dimensional\n array with the same number of rows and columns as mean has elements.\n\n The first form returns a single 1-D array containing a multivariate\n normal.\n\n The second form returns an array of shape (m, n, ..., cov.shape[0]).\n In this case, output[i,j,...,:] is a 1-D array containing a multivariate\n normal.\n "; @@ -6537,7 +6539,7 @@ __pyx_v_s = Py_None; Py_INCREF(Py_None); __pyx_v_v = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */ + /* "/home/oliphant/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; @@ -6551,7 +6553,7 @@ __pyx_v_mean = __pyx_3; __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1114 */ + /* "/home/oliphant/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; @@ -6565,11 +6567,11 @@ __pyx_v_cov = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1115 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1115 */ __pyx_4 = __pyx_v_size == Py_None; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1116 */ + /* "/home/oliphant/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; @@ -6578,14 +6580,14 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1118 */ + /* "/home/oliphant/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:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1119 */ + /* "/home/oliphant/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;} @@ -6601,11 +6603,11 @@ Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1120 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k119p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k119p); __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; @@ -6616,7 +6618,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1121 */ + /* "/home/oliphant/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;} @@ -6648,11 +6650,11 @@ } if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1122 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k120p); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k120p); __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; @@ -6663,7 +6665,7 @@ } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1123 */ + /* "/home/oliphant/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;} @@ -6680,11 +6682,11 @@ Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1124 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k121p); + PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k121p); __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; @@ -6695,7 +6697,7 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1126 */ + /* "/home/oliphant/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;} @@ -6710,7 +6712,7 @@ Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_4) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */ + /* "/home/oliphant/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); @@ -6721,7 +6723,7 @@ } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1128 */ + /* "/home/oliphant/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, 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;} @@ -6734,7 +6736,7 @@ __pyx_v_final_shape = __pyx_1; __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1129 */ + /* "/home/oliphant/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;} @@ -6749,7 +6751,7 @@ Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1133 */ + /* "/home/oliphant/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;} @@ -6772,7 +6774,7 @@ __pyx_v_x = __pyx_5; __pyx_5 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1134 */ + /* "/home/oliphant/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; @@ -6811,11 +6813,11 @@ 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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1143 */ + /* "/home/oliphant/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); - __pyx_3 = __Pyx_Import(__pyx_k121p, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;} + __pyx_3 = __Pyx_Import(__pyx_k122p, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_svd); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;} Py_DECREF(__pyx_v_svd); @@ -6823,7 +6825,7 @@ __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1145 */ + /* "/home/oliphant/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); @@ -6846,7 +6848,7 @@ if (__Pyx_EndUnpack(__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1146 */ + /* "/home/oliphant/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; @@ -6873,7 +6875,7 @@ __pyx_v_x = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1149 */ + /* "/home/oliphant/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; @@ -6889,7 +6891,7 @@ Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */ + /* "/home/oliphant/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); @@ -6900,7 +6902,7 @@ 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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1151 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1151 */ Py_INCREF(__pyx_v_x); __pyx_r = __pyx_v_x; goto __pyx_L0; @@ -6931,9 +6933,9 @@ static PyObject *__pyx_n_zeros; -static PyObject *__pyx_k123p; +static PyObject *__pyx_k124p; -static char (__pyx_k123[]) = "sum(pvals) > 1.0"; +static char (__pyx_k124[]) = "sum(pvals) > 1.0"; static PyObject *__pyx_f_6mtrand_11RandomState_multinomial(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_multinomial[] = "Multinomial distribution.\n \n multinomial(n, pvals, size=None) -> random values\n\n pvals is a sequence of probabilities that should sum to 1 (however, the\n last element is always assumed to account for the remaining probability\n as long as sum(pvals[:-1]) <= 1).\n "; @@ -6969,7 +6971,7 @@ __pyx_v_shape = Py_None; Py_INCREF(Py_None); __pyx_v_multin = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1169 */ + /* "/home/oliphant/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); @@ -6981,25 +6983,25 @@ Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_v_d = __pyx_4; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1170 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1171 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1171 */ __pyx_v_pix = ((double (*))arrayObject_parr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1174 */ + /* "/home/oliphant/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); + Py_INCREF(__pyx_k124p); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k124p); __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; @@ -7010,11 +7012,11 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1176 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1176 */ __pyx_5 = __pyx_v_size == Py_None; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1177 */ + /* "/home/oliphant/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); @@ -7037,7 +7039,7 @@ Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1179 */ + /* "/home/oliphant/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); @@ -7051,7 +7053,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1181 */ + /* "/home/oliphant/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); @@ -7064,7 +7066,7 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */ + /* "/home/oliphant/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; @@ -7081,68 +7083,68 @@ __pyx_v_multin = __pyx_3; __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */ + /* "/home/oliphant/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); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1185 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1185 */ __pyx_v_mnix = ((long (*))arrayObject_mnarr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1186 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1186 */ __pyx_v_i = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1187 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1187 */ while (1) { __pyx_5 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr)); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1188 */ __pyx_v_Sum = 1.0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1189 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1189 */ __pyx_v_dn = __pyx_v_n; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1190 */ + /* "/home/oliphant/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) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1191 */ + /* "/home/oliphant/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)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1192 */ __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1193 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1193 */ __pyx_5 = (__pyx_v_dn <= 0); if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1194 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1194 */ goto __pyx_L7; goto __pyx_L8; } __pyx_L8:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1195 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1195 */ __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j])); } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1196 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1196 */ __pyx_5 = (__pyx_v_dn > 0); if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1197 */ + /* "/home/oliphant/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:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1199 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1199 */ __pyx_v_i = (__pyx_v_i + __pyx_v_d); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1201 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1201 */ Py_INCREF(__pyx_v_multin); __pyx_r = __pyx_v_multin; goto __pyx_L0; @@ -7166,6 +7168,205 @@ return __pyx_r; } +static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static char __pyx_doc_6mtrand_11RandomState_dirichlet[] = "dirichlet(alpha, size=None)\n \n Draw `size` samples of dimension k from a Dirichlet distribution. A \n Dirichlet-distributed random variable can be seen as a multivariate \n generalization of a Beta distribution. Dirichlet pdf is the conjugate\n prior of a multinomial in Bayesian inference.\n \n :Parameters:\n alpha : array\n parameter of the distribution (k dimension\n for sample of dimension k).\n size : array\n number of samples to draw.\n\n $X \approx \\prod_{i=1}^{k}{x^{\alpha_i-1}_i}$\n \n Uses the following property for computation: for each dimension,\n draw a random sample y_i from a standard gamma generator of shape \n alpha_i, then X = \frac{1}{\\sum_{i=1}^k{y_i}} (y_1, ..., y_n) is \n Dirichlet distributed. \n \n Reference:\n - David Mc Kay : Information Theory, inference and Learning \n algorithms, chapter 23. the book is available for free at \n http://www.inference.phy.cam.ac.uk/mackay/\n "; +static PyObject *__pyx_f_6mtrand_11RandomState_dirichlet(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + PyObject *__pyx_v_alpha = 0; + PyObject *__pyx_v_size = 0; + long __pyx_v_k; + long __pyx_v_totsize; + PyArrayObject *__pyx_v_alpha_arr; + PyArrayObject *__pyx_v_val_arr; + double (*__pyx_v_alpha_data); + double (*__pyx_v_val_data); + long __pyx_v_i; + long __pyx_v_j; + double __pyx_v_acc; + double __pyx_v_invacc; + PyObject *__pyx_v_shape; + PyObject *__pyx_v_diric; + PyObject *__pyx_r; + PyObject *__pyx_1 = 0; + PyObject *__pyx_2 = 0; + PyObject *__pyx_3 = 0; + long __pyx_4; + int __pyx_5; + static char *__pyx_argnames[] = {"alpha","size",0}; + __pyx_v_size = __pyx_k60; + if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O|O", __pyx_argnames, &__pyx_v_alpha, &__pyx_v_size)) return 0; + Py_INCREF(__pyx_v_self); + Py_INCREF(__pyx_v_alpha); + Py_INCREF(__pyx_v_size); + __pyx_v_alpha_arr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + __pyx_v_val_arr = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + __pyx_v_shape = Py_None; Py_INCREF(Py_None); + __pyx_v_diric = Py_None; Py_INCREF(Py_None); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1258 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + Py_INCREF(__pyx_v_alpha); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_alpha); + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; 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 = 1258; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_v_k = __pyx_4; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1259 */ + __pyx_1 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} + Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); + Py_DECREF(((PyObject *)__pyx_v_alpha_arr)); + __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_1); + Py_DECREF(__pyx_1); __pyx_1 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1260 */ + __pyx_v_alpha_data = ((double (*))__pyx_v_alpha_arr->data); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1262 */ + __pyx_5 = __pyx_v_size == Py_None; + if (__pyx_5) { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1263 */ + __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1263; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); + __pyx_2 = 0; + Py_DECREF(__pyx_v_shape); + __pyx_v_shape = __pyx_3; + __pyx_3 = 0; + goto __pyx_L2; + } + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; goto __pyx_L1;} + Py_INCREF(__pyx_v_size); + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1264; 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 = 1264; goto __pyx_L1;} + __pyx_5 = __pyx_3 == __pyx_1; + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_1); __pyx_1 = 0; + if (__pyx_5) { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1265 */ + __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1265; goto __pyx_L1;} + Py_INCREF(__pyx_v_size); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_size); + PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2); + __pyx_2 = 0; + Py_DECREF(__pyx_v_shape); + __pyx_v_shape = __pyx_3; + __pyx_3 = 0; + goto __pyx_L2; + } + /*else*/ { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1267 */ + __pyx_1 = PyInt_FromLong(__pyx_v_k); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} + PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); + __pyx_1 = 0; + __pyx_3 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1267; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_v_shape); + __pyx_v_shape = __pyx_3; + __pyx_3 = 0; + } + __pyx_L2:; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1269 */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} + Py_DECREF(__pyx_1); __pyx_1 = 0; + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_float64); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; 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 = 1269; goto __pyx_L1;} + Py_INCREF(__pyx_v_shape); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_shape); + PyTuple_SET_ITEM(__pyx_3, 1, __pyx_1); + __pyx_1 = 0; + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_v_diric); + __pyx_v_diric = __pyx_1; + __pyx_1 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1270 */ + Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_diric))); + Py_DECREF(((PyObject *)__pyx_v_val_arr)); + __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1271 */ + __pyx_v_val_data = ((double (*))__pyx_v_val_arr->data); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1273 */ + __pyx_v_i = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1274 */ + __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1275 */ + while (1) { + __pyx_5 = (__pyx_v_i < __pyx_v_totsize); + if (!__pyx_5) break; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1276 */ + __pyx_v_acc = 0.0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1277 */ + for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1278 */ + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = rk_standard_gamma(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,(__pyx_v_alpha_data[__pyx_v_j])); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1279 */ + __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)])); + } + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1280 */ + __pyx_v_invacc = (1 / __pyx_v_acc); + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1281 */ + for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1282 */ + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc); + } + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1283 */ + __pyx_v_i = (__pyx_v_i + __pyx_v_k); + } + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1285 */ + Py_INCREF(__pyx_v_diric); + __pyx_r = __pyx_v_diric; + goto __pyx_L0; + + __pyx_r = Py_None; Py_INCREF(Py_None); + goto __pyx_L0; + __pyx_L1:; + Py_XDECREF(__pyx_1); + Py_XDECREF(__pyx_2); + Py_XDECREF(__pyx_3); + __Pyx_AddTraceback("mtrand.RandomState.dirichlet"); + __pyx_r = 0; + __pyx_L0:; + Py_DECREF(__pyx_v_alpha_arr); + Py_DECREF(__pyx_v_val_arr); + Py_DECREF(__pyx_v_shape); + Py_DECREF(__pyx_v_diric); + Py_DECREF(__pyx_v_self); + Py_DECREF(__pyx_v_alpha); + Py_DECREF(__pyx_v_size); + return __pyx_r; +} + static PyObject *__pyx_n_hasattr; static PyObject *__pyx_n_copy; @@ -7188,37 +7389,37 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_x); - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1296 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); 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 = 1296; 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;} - __pyx_2 = PyNumber_Subtract(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1212; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} + __pyx_2 = PyNumber_Subtract(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} 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 = 1212; goto __pyx_L1;} + __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_i = __pyx_4; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1213 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1297 */ /*try:*/ { - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1298 */ + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_len); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L2;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L2;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L2;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L2;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L2;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); 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 = 1298; 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;} + __pyx_4 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1298; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_j = __pyx_4; } @@ -7228,142 +7429,142 @@ Py_XDECREF(__pyx_1); __pyx_1 = 0; Py_XDECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1299 */ /*except:*/ { __Pyx_AddTraceback("mtrand.shuffle"); - __pyx_3 = __Pyx_GetExcValue(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; goto __pyx_L1;} + __pyx_3 = __Pyx_GetExcValue(); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1216 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1300 */ __pyx_v_j = 0; goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1218 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1302 */ __pyx_5 = (__pyx_v_j == 0); if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1220 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1304 */ while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1221 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1305 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1306 */ + __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} - __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_i); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 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;} + __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1307 */ __pyx_v_i = (__pyx_v_i - 1); } goto __pyx_L4; } /*else*/ { - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1310 */ + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_hasattr); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; 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;} + __pyx_1 = PyTuple_New(2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_2); Py_INCREF(__pyx_n_copy); 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;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; 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;} + __pyx_5 = PyInt_AsLong(__pyx_2); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_copy = __pyx_5; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1227 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1311 */ __pyx_5 = __pyx_v_copy; if (__pyx_5) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1228 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1312 */ while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1229 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1313 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1314 */ + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} + __pyx_1 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_copy); if (!__pyx_2) {__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 = 1314; 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;} + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; 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;} + __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; 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;} + __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__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 = 1314; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 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;} + __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_1, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 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 = 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;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1231 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1315 */ __pyx_v_i = (__pyx_v_i - 1); } goto __pyx_L7; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1233 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1317 */ while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1234 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1318 */ __pyx_v_j = rk_interval(__pyx_v_i,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/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_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1319 */ + __pyx_1 = PyInt_FromLong(__pyx_v_j); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1235; goto __pyx_L1;} + __pyx_3 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; 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 = 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;} + __pyx_1 = PyInt_FromLong(__pyx_v_i); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; 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;} + __pyx_1 = PySequence_GetSlice(__pyx_2, 0, 0x7fffffff); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; 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;} + __pyx_2 = PyInt_FromLong(__pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; 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;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1319; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1236 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1320 */ __pyx_v_i = (__pyx_v_i - 1); } } @@ -7405,37 +7606,37 @@ Py_INCREF(__pyx_v_x); __pyx_v_arr = Py_None; Py_INCREF(Py_None); - /* "/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;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_integer); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1328 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_isinstance); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_integer); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; 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 = 1244; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4); __pyx_2 = 0; __pyx_4 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_3); __pyx_3 = 0; - __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); 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 = 1328; 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;} + __pyx_5 = PyObject_IsTrue(__pyx_4); if (__pyx_5 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_5) { - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1329 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_arange); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; 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;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1329; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); 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 = 1329; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_arr); @@ -7445,14 +7646,14 @@ } /*else*/ { - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1331 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1331; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1331; 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;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1331; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); 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 = 1331; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_arr); @@ -7461,17 +7662,17 @@ } __pyx_L2:; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1332 */ + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1332; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1332; goto __pyx_L1;} Py_INCREF(__pyx_v_arr); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_arr); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_1); 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 = 1332; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1333 */ Py_INCREF(__pyx_v_arr); __pyx_r = __pyx_v_arr; goto __pyx_L0; @@ -7508,6 +7709,7 @@ {&__pyx_n_bytes, "bytes"}, {&__pyx_n_chisquare, "chisquare"}, {&__pyx_n_copy, "copy"}, + {&__pyx_n_dirichlet, "dirichlet"}, {&__pyx_n_dot, "dot"}, {&__pyx_n_empty, "empty"}, {&__pyx_n_equal, "equal"}, @@ -7578,16 +7780,15 @@ }; static __Pyx_StringTabEntry __pyx_string_tab[] = { - {&__pyx_k60p, __pyx_k60, sizeof(__pyx_k60)}, {&__pyx_k61p, __pyx_k61, sizeof(__pyx_k61)}, {&__pyx_k62p, __pyx_k62, sizeof(__pyx_k62)}, {&__pyx_k63p, __pyx_k63, sizeof(__pyx_k63)}, {&__pyx_k64p, __pyx_k64, sizeof(__pyx_k64)}, {&__pyx_k65p, __pyx_k65, sizeof(__pyx_k65)}, - {&__pyx_k68p, __pyx_k68, sizeof(__pyx_k68)}, + {&__pyx_k66p, __pyx_k66, sizeof(__pyx_k66)}, {&__pyx_k69p, __pyx_k69, sizeof(__pyx_k69)}, {&__pyx_k70p, __pyx_k70, sizeof(__pyx_k70)}, - {&__pyx_k72p, __pyx_k72, sizeof(__pyx_k72)}, + {&__pyx_k71p, __pyx_k71, sizeof(__pyx_k71)}, {&__pyx_k73p, __pyx_k73, sizeof(__pyx_k73)}, {&__pyx_k74p, __pyx_k74, sizeof(__pyx_k74)}, {&__pyx_k75p, __pyx_k75, sizeof(__pyx_k75)}, @@ -7637,7 +7838,8 @@ {&__pyx_k119p, __pyx_k119, sizeof(__pyx_k119)}, {&__pyx_k120p, __pyx_k120, sizeof(__pyx_k120)}, {&__pyx_k121p, __pyx_k121, sizeof(__pyx_k121)}, - {&__pyx_k123p, __pyx_k123, sizeof(__pyx_k123)}, + {&__pyx_k122p, __pyx_k122, sizeof(__pyx_k122)}, + {&__pyx_k124p, __pyx_k124, sizeof(__pyx_k124)}, {0, 0, 0} }; @@ -7715,6 +7917,7 @@ {"logseries", (PyCFunction)__pyx_f_6mtrand_11RandomState_logseries, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_logseries}, {"multivariate_normal", (PyCFunction)__pyx_f_6mtrand_11RandomState_multivariate_normal, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_multivariate_normal}, {"multinomial", (PyCFunction)__pyx_f_6mtrand_11RandomState_multinomial, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_multinomial}, + {"dirichlet", (PyCFunction)__pyx_f_6mtrand_11RandomState_dirichlet, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_dirichlet}, {"shuffle", (PyCFunction)__pyx_f_6mtrand_11RandomState_shuffle, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_shuffle}, {"permutation", (PyCFunction)__pyx_f_6mtrand_11RandomState_permutation, METH_VARARGS|METH_KEYWORDS, __pyx_doc_6mtrand_11RandomState_permutation}, {0, 0, 0, 0} @@ -7878,37 +8081,37 @@ 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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":119 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":119 */ import_array(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":121 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":476 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":476 */ Py_INCREF(Py_None); __pyx_k2 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":486 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":486 */ Py_INCREF(Py_None); __pyx_k3 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":547 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":547 */ Py_INCREF(Py_None); __pyx_k4 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":554 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":554 */ Py_INCREF(Py_None); __pyx_k5 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":561 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":561 */ Py_INCREF(Py_None); __pyx_k6 = Py_None; Py_INCREF(Py_None); __pyx_k7 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":607 */ + /* "/home/oliphant/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; @@ -7918,17 +8121,17 @@ Py_INCREF(Py_None); __pyx_k10 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":655 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":655 */ Py_INCREF(Py_None); __pyx_k11 = Py_None; Py_INCREF(Py_None); __pyx_k12 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":668 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":668 */ Py_INCREF(Py_None); __pyx_k13 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":675 */ + /* "/home/oliphant/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; @@ -7938,73 +8141,73 @@ Py_INCREF(Py_None); __pyx_k16 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":688 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":688 */ Py_INCREF(Py_None); __pyx_k17 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":704 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":715 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":715 */ Py_INCREF(Py_None); __pyx_k20 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":722 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":722 */ Py_INCREF(Py_None); __pyx_k21 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":733 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":748 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":748 */ Py_INCREF(Py_None); __pyx_k24 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":763 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":763 */ Py_INCREF(Py_None); __pyx_k25 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":784 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":784 */ Py_INCREF(Py_None); __pyx_k26 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":795 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":795 */ Py_INCREF(Py_None); __pyx_k27 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":811 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":811 */ Py_INCREF(Py_None); __pyx_k28 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":818 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":818 */ Py_INCREF(Py_None); __pyx_k29 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":829 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":829 */ Py_INCREF(Py_None); __pyx_k30 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":843 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":843 */ Py_INCREF(Py_None); __pyx_k31 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":854 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":854 */ Py_INCREF(Py_None); __pyx_k32 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":865 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":865 */ Py_INCREF(Py_None); __pyx_k33 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":876 */ + /* "/home/oliphant/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; @@ -8014,7 +8217,7 @@ Py_INCREF(Py_None); __pyx_k36 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":889 */ + /* "/home/oliphant/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; @@ -8024,7 +8227,7 @@ Py_INCREF(Py_None); __pyx_k39 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":902 */ + /* "/home/oliphant/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; @@ -8034,7 +8237,7 @@ Py_INCREF(Py_None); __pyx_k42 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":915 */ + /* "/home/oliphant/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; @@ -8044,379 +8247,390 @@ Py_INCREF(Py_None); __pyx_k45 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":933 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":944 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":944 */ Py_INCREF(Py_None); __pyx_k48 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":959 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":959 */ Py_INCREF(Py_None); __pyx_k49 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":982 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":982 */ Py_INCREF(Py_None); __pyx_k50 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":999 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":999 */ Py_INCREF(Py_None); __pyx_k51 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1017 */ + /* "/home/oliphant/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; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1028 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1028 */ Py_INCREF(Py_None); __pyx_k54 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1039 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1039 */ Py_INCREF(Py_None); __pyx_k55 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1053 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1053 */ Py_INCREF(Py_None); __pyx_k56 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1081 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1081 */ Py_INCREF(Py_None); __pyx_k57 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1095 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1095 */ Py_INCREF(Py_None); __pyx_k58 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ Py_INCREF(Py_None); __pyx_k59 = Py_None; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1203 */ + Py_INCREF(Py_None); + __pyx_k60 = Py_None; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1335 */ + __pyx_17 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1335; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1335; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1336 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1337 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1338 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1338; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1338; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1338; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1339 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1339; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1339; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1339; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1340 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1340; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1340; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1340; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1341 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1341; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1341; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1341; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1342 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1342; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1342; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1342; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1343 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1343; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1343; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1343; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1344 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1344; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1344; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1344; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1345 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1345; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1346 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1346; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1346; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1346; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1347 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1347; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1347; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1347; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1348 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1348; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1348; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1348; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1349 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1350 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1350; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1351 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1352 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1353 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1353; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1353; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1353; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1354 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1355 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1356 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1356; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1356; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1356; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1357 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1357; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1357; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1357; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1358 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1359 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1360 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1361 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1362 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1363 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1364 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1365 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1365; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1365; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1365; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1366 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1366; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1366; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1366; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1367 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1367; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1367; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1367; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1368 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1368; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1368; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1368; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1369 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1369; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1369; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1369; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1371 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1371; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1371; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1371; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1372 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1372; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1372; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1372; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1373 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1373; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1373; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1373; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1374 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1374; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1374; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1374; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1375 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_geometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1375; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1376 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1376; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1377 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1377; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1379 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1379; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1379; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1379; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1380 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1380; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1380; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1380; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1381 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_dirichlet); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; 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;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_dirichlet, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/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;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1383 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; - if (PyObject_SetAttr(__pyx_m, __pyx_n_permutation, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_shuffle, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1384 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + Py_DECREF(__pyx_17); __pyx_17 = 0; + if (PyObject_SetAttr(__pyx_m, __pyx_n_permutation, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + Py_DECREF(__pyx_18); __pyx_18 = 0; return; __pyx_L1:; Py_XDECREF(__pyx_1); Modified: trunk/numpy/random/mtrand/mtrand.pyx =================================================================== --- trunk/numpy/random/mtrand/mtrand.pyx 2007-02-01 20:34:56 UTC (rev 3530) +++ trunk/numpy/random/mtrand/mtrand.pyx 2007-02-01 21:14:12 UTC (rev 3531) @@ -1200,6 +1200,90 @@ return multin + def dirichlet(self, object alpha, size=None): + """dirichlet(alpha, size=None) + + Draw `size` samples of dimension k from a Dirichlet distribution. A + Dirichlet-distributed random variable can be seen as a multivariate + generalization of a Beta distribution. Dirichlet pdf is the conjugate + prior of a multinomial in Bayesian inference. + + :Parameters: + alpha : array + parameter of the distribution (k dimension + for sample of dimension k). + size : array + number of samples to draw. + + $X \approx \prod_{i=1}^{k}{x^{\alpha_i-1}_i}$ + + Uses the following property for computation: for each dimension, + draw a random sample y_i from a standard gamma generator of shape + alpha_i, then X = \frac{1}{\sum_{i=1}^k{y_i}} (y_1, ..., y_n) is + Dirichlet distributed. + + Reference: + - David Mc Kay : Information Theory, inference and Learning + algorithms, chapter 23. the book is available for free at + http://www.inference.phy.cam.ac.uk/mackay/ + """ + + #================= + # Pure python algo + #================= + #alpha = N.atleast_1d(alpha) + #k = alpha.size + + #if n == 1: + # val = N.zeros(k) + # for i in range(k): + # val[i] = sgamma(alpha[i], n) + # val /= N.sum(val) + #else: + # val = N.zeros((k, n)) + # for i in range(k): + # val[i] = sgamma(alpha[i], n) + # val /= N.sum(val, axis = 0) + # val = val.T + + #return val + + cdef long k + cdef long totsize + cdef ndarray alpha_arr, val_arr + cdef double *alpha_data, *val_data + cdef long i, j + cdef double acc, invacc + + k = len(alpha) + alpha_arr = PyArray_ContiguousFromObject(alpha, NPY_DOUBLE, 1, 1) + alpha_data = alpha_arr.data + + if size is None: + shape = (k,) + elif type(size) is int: + shape = (size, k) + else: + shape = size + (k,) + + diric = _sp.zeros(shape, _sp.float64) + val_arr = diric + val_data= val_arr.data + + i = 0 + totsize = PyArray_SIZE(val_arr) + while i < totsize: + acc = 0.0 + for j from 0 <= j < k: + val_data[i+j] = rk_standard_gamma(self.internal_state, alpha_data[j]) + acc = acc + val_data[i+j] + invacc = 1/acc + for j from 0 <= j < k: + val_data[i+j] = val_data[i+j] * invacc + i = i + k + + return diric + # Shuffling and permutations: def shuffle(self, object x): """Modify a sequence in-place by shuffling its contents. @@ -1294,6 +1378,7 @@ multivariate_normal = _rand.multivariate_normal multinomial = _rand.multinomial +dirichlet = _rand.dirichlet shuffle = _rand.shuffle permutation = _rand.permutation From numpy-svn at scipy.org Thu Feb 1 19:47:36 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 18:47:36 -0600 (CST) Subject: [Numpy-svn] r3532 - trunk/numpy/lib Message-ID: <20070202004736.CF11839C069@new.scipy.org> Author: oliphant Date: 2007-02-01 18:47:34 -0600 (Thu, 01 Feb 2007) New Revision: 3532 Modified: trunk/numpy/lib/utils.py Log: Add memory_bounds and may_share_memory functions to numpy. Modified: trunk/numpy/lib/utils.py =================================================================== --- trunk/numpy/lib/utils.py 2007-02-01 21:14:12 UTC (rev 3531) +++ trunk/numpy/lib/utils.py 2007-02-02 00:47:34 UTC (rev 3532) @@ -7,7 +7,8 @@ __all__ = ['issubclass_', 'get_numpy_include', 'issubsctype', 'issubdtype', 'deprecate', 'get_numarray_include', - 'get_include', 'info', 'source', 'who'] + 'get_include', 'info', 'source', 'who', + 'memory_bounds', 'may_share_memory'] def issubclass_(arg1, arg2): try: @@ -101,6 +102,56 @@ get_numpy_include = deprecate(get_include, 'get_numpy_include', 'get_include') +#-------------------------------------------- +# Determine if two arrays can share memory +#-------------------------------------------- + +def memory_bounds(a): + """(low, high) are pointers to the end-points of an array + + low is the first byte + high is just *past* the last byte + + The array provided must conform to the Python-side of the array interface + """ + ai = a.__array_interface__ + a_data = ai['data'][0] + astrides = ai['strides'] + ashape = ai['shape'] + nd_a = len(ashape) + bytes_a = int(ai['typestr'][2:]) + + # a_low points to first element of array + # a_high points to last element of the array + + a_low = a_high = a_data + if astrides is None: # contiguous case + a_high += product(ashape, dtype=int)*bytes_a + else: + for shape, stride in zip(ashape, astrides): + if stride < 0: + a_low += (shape-1)*stride + else: + a_high += (shape-1)*stride + a_high += bytes_a + return a_low, a_high + + +def may_share_memory(a, b): + """Determine if two arrays can share memory + + The memory-bounds of a and b are computed. If they overlap then + this function returns True. Otherwise, it returns False. + + A return of True does not necessarily mean that the two arrays + share any element. It just means that they *might*. + """ + a_low, a_high = memory_bounds(a) + b_low, b_high = memory_bounds(b) + if b_low >= a_high or a_low >= b_high: + return False + return True + #----------------------------------------------------------------------------- # Function for output and information on the variables used. #----------------------------------------------------------------------------- From numpy-svn at scipy.org Thu Feb 1 19:55:41 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 18:55:41 -0600 (CST) Subject: [Numpy-svn] r3533 - trunk/numpy/lib Message-ID: <20070202005541.BA8DC39C0DE@new.scipy.org> Author: oliphant Date: 2007-02-01 18:55:40 -0600 (Thu, 01 Feb 2007) New Revision: 3533 Modified: trunk/numpy/lib/utils.py Log: Fix a comment string. Modified: trunk/numpy/lib/utils.py =================================================================== --- trunk/numpy/lib/utils.py 2007-02-02 00:47:34 UTC (rev 3532) +++ trunk/numpy/lib/utils.py 2007-02-02 00:55:40 UTC (rev 3533) @@ -121,9 +121,6 @@ nd_a = len(ashape) bytes_a = int(ai['typestr'][2:]) - # a_low points to first element of array - # a_high points to last element of the array - a_low = a_high = a_data if astrides is None: # contiguous case a_high += product(ashape, dtype=int)*bytes_a From numpy-svn at scipy.org Thu Feb 1 19:57:45 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 1 Feb 2007 18:57:45 -0600 (CST) Subject: [Numpy-svn] r3534 - trunk/numpy/lib Message-ID: <20070202005745.92FD239C069@new.scipy.org> Author: oliphant Date: 2007-02-01 18:57:43 -0600 (Thu, 01 Feb 2007) New Revision: 3534 Modified: trunk/numpy/lib/utils.py Log: Fix docstring and rename to byte_bounds. Modified: trunk/numpy/lib/utils.py =================================================================== --- trunk/numpy/lib/utils.py 2007-02-02 00:55:40 UTC (rev 3533) +++ trunk/numpy/lib/utils.py 2007-02-02 00:57:43 UTC (rev 3534) @@ -8,7 +8,7 @@ __all__ = ['issubclass_', 'get_numpy_include', 'issubsctype', 'issubdtype', 'deprecate', 'get_numarray_include', 'get_include', 'info', 'source', 'who', - 'memory_bounds', 'may_share_memory'] + 'byte_bounds', 'may_share_memory'] def issubclass_(arg1, arg2): try: @@ -106,12 +106,15 @@ # Determine if two arrays can share memory #-------------------------------------------- -def memory_bounds(a): +def byte_bounds(a): """(low, high) are pointers to the end-points of an array low is the first byte high is just *past* the last byte + If the array is not single-segment, then it may not actually + use every byte between these bounds. + The array provided must conform to the Python-side of the array interface """ ai = a.__array_interface__ @@ -143,8 +146,8 @@ A return of True does not necessarily mean that the two arrays share any element. It just means that they *might*. """ - a_low, a_high = memory_bounds(a) - b_low, b_high = memory_bounds(b) + a_low, a_high = byte_bounds(a) + b_low, b_high = byte_bounds(b) if b_low >= a_high or a_low >= b_high: return False return True From numpy-svn at scipy.org Sat Feb 3 05:34:07 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 3 Feb 2007 04:34:07 -0600 (CST) Subject: [Numpy-svn] r3535 - trunk/numpy/numarray Message-ID: <20070203103407.4FFD039C052@new.scipy.org> Author: stefan Date: 2007-02-03 04:33:58 -0600 (Sat, 03 Feb 2007) New Revision: 3535 Modified: trunk/numpy/numarray/__init__.py Log: Import NewAxis for numarray compatibility. Modified: trunk/numpy/numarray/__init__.py =================================================================== --- trunk/numpy/numarray/__init__.py 2007-02-02 00:57:43 UTC (rev 3534) +++ trunk/numpy/numarray/__init__.py 2007-02-03 10:33:58 UTC (rev 3535) @@ -2,6 +2,7 @@ from numerictypes import * from functions import * from ufuncs import * +from compat import * from session import * import util From numpy-svn at scipy.org Sat Feb 3 06:34:51 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 3 Feb 2007 05:34:51 -0600 (CST) Subject: [Numpy-svn] r3536 - trunk/numpy/doc Message-ID: <20070203113451.19F8A39C100@new.scipy.org> Author: stefan Date: 2007-02-03 05:34:42 -0600 (Sat, 03 Feb 2007) New Revision: 3536 Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt Log: Comment on __docformat__ in documentation standard. Fix reference to math, :lm:eqn -> :lm:`eqn`. Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt =================================================================== --- trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-03 10:33:58 UTC (rev 3535) +++ trunk/numpy/doc/HOWTO_DOCUMENT.txt 2007-02-03 11:34:42 UTC (rev 3536) @@ -85,20 +85,28 @@ 5) The Notes section can contain algorithmic information if that is useful. -6) The Examples section is strongly encouraged. The examples can provide a mini-tutorial as well as additional regression testing. +6) The Examples section is strongly encouraged. The examples can provide a mini-tutorial as well as additional regression testing. Common reST concepts: +A reST-documented module should define + + __docformat__ = 'restructuredtext' + +at the top level in accordance with PEP 258. Note that the +__docformat__ variable in a package's __init__.py file does not apply +to objects defined in subpackages and submodules. + For paragraphs, indentation is significant and indicates indentation in the output. New paragraphs are marked with blank line. Use *italics*, **bold**, and ``courier`` if needed in any explanations (but not for variable names and doctest code or multi-line code) -Use :lm:eqn for in-line math in latex format (remember to use the -raw-format for your text string or escape any '\' symbols). Use :m:eqn -for non-latex math. +Use :lm:`eqn` for in-line math in latex format (remember to use the +raw-format for your text string or escape any '\' symbols). Use +:m:`eqn` for non-latex math. A more extensive example of reST markup can be found here: http://docutils.sourceforge.net/docs/user/rst/demo.txt From numpy-svn at scipy.org Sat Feb 3 10:30:09 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 3 Feb 2007 09:30:09 -0600 (CST) Subject: [Numpy-svn] r3537 - trunk/numpy/core Message-ID: <20070203153009.0C09D39C100@new.scipy.org> Author: stefan Date: 2007-02-03 09:30:00 -0600 (Sat, 03 Feb 2007) New Revision: 3537 Modified: trunk/numpy/core/arrayprint.py Log: Update docstrings. Modified: trunk/numpy/core/arrayprint.py =================================================================== --- trunk/numpy/core/arrayprint.py 2007-02-03 11:34:42 UTC (rev 3536) +++ trunk/numpy/core/arrayprint.py 2007-02-03 15:30:00 UTC (rev 3537) @@ -3,6 +3,7 @@ $Id: arrayprint.py,v 1.9 2005/09/13 13:58:44 teoliphant Exp $ """ __all__ = ["array2string", "set_printoptions", "get_printoptions"] +__docformat__ = 'restructuredtext' # # Written by Konrad Hinsen @@ -68,21 +69,21 @@ linewidth=None, suppress=None): """Set options associated with printing. - precision the default number of digits of precision for floating - point output - (default 8) - threshold total number of array elements which trigger summarization - rather than full repr. - (default 1000) - edgeitems number of array items in summary at beginning and end of - each dimension. - (default 3) - linewidth the number of characters per line for the purpose of inserting - line breaks. - (default 75) - suppress Boolean value indicating whether or not suppress printing - of small floating point values using scientific notation - (default False) + :Parameters: + precision : int + Number of digits of precision for floating point output (default 8). + threshold : int + Total number of array elements which trigger summarization + rather than full repr (default 1000). + edgeitems : int + Number of array items in summary at beginning and end of + each dimension (default 3). + linewidth : int + The number of characters per line for the purpose of inserting + line breaks (default 75). + suppress : bool + Whether or not suppress printing of small floating point values + using scientific notation (default False). """ global _summaryThreshold, _summaryEdgeItems, _float_output_precision, \ @@ -100,6 +101,19 @@ return def get_printoptions(): + """Return the current print options. + + :Returns: + precision : int + threshold : int + edgeitems : int + linewidth : int + suppress : bool + + :SeeAlso: + - set_printoptions : parameter descriptions + + """ return _float_output_precision, _summaryThreshold, _summaryEdgeItems, \ _line_width, _float_output_suppress_small @@ -205,7 +219,38 @@ def array2string(a, max_line_width = None, precision = None, suppress_small = None, separator=' ', prefix="", style=repr): + """Return a string representation of an array. + :Parameters: + a : ndarray + Input array. + max_line_width : int + The maximum number of columns the string should span. Newline + characters splits the string appropriately after array elements. + precision : int + Floating point precision. + suppress_small : bool + Represent very small numbers as zero. + separator : string + Inserted between elements. + prefix : string + An array is typically printed as + + 'prefix(' + array2string(a) + ')' + + The length of the prefix string is used to align the + output correctly. + style : function + + Examples + -------- + + >>> x = array([1e-16,1,2,3]) + >>> print array2string(x,precision=2,separator=',',suppress_small=True) + [ 0., 1., 2., 3.] + + """ + if a.shape == (): x = a.item() try: From numpy-svn at scipy.org Sun Feb 4 19:24:56 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 4 Feb 2007 18:24:56 -0600 (CST) Subject: [Numpy-svn] r3538 - in trunk/numpy/distutils: . fcompiler Message-ID: <20070205002456.A046C39C02F@new.scipy.org> Author: edschofield Date: 2007-02-04 18:24:42 -0600 (Sun, 04 Feb 2007) New Revision: 3538 Modified: trunk/numpy/distutils/cpuinfo.py trunk/numpy/distutils/fcompiler/gnu.py Log: Fixed detection of Core2 CPUs (scipy ticket #349) Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2007-02-03 15:30:00 UTC (rev 3537) +++ trunk/numpy/distutils/cpuinfo.py 2007-02-05 00:24:42 UTC (rev 3538) @@ -185,8 +185,13 @@ return self.is_PentiumIV() and self.has_sse3() def _is_Nocona(self): - return self.is_PentiumIV() and self.is_64bit() - + return self.is_64bit() and self.is_i686() + + def _is_Core2(self): + return self.is_64bit() and self.is_Intel() and \ + re.match(r'.*?Core\(TM\)2\b', \ + self.info[0]['model name']) is not None + def _is_Itanium(self): return re.match(r'.*?Itanium\b', self.info[0]['family']) is not None Modified: trunk/numpy/distutils/fcompiler/gnu.py =================================================================== --- trunk/numpy/distutils/fcompiler/gnu.py 2007-02-03 15:30:00 UTC (rev 3537) +++ trunk/numpy/distutils/fcompiler/gnu.py 2007-02-05 00:24:42 UTC (rev 3538) @@ -196,6 +196,8 @@ # there's also: athlon-tbird, athlon-4, athlon-xp elif cpu.is_Nocona(): march_opt = '-march=nocona' + elif cpu.is_Core2(): + march_opt = '-march=nocona' elif cpu.is_Prescott(): march_opt = '-march=prescott' elif cpu.is_PentiumIV(): @@ -216,7 +218,12 @@ if gnu_ver >= '3.4.4': if cpu.is_PentiumM(): march_opt = '-march=pentium-m' - + + # Future: + # if gnu_ver >= '4.3': + # if cpu.is_Core2(): + # march_opt = '-march=core2' + # Note: gcc 3.2 on win32 has breakage with -march specified if '3.1.1' <= gnu_ver <= '3.4' and sys.platform=='win32': march_opt = '' From numpy-svn at scipy.org Mon Feb 5 15:58:35 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 5 Feb 2007 14:58:35 -0600 (CST) Subject: [Numpy-svn] r3539 - trunk/numpy/lib Message-ID: <20070205205835.07B7A39C088@new.scipy.org> Author: rkern Date: 2007-02-05 14:58:32 -0600 (Mon, 05 Feb 2007) New Revision: 3539 Modified: trunk/numpy/lib/function_base.py Log: Flesh out the docstring for histogram() to address the concerns of #445. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2007-02-05 00:24:42 UTC (rev 3538) +++ trunk/numpy/lib/function_base.py 2007-02-05 20:58:32 UTC (rev 3539) @@ -67,21 +67,31 @@ return 1 def histogram(a, bins=10, range=None, normed=False): - """histogram(sample, bins = 10, range = None, normed = False) -> H, ledges + """Compute the histogram from a set of data. - Return the distribution of a sample. + :Parameters: + - `a` : array + The data to histogram. n-D arrays will be flattened. + - `bins` : int or sequence of floats, optional + If an int, then the number of equal-width bins in the given range. + Otherwise, a sequence of the lower bound of each bin. + - `range` : (float, float), optional + The lower and upper range of the bins. If not provided, then (a.min(), + a.max()) is used. Values outside of this range are allocated to the + closest bin. + - `normed` : bool, optional + If False, the result array will contain the number of samples in each bin. + If True, the result array is the value of the probability *density* + function at the bin normalized such that the *integral* over the range + is 1. Note that the sum of all of the histogram values will not usually + be 1; it is not a probability *mass* function. - Parameters - ---------- - bins: Number of bins - range: Lower and upper bin edges (default: [sample.min(), sample.max()]). - All values greater than range are stored in the last bin. - normed: If False (default), return the number of samples in each bin. - If True, return a frequency distribution. - - Output - ------ - histogram array, left bin edges array. + :Returns: + - `hist` : array (n,) + The values of the histogram. See `normed` for a description of the + possible semantics. + - `lower_edges` : float array (n,) + The lower edges of each bin. """ a = asarray(a).ravel() if not iterable(bins): From numpy-svn at scipy.org Mon Feb 5 23:03:06 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 5 Feb 2007 22:03:06 -0600 (CST) Subject: [Numpy-svn] r3540 - trunk/numpy/lib Message-ID: <20070206040306.7B38D39C18B@new.scipy.org> Author: oliphant Date: 2007-02-05 22:03:04 -0600 (Mon, 05 Feb 2007) New Revision: 3540 Modified: trunk/numpy/lib/type_check.py Log: Fix nan_to_num on complex arrays. Fixes ticket #443 Modified: trunk/numpy/lib/type_check.py =================================================================== --- trunk/numpy/lib/type_check.py 2007-02-05 20:58:32 UTC (rev 3539) +++ trunk/numpy/lib/type_check.py 2007-02-06 04:03:04 UTC (rev 3540) @@ -117,7 +117,7 @@ except AttributeError: t = obj2sctype(type(x)) if issubclass(t, _nx.complexfloating): - y = nan_to_num(x.real) + 1j * nan_to_num(x.imag) + return nan_to_num(x.real) + 1j * nan_to_num(x.imag) else: try: y = x.copy() From numpy-svn at scipy.org Wed Feb 7 18:17:30 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 7 Feb 2007 17:17:30 -0600 (CST) Subject: [Numpy-svn] r3541 - trunk/numpy/core/src Message-ID: <20070207231730.3882039C120@new.scipy.org> Author: oliphant Date: 2007-02-07 17:17:28 -0600 (Wed, 07 Feb 2007) New Revision: 3541 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Fix possible segfault. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2007-02-06 04:03:04 UTC (rev 3540) +++ trunk/numpy/core/src/multiarraymodule.c 2007-02-07 23:17:28 UTC (rev 3541) @@ -4039,7 +4039,7 @@ PyArray_OrderConverter(PyObject *object, NPY_ORDER *val) { char *str; - if (object == Py_None) { + if (object == NULL || object == Py_None) { *val = PyArray_ANYORDER; } else if (!PyString_Check(object) || PyString_GET_SIZE(object) < 1) { From numpy-svn at scipy.org Wed Feb 7 18:30:04 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 7 Feb 2007 17:30:04 -0600 (CST) Subject: [Numpy-svn] r3542 - trunk/numpy/core/src Message-ID: <20070207233004.AA6F639C135@new.scipy.org> Author: oliphant Date: 2007-02-07 17:29:59 -0600 (Wed, 07 Feb 2007) New Revision: 3542 Modified: trunk/numpy/core/src/ufuncobject.c Log: Remove DECREF in userdef portion of ufuncobject.c because it is a borrowed reference. Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2007-02-07 23:17:28 UTC (rev 3541) +++ trunk/numpy/core/src/ufuncobject.c 2007-02-07 23:29:59 UTC (rev 3542) @@ -815,7 +815,6 @@ } funcdata = funcdata->next; } - Py_DECREF(obj); PyErr_SetString(PyExc_TypeError, msg); goto fail; } From numpy-svn at scipy.org Fri Feb 9 12:34:37 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 9 Feb 2007 11:34:37 -0600 (CST) Subject: [Numpy-svn] r3543 - in trunk/numpy: core/tests lib Message-ID: <20070209173437.33A2639C177@new.scipy.org> Author: stefan Date: 2007-02-09 11:34:23 -0600 (Fri, 09 Feb 2007) New Revision: 3543 Modified: trunk/numpy/core/tests/test_regression.py trunk/numpy/lib/polynomial.py Log: Fix polymul bug. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2007-02-07 23:29:59 UTC (rev 3542) +++ trunk/numpy/core/tests/test_regression.py 2007-02-09 17:34:23 UTC (rev 3543) @@ -613,5 +613,9 @@ assert_array_equal(N.divide.accumulate(todivide), N.array([2., 4., 16.])) + def check_mem_polymul(self, level=rlevel): + """Ticket #448""" + N.polymul([],[1.]) + if __name__ == "__main__": NumpyTest().run() Modified: trunk/numpy/lib/polynomial.py =================================================================== --- trunk/numpy/lib/polynomial.py 2007-02-07 23:29:59 UTC (rev 3542) +++ trunk/numpy/lib/polynomial.py 2007-02-09 17:34:23 UTC (rev 3543) @@ -383,6 +383,7 @@ """Multiplies two polynomials represented as sequences. """ truepoly = (isinstance(a1, poly1d) or isinstance(a2, poly1d)) + a1,a2 = poly1d(a1),poly1d(a2) val = NX.convolve(a1, a2) if truepoly: val = poly1d(val) From numpy-svn at scipy.org Fri Feb 9 12:55:48 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 9 Feb 2007 11:55:48 -0600 (CST) Subject: [Numpy-svn] r3544 - in trunk/numpy/core: . tests Message-ID: <20070209175548.B71C239C0E4@new.scipy.org> Author: stefan Date: 2007-02-09 11:55:37 -0600 (Fri, 09 Feb 2007) New Revision: 3544 Modified: trunk/numpy/core/numeric.py trunk/numpy/core/tests/test_regression.py Log: Do not attempt to convolve empty arrays. Modified: trunk/numpy/core/numeric.py =================================================================== --- trunk/numpy/core/numeric.py 2007-02-09 17:34:23 UTC (rev 3543) +++ trunk/numpy/core/numeric.py 2007-02-09 17:55:37 UTC (rev 3544) @@ -219,8 +219,11 @@ """Returns the discrete, linear convolution of 1-D sequences a and v; mode can be 'valid', 'same', or 'full' to specify size of the resulting sequence. """ + a,v = array(a,ndmin=1),array(v,ndmin=1) if (len(v) > len(a)): a, v = v, a + assert len(a) > 0, 'a cannot be empty' + assert len(v) > 0, 'v cannot be empty' mode = _mode_from_name(mode) return multiarray.correlate(a,asarray(v)[::-1],mode) Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2007-02-09 17:34:23 UTC (rev 3543) +++ trunk/numpy/core/tests/test_regression.py 2007-02-09 17:55:37 UTC (rev 3544) @@ -616,6 +616,11 @@ def check_mem_polymul(self, level=rlevel): """Ticket #448""" N.polymul([],[1.]) + + def check_convolve_empty(self, level=rlevel): + """Convolve should raise an error for empty input array.""" + self.failUnlessRaises(AssertionError,N.convolve,[],[1]) + self.failUnlessRaises(AssertionError,N.convolve,[1],[]) if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Fri Feb 9 15:00:51 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 9 Feb 2007 14:00:51 -0600 (CST) Subject: [Numpy-svn] r3545 - trunk/numpy/core/src Message-ID: <20070209200051.A02CC39C12F@new.scipy.org> Author: oliphant Date: 2007-02-09 14:00:48 -0600 (Fri, 09 Feb 2007) New Revision: 3545 Modified: trunk/numpy/core/src/arraymethods.c Log: Fix error in implementation of itemset for >= 2-d arrays. Modified: trunk/numpy/core/src/arraymethods.c =================================================================== --- trunk/numpy/core/src/arraymethods.c 2007-02-09 17:55:37 UTC (rev 3544) +++ trunk/numpy/core/src/arraymethods.c 2007-02-09 20:00:48 UTC (rev 3545) @@ -615,7 +615,7 @@ else { intp loc, index[MAX_DIMS]; PyObject *tupargs; - tupargs = PyTuple_GetSlice(args, 1, n+1); + tupargs = PyTuple_GetSlice(args, 0, n); nd = PyArray_IntpFromSequence(tupargs, index, MAX_DIMS); Py_DECREF(tupargs); if (nd < n) return NULL; From numpy-svn at scipy.org Fri Feb 9 19:43:48 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 9 Feb 2007 18:43:48 -0600 (CST) Subject: [Numpy-svn] r3546 - trunk/numpy/testing Message-ID: <20070210004348.9FE5939C079@new.scipy.org> Author: stefan Date: 2007-02-09 18:43:37 -0600 (Fri, 09 Feb 2007) New Revision: 3546 Modified: trunk/numpy/testing/numpytest.py Log: Prepare for doctest-runner. Modified: trunk/numpy/testing/numpytest.py =================================================================== --- trunk/numpy/testing/numpytest.py 2007-02-09 20:00:48 UTC (rev 3545) +++ trunk/numpy/testing/numpytest.py 2007-02-10 00:43:37 UTC (rev 3546) @@ -15,10 +15,9 @@ ] DEBUG=0 +from numpy.testing.utils import jiffies get_frame = sys._getframe -from utils import jiffies - class IgnoreException(Exception): "Ignoring this exception due to disabled feature" @@ -236,8 +235,7 @@ class NumpyTest: """ Numpy tests site manager. - Usage: - >>> NumpyTest().test(level=1,verbosity=1) + Usage: NumpyTest().test(level=1,verbosity=1) is package name or its module object. From numpy-svn at scipy.org Sat Feb 17 13:36:29 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 17 Feb 2007 12:36:29 -0600 (CST) Subject: [Numpy-svn] r3547 - trunk/benchmarks Message-ID: <20070217183629.2D38339C1B4@new.scipy.org> Author: stefan Date: 2007-02-17 12:36:16 -0600 (Sat, 17 Feb 2007) New Revision: 3547 Added: trunk/benchmarks/benchmark.py Modified: trunk/benchmarks/casting.py trunk/benchmarks/creating.py trunk/benchmarks/sorting.py Log: Refactor benchmarks. Added: trunk/benchmarks/benchmark.py =================================================================== --- trunk/benchmarks/benchmark.py 2007-02-10 00:43:37 UTC (rev 3546) +++ trunk/benchmarks/benchmark.py 2007-02-17 18:36:16 UTC (rev 3547) @@ -0,0 +1,42 @@ +from timeit import Timer + +class Benchmark(dict): + """Benchmark a feature in different modules.""" + + def __init__(self,modules,title='',runs=3,reps=1000): + self.module_test = dict((m,'') for m in modules) + self.runs = runs + self.reps = reps + self.title = title + + def __setitem__(self,module,(test_str,setup_str)): + """Set the test code for modules.""" + if module == 'all': + modules = self.module_test.keys() + else: + modules = [module] + + for m in modules: + setup_str = 'import %s; import %s as N; ' % (m,m) \ + + setup_str + self.module_test[m] = Timer(test_str, setup_str) + + def run(self): + """Run the benchmark on the different modules.""" + module_column_len = max(len(mod) for mod in self.module_test) + + if self.title: + print self.title + print 'Doing %d runs, each with %d reps.' % (self.runs,self.reps) + print '-'*79 + + for mod in sorted(self.module_test): + modname = mod.ljust(module_column_len) + try: + print "%s: %s" % (modname, \ + self.module_test[mod].repeat(self.runs,self.reps)) + except Exception, e: + print "%s: Failed to benchmark (%s)." % (modname,e) + + print '-'*79 + print Modified: trunk/benchmarks/casting.py =================================================================== --- trunk/benchmarks/casting.py 2007-02-10 00:43:37 UTC (rev 3546) +++ trunk/benchmarks/casting.py 2007-02-17 18:36:16 UTC (rev 3547) @@ -1,9 +1,17 @@ -import timeit +from benchmark import Benchmark + +modules = ['numpy','Numeric','numarray'] + +b = Benchmark(modules, + title='Casting a (10,10) integer array to float.', + runs=3,reps=10000) + N = [10,10] -t1 = timeit.Timer('b = a.astype(int)','import numpy;a=numpy.zeros(shape=%s,dtype=float)'%N) -t2 = timeit.Timer('b = a.astype("l")','import Numeric;a=Numeric.zeros(shape=%s,typecode="d")'%N) -t3 = timeit.Timer("b = a.astype('l')","import numarray; a=numarray.zeros(shape=%s,typecode='d')"%N) -print "1-D length = ", N -print "NumPy: ", t1.repeat(3,1000) -print "Numeric: ", t2.repeat(3,1000) -print "Numarray: ", t3.repeat(3,1000) +b['numpy'] = ('b = a.astype(int)', + 'a=numpy.zeros(shape=%s,dtype=float)' % N) +b['Numeric'] = ('b = a.astype("l")', + 'a=Numeric.zeros(shape=%s,typecode="d")' % N) +b['numarray'] = ("b = a.astype('l')", + "a=numarray.zeros(shape=%s,typecode='d')" % N) + +b.run() Modified: trunk/benchmarks/creating.py =================================================================== --- trunk/benchmarks/creating.py 2007-02-10 00:43:37 UTC (rev 3546) +++ trunk/benchmarks/creating.py 2007-02-17 18:36:16 UTC (rev 3547) @@ -1,9 +1,14 @@ -import timeit +from benchmark import Benchmark + +modules = ['numpy','Numeric','numarray'] + N = [10,10] -t1 = timeit.Timer('a=N.zeros(shape,type)','import numpy as N; shape=%s;type=float'%N) -t2 = timeit.Timer('a=N.zeros(shape,type)','import Numeric as N; shape=%s;type=N.Float'%N) -t3 = timeit.Timer('a=N.zeros(shape,type)',"import numarray as N; shape=%s;type=N.Float"%N) -print "shape = ", N -print "NumPy: ", t1.repeat(3,10000) -print "Numeric: ", t2.repeat(3,10000) -print "Numarray: ", t3.repeat(3,10000) +b = Benchmark(modules, + title='Creating %s zeros.' % N, + runs=3,reps=10000) + +b['numpy'] = ('a=N.zeros(shape,type)', 'shape=%s;type=float' % N) +b['Numeric'] = ('a=N.zeros(shape,type)', 'shape=%s;type=N.Float' % N) +b['numarray'] = ('a=N.zeros(shape,type)', "shape=%s;type=N.Float" % N) + +b.run() Modified: trunk/benchmarks/sorting.py =================================================================== --- trunk/benchmarks/sorting.py 2007-02-10 00:43:37 UTC (rev 3546) +++ trunk/benchmarks/sorting.py 2007-02-17 18:36:16 UTC (rev 3547) @@ -1,31 +1,25 @@ -import timeit +from benchmark import Benchmark +modules = ['numpy','Numeric','numarray'] +b = Benchmark(modules,runs=3,reps=100) + N = 10000 -t1 = timeit.Timer('a=array(None,shape=%d);a.sort()'%N,'from numarray import array') -t2 = timeit.Timer('a=empty(shape=%d);a.sort()'%N,'from numpy import empty') -t3 = timeit.Timer('a=empty(shape=%d);sort(a)'%N,'from Numeric import empty,sort') +b.title = 'Sorting %d elements' % N +b['numarray'] = ('a=N.array(None,shape=%d);a.sort()'%N,'') +b['numpy'] = ('a=N.empty(shape=%d);a.sort()'%N,'') +b['Numeric'] = ('a=N.empty(shape=%d);N.sort(a)'%N,'') +b.run() -print "1-D length = ", N -print "Numarray: ", t1.repeat(3,100) -print "NumPy: ", t2.repeat(3,100) -print "Numeric: ", t3.repeat(3,100) - N1,N2 = 100,100 -t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort()'%(N1,N2),'from numarray import array') -t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort()'%(N1,N2),'from numpy import empty') -t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a)'%(N1,N2),'from Numeric import empty,sort') +b.title = 'Sorting (%d,%d) elements, last axis' % (N1,N2) +b['numarray'] = ('a=N.array(None,shape=(%d,%d));a.sort()'%(N1,N2),'') +b['numpy'] = ('a=N.empty(shape=(%d,%d));a.sort()'%(N1,N2),'') +b['Numeric'] = ('a=N.empty(shape=(%d,%d));N.sort(a)'%(N1,N2),'') +b.run() -print "2-D shape = (%d,%d), last-axis" % (N1,N2) -print "Numarray: ", t1.repeat(3,100) -print "NumPy: ", t2.repeat(3,100) -print "Numeric: ", t3.repeat(3,100) - N1,N2 = 100,100 -t1 = timeit.Timer('a=array(None,shape=(%d,%d));a.sort(0)'%(N1,N2),'from numarray import array') -t2 = timeit.Timer('a=empty(shape=(%d,%d));a.sort(0)'%(N1,N2),'from numpy import empty') -t3 = timeit.Timer('a=empty(shape=(%d,%d));sort(a,0)'%(N1,N2),'from Numeric import empty,sort') - -print "2-D shape = (%d,%d), first-axis" % (N1,N2) -print "Numarray: ", t1.repeat(3,100) -print "NumPy: ", t2.repeat(3,100) -print "Numeric: ", t3.repeat(3,100) +b.title = 'Sorting (%d,%d) elements, first axis' % (N1,N2) +b['numarray'] = ('a=N.array(None,shape=(%d,%d));a.sort(0)'%(N1,N2),'') +b['Numeric'] = ('a=N.empty(shape=(%d,%d));N.sort(a,0)'%(N1,N2),'') +b['numpy'] = ('a=N.empty(shape=(%d,%d));N.sort(a,0)'%(N1,N2),'') +b.run() From numpy-svn at scipy.org Sun Feb 18 15:34:38 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 18 Feb 2007 14:34:38 -0600 (CST) Subject: [Numpy-svn] r3548 - trunk/numpy/core Message-ID: <20070218203438.5DD0D39C13A@new.scipy.org> Author: stefan Date: 2007-02-18 14:34:30 -0600 (Sun, 18 Feb 2007) New Revision: 3548 Modified: trunk/numpy/core/records.py Log: Fix numpy.core.records doctests. Modified: trunk/numpy/core/records.py =================================================================== --- trunk/numpy/core/records.py 2007-02-17 18:36:16 UTC (rev 3547) +++ trunk/numpy/core/records.py 2007-02-18 20:34:30 UTC (rev 3548) @@ -274,10 +274,10 @@ names=None, titles=None, aligned=False, byteorder=None): """ create a record array from a (flat) list of arrays - >>> x1=array([1,2,3,4]) - >>> x2=array(['a','dd','xyz','12']) - >>> x3=array([1.1,2,3,4]) - >>> r=fromarrays([x1,x2,x3],names='a,b,c') + >>> x1=N.array([1,2,3,4]) + >>> x2=N.array(['a','dd','xyz','12']) + >>> x3=N.array([1.1,2,3,4]) + >>> r = fromarrays([x1,x2,x3],names='a,b,c') >>> print r[1] (2, 'dd', 2.0) >>> x1[1]=34 @@ -361,13 +361,11 @@ >>> r.col1 array([456, 2]) >>> r.col2 - chararray(['dbe', 'de']) + chararray(['dbe', 'de'], + dtype='|S3') >>> import cPickle >>> print cPickle.loads(cPickle.dumps(r)) - recarray[ - (456, 'dbe', 1.2), - (2, 'de', 1.3) - ] + [(456, 'dbe', 1.2) (2, 'de', 1.3)] """ nfields = len(recList[0]) @@ -442,17 +440,22 @@ If file is a string then that file is opened, else it is assumed to be a file object. - >>> import testdata, sys - >>> fd=open(testdata.filename) - >>> fd.seek(2880*2) - >>> r=fromfile(fd, formats='f8,i4,a5', shape=3, byteorder='big') - >>> print r[0] - (5.1000000000000005, 61, 'abcde') - >>> r._shape - (3,) + >>> from tempfile import TemporaryFile + >>> a = N.empty(10,dtype='f8,i4,a5') + >>> a[5] = (0.5,10,'abcde') + >>> + >>> fd=TemporaryFile() + >>> a = a.newbyteorder('<') + >>> a.tofile(fd) + >>> + >>> fd.seek(0) + >>> r=fromfile(fd, formats='f8,i4,a5', shape=10, byteorder='<') + >>> print r[5] + (0.5, 10, 'abcde') + >>> r.shape + (10,) """ - if (shape is None or shape == 0): shape = (-1,) elif isinstance(shape, (int, long)): From numpy-svn at scipy.org Sun Feb 18 16:03:20 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 18 Feb 2007 15:03:20 -0600 (CST) Subject: [Numpy-svn] r3549 - in trunk/numpy: core distutils lib Message-ID: <20070218210320.3EE3339C289@new.scipy.org> Author: stefan Date: 2007-02-18 15:02:46 -0600 (Sun, 18 Feb 2007) New Revision: 3549 Modified: trunk/numpy/core/numerictypes.py trunk/numpy/distutils/ccompiler.py trunk/numpy/lib/function_base.py trunk/numpy/lib/index_tricks.py trunk/numpy/lib/polynomial.py trunk/numpy/lib/shape_base.py Log: Fix docstrings for loading with DocFileSuite. Modified: trunk/numpy/core/numerictypes.py =================================================================== --- trunk/numpy/core/numerictypes.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/core/numerictypes.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -80,7 +80,7 @@ 'ScalarType', 'obj2sctype', 'cast', 'nbytes', 'sctype2char', 'maximum_sctype', 'issctype', 'typecodes'] -from multiarray import typeinfo, ndarray, array, empty, dtype +from numpy.core.multiarray import typeinfo, ndarray, array, empty, dtype import types as _types # we don't export these for import *, but we do want them accessible Modified: trunk/numpy/distutils/ccompiler.py =================================================================== --- trunk/numpy/distutils/ccompiler.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/distutils/ccompiler.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -8,9 +8,9 @@ from distutils.sysconfig import customize_compiler from distutils.version import LooseVersion -import log -from exec_command import exec_command -from misc_util import cyg2win32, is_sequence, mingw32 +from numpy.distutils import log +from numpy.distutils.exec_command import exec_command +from numpy.distutils.misc_util import cyg2win32, is_sequence, mingw32 from distutils.spawn import _nt_quote_args # hack to set compiler optimizing options. Needs to integrated with something. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/lib/function_base.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -143,6 +143,7 @@ H, edges = histogramdd(x, bins = (5, 6, 7)) See also: histogram + """ try: @@ -263,6 +264,7 @@ Raises ZeroDivisionError if appropriate. (The version in MA does not -- it returns masked values). + """ if axis is None: a = array(a).ravel() @@ -376,31 +378,32 @@ def select(condlist, choicelist, default=0): """ Return an array composed of different elements of choicelist - depending on the list of conditions. + depending on the list of conditions. - condlist is a list of condition arrays containing ones or zeros + condlist is a list of condition arrays containing ones or zeros - choicelist is a list of choice arrays (of the "same" size as the - arrays in condlist). The result array has the "same" size as the - arrays in choicelist. If condlist is [c0, ..., cN-1] then choicelist - must be of length N. The elements of the choicelist can then be - represented as [v0, ..., vN-1]. The default choice if none of the - conditions are met is given as the default argument. + choicelist is a list of choice arrays (of the "same" size as the + arrays in condlist). The result array has the "same" size as the + arrays in choicelist. If condlist is [c0, ..., cN-1] then choicelist + must be of length N. The elements of the choicelist can then be + represented as [v0, ..., vN-1]. The default choice if none of the + conditions are met is given as the default argument. - The conditions are tested in order and the first one statisfied is - used to select the choice. In other words, the elements of the - output array are found from the following tree (notice the order of - the conditions matters): + The conditions are tested in order and the first one statisfied is + used to select the choice. In other words, the elements of the + output array are found from the following tree (notice the order of + the conditions matters): - if c0: v0 - elif c1: v1 - elif c2: v2 - ... - elif cN-1: vN-1 - else: default + if c0: v0 + elif c1: v1 + elif c2: v2 + ... + elif cN-1: vN-1 + else: default - Note that one of the condition arrays must be large enough to handle - the largest array in the choice list. + Note that one of the condition arrays must be large enough to handle + the largest array in the choice list. + """ n = len(condlist) n2 = len(choicelist) @@ -452,7 +455,8 @@ Outputs: N arrays of the same shape as f giving the derivative of f with respect - to each dimension. + to each dimension. + """ N = len(f.shape) # number of dimensions n = len(varargs) @@ -542,6 +546,7 @@ bins is monotonically decreasing. Beyond the bounds of the bins 0 or len(bins) is returned as appropriate. + """) except RuntimeError: pass @@ -558,6 +563,7 @@ weights[p] instead of 1. See also: histogram, digitize, unique. + """) except RuntimeError: pass @@ -570,6 +576,7 @@ If the obj already has a docstring raise a RuntimeError If this routine does not know how to add a docstring to the object raise a TypeError + """) except RuntimeError: pass @@ -612,6 +619,7 @@ the imaginary part if the real part is equal (the default sort order for complex arrays). This function is a wrapper ensuring a complex return type. + """ b = array(a,copy=True) b.sort() @@ -633,6 +641,7 @@ >>> a = array((0, 0, 0, 1, 2, 3, 2, 1, 0)) >>> numpy.trim_zeros(a) array([1, 2, 3, 2, 1]) + """ first = 0 trim = trim.upper() @@ -657,6 +666,7 @@ Example: >>> unique([5,2,4,0,4,4,2,2,1]) array([0,1,2,4,5]) + """ try: tmp = x.flatten() @@ -682,6 +692,7 @@ """Similar to putmask arr[mask] = vals but the 1D array vals has the same number of elements as the non-zero values of mask. Inverse of extract. + """ return _insert(arr, mask, vals) Modified: trunk/numpy/lib/index_tricks.py =================================================================== --- trunk/numpy/lib/index_tricks.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/lib/index_tricks.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -119,6 +119,7 @@ >>> ogrid = nd_grid(sparse=True) >>> ogrid[0:5,0:5] [array([[0],[1],[2],[3],[4]]), array([[0, 1, 2, 3, 4]])] + """ def __init__(self, sparse=False): self.sparse = sparse @@ -312,6 +313,7 @@ For example: >>> r_[array([1,2,3]), 0, 0, array([4,5,6])] array([1, 2, 3, 0, 0, 4, 5, 6]) + """ def __init__(self): concatenator.__init__(self, 0) Modified: trunk/numpy/lib/polynomial.py =================================================================== --- trunk/numpy/lib/polynomial.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/lib/polynomial.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -50,13 +50,14 @@ def poly(seq_of_zeros): """ Return a sequence representing a polynomial given a sequence of roots. - If the input is a matrix, return the characteristic polynomial. + If the input is a matrix, return the characteristic polynomial. - Example: - - >>> b = roots([1,3,1,5,6]) - >>> poly(b) - array([1., 3., 1., 5., 6.]) + Example: + + >>> b = roots([1,3,1,5,6]) + >>> poly(b) + array([1., 3., 1., 5., 6.]) + """ seq_of_zeros = atleast_1d(seq_of_zeros) sh = seq_of_zeros.shape Modified: trunk/numpy/lib/shape_base.py =================================================================== --- trunk/numpy/lib/shape_base.py 2007-02-18 20:34:30 UTC (rev 3548) +++ trunk/numpy/lib/shape_base.py 2007-02-18 21:02:46 UTC (rev 3549) @@ -274,29 +274,30 @@ def dstack(tup): """ Stack arrays in sequence depth wise (along third dimension) - Description: - Take a sequence of arrays and stack them along the third axis. - All arrays in the sequence must have the same shape along all - but the third axis. This is a simple way to stack 2D arrays - (images) into a single 3D array for processing. - dstack will rebuild arrays divided by dsplit. - Arguments: - tup -- sequence of arrays. All arrays must have the same - shape. - Examples: - >>> import numpy - >>> a = array((1,2,3)) - >>> b = array((2,3,4)) - >>> numpy.dstack((a,b)) - array([ [[1, 2], - [2, 3], - [3, 4]]]) - >>> a = array([[1],[2],[3]]) - >>> b = array([[2],[3],[4]]) - >>> numpy.dstack((a,b)) - array([[ [1, 2]], - [ [2, 3]], - [ [3, 4]]]) + Description: + Take a sequence of arrays and stack them along the third axis. + All arrays in the sequence must have the same shape along all + but the third axis. This is a simple way to stack 2D arrays + (images) into a single 3D array for processing. + dstack will rebuild arrays divided by dsplit. + Arguments: + tup -- sequence of arrays. All arrays must have the same + shape. + Examples: + >>> import numpy + >>> a = array((1,2,3)) + >>> b = array((2,3,4)) + >>> numpy.dstack((a,b)) + array([ [[1, 2], + [2, 3], + [3, 4]]]) + >>> a = array([[1],[2],[3]]) + >>> b = array([[2],[3],[4]]) + >>> numpy.dstack((a,b)) + array([[ [1, 2]], + [ [2, 3]], + [ [3, 4]]]) + """ return _nx.concatenate(map(atleast_3d,tup),2) From numpy-svn at scipy.org Sun Feb 18 17:44:01 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 18 Feb 2007 16:44:01 -0600 (CST) Subject: [Numpy-svn] r3550 - in trunk/numpy: core lib Message-ID: <20070218224401.0819C39C1D6@new.scipy.org> Author: stefan Date: 2007-02-18 16:43:40 -0600 (Sun, 18 Feb 2007) New Revision: 3550 Modified: trunk/numpy/core/arrayprint.py trunk/numpy/core/fromnumeric.py trunk/numpy/core/numeric.py trunk/numpy/lib/function_base.py trunk/numpy/lib/index_tricks.py trunk/numpy/lib/polynomial.py trunk/numpy/lib/shape_base.py trunk/numpy/lib/utils.py Log: Fix doctests. Modified: trunk/numpy/core/arrayprint.py =================================================================== --- trunk/numpy/core/arrayprint.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/core/arrayprint.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -245,7 +245,7 @@ Examples -------- - >>> x = array([1e-16,1,2,3]) + >>> x = N.array([1e-16,1,2,3]) >>> print array2string(x,precision=2,separator=',',suppress_small=True) [ 0., 1., 2., 3.] Modified: trunk/numpy/core/fromnumeric.py =================================================================== --- trunk/numpy/core/fromnumeric.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/core/fromnumeric.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -142,6 +142,7 @@ array([20, 31, 12, 3]) >>> choose([2, 4, 1, 0], choices, mode='wrap') array([20, 1, 12, 3]) + """ try: choose = a.choose @@ -173,6 +174,7 @@ array([0, 0, 1, 1, 2, 2]) >>> repeat([0, 1, 2], [2, 3, 4]) array([0, 0, 1, 1, 1, 2, 2, 2, 2]) + """ try: repeat = a.repeat @@ -487,16 +489,16 @@ x.dtype default sum() dtype --------------------------------------------------- - bool, Int8, Int16, Int32 Int32 + bool, int8, int16, int32 int32 Examples: - >>> sum([0.5, 1.5]) + >>> N.sum([0.5, 1.5]) 2.0 - >>> sum([0.5, 1.5], dtype=Int32) + >>> N.sum([0.5, 1.5], dtype=N.int32) 1 - >>> sum([[0, 1], [0, 5]]) - array([0, 6]) - >>> sum([[0, 1], [0, 5]], axis=1) + >>> N.sum([[0, 1], [0, 5]]) + 6 + >>> N.sum([[0, 1], [0, 5]], axis=1) array([1, 5]) """ if isinstance(x, _gentype): Modified: trunk/numpy/core/numeric.py =================================================================== --- trunk/numpy/core/numeric.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/core/numeric.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -691,15 +691,17 @@ Example: - >>> seterr(over='raise') + >>> seterr(over='raise') # doctest: +SKIP {'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'} - >>> seterr(all='warn', over='raise') + + >>> seterr(all='warn', over='raise') # doctest: +SKIP {'over': 'raise', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'} - >>> int16(32000) * int16(3) + + >>> int16(32000) * int16(3) # doctest: +SKIP Traceback (most recent call last): File "", line 1, in ? FloatingPointError: overflow encountered in short_scalars - >>> seterr(all='ignore') + >>> seterr(all='ignore') # doctest: +SKIP {'over': 'ignore', 'divide': 'ignore', 'invalid': 'ignore', 'under': 'ignore'} """ Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/lib/function_base.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -665,7 +665,7 @@ Example: >>> unique([5,2,4,0,4,4,2,2,1]) - array([0,1,2,4,5]) + array([0, 1, 2, 4, 5]) """ try: @@ -806,13 +806,13 @@ Example: - def myfunc(a, b): - if a > b: - return a-b - else - return a+b + >>> def myfunc(a, b): + ... if a > b: + ... return a-b + ... else: + ... return a+b - vfunc = vectorize(myfunc) + >>> vfunc = vectorize(myfunc) >>> vfunc([1, 2, 3, 4], 2) array([3, 4, 1, 2]) @@ -1197,16 +1197,16 @@ Example: >>> arr = [[3,4,5], - [1,2,3], - [6,7,8]] + ... [1,2,3], + ... [6,7,8]] >>> delete(arr, 1, 1) - array([[3,5], - [1,3], - [6,8]) + array([[3, 5], + [1, 3], + [6, 8]]) >>> delete(arr, 1, 0) - array([[3,4,5], - [6,7,8]]) + array([[3, 4, 5], + [6, 7, 8]]) """ wrap = None if type(arr) is not ndarray: @@ -1300,15 +1300,15 @@ Example: >>> a = array([[1,2,3], - [4,5,6], - [7,8,9]]) + ... [4,5,6], + ... [7,8,9]]) >>> insert(a, [1,2], [[4],[5]], axis=0) - array([[1,2,3], - [4,4,4], - [4,5,6], - [5,5,5], - [7,8,9]) + array([[1, 2, 3], + [4, 4, 4], + [4, 5, 6], + [5, 5, 5], + [7, 8, 9]]) """ wrap = None if type(arr) is not ndarray: Modified: trunk/numpy/lib/index_tricks.py =================================================================== --- trunk/numpy/lib/index_tricks.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/lib/index_tricks.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -108,6 +108,7 @@ [2, 2, 2, 2, 2], [3, 3, 3, 3, 3], [4, 4, 4, 4, 4]], + [[0, 1, 2, 3, 4], [0, 1, 2, 3, 4], [0, 1, 2, 3, 4], @@ -118,7 +119,11 @@ >>> ogrid = nd_grid(sparse=True) >>> ogrid[0:5,0:5] - [array([[0],[1],[2],[3],[4]]), array([[0, 1, 2, 3, 4]])] + [array([[0], + [1], + [2], + [3], + [4]]), array([[0, 1, 2, 3, 4]])] """ def __init__(self, sparse=False): @@ -359,15 +364,15 @@ will then return an N-dimensional counter. Example: - >>> for index in ndindex(4,3,2): - print index - (0,0,0) - (0,0,1) - (0,1,0) - ... - (3,1,1) - (3,2,0) - (3,2,1) + >>> for index in ndindex(3,2,1): + ... print index + (0, 0, 0) + (0, 1, 0) + (1, 0, 0) + (1, 1, 0) + (2, 0, 0) + (2, 1, 0) + """ def __init__(self, *args): Modified: trunk/numpy/lib/polynomial.py =================================================================== --- trunk/numpy/lib/polynomial.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/lib/polynomial.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -56,7 +56,7 @@ >>> b = roots([1,3,1,5,6]) >>> poly(b) - array([1., 3., 1., 5., 6.]) + array([ 1., 3., 1., 5., 6.]) """ seq_of_zeros = atleast_1d(seq_of_zeros) Modified: trunk/numpy/lib/shape_base.py =================================================================== --- trunk/numpy/lib/shape_base.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/lib/shape_base.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -288,15 +288,17 @@ >>> a = array((1,2,3)) >>> b = array((2,3,4)) >>> numpy.dstack((a,b)) - array([ [[1, 2], - [2, 3], - [3, 4]]]) + array([[[1, 2], + [2, 3], + [3, 4]]]) >>> a = array([[1],[2],[3]]) >>> b = array([[2],[3],[4]]) >>> numpy.dstack((a,b)) - array([[ [1, 2]], - [ [2, 3]], - [ [3, 4]]]) + array([[[1, 2]], + + [[2, 3]], + + [[3, 4]]]) """ return _nx.concatenate(map(atleast_3d,tup),2) @@ -436,6 +438,7 @@ >>> numpy.hsplit(a,2) [array([1, 2]), array([3, 4])] >>> a = array([[1,2,3,4],[1,2,3,4]]) + >>> hsplit(a,2) [array([[1, 2], [1, 2]]), array([[3, 4], [3, 4]])] @@ -482,8 +485,8 @@ import numpy >>> a = array([[1,2,3,4], ... [1,2,3,4]]) - >>> numpy.vsplit(a) - [array([ [1, 2, 3, 4]]), array([ [1, 2, 3, 4]])] + >>> numpy.vsplit(a,2) + [array([[1, 2, 3, 4]]), array([[1, 2, 3, 4]])] """ if len(_nx.shape(ary)) < 2: @@ -518,8 +521,9 @@ dstack, split, array_split, hsplit, vsplit. Examples: >>> a = array([[[1,2,3,4],[1,2,3,4]]]) - [array([ [[1, 2], - [1, 2]]]), array([ [[3, 4], + >>> dsplit(a,2) + [array([[[1, 2], + [1, 2]]]), array([[[3, 4], [3, 4]]])] """ @@ -603,7 +607,7 @@ [0, 1, 2, 0, 1, 2]]) >>> tile(a,(2,1,2)) array([[[0, 1, 2, 0, 1, 2]], - + [[0, 1, 2, 0, 1, 2]]]) See Also: Modified: trunk/numpy/lib/utils.py =================================================================== --- trunk/numpy/lib/utils.py 2007-02-18 21:02:46 UTC (rev 3549) +++ trunk/numpy/lib/utils.py 2007-02-18 22:43:40 UTC (rev 3550) @@ -269,7 +269,8 @@ Example: >>> from numpy import * - >>> info(polyval) + >>> info(polyval) # doctest: +SKIP + polyval(p, x) Evaluate the polymnomial p at x. From numpy-svn at scipy.org Thu Feb 22 02:37:33 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 22 Feb 2007 01:37:33 -0600 (CST) Subject: [Numpy-svn] r3551 - trunk/numpy/core/src Message-ID: <20070222073733.1673439C01A@new.scipy.org> Author: oliphant Date: 2007-02-22 01:37:28 -0600 (Thu, 22 Feb 2007) New Revision: 3551 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Fix mixed-kind scalar operations to use the standard in each kind. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2007-02-18 22:43:40 UTC (rev 3550) +++ trunk/numpy/core/src/multiarraymodule.c 2007-02-22 07:37:28 UTC (rev 3551) @@ -1902,14 +1902,14 @@ if (PyTypeNum_ISUSERDEF(neededtype)) return FALSE; switch(scalar) { case PyArray_INTPOS_SCALAR: - return (neededtype >= PyArray_BYTE); + return (neededtype >= PyArray_LONG); case PyArray_INTNEG_SCALAR: - return (neededtype >= PyArray_BYTE) && \ + return (neededtype >= PyArray_LONG) && \ !(PyTypeNum_ISUNSIGNED(neededtype)); case PyArray_FLOAT_SCALAR: - return (neededtype >= PyArray_FLOAT); + return (neededtype >= PyArray_DOUBLE); case PyArray_COMPLEX_SCALAR: - return (neededtype >= PyArray_CFLOAT); + return (neededtype >= PyArray_CDOUBLE); default: return 1; /* should never get here... */ } From numpy-svn at scipy.org Thu Feb 22 02:38:55 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 22 Feb 2007 01:38:55 -0600 (CST) Subject: [Numpy-svn] r3552 - trunk/numpy/core/src Message-ID: <20070222073855.CB1E739C067@new.scipy.org> Author: oliphant Date: 2007-02-22 01:38:53 -0600 (Thu, 22 Feb 2007) New Revision: 3552 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Undo the change. It breaks the desired behavior. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2007-02-22 07:37:28 UTC (rev 3551) +++ trunk/numpy/core/src/multiarraymodule.c 2007-02-22 07:38:53 UTC (rev 3552) @@ -1902,14 +1902,14 @@ if (PyTypeNum_ISUSERDEF(neededtype)) return FALSE; switch(scalar) { case PyArray_INTPOS_SCALAR: - return (neededtype >= PyArray_LONG); + return (neededtype >= PyArray_BYTE); case PyArray_INTNEG_SCALAR: - return (neededtype >= PyArray_LONG) && \ + return (neededtype >= PyArray_BYTE) && \ !(PyTypeNum_ISUNSIGNED(neededtype)); case PyArray_FLOAT_SCALAR: - return (neededtype >= PyArray_DOUBLE); + return (neededtype >= PyArray_FLOAT); case PyArray_COMPLEX_SCALAR: - return (neededtype >= PyArray_CDOUBLE); + return (neededtype >= PyArray_CFLOAT); default: return 1; /* should never get here... */ } From numpy-svn at scipy.org Tue Feb 27 20:00:12 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 19:00:12 -0600 (CST) Subject: [Numpy-svn] r3553 - in trunk: . numpy/doc Message-ID: <20070228010012.6262739C096@new.scipy.org> Author: oliphant Date: 2007-02-27 19:00:07 -0600 (Tue, 27 Feb 2007) New Revision: 3553 Added: trunk/numpy/doc/pep_buffer.txt Modified: trunk/DEV_README.txt Log: Add buffer interface pep to doc Modified: trunk/DEV_README.txt =================================================================== --- trunk/DEV_README.txt 2007-02-22 07:38:53 UTC (rev 3552) +++ trunk/DEV_README.txt 2007-02-28 01:00:07 UTC (rev 3553) @@ -8,7 +8,7 @@ Simple changes and obvious improvements are always welcome. Changes that fundamentally change behavior need discussion on -numpy-discussions at lists.sourceforge.net before anything is done. +numpy-discussions at scipy.org before anything is done. Please add meaningful comments when you check changes in. These comments form the basis of the change-log. Added: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-22 07:38:53 UTC (rev 3552) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 01:00:07 UTC (rev 3553) @@ -0,0 +1,307 @@ +PEP: +Title: Revising the buffer protocol +Version: $Revision: $ +Last-Modified: $Date: $ +Author: Travis Oliphant +Status: Draft +Type: Standards Track +Created: 28-Aug-2006 +Python-Version: 3000 + +Abstract + + This PEP proposes re-designing the buffer API (PyBufferProcs + function pointers) to improve the way Python allows memory sharing + in Python 3.0 + + In particular, it is proposed that the multiple-segment and + character buffer portions of the buffer API are eliminated and + additional function pointers are provided to allow sharing any + multi-dimensional nature of the memory and what data-format the + memory contains. + +Rationale + + The buffer protocol allows different Python types to exchange a + pointer to a sequence of internal buffers. This functionality is + '''extremely''' useful for sharing large segments of memory between + different high-level objects, but it's too limited and has issues. + + 1. There is the little (never?) used "sequence-of-segments" option + (bf_getsegcount) + + 2. There is the apparently redundant character-buffer option + (bf_getcharbuffer) + + 3. There is no way for a consumer to tell the buffer-API-exporting + object it is "finished" with its view of the memory and + therefore no way for the exporting object to be sure that it is + safe to reallocate the pointer to the memory that it owns (the + array object reallocating its memory after sharing it with the + buffer object which held the original pointer led to the + infamous buffer-object problem). + + 4. Memory is just a pointer with a length. There is no way to + describe what's "in" the memory (float, int, C-structure, etc.) + + 5. There is no shape information provided for the memory. But, + several array-like Python types could make use of a standard + way to describe the shape-interpretation of the memory + (!wxPython, GTK, pyQT, CVXOPT, !PyVox, Audio and Video + Libraries, ctypes, !NumPy, data-base interfaces, etc.) + + There are two widely used libraries that use the concept of + discontiguous memory: PIL and NumPy. Their view of discontiguous + arrays is a bit different, though. NumPy uses the notion of + constant striding in each dimension as it's basic concept of an + array. In this way a simple sub-region of a larger array can be + described without copying the data. Strided memory is a common + way to describe data to many computing libraries (such as the BLAS + and LAPACK). + + The PIL uses a more opaque memory representation. Sometimes an + image is contained in a contiguous segment of memory, but + sometimes it is contained in an array of pointers to the + contiguous segments (usually lines) of the image. This allows the + image to not be loaded entirely into memory. The PIL is where the + idea of multiple buffer segments in the original buffer interface + came from, I believe. + + The buffer interface should allow discontiguous memory areas to + share standard striding information. However, consumers that do + not want to deal with strided memory should also be able to + request a contiguous segment easily. + + +Proposal Overview + + * Eliminate the char-buffer and multiple-segment sections of the + buffer-protocol. + + * Unify the read/write versions of getting the buffer. + + * Add a new function to the protocol that should be called when + the consumer object is "done" with the view. + + * Add a new function to allow the protocol to describe what is in + memory (unifying what is currently done now in struct and + array) + + * Add a new function to allow the protocol to share shape + information + + * Fix all objects in core and standard library to conform to the + new interface + + * Extend the struct module to handle more format specifiers + +Specification + + Change the PyBufferProcs structure to + + typedef struct { + getbufferproc bf_getbuffer + releasebufferproc bf_releasebuffer + formatbufferproc bf_getbufferformat + shapebufferproc bf_getbuffershape + } + + typedef PyObject *(*getbufferproc)(PyObject *obj, void **buf, + Py_ssize_t *len, int requires) + + Return a pointer to memory in buf and the length of that memory + buffer in buf. Requirements for the memory are provided in + requires (PYBUFFER_WRITE, PYBUFFER_ONESEGMENT). NULL is + returned and an error raised if the object cannot return a view + with those requirements. Otherwise, an object-specific "view" + object is returned (which can just be a borrowed reference to + obj). + + This view object should be used in the other API calls and + does not need to be decref'd. It should be "released" if the + interface exporter provides the bf_releasebuffer function. + + typedef int (*releasebufferproc)(PyObject *view) + + This function is called when a view of memory previously + acquired from the object is no longer needed. It is up to the + exporter of the API to make sure all views have been released + before eliminating a reference to a previously returned pointer. + It is up to consumers of the API to call this function on the + object whose view is obtained when it is no longer needed. A -1 + is returned on error and 0 on success. + + typedef char *(*formatbufferproc)(PyObject *view, int *itemsize) + + Get the format-string of the memory using the struct-module + string syntax (see below for proposed additions to that syntax). + Also, there is never an alignment assumption in this + string---the full byte-layout is always required. If the + implied size of this string is smaller than the length of the + buffer then it is assumed that the string is repeated. + + If itemsize is not NULL, then return the size implied by the + format string. This could be the entire length of the buffer or + just the length of each element. It is equivalent to *itemsize + = PyObject_SizeFromFormat(ret) if ret is the returned string. + However, very often objects already know the itemsize without + having to compute it separately. + + typedef PyObject *(*shapebufferproc)(PyObject *view) + + Return a 2-tuple of lists containing shape information: (shape, + strides). The strides object can be None if the memory is + C-style contiguous) otherwise it provides the striding in each + dimension. + + All of these routines are optional for a type object (but the last + three make no sense unless the first one is implemented). + + +New C-API calls are proposed + + int + PyObject_CheckBuffer(PyObject *obj) + + return 1 if the getbuffer function is available otherwise 0 + + PyObject * + PyObject_GetBuffer(PyObject *obj, void **buf, Py_ssize_t *len, + int requires) + + return a borrowed reference to a "view" object of memory for the + object. Requirements for the memory should be given in requires + (PYBUFFER_WRITE, PYBUFFER_ONESEGMENT). The memory pointer is in + *buf and its length in *len. + + Note, the memory is not considered a single segment of memory + unless PYBUFFER_ONESEGMENT is used in requires. Get possible + striding using PyObject_GetBufferShape on the view object. + + int + PyObject_ReleaseBuffer(PyObject *view) + + call this function to tell obj that you are done with your "view" + This is a no-op if the object doesn't implement a release function. + Only call this after a previous PyObject_GetBuffer has succeeded. + Return -1 on error. + + char * + PyObject_GetBufferFormat(PyObject *view, int *itemsize) + + Return a NULL-terminated string indicating the data-format of + the memory buffer. The string is in struct-module syntax with + the exception that there is never an alignment assumption (all + bytes must be accounted for). If the length of the buffer + indicated by this string is smaller than the total length of the + buffer, then a repeat of the string is implied to fill the + length of the buffer. + + If itemsize is not NULL, then return the implied size + of each item (this could be calculated from the format string + but it is often known by the view object anyway). + + PyObject * + PyObject_GetBufferShape(PyObject *view) + + Return a 2-tuple of lists (shape, stride) providing the + multi-dimensional shape of the memory area. The stride + shows how many bytes to skip in each dimension to move + in that dimension from the start of the array. + + Memory that is not a single contiguous-buffer can be represented + with the pointer returned from GetBuffer and the shape and + strides returned from GetBufferShape. + + int PyObject_SizeFromFormat(char *) + Return the implied size of the data-format area from a struct-style + description. + +Additions to the struct string-syntax + + The struct string-syntax is missing some characters to fully + implement data-format descriptions already available elsewhere (in + ctypes and NumPy for example). Here are the proposed additions: + + Character Description + ================================== + '1' bit (number before states how many bits) + '?' platform _Bool type + 'g' long double + 'F' complex float + 'D' complex double + 'G' complex long double + 'c' ucs-1 (latin-1) encoding + 'u' ucs-2 + 'w' ucs-4 + 'O' pointer to Python Object + 'T{}' structure (detailed layout inside {}) + '(k1,k2,...,kn)' multi-dimensional array of whatever follows + ':name:' optional name of the preceeding element + '&' specific pointer (prefix before another charater) + 'X{}' pointer to a function (optional function + signature inside {}) + + The struct module will be changed to understand these as well and + return appropriate Python objects on unpacking. Un-packing a + long-double will return a c-types long_double. Unpacking 'u' or + 'w' will return Python unicode. Unpacking a multi-dimensional + array will return a list of lists. Un-packing a pointer will + return a ctypes pointer object. Un-packing a bit will return a + Python Bool. + + Endian-specification ('=','>','<') is also allowed inside the + string so that it can change if needed. The previously-specified + endian string is enforce at all times. The default endian is '='. + + According to the struct-module, a number can preceed a character + code to specify how many of that type there are. The + (k1,k2,...,kn) extension also allows specifying if the data is + supposed to be viewed as a (C-style contiguous, last-dimension + varies the fastest) multi-dimensional array of a particular format. + + Functions should be added to ctypes to create a ctypes object from + a struct description, and add long-double, and ucs-2 to ctypes. + +Code to be affected + + All objects and modules in Python that export or consume the old + buffer interface will be modified. Here is a partial list. + + * buffer object + * bytes object + * string object + * array module + * struct module + * mmap module + * ctypes module + + anything else using the buffer API + +Issues and Details + + The proposed locking mechanism relies entirely on the objects + implementing the buffer interface to do their own thing. Ideally + an object that implements the buffer interface should keep at least + a number indicating how many releases are extant. + + The handling of discontiguous memory is new and can be seen as a + modification of the multiple-segment interface. It is motivated by + NumPy (used to be Numeric). NumPy objects should be able to share + their strided memory with code that understands how to manage + strided memory. + + Code should also be able to request contiguous memory if needed and + objects exporting the buffer interface should be able to handle + that either by raising an error (or constructing a read-only + contiguous object and returning that as the view). + + Currently the struct module does not allow specification of nested + structures. It seems like specifying a nested structure should be + specified as several ways of viewing memory areas (ctypes and + NumPy) already allow this. + +Copyright + + This PEP is placed in the public domain + Property changes on: trunk/numpy/doc/pep_buffer.txt ___________________________________________________________________ Name: svn:eol-style + native From numpy-svn at scipy.org Tue Feb 27 20:09:06 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 19:09:06 -0600 (CST) Subject: [Numpy-svn] r3554 - trunk/numpy/doc Message-ID: <20070228010906.B5A4A39C2CF@new.scipy.org> Author: oliphant Date: 2007-02-27 19:09:01 -0600 (Tue, 27 Feb 2007) New Revision: 3554 Modified: trunk/numpy/doc/pep_buffer.txt Log: Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 01:00:07 UTC (rev 3553) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 01:09:01 UTC (rev 3554) @@ -109,13 +109,13 @@ typedef PyObject *(*getbufferproc)(PyObject *obj, void **buf, Py_ssize_t *len, int requires) - Return a pointer to memory in buf and the length of that memory - buffer in buf. Requirements for the memory are provided in + Return a pointer to memory in *buf and the length of that memory + buffer in *len. Requirements for the memory are provided in requires (PYBUFFER_WRITE, PYBUFFER_ONESEGMENT). NULL is returned and an error raised if the object cannot return a view with those requirements. Otherwise, an object-specific "view" - object is returned (which can just be a borrowed reference to - obj). + object is returned (which can just be as simple as a borrowed + reference to obj). This view object should be used in the other API calls and does not need to be decref'd. It should be "released" if the @@ -126,7 +126,7 @@ This function is called when a view of memory previously acquired from the object is no longer needed. It is up to the exporter of the API to make sure all views have been released - before eliminating a reference to a previously returned pointer. + before re-allocating the previously returned pointer. It is up to consumers of the API to call this function on the object whose view is obtained when it is no longer needed. A -1 is returned on error and 0 on success. @@ -224,9 +224,9 @@ ctypes and NumPy for example). Here are the proposed additions: Character Description - ================================== + ============================================================= '1' bit (number before states how many bits) - '?' platform _Bool type + 't' platform _Bool type if available 'g' long double 'F' complex float 'D' complex double From numpy-svn at scipy.org Tue Feb 27 20:16:02 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 19:16:02 -0600 (CST) Subject: [Numpy-svn] r3555 - trunk/numpy/doc Message-ID: <20070228011602.77BF339C2DE@new.scipy.org> Author: oliphant Date: 2007-02-27 19:15:59 -0600 (Tue, 27 Feb 2007) New Revision: 3555 Modified: trunk/numpy/doc/pep_buffer.txt Log: Update to buffer interface PEP Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 01:09:01 UTC (rev 3554) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 01:15:59 UTC (rev 3555) @@ -248,7 +248,7 @@ 'w' will return Python unicode. Unpacking a multi-dimensional array will return a list of lists. Un-packing a pointer will return a ctypes pointer object. Un-packing a bit will return a - Python Bool. + Python Bool. Spaces in the struct-string syntax will be ignored. Endian-specification ('=','>','<') is also allowed inside the string so that it can change if needed. The previously-specified @@ -263,6 +263,36 @@ Functions should be added to ctypes to create a ctypes object from a struct description, and add long-double, and ucs-2 to ctypes. +Examples of Data-Format Descriptions + + Here are some examples of C-structures and how they would be + represented using the struct-style syntax: + + float + 'f' + complex double + 'F' or 'ff' + RGB Pixel data + 'BBB' or 'B:r: B:g: B:b:' + Mixed endian (weird but possible) + '>i:big: Author: oliphant Date: 2007-02-27 21:22:18 -0600 (Tue, 27 Feb 2007) New Revision: 3556 Modified: trunk/numpy/core/src/arraytypes.inc.src Log: Fix copyswap when a field is a sub-array Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2007-02-28 01:15:59 UTC (rev 3555) +++ trunk/numpy/core/src/arraytypes.inc.src 2007-02-28 03:22:18 UTC (rev 3556) @@ -1298,9 +1298,7 @@ VOID_copyswapn (char *dst, intp dstride, char *src, intp sstride, intp n, int swap, PyArrayObject *arr) { - int itemsize; if (arr == NULL) return; - itemsize = arr->descr->elsize; if (PyArray_HASFIELDS(arr)) { PyObject *key, *value, *title=NULL; PyArray_Descr *new, *descr; @@ -1320,8 +1318,30 @@ arr->descr = descr; return; } + if (swap && arr->descr->subarray != NULL) { + PyArray_Descr *descr, *new; + npy_intp num; + npy_intp i; + int subitemsize; + char *dstptr, *srcptr; + descr = arr->descr; + new = descr->subarray->base; + arr->descr = new; + dstptr = dst; + srcptr = src; + subitemsize = new->elsize; + num = descr->elsize / subitemsize; + for (i=0; if->copyswapn(dstptr, subitemsize, srcptr, + subitemsize, num, swap, arr); + dstptr += dstride; + if (srcptr) srcptr += sstride; + } + arr->descr = descr; + return; + } if (src != NULL) { - memcpy(dst, src, itemsize * n); + memcpy(dst, src, arr->descr->elsize * n); } return; } @@ -1349,6 +1369,20 @@ arr->descr = descr; return; } + if (swap && arr->descr->subarray != NULL) { + PyArray_Descr *descr, *new; + npy_intp num; + int itemsize; + descr = arr->descr; + new = descr->subarray->base; + arr->descr = new; + itemsize = new->elsize; + num = descr->elsize / itemsize; + new->f->copyswapn(dst, itemsize, src, + itemsize, num, swap, arr); + arr->descr = descr; + return; + } if (src != NULL) { memcpy(dst, src, arr->descr->elsize); } From numpy-svn at scipy.org Tue Feb 27 23:01:15 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 22:01:15 -0600 (CST) Subject: [Numpy-svn] r3557 - trunk/numpy/core/src Message-ID: <20070228040115.694EC39C2C4@new.scipy.org> Author: oliphant Date: 2007-02-27 22:01:10 -0600 (Tue, 27 Feb 2007) New Revision: 3557 Modified: trunk/numpy/core/src/arraytypes.inc.src Log: Fix getitem on a string to just truncate trailing NULLs rather than stop at interior NULLs Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2007-02-28 03:22:18 UTC (rev 3556) +++ trunk/numpy/core/src/arraytypes.inc.src 2007-02-28 04:01:10 UTC (rev 3557) @@ -360,14 +360,19 @@ return 0; } -/* STRING -- can handle both NULL-terminated and not NULL-terminated cases */ +/* STRING -- can handle both NULL-terminated and not NULL-terminated cases + will truncate all ending NULLs in returned string. +*/ static PyObject * STRING_getitem(char *ip, PyArrayObject *ap) { - if (ip[ap->descr->elsize-1]) - return PyString_FromStringAndSize(ip,ap->descr->elsize); - else - return PyString_FromString(ip); + /* Will eliminate NULLs at the end */ + char *ptr; + int size = ap->descr->elsize; + + ptr = ip + size-1; + while (*ptr-- == '\0') size--; + return PyString_FromStringAndSize(ip,size); } static int From numpy-svn at scipy.org Tue Feb 27 23:13:33 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 22:13:33 -0600 (CST) Subject: [Numpy-svn] r3558 - trunk/numpy/numarray Message-ID: <20070228041333.1692D39C0E1@new.scipy.org> Author: oliphant Date: 2007-02-27 22:13:31 -0600 (Tue, 27 Feb 2007) New Revision: 3558 Modified: trunk/numpy/numarray/functions.py Log: Fix numarray.fromstring Modified: trunk/numpy/numarray/functions.py =================================================================== --- trunk/numpy/numarray/functions.py 2007-02-28 04:01:10 UTC (rev 3557) +++ trunk/numpy/numarray/functions.py 2007-02-28 04:13:31 UTC (rev 3558) @@ -270,8 +270,8 @@ if shape is None: count = -1 else: - count = N.product(shape)*dtype.itemsize - res = N.fromstring(datastring, count=count) + count = N.product(shape) + res = N.fromstring(datastring, dtype=dtype, count=count) if shape is not None: res.shape = shape return res From numpy-svn at scipy.org Tue Feb 27 23:32:33 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 22:32:33 -0600 (CST) Subject: [Numpy-svn] r3559 - trunk/numpy/doc Message-ID: <20070228043233.AA7C839C0E1@new.scipy.org> Author: oliphant Date: 2007-02-27 22:32:25 -0600 (Tue, 27 Feb 2007) New Revision: 3559 Modified: trunk/numpy/doc/pep_buffer.txt Log: Changes to pep. Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 04:13:31 UTC (rev 3558) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 04:32:25 UTC (rev 3559) @@ -225,12 +225,10 @@ Character Description ============================================================= - '1' bit (number before states how many bits) - 't' platform _Bool type if available + 't' bit (number before states how many bits) + '?' platform _Bool type 'g' long double - 'F' complex float - 'D' complex double - 'G' complex long double + 'Z' complex (whatever the next specifier is) 'c' ucs-1 (latin-1) encoding 'u' ucs-2 'w' ucs-4 @@ -271,7 +269,7 @@ float 'f' complex double - 'F' or 'ff' + 'zd' RGB Pixel data 'BBB' or 'B:r: B:g: B:b:' Mixed endian (weird but possible) From numpy-svn at scipy.org Tue Feb 27 23:32:43 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 22:32:43 -0600 (CST) Subject: [Numpy-svn] r3560 - trunk/numpy/doc Message-ID: <20070228043243.C7CFA39C0E1@new.scipy.org> Author: oliphant Date: 2007-02-27 22:32:41 -0600 (Tue, 27 Feb 2007) New Revision: 3560 Modified: trunk/numpy/doc/pep_buffer.txt Log: Changes to pep. Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 04:32:25 UTC (rev 3559) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 04:32:41 UTC (rev 3560) @@ -269,7 +269,7 @@ float 'f' complex double - 'zd' + 'Zd' RGB Pixel data 'BBB' or 'B:r: B:g: B:b:' Mixed endian (weird but possible) From numpy-svn at scipy.org Wed Feb 28 00:14:34 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 23:14:34 -0600 (CST) Subject: [Numpy-svn] r3561 - trunk/numpy/doc Message-ID: <20070228051434.2065D39C2E8@new.scipy.org> Author: oliphant Date: 2007-02-27 23:14:30 -0600 (Tue, 27 Feb 2007) New Revision: 3561 Modified: trunk/numpy/doc/pep_buffer.txt Log: buffer pep changes. Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 04:32:41 UTC (rev 3560) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 05:14:30 UTC (rev 3561) @@ -131,7 +131,7 @@ object whose view is obtained when it is no longer needed. A -1 is returned on error and 0 on success. - typedef char *(*formatbufferproc)(PyObject *view, int *itemsize) + typedef PyObject *(*formatbufferproc)(PyObject *view, int *itemsize) Get the format-string of the memory using the struct-module string syntax (see below for proposed additions to that syntax). @@ -147,17 +147,30 @@ However, very often objects already know the itemsize without having to compute it separately. + The returned object is a Python CObject surrounding a char * + pointer which will deallocate the memory for the char * when + the reference disappears. + typedef PyObject *(*shapebufferproc)(PyObject *view) - Return a 2-tuple of lists containing shape information: (shape, - strides). The strides object can be None if the memory is - C-style contiguous) otherwise it provides the striding in each - dimension. + Return a Python CObject surrounding a pointer to the structure - All of these routines are optional for a type object (but the last - three make no sense unless the first one is implemented). + struct { + int ndim + Py_ssize_t *shape; + Py_ssize_t *strides; + } + The strides pointer can be NULL if the memory is C-style contiguous + otherwise it provides the striding in each dimension. + When the returned Object is deallocated, the memory for the shape + and strides is freed. + + All of these routines are optional for a type object (but the last + three make no sense unless the first one is implemented). + + New C-API calls are proposed int @@ -217,6 +230,15 @@ Return the implied size of the data-format area from a struct-style description. + PyObject *PyObject_BufferFormat(char *format, int copy) + Construct a CObject to return as the format in the buffer interface + from a string being sure to copy if specified. + + PyObject *PyObject_BufferShape(int ndim, Py_ssize_t *shape, Py_ssize_t *strides) + Construct a CObject to return as the shape object in the buffer interface. + The values are copied from the arrays pointed to by shape and strides. + Strides can be NULL if the memory is C-style contiguous. + Additions to the struct string-syntax The struct string-syntax is missing some characters to fully @@ -239,6 +261,7 @@ '&' specific pointer (prefix before another charater) 'X{}' pointer to a function (optional function signature inside {}) + ' ' ignored (allow readability) The struct module will be changed to understand these as well and return appropriate Python objects on unpacking. Un-packing a @@ -250,7 +273,7 @@ Endian-specification ('=','>','<') is also allowed inside the string so that it can change if needed. The previously-specified - endian string is enforce at all times. The default endian is '='. + endian string is enforce until changed. The default endian is '='. According to the struct-module, a number can preceed a character code to specify how many of that type there are. The @@ -311,7 +334,9 @@ The proposed locking mechanism relies entirely on the objects implementing the buffer interface to do their own thing. Ideally an object that implements the buffer interface should keep at least - a number indicating how many releases are extant. + a number indicating how many releases are extant. If there are views + to a memory location, then reallocation should fail and raise + an error. The handling of discontiguous memory is new and can be seen as a modification of the multiple-segment interface. It is motivated by @@ -329,6 +354,11 @@ specified as several ways of viewing memory areas (ctypes and NumPy) already allow this. + Python Objects are returned for Format and Shape descriptions so + that memory-management is simply handled using reference-counting. + + + Copyright This PEP is placed in the public domain From numpy-svn at scipy.org Wed Feb 28 00:24:28 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 27 Feb 2007 23:24:28 -0600 (CST) Subject: [Numpy-svn] r3562 - trunk/numpy/doc Message-ID: <20070228052428.7591039C035@new.scipy.org> Author: oliphant Date: 2007-02-27 23:24:26 -0600 (Tue, 27 Feb 2007) New Revision: 3562 Modified: trunk/numpy/doc/pep_buffer.txt Log: Fix buffer PEP. Modified: trunk/numpy/doc/pep_buffer.txt =================================================================== --- trunk/numpy/doc/pep_buffer.txt 2007-02-28 05:14:30 UTC (rev 3561) +++ trunk/numpy/doc/pep_buffer.txt 2007-02-28 05:24:26 UTC (rev 3562) @@ -148,9 +148,14 @@ having to compute it separately. The returned object is a Python CObject surrounding a char * - pointer which will deallocate the memory for the char * when - the reference disappears. + pointer which will manage the memory for the char * when the + reference disappears. + If this is routine is not provided, then it is the same as if + "B" were the returned string (i.e. it's just a block of bytes) + and itemsize==1. + + typedef PyObject *(*shapebufferproc)(PyObject *view) Return a Python CObject surrounding a pointer to the structure @@ -158,19 +163,28 @@ struct { int ndim Py_ssize_t *shape; - Py_ssize_t *strides; + Py_ssize_t *strides; } The strides pointer can be NULL if the memory is C-style contiguous - otherwise it provides the striding in each dimension. + otherwise it provides the striding in each dimension (how many bytes + to skip to get to the next element along a particular dimension). - When the returned Object is deallocated, the memory for the shape - and strides is freed. + When the returned object is collected, the memory for the shape + and strides is freed by the deallocator stored in the CObject. - All of these routines are optional for a type object (but the last - three make no sense unless the first one is implemented). + If this routine is not provided, then it's equivalent to + ndim == 1 and shape == [len] + Notice that the buffer length, len, should be + (shape[0]*...*shape[ndim-1])*itemsize regardless of the strides. + + All of these routines are optional for a type object (but the last + three make no sense unless the first one is implemented). + + + New C-API calls are proposed int From numpy-svn at scipy.org Wed Feb 28 08:12:10 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 28 Feb 2007 07:12:10 -0600 (CST) Subject: [Numpy-svn] r3563 - trunk/numpy/distutils/fcompiler Message-ID: <20070228131210.66D1239C1C5@new.scipy.org> Author: pearu Date: 2007-02-28 07:12:06 -0600 (Wed, 28 Feb 2007) New Revision: 3563 Modified: trunk/numpy/distutils/fcompiler/ibm.py Log: Added support for xml Fortran V10 compiler (needs testing). Modified: trunk/numpy/distutils/fcompiler/ibm.py =================================================================== --- trunk/numpy/distutils/fcompiler/ibm.py 2007-02-28 05:24:26 UTC (rev 3562) +++ trunk/numpy/distutils/fcompiler/ibm.py 2007-02-28 13:12:06 UTC (rev 3563) @@ -8,8 +8,8 @@ class IbmFCompiler(FCompiler): compiler_type = 'ibm' - version_pattern = r'xlf\(1\)\s*IBM XL Fortran (Advanced Edition |)Version (?P[^\s*]*)' - + version_pattern = r'(xlf\(1\)\s*|)IBM XL Fortran ((Advanced Edition |)Version |Enterprise Edition V)(?P[^\s*]*)' + #IBM XL Fortran Enterprise Edition V10.1 for AIX \nVersion: 10.01.0000.0004 executables = { 'version_cmd' : ["xlf"], 'compiler_f77' : ["xlf"], @@ -22,6 +22,16 @@ def get_version(self,*args,**kwds): version = FCompiler.get_version(self,*args,**kwds) + + if version is None: + # Let's try version_cmd with -qversion flag that V10 supports: + l = self.__class__.executables['version_cmd'] + if '-qversion' not in l: + l.append('-qversion') + version = FCompiler.get_version(self,*args,**kwds) + if version is None: + l.remove('-qversion') + xlf_dir = '/etc/opt/ibmcmp/xlf' if version is None and os.path.isdir(xlf_dir): # If the output of xlf does not contain version info From numpy-svn at scipy.org Wed Feb 28 13:32:22 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 28 Feb 2007 12:32:22 -0600 (CST) Subject: [Numpy-svn] r3564 - trunk/numpy/distutils/fcompiler Message-ID: <20070228183222.5F3DD39C2BA@new.scipy.org> Author: pearu Date: 2007-02-28 12:32:18 -0600 (Wed, 28 Feb 2007) New Revision: 3564 Modified: trunk/numpy/distutils/fcompiler/ibm.py Log: Fixing xlf compiler for AIX with 9.x and 10.x version support (needs testing and checking that xlf 8.x compilers are still detected) Modified: trunk/numpy/distutils/fcompiler/ibm.py =================================================================== --- trunk/numpy/distutils/fcompiler/ibm.py 2007-02-28 13:12:06 UTC (rev 3563) +++ trunk/numpy/distutils/fcompiler/ibm.py 2007-02-28 18:32:18 UTC (rev 3564) @@ -11,7 +11,7 @@ version_pattern = r'(xlf\(1\)\s*|)IBM XL Fortran ((Advanced Edition |)Version |Enterprise Edition V)(?P[^\s*]*)' #IBM XL Fortran Enterprise Edition V10.1 for AIX \nVersion: 10.01.0000.0004 executables = { - 'version_cmd' : ["xlf"], + 'version_cmd' : ["xlf","-qversion"], 'compiler_f77' : ["xlf"], 'compiler_fix' : ["xlf90", "-qfixed"], 'compiler_f90' : ["xlf90"], @@ -24,14 +24,16 @@ version = FCompiler.get_version(self,*args,**kwds) if version is None: - # Let's try version_cmd with -qversion flag that V10 supports: - l = self.__class__.executables['version_cmd'] - if '-qversion' not in l: - l.append('-qversion') + # Let's try version_cmd without -qversion flag that + # xlf versions <=8.x don't have. + version_cmd = self.version_cmd + orig_version_cmd = version_cmd[:] + if '-qversion' in version_cmd: + version_cmd.remove('-qversion') version = FCompiler.get_version(self,*args,**kwds) if version is None: - l.remove('-qversion') - + version_cmd[:] = orig_version_cmd + xlf_dir = '/etc/opt/ibmcmp/xlf' if version is None and os.path.isdir(xlf_dir): # If the output of xlf does not contain version info @@ -61,7 +63,10 @@ version = self.get_version(ok_status=[0,40]) if version is not None: import tempfile - xlf_cfg = '/etc/opt/ibmcmp/xlf/%s/xlf.cfg' % version + if sys.platform.startswith('aix'): + xlf_cfg = '/etc/xlf.cfg' + else: + xlf_cfg = '/etc/opt/ibmcmp/xlf/%s/xlf.cfg' % version new_cfg = tempfile.mktemp()+'_xlf.cfg' log.info('Creating '+new_cfg) fi = open(xlf_cfg,'r') From numpy-svn at scipy.org Wed Feb 28 15:21:50 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 28 Feb 2007 14:21:50 -0600 (CST) Subject: [Numpy-svn] r3565 - trunk/numpy/core Message-ID: <20070228202150.3FAC139C31F@new.scipy.org> Author: stefan Date: 2007-02-28 14:21:39 -0600 (Wed, 28 Feb 2007) New Revision: 3565 Modified: trunk/numpy/core/fromnumeric.py Log: Fix searchsorted docstring. Closes #457. Modified: trunk/numpy/core/fromnumeric.py =================================================================== --- trunk/numpy/core/fromnumeric.py 2007-02-28 18:32:18 UTC (rev 3564) +++ trunk/numpy/core/fromnumeric.py 2007-02-28 20:21:39 UTC (rev 3565) @@ -339,7 +339,7 @@ side -- {'left', 'right'}, default('left'). Returns: - array of indices with the same shape as a. + array of indices with the same shape as v. The array to be searched must be 1-D and is assumed to be sorted in ascending order. From numpy-svn at scipy.org Wed Feb 28 16:35:17 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 28 Feb 2007 15:35:17 -0600 (CST) Subject: [Numpy-svn] r3566 - trunk/numpy/core/tests Message-ID: <20070228213517.1638E39C282@new.scipy.org> Author: stefan Date: 2007-02-28 15:35:10 -0600 (Wed, 28 Feb 2007) New Revision: 3566 Modified: trunk/numpy/core/tests/test_regression.py Log: Regression test for changeset 3557. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2007-02-28 20:21:39 UTC (rev 3565) +++ trunk/numpy/core/tests/test_regression.py 2007-02-28 21:35:10 UTC (rev 3566) @@ -616,11 +616,16 @@ def check_mem_polymul(self, level=rlevel): """Ticket #448""" N.polymul([],[1.]) - + def check_convolve_empty(self, level=rlevel): """Convolve should raise an error for empty input array.""" self.failUnlessRaises(AssertionError,N.convolve,[],[1]) self.failUnlessRaises(AssertionError,N.convolve,[1],[]) + def check_string_NULL(self, level=rlevel): + """Changeset 3557""" + assert_equal(N.array("a\x00\x0b\x0c\x00").item(), + 'a\x00\x0b\x0c') + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Wed Feb 28 18:52:35 2007 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 28 Feb 2007 17:52:35 -0600 (CST) Subject: [Numpy-svn] r3567 - trunk/numpy/core/src Message-ID: <20070228235235.F190A39C25D@new.scipy.org> Author: oliphant Date: 2007-02-28 17:52:12 -0600 (Wed, 28 Feb 2007) New Revision: 3567 Modified: trunk/numpy/core/src/arrayobject.c Log: Fix string comparison so it is not fooled by NULLs in the string. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2007-02-28 21:35:10 UTC (rev 3566) +++ trunk/numpy/core/src/arrayobject.c 2007-02-28 23:52:12 UTC (rev 3567) @@ -4254,6 +4254,7 @@ PyArray_UCS4 *s1t=s1, *s2t=s2; int val; intp size; + int diff; if ((intp)s1 % sizeof(PyArray_UCS4) != 0) { size = len1*sizeof(PyArray_UCS4); @@ -4267,9 +4268,12 @@ } val = PyArray_CompareUCS4(s1t, s2t, MIN(len1,len2)); if ((val != 0) || (len1 == len2)) goto finish; - if (len2 > len1) {sptr = s2t+len1; val = -1;} - else {sptr = s1t+len2; val = 1;} - if (*sptr != 0) goto finish; + if (len2 > len1) {sptr = s2t+len1; val = -1; diff=len2-len1;} + else {sptr = s1t+len2; val = 1; diff=len1-len2;} + while (diff--) { + if (*sptr != 0) goto finish; + sptr++; + } val = 0; finish: @@ -4291,13 +4295,17 @@ { char *sptr; int val; + int diff; val = strncmp(s1, s2, MIN(len1, len2)); if ((val != 0) || (len1 == len2)) return val; - if (len2 > len1) {sptr = s2+len1; val = -1;} - else {sptr = s1+len2; val = 1;} - if (*sptr != 0) return val; - return 0; + if (len2 > len1) {sptr = s2+len1; val = -1; diff=len2-len1;} + else {sptr = s1+len2; val = 1; diff=len1-len2;} + while (diff--) { + if (*sptr != 0) return val; + sptr++; + } + return 0; /* Only happens if NULLs are everywhere */ } /* Borrowed from Numarray */