From numpy-svn at scipy.org Sat Mar 1 03:20:15 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 1 Mar 2008 02:20:15 -0600 (CST) Subject: [Numpy-svn] r4837 - trunk/numpy Message-ID: <20080301082015.CC55339C037@new.scipy.org> Author: stefan Date: 2008-03-01 02:20:07 -0600 (Sat, 01 Mar 2008) New Revision: 4837 Modified: trunk/numpy/add_newdocs.py Log: Add basic usage docstring for dtype. Modified: trunk/numpy/add_newdocs.py =================================================================== --- trunk/numpy/add_newdocs.py 2008-02-29 21:21:04 UTC (rev 4836) +++ trunk/numpy/add_newdocs.py 2008-03-01 08:20:07 UTC (rev 4837) @@ -4,6 +4,61 @@ # docstrings without requiring a re-compile. from lib import add_newdoc +add_newdoc('numpy.core', 'dtype', +"""Create a data type. + +A numpy array is homogeneous, and contains elements described by a +dtype. A dtype can be constructed from different combinations of +fundamental numeric types, as illustrated below. + +Examples +-------- + +Using array-scalar type: +>>> dtype(int16) +dtype('int16') + +Record, one field name 'f1', containing int16: +>>> dtype([('f1', int16)]) +dtype([('f1', '>> dtype([('f1', [('f1', int16)])]) +dtype([('f1', [('f1', '>> dtype([('f1', uint), ('f2', int32)]) +dtype([('f1', '>> dtype([('a','f8'),('b','S10')]) +dtype([('a', '>> dtype("i4, (2,3)f8") +dtype([('f0', '>> dtype([('hello',(int,3)),('world',void,10)]) +dtype([('hello', '>> dtype((int16, {'x':(int8,0), 'y':(int8,1)})) +dtype(('>> dtype({'names':['gender','age'], 'formats':['S1',uint8]}) +dtype([('gender', '|S1'), ('age', '|u1')]) + +Offsets in bytes, here 0 and 25: +>>> dtype({'surname':('S25',0),'age':(uint8,25)}) +dtype([('surname', '|S25'), ('age', '|u1')]) + +""") + add_newdoc('numpy.core','dtype', [('fields', "Fields of the data-type or None if no fields"), ('names', "Names of fields or None if no fields"), From numpy-svn at scipy.org Sat Mar 1 12:17:48 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 1 Mar 2008 11:17:48 -0600 (CST) Subject: [Numpy-svn] r4838 - trunk/numpy/core/tests Message-ID: <20080301171748.76AA839C061@new.scipy.org> Author: stefan Date: 2008-03-01 11:17:46 -0600 (Sat, 01 Mar 2008) New Revision: 4838 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Add test for scalar indexing. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-01 08:20:07 UTC (rev 4837) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-01 17:17:46 UTC (rev 4838) @@ -68,5 +68,13 @@ # val2 = eval(val_repr) # assert_equal( val, val2 ) +class TestIndexing(NumpyTestCase): + def test_basic(self): + for t in types: + value = t(1) + x = value + assert_array_equal(x[...],value) + assert_array_equal(x[()],value) + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Sat Mar 1 22:28:11 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 1 Mar 2008 21:28:11 -0600 (CST) Subject: [Numpy-svn] r4839 - trunk/numpy/core/src Message-ID: <20080302032811.BEB6839C15C@new.scipy.org> Author: oliphant Date: 2008-03-01 21:28:03 -0600 (Sat, 01 Mar 2008) New Revision: 4839 Modified: trunk/numpy/core/src/arrayobject.c Log: Allow names to be changed for data type objects without creating an entirely new data-type. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-01 17:17:46 UTC (rev 4838) +++ trunk/numpy/core/src/arrayobject.c 2008-03-02 03:28:03 UTC (rev 4839) @@ -10785,7 +10785,6 @@ {"itemsize", T_INT, offsetof(PyArray_Descr, elsize), RO, NULL}, {"alignment", T_INT, offsetof(PyArray_Descr, alignment), RO, NULL}, {"flags", T_UBYTE, offsetof(PyArray_Descr, hasobject), RO, NULL}, - {"names", T_OBJECT, offsetof(PyArray_Descr, names), RO, NULL}, {NULL}, }; @@ -10980,6 +10979,70 @@ return res; } +static PyObject * +arraydescr_names_get(PyArray_Descr *self) +{ + if (self->names == NULL) { + Py_INCREF(Py_None); + return Py_None; + } + Py_INCREF(self->names); + return self->names; +} + +static int +arraydescr_names_set(PyArray_Descr *self, PyObject *val) +{ + int N = 0; + int i; + PyObject *new_names; + if (self->names == NULL) { + PyErr_SetString(PyExc_ValueError, "there are no fields defined"); + return -1; + } + + N = PyTuple_GET_SIZE(self->names); + if (!PySequence_Check(val) || PyObject_Size((PyObject *)val) != N) { + PyErr_Format(PyExc_ValueError, "must replace all names at once" \ + " with a sequence of length %d", N, N); + return -1; + } + /* Make sure all entries are strings */ + for (i=0; iob_type->tp_name); + return -1; + } + } + /* Update dictionary keys in fields */ + new_names = PySequence_Tuple(val); + + for (i=0; inames, i); + /* Borrowed reference to item */ + item = PyDict_GetItem(self->fields, key); + new_key = PyTuple_GET_ITEM(new_names, i); + PyDict_SetItem(self->fields, new_key, item); + PyDict_DelItem(self->fields, key); + } + + /* Replace names */ + Py_DECREF(self->names); + self->names = new_names; + + return 0; +} + static PyGetSetDef arraydescr_getsets[] = { {"subdtype", (getter)arraydescr_subdescr_get, @@ -11008,6 +11071,10 @@ {"fields", (getter)arraydescr_fields_get, NULL, NULL}, + {"names", + (getter)arraydescr_names_get, + (setter)arraydescr_names_set, + NULL}, {"hasobject", (getter)arraydescr_hasobject_get, NULL, NULL}, From numpy-svn at scipy.org Sun Mar 2 03:20:10 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 2 Mar 2008 02:20:10 -0600 (CST) Subject: [Numpy-svn] r4840 - trunk/numpy/core/src Message-ID: <20080302082010.0AD8739C302@new.scipy.org> Author: oliphant Date: 2008-03-02 02:20:03 -0600 (Sun, 02 Mar 2008) New Revision: 4840 Modified: trunk/numpy/core/src/ufuncobject.c Log: Improve the way ufuncs look up 1d loops for registered data-types. Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2008-03-02 03:28:03 UTC (rev 4839) +++ trunk/numpy/core/src/ufuncobject.c 2008-03-02 08:20:03 UTC (rev 4840) @@ -674,7 +674,6 @@ } funcdata = funcdata->next; } - PyErr_SetString(PyExc_TypeError, _types_msg); return -1; } @@ -866,11 +865,13 @@ int i, j; char start_type; int userdef=-1; + int userdef_ind=-1; if (self->userloops) { for (i=0; inin; i++) { if (PyTypeNum_ISUSERDEF(arg_types[i])) { userdef = arg_types[i]; + userdef_ind = i; break; } } @@ -882,25 +883,30 @@ if (userdef > 0) { PyObject *key, *obj; - int ret; + int ret=-1; obj = NULL; - key = PyInt_FromLong((long) userdef); - if (key == NULL) return -1; - obj = PyDict_GetItem(self->userloops, key); - Py_DECREF(key); - if (obj == NULL) { - PyErr_SetString(PyExc_TypeError, - "user-defined type used in ufunc" \ - " with no registered loops"); - return -1; - } - /* extract the correct function - data and argtypes - */ - ret = _find_matching_userloop(obj, arg_types, scalars, - function, data, self->nargs, - self->nin); - return ret; + /* Look through all the registered loops for all the user-defined + types to find a match. + */ + while (ret == -1) { + if (userdef_ind >= self->nin) break; + userdef = arg_types[userdef_ind++]; + if (!(PyTypeNum_ISUSERDEF(userdef))) continue; + key = PyInt_FromLong((long) userdef); + if (key == NULL) return -1; + obj = PyDict_GetItem(self->userloops, key); + Py_DECREF(key); + if (obj == NULL) continue; + /* extract the correct function + data and argtypes for this user-defined type. + */ + ret = _find_matching_userloop(obj, arg_types, scalars, + function, data, self->nargs, + self->nin); + } + if (ret == 0) return ret; + PyErr_SetString(PyExc_TypeError, _types_msg); + return ret; } start_type = arg_types[0]; From numpy-svn at scipy.org Sun Mar 2 03:21:50 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 2 Mar 2008 02:21:50 -0600 (CST) Subject: [Numpy-svn] r4841 - trunk/numpy/core Message-ID: <20080302082150.968C839C0DF@new.scipy.org> Author: oliphant Date: 2008-03-02 02:21:48 -0600 (Sun, 02 Mar 2008) New Revision: 4841 Modified: trunk/numpy/core/memmap.py Log: Fix the way memory maps are created to avoid masked_array and memory mapped. Modified: trunk/numpy/core/memmap.py =================================================================== --- trunk/numpy/core/memmap.py 2008-03-02 08:20:03 UTC (rev 4840) +++ trunk/numpy/core/memmap.py 2008-03-02 08:21:48 UTC (rev 4841) @@ -199,13 +199,9 @@ return self def __array_finalize__(self, obj): - if obj is not None: - if hasattr(obj, '_mmap'): - self._mmap = obj._mmap - else: - raise ValueError, 'Cannot create a memmap from object %s'%obj - else: - self._mmap = None + self._mmap = None + if obj is not None and hasattr(obj, '_mmap'): + self._mmap = obj._mmap def flush(self): """Flush any changes in the array to the file on disk.""" @@ -219,7 +215,7 @@ def close(self): """Close the memmap file.""" - if (self.base is self._mmap): + if self.base is self._mmap: self._mmap.close() elif self._mmap is not None: raise ValueError, "Cannot close a memmap that is being used " \ From numpy-svn at scipy.org Sun Mar 2 11:35:12 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 2 Mar 2008 10:35:12 -0600 (CST) Subject: [Numpy-svn] r4842 - trunk/numpy/core/src Message-ID: <20080302163512.12F0539C14D@new.scipy.org> Author: oliphant Date: 2008-03-02 10:35:09 -0600 (Sun, 02 Mar 2008) New Revision: 4842 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Fix realloc problem by making sure it is never called with 0. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-02 08:21:48 UTC (rev 4841) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-02 16:35:09 UTC (rev 4842) @@ -6308,11 +6308,14 @@ NULL); } if (((intp) nread) < num) { + int mem_nread; fprintf(stderr, "%ld items requested but only %ld read\n", (long) num, (long) nread); - tmp = PyDataMem_RENEW(ret->data, - nread * ret->descr->elsize); - if (tmp == NULL) { + /* Make sure realloc is > 0 */ + mem_nread = NPY_MAX(nread, 1); + tmp = PyDataMem_RENEW(ret->data, + mem_nread * ret->descr->elsize); + if (tmp == NULL) { Py_DECREF(ret); return PyErr_NoMemory(); } From numpy-svn at scipy.org Sun Mar 2 19:42:47 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 2 Mar 2008 18:42:47 -0600 (CST) Subject: [Numpy-svn] r4843 - trunk/numpy/core/src Message-ID: <20080303004247.5D97539C01A@new.scipy.org> Author: oliphant Date: 2008-03-02 18:42:42 -0600 (Sun, 02 Mar 2008) New Revision: 4843 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Re-raise the MemoryError for 0-bytes read even if it is not the right thing... Change in 1.1 Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-02 16:35:09 UTC (rev 4842) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-03 00:42:42 UTC (rev 4843) @@ -6308,14 +6308,15 @@ NULL); } if (((intp) nread) < num) { - int mem_nread; fprintf(stderr, "%ld items requested but only %ld read\n", (long) num, (long) nread); /* Make sure realloc is > 0 */ - mem_nread = NPY_MAX(nread, 1); tmp = PyDataMem_RENEW(ret->data, - mem_nread * ret->descr->elsize); - if (tmp == NULL) { + NPY_MAX(nread,1) * ret->descr->elsize); + /* FIXME: This should not raise a memory error when nread == 0 + We should return an empty array or at least raise an EOF Error. + */ + if ((tmp == NULL) || (nread == 0)) { Py_DECREF(ret); return PyErr_NoMemory(); } From numpy-svn at scipy.org Mon Mar 3 19:21:30 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 3 Mar 2008 18:21:30 -0600 (CST) Subject: [Numpy-svn] r4844 - trunk/numpy/core Message-ID: <20080304002130.E4C0A39C053@new.scipy.org> Author: oliphant Date: 2008-03-03 18:21:29 -0600 (Mon, 03 Mar 2008) New Revision: 4844 Modified: trunk/numpy/core/memmap.py Log: Deprecate close method on memmap arrays. Modified: trunk/numpy/core/memmap.py =================================================================== --- trunk/numpy/core/memmap.py 2008-03-03 00:42:42 UTC (rev 4843) +++ trunk/numpy/core/memmap.py 2008-03-04 00:21:29 UTC (rev 4844) @@ -200,7 +200,7 @@ def __array_finalize__(self, obj): self._mmap = None - if obj is not None and hasattr(obj, '_mmap'): + if hasattr(obj, '_mmap'): self._mmap = obj._mmap def flush(self): @@ -213,17 +213,22 @@ warnings.warn("Use ``flush``.", DeprecationWarning) self.flush() - def close(self): - """Close the memmap file.""" + def _close(self): + """Close the memmap file. Only do this when deleting the object.""" if self.base is self._mmap: self._mmap.close() elif self._mmap is not None: raise ValueError, "Cannot close a memmap that is being used " \ "by another object." + def close(self): + """Close the memmap file. Does nothing.""" + warnings.warn("``close`` is deprecated on memmap arrays. Use del", + DeprecationWarning) + def __del__(self): self.flush() try: - self.close() + self._close() except ValueError: pass From numpy-svn at scipy.org Tue Mar 4 00:17:39 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 3 Mar 2008 23:17:39 -0600 (CST) Subject: [Numpy-svn] r4845 - trunk/numpy/core/tests Message-ID: <20080304051739.166BE39C031@new.scipy.org> Author: stefan Date: 2008-03-03 23:17:38 -0600 (Mon, 03 Mar 2008) New Revision: 4845 Modified: trunk/numpy/core/tests/test_multiarray.py Log: Add test for dtype field renaming. Modified: trunk/numpy/core/tests/test_multiarray.py =================================================================== --- trunk/numpy/core/tests/test_multiarray.py 2008-03-04 00:21:29 UTC (rev 4844) +++ trunk/numpy/core/tests/test_multiarray.py 2008-03-04 05:17:38 UTC (rev 4845) @@ -713,6 +713,12 @@ y = x self.failUnlessRaises(ValueError,x.resize,(5,1)) +class TestRecord(NumpyTestCase): + def test_field_rename(self): + dt = np.dtype([('f',float),('i',int)]) + dt.names = ['p','q'] + assert_equal(dt.names,['p','q']) + # Import tests without matching module names set_local_path() from test_unicode import * From numpy-svn at scipy.org Tue Mar 4 15:05:54 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 4 Mar 2008 14:05:54 -0600 (CST) Subject: [Numpy-svn] r4846 - in trunk/numpy/doc: . newdtype_example newdtype_example/floatint Message-ID: <20080304200554.86CCD39C0D5@new.scipy.org> Author: oliphant Date: 2008-03-04 14:05:40 -0600 (Tue, 04 Mar 2008) New Revision: 4846 Added: trunk/numpy/doc/newdtype_example/ trunk/numpy/doc/newdtype_example/floatint.c trunk/numpy/doc/newdtype_example/floatint/ trunk/numpy/doc/newdtype_example/floatint/__init__.py trunk/numpy/doc/newdtype_example/setup.py Log: Simple example of an extended data-type. Added: trunk/numpy/doc/newdtype_example/floatint/__init__.py =================================================================== Property changes on: trunk/numpy/doc/newdtype_example/floatint/__init__.py ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Added: trunk/numpy/doc/newdtype_example/floatint.c =================================================================== --- trunk/numpy/doc/newdtype_example/floatint.c 2008-03-04 05:17:38 UTC (rev 4845) +++ trunk/numpy/doc/newdtype_example/floatint.c 2008-03-04 20:05:40 UTC (rev 4846) @@ -0,0 +1,143 @@ + +#include "Python.h" +#include "structmember.h" /* for offsetof macro if needed */ +#include "numpy/arrayobject.h" + + +/* Use a Python float as the cannonical type being added +*/ + +typedef struct _floatint { + PyObject_HEAD + npy_int32 first; + npy_int32 last; +} PyFloatIntObject; + +static PyTypeObject PyFloatInt_Type = { + PyObject_HEAD_INIT(NULL) + 0, /*ob_size*/ + "floatint.floatint", /*tp_name*/ + sizeof(PyFloatIntObject), /*tp_basicsize*/ +}; + +static PyArray_ArrFuncs _PyFloatInt_Funcs; + +#define _ALIGN(type) offsetof(struct {char c; type v;},v) + +/* Need to inherit from scalar type... */ + +static PyArray_Descr _PyFloatInt_Dtype = { + PyObject_HEAD_INIT(NULL) + &PyFloatInt_Type, + 'f', + '0', + '=', + 0, + 0, + sizeof(double), + _ALIGN(double), + NULL, + NULL, + NULL, + &_PyFloatInt_Funcs +}; + +static void +twoint_copyswap(void *dst, void *src, int swap, void *arr) +{ + if (src != NULL) + memcpy(dst, src, sizeof(double)); + + if (swap) { + register char *a, *b, c; + a = (char *)dst; + b = a + 7; + c = *a; *a++ = *b; *b-- = c; + c = *a; *a++ = *b; *b-- = c; + c = *a; *a++ = *b; *b-- = c; + c = *a; *a++ = *b; *b = c; + } +} + +static PyObject * +twoint_getitem(char *ip, PyArrayObject *ap) { + npy_int32 a[2]; + + if ((ap==NULL) || PyArray_ISBEHAVED_RO(ap)) { + a[0] = *((npy_int32 *)ip); + a[1] = *((npy_int32 *)ip + 1); + } + else { + ap->descr->f->copyswap(a, ip, !PyArray_ISNOTSWAPPED(ap), + ap); + } + return Py_BuildValue("(ii)", a[0], a[1]); +} + +static int +twoint_setitem(PyObject *op, char *ov, PyArrayObject *ap) { + npy_int32 a[2]; + + if (!PyTuple_Check(op)) { + PyErr_SetString(PyExc_TypeError, "must be a tuple"); + return -1; + } + if (!PyArg_ParseTuple(op, "ii", a, a+1)) return -1; + + if (ap == NULL || PyArray_ISBEHAVED(ap)) { + memcpy(ov, a, sizeof(double)); + } + else { + ap->descr->f->copyswap(ov, a, !PyArray_ISNOTSWAPPED(ap), + ap); + } + return 0; +} + +static PyArray_Descr * _register_dtype(void) +{ + int userval; + PyArray_InitArrFuncs(&_PyFloatInt_Funcs); + /* Add copyswap, copyswapn, + nonzero, getitem, setitem, cast */ + _PyFloatInt_Funcs.copyswap = twoint_copyswap; + _PyFloatInt_Funcs.getitem = (PyArray_GetItemFunc *)twoint_getitem; + _PyFloatInt_Funcs.setitem = (PyArray_SetItemFunc *)twoint_setitem; + _PyFloatInt_Dtype.ob_type = &PyArrayDescr_Type; + + userval = PyArray_RegisterDataType(&_PyFloatInt_Dtype); + return PyArray_DescrFromType(userval); +} + + +/* Initialization function for the module (*must* be called init) */ + +PyMODINIT_FUNC initfloatint(void) { + PyObject *m, *d, *s; + PyArray_Descr *dtype; + + /* Create the module and add the functions */ + m = Py_InitModule("floatint", NULL); + + /* Import the array objects */ + import_array(); + + + /* Initialize the new float type */ + + /* Add some symbolic constants to the module */ + d = PyModule_GetDict(m); + + if (PyType_Ready(&PyFloat_Type) < 0) return; + PyFloatInt_Type.tp_base = &PyFloat_Type; + if (PyType_Ready(&PyFloatInt_Type) < 0) return; + + dtype = _register_dtype(); + Py_XINCREF(dtype); + if (dtype != NULL) { + PyDict_SetItemString(d, "floatint_type", (PyObject *)dtype); + } + Py_INCREF(&PyFloatInt_Type); + PyDict_SetItemString(d, "floatint", (PyObject *)&PyFloatInt_Type); + return; +} Property changes on: trunk/numpy/doc/newdtype_example/floatint.c ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native Added: trunk/numpy/doc/newdtype_example/setup.py =================================================================== --- trunk/numpy/doc/newdtype_example/setup.py 2008-03-04 05:17:38 UTC (rev 4845) +++ trunk/numpy/doc/newdtype_example/setup.py 2008-03-04 20:05:40 UTC (rev 4846) @@ -0,0 +1,13 @@ + +from numpy.distutils.core import setup + +def configuration(parent_package = '', top_path=None): + from numpy.distutils.misc_util import Configuration + config = Configuration('floatint',parent_package,top_path) + + config.add_extension('floatint', + sources = ['floatint.c']); + return config + +setup(configuration=configuration) + Property changes on: trunk/numpy/doc/newdtype_example/setup.py ___________________________________________________________________ Name: svn:keywords + Id Name: svn:eol-style + native From numpy-svn at scipy.org Tue Mar 4 15:06:49 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 4 Mar 2008 14:06:49 -0600 (CST) Subject: [Numpy-svn] r4847 - trunk/numpy/core/src Message-ID: <20080304200649.2044C39C3B1@new.scipy.org> Author: oliphant Date: 2008-03-04 14:06:39 -0600 (Tue, 04 Mar 2008) New Revision: 4847 Modified: trunk/numpy/core/src/arrayobject.c Log: Add _default_copyswapn for extended data-types. Fix recent format error. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-04 20:05:40 UTC (rev 4846) +++ trunk/numpy/core/src/arrayobject.c 2008-03-04 20:06:39 UTC (rev 4847) @@ -1530,6 +1530,24 @@ return FALSE; } +static void +_default_copyswapn(void *dst, npy_intp dstride, void *src, + npy_intp sstride, npy_intp n, int swap, void *arr) +{ + npy_intp i; + PyArray_CopySwapFunc *copyswap; + char *dstptr = dst; + char *srcptr = src; + + copyswap = PyArray_DESCR(arr)->f->copyswap; + + for (i=0; inonzero == NULL) { f->nonzero = _default_nonzero; } + if (f->copyswapn == NULL) { + f->copyswapn = _default_copyswapn; + } if (f->copyswap == NULL || f->getitem == NULL || - f->copyswapn == NULL || f->setitem == NULL) { - PyErr_SetString(PyExc_ValueError, "a required array function" \ + f->setitem == NULL) { + PyErr_SetString(PyExc_ValueError, "a required array function" \ " is missing."); return -1; } @@ -11004,7 +11025,7 @@ N = PyTuple_GET_SIZE(self->names); if (!PySequence_Check(val) || PyObject_Size((PyObject *)val) != N) { PyErr_Format(PyExc_ValueError, "must replace all names at once" \ - " with a sequence of length %d", N, N); + " with a sequence of length %d", N); return -1; } /* Make sure all entries are strings */ From numpy-svn at scipy.org Tue Mar 4 17:04:48 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 4 Mar 2008 16:04:48 -0600 (CST) Subject: [Numpy-svn] r4848 - trunk/numpy/doc/newdtype_example Message-ID: <20080304220448.E529739C3CB@new.scipy.org> Author: oliphant Date: 2008-03-04 16:04:46 -0600 (Tue, 04 Mar 2008) New Revision: 4848 Added: trunk/numpy/doc/newdtype_example/example.py Modified: trunk/numpy/doc/newdtype_example/floatint.c Log: Finish simple example for new data-type and add test. Added: trunk/numpy/doc/newdtype_example/example.py =================================================================== --- trunk/numpy/doc/newdtype_example/example.py 2008-03-04 20:06:39 UTC (rev 4847) +++ trunk/numpy/doc/newdtype_example/example.py 2008-03-04 22:04:46 UTC (rev 4848) @@ -0,0 +1,17 @@ +import floatint.floatint as ff +import numpy as np + +# Setting using array is hard because +# The parser doesn't stop at tuples always +# So, the setitem code will be called with scalars on the +# wrong shaped array. +# But we can get a view as an ndarray of the given type: +g = np.array([1,2,3,4,5,6,7,8]).view(ff.floatint_type) + +# Now, the elements will be the scalar type associated +# with the ndarray. +print g[0] +print type(g[1]) + +# Now, you need to register ufuncs and more arrfuncs to do useful things... + Modified: trunk/numpy/doc/newdtype_example/floatint.c =================================================================== --- trunk/numpy/doc/newdtype_example/floatint.c 2008-03-04 20:06:39 UTC (rev 4847) +++ trunk/numpy/doc/newdtype_example/floatint.c 2008-03-04 22:04:46 UTC (rev 4848) @@ -24,7 +24,7 @@ #define _ALIGN(type) offsetof(struct {char c; type v;},v) -/* Need to inherit from scalar type... */ +/* The scalar-type */ static PyArray_Descr _PyFloatInt_Dtype = { PyObject_HEAD_INIT(NULL) @@ -98,8 +98,8 @@ { int userval; PyArray_InitArrFuncs(&_PyFloatInt_Funcs); - /* Add copyswap, copyswapn, - nonzero, getitem, setitem, cast */ + /* Add copyswap, + nonzero, getitem, setitem*/ _PyFloatInt_Funcs.copyswap = twoint_copyswap; _PyFloatInt_Funcs.getitem = (PyArray_GetItemFunc *)twoint_getitem; _PyFloatInt_Funcs.setitem = (PyArray_SetItemFunc *)twoint_setitem; @@ -113,7 +113,7 @@ /* Initialization function for the module (*must* be called init) */ PyMODINIT_FUNC initfloatint(void) { - PyObject *m, *d, *s; + PyObject *m, *d; PyArray_Descr *dtype; /* Create the module and add the functions */ @@ -130,7 +130,17 @@ if (PyType_Ready(&PyFloat_Type) < 0) return; PyFloatInt_Type.tp_base = &PyFloat_Type; + /* This is only needed because we are sub-typing the + Float type and must pre-set some function pointers + to get PyType_Ready to fill in the rest. + */ + PyFloatInt_Type.tp_alloc = PyType_GenericAlloc; + PyFloatInt_Type.tp_new = PyFloat_Type.tp_new; + PyFloatInt_Type.tp_dealloc = PyFloat_Type.tp_dealloc; + PyFloatInt_Type.tp_free = PyObject_Del; if (PyType_Ready(&PyFloatInt_Type) < 0) return; + /* End specific code */ + dtype = _register_dtype(); Py_XINCREF(dtype); From numpy-svn at scipy.org Wed Mar 5 00:19:11 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 4 Mar 2008 23:19:11 -0600 (CST) Subject: [Numpy-svn] r4849 - trunk/numpy/core Message-ID: <20080305051911.EA0FE39C0B9@new.scipy.org> Author: cdavid Date: 2008-03-04 23:19:07 -0600 (Tue, 04 Mar 2008) New Revision: 4849 Modified: trunk/numpy/core/SConstruct Log: Remove debug pring statement in numpy.core SConstruct. Modified: trunk/numpy/core/SConstruct =================================================================== --- trunk/numpy/core/SConstruct 2008-03-04 22:04:46 UTC (rev 4848) +++ trunk/numpy/core/SConstruct 2008-03-05 05:19:07 UTC (rev 4849) @@ -1,4 +1,4 @@ -# Last Change: Wed Jan 23 08:00 PM 2008 J +# Last Change: Wed Mar 05 02:00 PM 2008 J # vim:syntax=python import os import sys @@ -20,7 +20,6 @@ # simple code using only typedef and so on, so we need it for configuration # checks env.AppendUnique(LIBPATH = [get_pythonlib_dir()]) -print env["CPPPATH"] #======================= # Starting Configuration From numpy-svn at scipy.org Wed Mar 5 01:20:08 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 5 Mar 2008 00:20:08 -0600 (CST) Subject: [Numpy-svn] r4850 - in trunk/numpy/core: src tests Message-ID: <20080305062008.D80AF39C03D@new.scipy.org> Author: charris Date: 2008-03-05 00:20:04 -0600 (Wed, 05 Mar 2008) New Revision: 4850 Modified: trunk/numpy/core/src/arraytypes.inc.src trunk/numpy/core/tests/test_regression.py Log: Fix ticket 597. The conversion of negative numbers to uint64 returned the wrong values. Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2008-03-05 05:19:07 UTC (rev 4849) +++ trunk/numpy/core/src/arraytypes.inc.src 2008-03-05 06:20:04 UTC (rev 4850) @@ -52,12 +52,12 @@ ret = PyLong_AsUnsignedLongLong(vv); if (PyErr_Occurred()) { - longlong new; PyErr_Clear(); - new = PyLong_AsLongLong(vv); + longlong new = PyLong_AsLongLong(vv); if (!PyErr_Occurred() && new < 0) ret = (ulonglong) new; - ret = NPY_MAX_ULONGLONG; + else + ret = NPY_MAX_ULONGLONG; } Py_DECREF(vv); return ret; Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-05 05:19:07 UTC (rev 4849) +++ trunk/numpy/core/tests/test_regression.py 2008-03-05 06:20:04 UTC (rev 4850) @@ -802,5 +802,8 @@ assert_array_equal(x.astype('>i4'),x.astype('i4').flat[:],x.astype(' Author: charris Date: 2008-03-05 01:00:18 -0600 (Wed, 05 Mar 2008) New Revision: 4851 Modified: trunk/numpy/core/src/arraytypes.inc.src Log: Simplify MyPyLong_AsUnsignedLongLong and make it compatible with old C compilers. This function will still fail for numbers less than -2**63, which is not quite correct. The problem is with the conversion functions provided by Python. The alternative is to write our own or call the Python modulus function to convert to the valid C ranges. The other conversion functions have the same problem. Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2008-03-05 06:20:04 UTC (rev 4850) +++ trunk/numpy/core/src/arraytypes.inc.src 2008-03-05 07:00:18 UTC (rev 4851) @@ -53,11 +53,7 @@ ret = PyLong_AsUnsignedLongLong(vv); if (PyErr_Occurred()) { PyErr_Clear(); - longlong new = PyLong_AsLongLong(vv); - if (!PyErr_Occurred() && new < 0) - ret = (ulonglong) new; - else - ret = NPY_MAX_ULONGLONG; + ret = (ulonglong) PyLong_AsLongLong(vv); } Py_DECREF(vv); return ret; From numpy-svn at scipy.org Thu Mar 6 00:03:04 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 5 Mar 2008 23:03:04 -0600 (CST) Subject: [Numpy-svn] r4852 - trunk/numpy/distutils Message-ID: <20080306050304.4C8E439C21E@new.scipy.org> Author: charris Date: 2008-03-05 23:03:02 -0600 (Wed, 05 Mar 2008) New Revision: 4852 Modified: trunk/numpy/distutils/cpuinfo.py Log: Apply David's patch to fix ticket 653. Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2008-03-05 07:00:18 UTC (rev 4851) +++ trunk/numpy/distutils/cpuinfo.py 2008-03-06 05:03:02 UTC (rev 4852) @@ -18,6 +18,7 @@ import os import commands import warnings +import platform def getoutput(cmd, successful_status=(0,), stacklevel=1): try: @@ -80,9 +81,17 @@ def _getNCPUs(self): return 1 + def __get_nbits(self): + abits = platform.architecture()[0] + nbits = re.compile('(\d+)bit').search(abits).group(1) + return nbits + def _is_32bit(self): - return not self.is_64bit() + return self.__get_nbits() == '32' + def _is_64bit(self): + return self.__get_nbits() == '64' + class LinuxCPUInfo(CPUInfoBase): info = None @@ -271,20 +280,6 @@ def _has_3dnowext(self): return re.match(r'.*?\b3dnowext\b',self.info[0]['flags']) is not None - def _is_64bit(self): - if self.is_Alpha(): - return True - if self.info[0].get('clflush size','')=='64': - return True - if self.info[0].get('uname_m','')=='x86_64': - return True - if self.info[0].get('arch','')=='IA-64': - return True - return False - - def _is_32bit(self): - return not self.is_64bit() - class IRIXCPUInfo(CPUInfoBase): info = None @@ -412,11 +407,6 @@ def _not_impl(self): pass - def _is_32bit(self): - return self.info['isainfo_b']=='32' - def _is_64bit(self): - return self.info['isainfo_b']=='64' - def _is_i386(self): return self.info['isainfo_n']=='i386' def _is_sparc(self): From numpy-svn at scipy.org Fri Mar 7 16:32:05 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 7 Mar 2008 15:32:05 -0600 (CST) Subject: [Numpy-svn] r4853 - in trunk/numpy: core core/src ma Message-ID: <20080307213205.17E2639C073@new.scipy.org> Author: oliphant Date: 2008-03-07 15:32:04 -0600 (Fri, 07 Mar 2008) New Revision: 4853 Modified: trunk/numpy/core/fromnumeric.py trunk/numpy/core/src/arraymethods.c trunk/numpy/core/src/multiarraymodule.c trunk/numpy/ma/core.py Log: Add ddof parameter to std and var computations. Modified: trunk/numpy/core/fromnumeric.py =================================================================== --- trunk/numpy/core/fromnumeric.py 2008-03-06 05:03:02 UTC (rev 4852) +++ trunk/numpy/core/fromnumeric.py 2008-03-07 21:32:04 UTC (rev 4853) @@ -1631,7 +1631,7 @@ return mean(axis, dtype, out) -def std(a, axis=None, dtype=None, out=None): +def std(a, axis=None, dtype=None, out=None, ddof=0): """Compute the standard deviation along the specified axis. Returns the standard deviation of the array elements, a measure of the @@ -1654,6 +1654,9 @@ Alternative output array in which to place the result. It must have the same shape as the expected output but the type will be cast if necessary. + ddof : {0, integer} + Means Delta Degrees of Freedom. The divisor used in calculations + is N-ddof. Returns ------- @@ -1670,8 +1673,8 @@ ----- The standard deviation is the square root of the average of the squared deviations from the mean, i.e. var = sqrt(mean((x - x.mean())**2)). The - computed standard deviation is biased, i.e., the mean is computed by - dividing by the number of elements, N, rather than by N-1. + computed standard deviation is computed by dividing by the number of + elements, N-ddof. Examples -------- @@ -1687,11 +1690,11 @@ try: std = a.std except AttributeError: - return _wrapit(a, 'std', axis, dtype, out) - return std(axis, dtype, out) + return _wrapit(a, 'std', axis, dtype, out, ddof) + return std(axis, dtype, out, ddof) -def var(a, axis=None, dtype=None, out=None): +def var(a, axis=None, dtype=None, out=None, ddof=0): """Compute the variance along the specified axis. Returns the variance of the array elements, a measure of the spread of a @@ -1714,6 +1717,9 @@ Alternative output array in which to place the result. It must have the same shape as the expected output but the type will be cast if necessary. + ddof : {0, integer}, + Means Delta Degrees of Freedom. The divisor used in calculation is + N - ddof. Returns ------- @@ -1747,5 +1753,5 @@ try: var = a.var except AttributeError: - return _wrapit(a, 'var', axis, dtype, out) - return var(axis, dtype, out) + return _wrapit(a, 'var', axis, dtype, out, ddof) + return var(axis, dtype, out, ddof) Modified: trunk/numpy/core/src/arraymethods.c =================================================================== --- trunk/numpy/core/src/arraymethods.c 2008-03-06 05:03:02 UTC (rev 4852) +++ trunk/numpy/core/src/arraymethods.c 2008-03-07 21:32:04 UTC (rev 4853) @@ -1554,23 +1554,27 @@ static PyObject * +__New_PyArray_Std(PyArrayObject *self, int axis, int rtype, PyArrayObject *out, + int variance, int num); +static PyObject * array_stddev(PyArrayObject *self, PyObject *args, PyObject *kwds) { int axis=MAX_DIMS; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; int num; - static char *kwlist[] = {"axis", "dtype", "out", NULL}; + int ddof = 0; + static char *kwlist[] = {"axis", "dtype", "out", "ddof", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&i", kwlist, PyArray_AxisConverter, &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out, &ddof)) return NULL; num = _get_type_num_double(self->descr, dtype); - return PyArray_Std(self, axis, num, out, 0); + return __New_PyArray_Std(self, axis, num, out, 0, ddof); } @@ -1581,17 +1585,18 @@ PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; int num; - static char *kwlist[] = {"axis", "dtype", "out", NULL}; + int ddof = 0; + static char *kwlist[] = {"axis", "dtype", "out", "ddof", NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&i", kwlist, PyArray_AxisConverter, &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out, &ddof)) return NULL; num = _get_type_num_double(self->descr, dtype); - return PyArray_Std(self, axis, num, out, 1); + return __New_PyArray_Std(self, axis, num, out, 1, ddof); } Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-06 05:03:02 UTC (rev 4852) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-07 21:32:04 UTC (rev 4853) @@ -832,8 +832,15 @@ */ static PyObject * PyArray_Std(PyArrayObject *self, int axis, int rtype, PyArrayObject *out, - int variance) + int variance) { + return __New_PyArray_Std(self, axis, rtype, out, variance, 0); +} + +static PyObject * +__New_PyArray_Std(PyArrayObject *self, int axis, int rtype, PyArrayObject *out, + int variance, int num) +{ PyObject *obj1=NULL, *obj2=NULL, *new=NULL; PyObject *ret=NULL, *newshape=NULL; int i, n; @@ -876,6 +883,7 @@ n = PyArray_DIM(new,axis); Py_DECREF(new); + n = (n-num); if (n==0) n=1; obj2 = PyFloat_FromDouble(1.0/((double )n)); if (obj2 == NULL) {Py_DECREF(obj1); return NULL;} Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-06 05:03:02 UTC (rev 4852) +++ trunk/numpy/ma/core.py 2008-03-07 21:32:04 UTC (rev 4853) @@ -2145,7 +2145,7 @@ else: return (self - expand_dims(m,axis)) - def var(self, axis=None, dtype=None): + def var(self, axis=None, dtype=None, ddof=0): """Return the variance, a measure of the spread of a distribution. The variance is the average of the squared deviations from the @@ -2168,9 +2168,10 @@ """ if self._mask is nomask: # TODO: Do we keep super, or var _data and take a view ? - return super(MaskedArray, self).var(axis=axis, dtype=dtype) + return super(MaskedArray, self).var(axis=axis, dtype=dtype, + ddof=ddof) else: - cnt = self.count(axis=axis) + cnt = self.count(axis=axis)-ddof danom = self.anom(axis=axis, dtype=dtype) danom *= danom dvar = narray(danom.sum(axis) / cnt).view(type(self)) @@ -2179,7 +2180,7 @@ dvar._update_from(self) return dvar - def std(self, axis=None, dtype=None): + def std(self, axis=None, dtype=None, ddof=0): """Return the standard deviation, a measure of the spread of a distribution. @@ -2204,7 +2205,7 @@ estimate, use stdu. """ - dvar = self.var(axis,dtype) + dvar = self.var(axis,dtype,ddof=ddof) if axis is not None or dvar is not masked: dvar = sqrt(dvar) return dvar From numpy-svn at scipy.org Fri Mar 7 19:42:43 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 7 Mar 2008 18:42:43 -0600 (CST) Subject: [Numpy-svn] r4854 - trunk/numpy/core Message-ID: <20080308004243.2870239C085@new.scipy.org> Author: chris.burns Date: 2008-03-07 18:42:40 -0600 (Fri, 07 Mar 2008) New Revision: 4854 Modified: trunk/numpy/core/memmap.py Log: Refactor __del__ so views of memmaps do not close the python mmap. Modified: trunk/numpy/core/memmap.py =================================================================== --- trunk/numpy/core/memmap.py 2008-03-07 21:32:04 UTC (rev 4853) +++ trunk/numpy/core/memmap.py 2008-03-08 00:42:40 UTC (rev 4854) @@ -199,9 +199,10 @@ return self def __array_finalize__(self, obj): - self._mmap = None if hasattr(obj, '_mmap'): self._mmap = obj._mmap + else: + self._mmap = None def flush(self): """Flush any changes in the array to the file on disk.""" @@ -217,18 +218,33 @@ """Close the memmap file. Only do this when deleting the object.""" if self.base is self._mmap: self._mmap.close() - elif self._mmap is not None: - raise ValueError, "Cannot close a memmap that is being used " \ - "by another object." + self._mmap = None + # DEV NOTE: This error is raised on the deletion of each row + # in a view of this memmap. Python traps exceptions in + # __del__ and prints them to stderr. Suppressing this for now + # until memmap code is cleaned up and and better tested for + # numpy v1.1 Objects that do not have a python mmap instance + # as their base data array, should not do anything in the + # close anyway. + #elif self._mmap is not None: + #raise ValueError, "Cannot close a memmap that is being used " \ + # "by another object." + def close(self): """Close the memmap file. Does nothing.""" warnings.warn("``close`` is deprecated on memmap arrays. Use del", DeprecationWarning) def __del__(self): - self.flush() - try: - self._close() - except ValueError: - pass + if self._mmap is not None: + try: + # First run tell() to see whether file is open + self._mmap.tell() + except ValueError: + pass + else: + # flush any changes to disk, even if it's a view + self.flush() + self._close() + From numpy-svn at scipy.org Mon Mar 10 12:56:53 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 10 Mar 2008 11:56:53 -0500 (CDT) Subject: [Numpy-svn] r4855 - trunk/numpy/distutils Message-ID: <20080310165653.A89C639C28F@new.scipy.org> Author: matthew.brett at gmail.com Date: 2008-03-10 11:56:38 -0500 (Mon, 10 Mar 2008) New Revision: 4855 Modified: trunk/numpy/distutils/ccompiler.py Log: Fixed setting of distutils.[plat]ccompiler.[plat]ccompiler leading to attribute error Modified: trunk/numpy/distutils/ccompiler.py =================================================================== --- trunk/numpy/distutils/ccompiler.py 2008-03-08 00:42:40 UTC (rev 4854) +++ trunk/numpy/distutils/ccompiler.py 2008-03-10 16:56:38 UTC (rev 4855) @@ -390,8 +390,7 @@ for _cc in ['msvc', 'bcpp', 'cygwinc', 'emxc', 'unixc']: _m = sys.modules.get('distutils.'+_cc+'compiler') if _m is not None: - setattr(getattr(_m, _cc+'compiler'), 'gen_lib_options', - gen_lib_options) + setattr(_m, 'gen_lib_options', gen_lib_options) _distutils_gen_preprocess_options = gen_preprocess_options def gen_preprocess_options (macros, include_dirs): From numpy-svn at scipy.org Mon Mar 10 22:30:17 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 10 Mar 2008 21:30:17 -0500 (CDT) Subject: [Numpy-svn] r4856 - in trunk/numpy/core: . tests Message-ID: <20080311023017.BE56439C221@new.scipy.org> Author: stefan Date: 2008-03-10 21:30:12 -0500 (Mon, 10 Mar 2008) New Revision: 4856 Modified: trunk/numpy/core/memmap.py trunk/numpy/core/tests/test_memmap.py Log: Allow file-like object to be used to create a memmap. Fix NamedTemporaryFile problem for Windows platforms. Modified: trunk/numpy/core/memmap.py =================================================================== --- trunk/numpy/core/memmap.py 2008-03-10 16:56:38 UTC (rev 4855) +++ trunk/numpy/core/memmap.py 2008-03-11 02:30:12 UTC (rev 4856) @@ -25,8 +25,9 @@ Parameters ---------- - name : filename - The file name to be used as the array data buffer. + filename : string or file-like object + The file name or file object to be used as the array data + buffer. dtype : data-type, optional The data-type used to interpret the file contents. Default is uint8 @@ -138,7 +139,7 @@ """ __array_priority__ = -100.0 - def __new__(subtype, name, dtype=uint8, mode='r+', offset=0, + def __new__(subtype, filename, dtype=uint8, mode='r+', offset=0, shape=None, order='C'): try: mode = mode_equivalents[mode] @@ -147,7 +148,10 @@ raise ValueError("mode must be one of %s" % \ (valid_filemodes + mode_equivalents.keys())) - fid = file(name, (mode == 'c' and 'r' or mode)+'b') + if hasattr(filename,'read'): + fid = filename + else: + fid = file(filename, (mode == 'c' and 'r' or mode)+'b') if (mode == 'w+') and shape is None: raise ValueError, "shape must be given" @@ -194,8 +198,7 @@ self._offset = offset self._mode = mode self._size = size - self._name = name - fid.close() + self._name = filename return self def __array_finalize__(self, obj): Modified: trunk/numpy/core/tests/test_memmap.py =================================================================== --- trunk/numpy/core/tests/test_memmap.py 2008-03-10 16:56:38 UTC (rev 4855) +++ trunk/numpy/core/tests/test_memmap.py 2008-03-11 02:30:12 UTC (rev 4856) @@ -14,18 +14,29 @@ self.data = arange(12, dtype=self.dtype) self.data.resize(self.shape) - def test_RoundTrip(self): - fp = memmap(self.tmpfp.name, dtype=self.dtype, mode='w+', + def test_roundtrip(self): + # Write data to file + fp = memmap(self.tmpfp, dtype=self.dtype, mode='w+', shape=self.shape) fp[:] = self.data[:] - del fp - newfp = memmap(self.tmpfp.name, dtype=self.dtype, mode='r', + del fp # Test __del__ machinery, which handles cleanup + + # Read data back from file + newfp = memmap(self.tmpfp, dtype=self.dtype, mode='r', shape=self.shape) assert allclose(self.data, newfp) assert_array_equal(self.data, newfp) + def test_open_with_filename(self): + fp = memmap(self.tmpfp, dtype=self.dtype, mode='w+', + shape=self.shape) + fp[:] = self.data[:] + + memmap(self.tmpfp.name, dtype=self.dtype, mode='r', + shape=self.shape) + def test_flush(self): - fp = memmap(self.tmpfp.name, dtype=self.dtype, mode='w+', + fp = memmap(self.tmpfp, dtype=self.dtype, mode='w+', shape=self.shape) fp[:] = self.data[:] fp.flush() From numpy-svn at scipy.org Mon Mar 10 22:59:06 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 10 Mar 2008 21:59:06 -0500 (CDT) Subject: [Numpy-svn] r4857 - trunk/numpy/core/tests Message-ID: <20080311025906.0E32239C013@new.scipy.org> Author: stefan Date: 2008-03-10 21:59:00 -0500 (Mon, 10 Mar 2008) New Revision: 4857 Modified: trunk/numpy/core/tests/test_memmap.py Log: Use mktemp as a last resort to fix the memmap tests that break under Windows. Modified: trunk/numpy/core/tests/test_memmap.py =================================================================== --- trunk/numpy/core/tests/test_memmap.py 2008-03-11 02:30:12 UTC (rev 4856) +++ trunk/numpy/core/tests/test_memmap.py 2008-03-11 02:59:00 UTC (rev 4857) @@ -1,4 +1,5 @@ -from tempfile import NamedTemporaryFile +from tempfile import NamedTemporaryFile, mktemp +import os from numpy.core import memmap from numpy import arange, allclose @@ -28,13 +29,12 @@ assert_array_equal(self.data, newfp) def test_open_with_filename(self): - fp = memmap(self.tmpfp, dtype=self.dtype, mode='w+', + tmpname = mktemp('','mmap') + fp = memmap(tmpname, dtype=self.dtype, mode='w+', shape=self.shape) fp[:] = self.data[:] + os.unlink(tmpname) - memmap(self.tmpfp.name, dtype=self.dtype, mode='r', - shape=self.shape) - def test_flush(self): fp = memmap(self.tmpfp, dtype=self.dtype, mode='w+', shape=self.shape) From numpy-svn at scipy.org Tue Mar 11 01:14:12 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 11 Mar 2008 00:14:12 -0500 (CDT) Subject: [Numpy-svn] r4858 - trunk/numpy/core/tests Message-ID: <20080311051412.644F939C344@new.scipy.org> Author: stefan Date: 2008-03-11 00:14:09 -0500 (Tue, 11 Mar 2008) New Revision: 4858 Modified: trunk/numpy/core/tests/test_memmap.py Log: Try to access file only once to make Windows tests pass. Modified: trunk/numpy/core/tests/test_memmap.py =================================================================== --- trunk/numpy/core/tests/test_memmap.py 2008-03-11 02:59:00 UTC (rev 4857) +++ trunk/numpy/core/tests/test_memmap.py 2008-03-11 05:14:09 UTC (rev 4858) @@ -33,6 +33,7 @@ fp = memmap(tmpname, dtype=self.dtype, mode='w+', shape=self.shape) fp[:] = self.data[:] + del fp os.unlink(tmpname) def test_flush(self): From numpy-svn at scipy.org Tue Mar 11 01:41:40 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 11 Mar 2008 00:41:40 -0500 (CDT) Subject: [Numpy-svn] r4859 - trunk/numpy/core/src Message-ID: <20080311054140.3FFB639C0D2@new.scipy.org> Author: charris Date: 2008-03-11 00:40:14 -0500 (Tue, 11 Mar 2008) New Revision: 4859 Modified: trunk/numpy/core/src/arraytypes.inc.src Log: Fix MyPyLong_AsUnsignedLong. I think this will fix the problem with uint64 conversions on 64 bit OS, but it needs to be tested. Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2008-03-11 05:14:09 UTC (rev 4858) +++ trunk/numpy/core/src/arraytypes.inc.src 2008-03-11 05:40:14 UTC (rev 4859) @@ -1,6 +1,7 @@ /* -*- c -*- */ #include "config.h" + static longlong MyPyLong_AsLongLong(PyObject *vv) { @@ -9,34 +10,48 @@ if (!PyLong_Check(vv)) { PyObject *mylong; mylong = PyNumber_Long(vv); - if (mylong == NULL) return (longlong) -1; + if (mylong == NULL) { + return (longlong) -1; + } vv = mylong; } - else Py_INCREF(vv); + else { + Py_INCREF(vv); + } ret = PyLong_AsLongLong(vv); Py_DECREF(vv); return ret; } + static ulong MyPyLong_AsUnsignedLong(PyObject *vv) { - longlong val; + ulong ret; if (!PyLong_Check(vv)) { PyObject *mylong; mylong = PyNumber_Long(vv); - if (mylong == NULL) return (ulong) -1; + if (mylong == NULL) { + return (ulong) -1; + } vv = mylong; } - else Py_INCREF(vv); + else { + Py_INCREF(vv); + } - val = PyLong_AsLongLong(vv); + ret = PyLong_AsUnsignedLong(vv); + if (PyErr_Occurred()) { + PyErr_Clear(); + ret = (ulong) PyLong_AsLong(vv); + } Py_DECREF(vv); - return (ulong) val; + return ret; } + static ulonglong MyPyLong_AsUnsignedLongLong(PyObject *vv) { @@ -45,10 +60,14 @@ if (!PyLong_Check(vv)) { PyObject *mylong; mylong = PyNumber_Long(vv); - if (mylong == NULL) return (ulonglong) -1; + if (mylong == NULL) { + return (ulonglong) -1; + } vv = mylong; } - else Py_INCREF(vv); + else { + Py_INCREF(vv); + } ret = PyLong_AsUnsignedLongLong(vv); if (PyErr_Occurred()) { @@ -83,6 +102,7 @@ #endif } + static double MyPyFloat_AsDouble(PyObject *obj) { From numpy-svn at scipy.org Tue Mar 11 01:47:44 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 11 Mar 2008 00:47:44 -0500 (CDT) Subject: [Numpy-svn] r4860 - trunk/numpy/core/tests Message-ID: <20080311054744.84C8239C0D2@new.scipy.org> Author: charris Date: 2008-03-11 00:47:42 -0500 (Tue, 11 Mar 2008) New Revision: 4860 Modified: trunk/numpy/core/tests/test_regression.py Log: Rename check to be closer to actual test. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-11 05:40:14 UTC (rev 4859) +++ trunk/numpy/core/tests/test_regression.py 2008-03-11 05:47:42 UTC (rev 4860) @@ -802,7 +802,7 @@ assert_array_equal(x.astype('>i4'),x.astype('i4').flat[:],x.astype(' Author: stefan Date: 2008-03-11 02:11:54 -0500 (Tue, 11 Mar 2008) New Revision: 4861 Modified: trunk/numpy/core/src/umathmodule.c.src Log: Clear sign-bit when calculating absolute value. Modified: trunk/numpy/core/src/umathmodule.c.src =================================================================== --- trunk/numpy/core/src/umathmodule.c.src 2008-03-11 05:47:42 UTC (rev 4860) +++ trunk/numpy/core/src/umathmodule.c.src 2008-03-11 07:11:54 UTC (rev 4861) @@ -1489,6 +1489,7 @@ n=dimensions[0]; for(i=0; i Author: stefan Date: 2008-03-11 02:14:54 -0500 (Tue, 11 Mar 2008) New Revision: 4862 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test for ticket #608. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-11 07:11:54 UTC (rev 4861) +++ trunk/numpy/core/tests/test_regression.py 2008-03-11 07:14:54 UTC (rev 4862) @@ -805,5 +805,9 @@ def check_uint64_from_negative(self, level=rlevel) : assert_equal(np.uint64(-2), np.uint64(18446744073709551614)) + def check_sign_bit(self, level=rlevel): + x = np.array([0,-0.0,0]) + assert_equal(str(np.abs(x)),'[ 0. 0. 0.]') + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Tue Mar 11 03:17:06 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 11 Mar 2008 02:17:06 -0500 (CDT) Subject: [Numpy-svn] r4863 - trunk/numpy/linalg Message-ID: <20080311071706.5495939C16B@new.scipy.org> Author: stefan Date: 2008-03-11 02:17:03 -0500 (Tue, 11 Mar 2008) New Revision: 4863 Modified: trunk/numpy/linalg/info.py Log: Fix pseudo-inverse description. Closes #631. Modified: trunk/numpy/linalg/info.py =================================================================== --- trunk/numpy/linalg/info.py 2008-03-11 07:14:54 UTC (rev 4862) +++ trunk/numpy/linalg/info.py 2008-03-11 07:17:03 UTC (rev 4863) @@ -8,7 +8,8 @@ - solve Solve a linear system of equations - det Determinant of a square matrix - lstsq Solve linear least-squares problem -- pinv Pseudo-inverse (Moore-Penrose) using lstsq +- pinv Pseudo-inverse (Moore-Penrose) calculated using a singular + value decomposition Eigenvalues and decompositions: From numpy-svn at scipy.org Tue Mar 11 16:37:11 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 11 Mar 2008 15:37:11 -0500 (CDT) Subject: [Numpy-svn] r4864 - trunk/numpy/ma Message-ID: <20080311203711.E80EC39C064@new.scipy.org> Author: rkern Date: 2008-03-11 15:37:07 -0500 (Tue, 11 Mar 2008) New Revision: 4864 Modified: trunk/numpy/ma/extras.py Log: BUG: Python 2.3 compatibility. We cannot use generator expressions in numpy. Modified: trunk/numpy/ma/extras.py =================================================================== --- trunk/numpy/ma/extras.py 2008-03-11 07:17:03 UTC (rev 4863) +++ trunk/numpy/ma/extras.py 2008-03-11 20:37:07 UTC (rev 4864) @@ -756,7 +756,7 @@ return None result = [] for k, group in groupby(enumerate(unmasked), lambda (i,x):i-x): - tmp = numpy.fromiter((g[1] for g in group), int_) + tmp = numpy.array([g[1] for g in group], int_) # result.append((tmp.size, tuple(tmp[[0,-1]]))) result.append( slice(tmp[0],tmp[-1]) ) result.sort() From numpy-svn at scipy.org Wed Mar 12 04:06:28 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 12 Mar 2008 03:06:28 -0500 (CDT) Subject: [Numpy-svn] r4865 - trunk/numpy/core/tests Message-ID: <20080312080628.A393E39C048@new.scipy.org> Author: stefan Date: 2008-03-12 03:06:22 -0500 (Wed, 12 Mar 2008) New Revision: 4865 Modified: trunk/numpy/core/tests/test_regression.py Log: Add test for r4797. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-11 20:37:07 UTC (rev 4864) +++ trunk/numpy/core/tests/test_regression.py 2008-03-12 08:06:22 UTC (rev 4865) @@ -809,5 +809,10 @@ x = np.array([0,-0.0,0]) assert_equal(str(np.abs(x)),'[ 0. 0. 0.]') + def check_flat_index_byteswap(self, level=rlevel): + for dt in (np.dtype('i4')): + x = np.array([-1,0,1],dtype=dt) + assert_equal(x.flat[0].dtype, x[0].dtype) + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Wed Mar 12 04:09:01 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 12 Mar 2008 03:09:01 -0500 (CDT) Subject: [Numpy-svn] r4866 - trunk/numpy/core/tests Message-ID: <20080312080901.1CA6939C01A@new.scipy.org> Author: stefan Date: 2008-03-12 03:08:57 -0500 (Wed, 12 Mar 2008) New Revision: 4866 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test for r4798 (ticket #658). Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-12 08:06:22 UTC (rev 4865) +++ trunk/numpy/core/tests/test_regression.py 2008-03-12 08:08:57 UTC (rev 4866) @@ -814,5 +814,9 @@ x = np.array([-1,0,1],dtype=dt) assert_equal(x.flat[0].dtype, x[0].dtype) + def check_copy_detection_corner_case(self, level=rlevel): + """Ticket #658""" + np.indices((0,3,4)).T.reshape(-1,3) + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Thu Mar 13 00:45:58 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 12 Mar 2008 23:45:58 -0500 (CDT) Subject: [Numpy-svn] r4867 - trunk/numpy/oldnumeric Message-ID: <20080313044558.10B4FC7C05E@new.scipy.org> Author: oliphant Date: 2008-03-12 23:44:55 -0500 (Wed, 12 Mar 2008) New Revision: 4867 Modified: trunk/numpy/oldnumeric/ma.py Log: Fix oldnumeric compatibility with ma Modified: trunk/numpy/oldnumeric/ma.py =================================================================== --- trunk/numpy/oldnumeric/ma.py 2008-03-12 08:08:57 UTC (rev 4866) +++ trunk/numpy/oldnumeric/ma.py 2008-03-13 04:44:55 UTC (rev 4867) @@ -1,8 +1,8 @@ # Incompatibility in that getmask and a.mask returns nomask # instead of None -from numpy.core.ma import * -import numpy.core.ma as nca +from numpy.ma import * +import numpy.ma as nca def repeat(a, repeats, axis=0): return nca.repeat(a, repeats, axis) From numpy-svn at scipy.org Thu Mar 13 03:30:11 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 13 Mar 2008 02:30:11 -0500 (CDT) Subject: [Numpy-svn] r4868 - trunk/numpy Message-ID: <20080313073011.660B739C117@new.scipy.org> Author: cdavid Date: 2008-03-13 02:29:56 -0500 (Thu, 13 Mar 2008) New Revision: 4868 Modified: trunk/numpy/__init__.py Log: Put a more meaningful message when importing numpy from its source tree. Modified: trunk/numpy/__init__.py =================================================================== --- trunk/numpy/__init__.py 2008-03-13 04:44:55 UTC (rev 4867) +++ trunk/numpy/__init__.py 2008-03-13 07:29:56 UTC (rev 4868) @@ -24,7 +24,13 @@ print >> _sys.stderr, 'Running from numpy source directory.' del _sys else: - from numpy.__config__ import show as show_config + try: + from numpy.__config__ import show as show_config + except ImportError, e: + msg = """Error importing numpy: you should not try to import numpy from + its source directory; please exit the numpy source tree, and relaunch + your python intepreter from there.""" + raise ImportError(msg) from version import version as __version__ from _import_tools import PackageLoader From numpy-svn at scipy.org Fri Mar 14 11:20:06 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 14 Mar 2008 10:20:06 -0500 (CDT) Subject: [Numpy-svn] r4869 - trunk/numpy/lib/tests Message-ID: <20080314152006.DE7FE39C042@new.scipy.org> Author: dhuard Date: 2008-03-14 10:19:58 -0500 (Fri, 14 Mar 2008) New Revision: 4869 Modified: trunk/numpy/lib/tests/test_function_base.py Log: Added test for 4D histogramdd case. Ticket 690. Modified: trunk/numpy/lib/tests/test_function_base.py =================================================================== --- trunk/numpy/lib/tests/test_function_base.py 2008-03-13 07:29:56 UTC (rev 4868) +++ trunk/numpy/lib/tests/test_function_base.py 2008-03-14 15:19:58 UTC (rev 4869) @@ -382,7 +382,8 @@ (a,b)=histogram(v) #check if the sum of the bins equals the number of samples assert(sum(a,axis=0)==n) - #check that the bin counts are evenly spaced when the data is from a linear function + #check that the bin counts are evenly spaced when the data is from a + # linear function (a,b)=histogram(linspace(0,10,100)) assert(all(a==10)) @@ -391,17 +392,21 @@ x = array([[-.5, .5, 1.5], [-.5, 1.5, 2.5], [-.5, 2.5, .5], \ [.5, .5, 1.5], [.5, 1.5, 2.5], [.5, 2.5, 2.5]]) H, edges = histogramdd(x, (2,3,3), range = [[-1,1], [0,3], [0,3]]) - answer = asarray([[[0,1,0], [0,0,1], [1,0,0]], [[0,1,0], [0,0,1], [0,0,1]]]) + answer = asarray([[[0,1,0], [0,0,1], [1,0,0]], [[0,1,0], [0,0,1], + [0,0,1]]]) assert_array_equal(H,answer) # Check normalization ed = [[-2,0,2], [0,1,2,3], [0,1,2,3]] H, edges = histogramdd(x, bins = ed, normed = True) assert(all(H == answer/12.)) # Check that H has the correct shape. - H, edges = histogramdd(x, (2,3,4), range = [[-1,1], [0,3], [0,4]], normed=True) - answer = asarray([[[0,1,0,0], [0,0,1,0], [1,0,0,0]], [[0,1,0,0], [0,0,1,0], [0,0,1,0]]]) + H, edges = histogramdd(x, (2,3,4), range = [[-1,1], [0,3], [0,4]], + normed=True) + answer = asarray([[[0,1,0,0], [0,0,1,0], [1,0,0,0]], [[0,1,0,0], + [0,0,1,0], [0,0,1,0]]]) assert_array_almost_equal(H, answer/6., 4) - # Check that a sequence of arrays is accepted and H has the correct shape. + # Check that a sequence of arrays is accepted and H has the correct + # shape. z = [squeeze(y) for y in split(x,3,axis=1)] H, edges = histogramdd(z, bins=(4,3,2),range=[[-2,2], [0,3], [0,2]]) answer = asarray([[[0,0],[0,0],[0,0]], @@ -415,11 +420,29 @@ H,edges = histogramdd([arange(5), arange(5), arange(5)], 5) assert_array_equal(H, Z) - def check_shape(self): - x = rand(100,3) - hist3d, edges = histogramdd(x, bins = (5, 7, 6)) - assert_array_equal(hist3d.shape, (5,7,6)) + def check_shape_3d(self): + # All possible permutations for bins of different lengths in 3D. + bins = ((5, 4, 6), (6, 4, 5), (5, 6, 4), (4, 6, 5), (6, 5, 4), + (4, 5, 6)) + r = rand(10,3) + for b in bins: + H, edges = histogramdd(r, b) + assert(H.shape == b) + def check_shape_4d(self): + # All possible permutations for bins of different lengths in 4D. + bins = ((7, 4, 5, 6), (4, 5, 7, 6), (5, 6, 4, 7), (7, 6, 5, 4), + (5, 7, 6, 4), (4, 6, 7, 5), (6, 5, 7, 4), (7, 5, 4, 6), + (7, 4, 6, 5), (6, 4, 7, 5), (6, 7, 5, 4), (4, 6, 5, 7), + (4, 7, 5, 6), (5, 4, 6, 7), (5, 7, 4, 6), (6, 7, 4, 5), + (6, 5, 4, 7), (4, 7, 6, 5), (4, 5, 6, 7), (7, 6, 4, 5), + (5, 4, 7, 6), (5, 6, 7, 4), (6, 4, 5, 7), (7, 5, 6, 4)) + + r = rand(10,4) + for b in bins: + H, edges = histogramdd(r, b) + assert(H.shape == b) + def check_weights(self): v = rand(100,2) hist, edges = histogramdd(v) From numpy-svn at scipy.org Fri Mar 14 12:17:46 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 14 Mar 2008 11:17:46 -0500 (CDT) Subject: [Numpy-svn] r4870 - trunk/numpy/lib/tests Message-ID: <20080314161746.D35BE39C0A1@new.scipy.org> Author: dhuard Date: 2008-03-14 11:17:44 -0500 (Fri, 14 Mar 2008) New Revision: 4870 Modified: trunk/numpy/lib/tests/test_function_base.py Log: Added a test for average. It uncovers a bug related to the shape of the weights. Modified: trunk/numpy/lib/tests/test_function_base.py =================================================================== --- trunk/numpy/lib/tests/test_function_base.py 2008-03-14 15:19:58 UTC (rev 4869) +++ trunk/numpy/lib/tests/test_function_base.py 2008-03-14 16:17:44 UTC (rev 4870) @@ -63,7 +63,21 @@ actual = average(y1,weights=[1,2],axis=0) desired = array([3.,4.,5.]) assert_array_equal(actual, desired) + + def check_shape(self): + y = array([[1,2,3], + [4,5,6]]) + w2 = [[0,0,1],[0,0,1]] + desired = array([3., 6.]) + assert_array_equal(average(y, weights=w2, axis=1), desired) + + w1 = [0,0,1] + desired = array([3., 6.]) + assert_array_equal(average(y, weights=w1, axis=1), desired) + + + class TestSelect(NumpyTestCase): def _select(self,cond,values,default=0): output = [] From numpy-svn at scipy.org Sat Mar 15 14:25:18 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 15 Mar 2008 13:25:18 -0500 (CDT) Subject: [Numpy-svn] r4871 - trunk/numpy/doc Message-ID: <20080315182518.5FCE539C279@new.scipy.org> Author: charris Date: 2008-03-15 13:25:15 -0500 (Sat, 15 Mar 2008) New Revision: 4871 Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt Log: Break lines. Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt =================================================================== --- trunk/numpy/doc/HOWTO_DOCUMENT.txt 2008-03-14 16:17:44 UTC (rev 4870) +++ trunk/numpy/doc/HOWTO_DOCUMENT.txt 2008-03-15 18:25:15 UTC (rev 4871) @@ -4,7 +4,17 @@ .. Contents:: -.. Attention:: This document is slightly out of date. During the December 2007 sprint, Travis Oliphant made some changes to the NumPy/SciPy docstring standard. The changes are relatively minor, but the standard no longer follows the epydoc/restructured text standards. The changes brings our docstring standard more in line with the ETS standard; in addition, it also conserves horizontal real-estate and arguably looks better when printed as plain text. Unfortunately, these changes mean that currently it isn't possible to render the docstrings as desired. Travis has committed to writing something to render the docstrings. At that point, we will update this document to correspond with the new standard. For now, just refer to: `example.py `__ +.. Attention:: This document is slightly out of date. During the December +2007 sprint, Travis Oliphant made some changes to the NumPy/SciPy docstring +standard. The changes are relatively minor, but the standard no longer +follows the epydoc/restructured text standards. The changes brings our +docstring standard more in line with the ETS standard; in addition, it also +conserves horizontal real-estate and arguably looks better when printed as +plain text. Unfortunately, these changes mean that currently it isn't +possible to render the docstrings as desired. Travis has committed to writing +something to render the docstrings. At that point, we will update this +document to correspond with the new standard. For now, just refer to: +`example.py `__ Overview -------- From numpy-svn at scipy.org Sat Mar 15 14:27:49 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 15 Mar 2008 13:27:49 -0500 (CDT) Subject: [Numpy-svn] r4872 - in trunk/numpy/lib: . tests Message-ID: <20080315182749.E26D239C3F3@new.scipy.org> Author: charris Date: 2008-03-15 13:27:45 -0500 (Sat, 15 Mar 2008) New Revision: 4872 Modified: trunk/numpy/lib/polynomial.py trunk/numpy/lib/tests/test_polynomial.py Log: Fix polyfit for 2D case and add test for same. Fixes ticket 697. Modified: trunk/numpy/lib/polynomial.py =================================================================== --- trunk/numpy/lib/polynomial.py 2008-03-15 18:25:15 UTC (rev 4871) +++ trunk/numpy/lib/polynomial.py 2008-03-15 18:27:45 UTC (rev 4872) @@ -182,44 +182,71 @@ def polyfit(x, y, deg, rcond=None, full=False): """Least squares polynomial fit. - Required arguments + Do a best fit polynomial of degree 'deg' of 'x' to 'y'. Return value is a + vector of polynomial coefficients [pk ... p1 p0]. Eg, for n=2 - x -- vector of sample points - y -- vector or 2D array of values to fit - deg -- degree of the fitting polynomial + p2*x0^2 + p1*x0 + p0 = y1 + p2*x1^2 + p1*x1 + p0 = y1 + p2*x2^2 + p1*x2 + p0 = y2 + ..... + p2*xk^2 + p1*xk + p0 = yk - Keyword arguments + Parameters + ---------- - rcond -- relative condition number of the fit (default len(x)*eps) - full -- return full diagnostic output (default False) + x : array_like + 1D vector of sample points. + y : array_like + 1D vector or 2D array of values to fit. The values should run down the + columes in the 2D case. + deg : integer + Degree of the fitting polynomial + rcond: {None, float}, optional + Relative condition number of the fit. Singular values smaller than this + relative to the largest singular value will be ignored. The defaul value + is len(x)*eps, where eps is the relative precision of the float type, + about 2e-16 in most cases. + full : {False, boolean}, optional + Switch determining nature of return value. When it is False just the + coefficients are returned, when True diagnostic information from the + singular value decomposition is also returned. Returns + ------- - full == False -- coefficients - full == True -- coefficients, residuals, rank, singular values, rcond. + coefficients, [residuals, rank, singular_values, rcond] : variable + When full=False, only the coefficients are returned, running down the + appropriate colume when y is a 2D array. When full=True, the rank of + the scaled Vandermonde matrix, it's effective rank in light of the rcond + value, its singular values, and the specified value of rcond are also + returned. Warns + ----- - RankWarning -- if rank is reduced and not full output + RankWarning : if rank is reduced and not full output + The warnings can be turned off by: + >>> import numpy as np + >>> import warnings + >>> warnings.simplefilter('ignore',np.RankWarning) - Do a best fit polynomial of degree 'deg' of 'x' to 'y'. Return value is a - vector of polynomial coefficients [pk ... p1 p0]. Eg, for n=2 - p2*x0^2 + p1*x0 + p0 = y1 - p2*x1^2 + p1*x1 + p0 = y1 - p2*x2^2 + p1*x2 + p0 = y2 - ..... - p2*xk^2 + p1*xk + p0 = yk + See Also + -------- + + polyval : computes polynomial values. - - Method: if X is a the Vandermonde Matrix computed from x (see + Notes + ----- + + If X is a the Vandermonde Matrix computed from x (see http://mathworld.wolfram.com/VandermondeMatrix.html), then the polynomial least squares solution is given by the 'p' in X*p = y - where X is a len(x) x N+1 matrix, p is a N+1 length vector, and y - is a len(x) x 1 vector + where X.shape is a matrix of dimensions (len(x), deg + 1), p is a vector of + dimensions (deg + 1, 1), and y is a vector of dimensions (len(x), 1). This equation can be solved as @@ -227,7 +254,7 @@ where XT is the transpose of X and -1 denotes the inverse. However, this method is susceptible to rounding errors and generally the singular value - decomposition is preferred and that is the method used here. The singular + decomposition of the matrix X is preferred and that is what is done here. The singular value method takes a paramenter, 'rcond', which sets a limit on the relative size of the smallest singular value to be used in solving the equation. This may result in lowering the rank of the Vandermonde matrix, @@ -235,27 +262,24 @@ a fit of lower degree or replace x by x - x.mean(), both of which will generally improve the condition number. The routine already normalizes the vector x by its maximum absolute value to help in this regard. The rcond - parameter may also be set to a value smaller than its default, but this may - result in bad fits. The current default value of rcond is len(x)*eps, where + parameter can be set to a value smaller than its default, but the + resulting fit may be spurious. The current default value of rcond is len(x)*eps, where eps is the relative precision of the floating type being used, generally around 1e-7 and 2e-16 for IEEE single and double precision respectively. This value of rcond is fairly conservative but works pretty well when x - x.mean() is used in place of x. - The warnings can be turned off by: - >>> import numpy - >>> import warnings - >>> warnings.simplefilter('ignore',numpy.RankWarning) - DISCLAIMER: Power series fits are full of pitfalls for the unwary once the degree of the fit becomes large or the interval of sample points is badly - centered. The basic problem is that the powers x**n are generally a poor - basis for the functions on the sample interval with the result that the - Vandermonde matrix is ill conditioned and computation of the polynomial - values is sensitive to coefficient error. The quality of the resulting fit - should be checked against the data whenever the condition number is large, - as the quality of polynomial fits *can not* be taken for granted. If all + centered. The problem is that the powers x**n are generally a poor + basis for the polynomial functions on the sample interval, resulting in a + Vandermonde matrix is ill conditioned and coefficients sensitive to rounding + erros. The computation of the polynomial + values will also sensitive to rounding errors. Consequently, the quality of + the polynomial fit + should be checked against the data whenever the condition number is large. + The quality of polynomial fits *can not* be taken for granted. If all you want to do is draw a smooth curve through the y values and polyfit is not doing the job, try centering the sample range or look into scipy.interpolate, which includes some nice spline fitting functions that @@ -266,8 +290,6 @@ but note that the k's and n's in the superscripts and subscripts on that page. The linear algebra is correct, however. - See also polyval - """ order = int(deg) + 1 x = NX.asarray(x) + 0.0 @@ -276,7 +298,9 @@ # check arguments. if deg < 0 : raise ValueError, "expected deg >= 0" - if x.ndim != 1 or x.size == 0: + if x.ndim != 1: + raise TypeError, "expected 1D vector for x" + if x.size == 0: raise TypeError, "expected non-empty vector for x" if y.ndim < 1 or y.ndim > 2 : raise TypeError, "expected 1D or 2D array for y" @@ -307,7 +331,10 @@ # scale returned coefficients if scale != 0 : - c /= vander([scale], order)[0] + if c.ndim == 1 : + c /= vander([scale], order)[0] + else : + c /= vander([scale], order).T if full : return c, resids, rank, s, rcond Modified: trunk/numpy/lib/tests/test_polynomial.py =================================================================== --- trunk/numpy/lib/tests/test_polynomial.py 2008-03-15 18:25:15 UTC (rev 4871) +++ trunk/numpy/lib/tests/test_polynomial.py 2008-03-15 18:27:45 UTC (rev 4872) @@ -94,5 +94,20 @@ p[1] = 0 assert_equal(str(p), " \n0") + def check_polyfit(self) : + c = np.array([3., 2., 1.]) + x = np.linspace(0,2,5) + y = np.polyval(c,x) + # check 1D case + assert_almost_equal(c, np.polyfit(x,y,2)) + # check 2D (n,1) case + y = y[:,np.newaxis] + c = c[:,np.newaxis] + assert_almost_equal(c, np.polyfit(x,y,2)) + # check 2D (n,2) case + yy = np.concatenate((y,y), axis=1) + cc = np.concatenate((c,c), axis=1) + assert_almost_equal(cc, np.polyfit(x,yy,2)) + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Sat Mar 15 14:54:04 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 15 Mar 2008 13:54:04 -0500 (CDT) Subject: [Numpy-svn] r4873 - trunk/numpy/lib Message-ID: <20080315185404.A573039C191@new.scipy.org> Author: charris Date: 2008-03-15 13:54:01 -0500 (Sat, 15 Mar 2008) New Revision: 4873 Modified: trunk/numpy/lib/polynomial.py Log: Clean up polyfit documentation. Add documentation for polyval. Modified: trunk/numpy/lib/polynomial.py =================================================================== --- trunk/numpy/lib/polynomial.py 2008-03-15 18:27:45 UTC (rev 4872) +++ trunk/numpy/lib/polynomial.py 2008-03-15 18:54:01 UTC (rev 4873) @@ -193,7 +193,6 @@ Parameters ---------- - x : array_like 1D vector of sample points. y : array_like @@ -213,17 +212,15 @@ Returns ------- - coefficients, [residuals, rank, singular_values, rcond] : variable When full=False, only the coefficients are returned, running down the - appropriate colume when y is a 2D array. When full=True, the rank of - the scaled Vandermonde matrix, it's effective rank in light of the rcond + appropriate colume when y is a 2D array. When full=True, the rank of the + scaled Vandermonde matrix, it's effective rank in light of the rcond value, its singular values, and the specified value of rcond are also returned. Warns ----- - RankWarning : if rank is reduced and not full output The warnings can be turned off by: >>> import numpy as np @@ -233,37 +230,35 @@ See Also -------- - polyval : computes polynomial values. Notes ----- - If X is a the Vandermonde Matrix computed from x (see http://mathworld.wolfram.com/VandermondeMatrix.html), then the polynomial least squares solution is given by the 'p' in - X*p = y + X*p = y where X.shape is a matrix of dimensions (len(x), deg + 1), p is a vector of dimensions (deg + 1, 1), and y is a vector of dimensions (len(x), 1). This equation can be solved as - p = (XT*X)^-1 * XT * y + p = (XT*X)^-1 * XT * y where XT is the transpose of X and -1 denotes the inverse. However, this method is susceptible to rounding errors and generally the singular value - decomposition of the matrix X is preferred and that is what is done here. The singular - value method takes a paramenter, 'rcond', which sets a limit on the - relative size of the smallest singular value to be used in solving the - equation. This may result in lowering the rank of the Vandermonde matrix, - in which case a RankWarning is issued. If polyfit issues a RankWarning, try - a fit of lower degree or replace x by x - x.mean(), both of which will + decomposition of the matrix X is preferred and that is what is done here. + The singular value method takes a paramenter, 'rcond', which sets a limit on + the relative size of the smallest singular value to be used in solving the + equation. This may result in lowering the rank of the Vandermonde matrix, in + which case a RankWarning is issued. If polyfit issues a RankWarning, try a + fit of lower degree or replace x by x - x.mean(), both of which will generally improve the condition number. The routine already normalizes the vector x by its maximum absolute value to help in this regard. The rcond - parameter can be set to a value smaller than its default, but the - resulting fit may be spurious. The current default value of rcond is len(x)*eps, where + parameter can be set to a value smaller than its default, but the resulting + fit may be spurious. The current default value of rcond is len(x)*eps, where eps is the relative precision of the floating type being used, generally around 1e-7 and 2e-16 for IEEE single and double precision respectively. This value of rcond is fairly conservative but works pretty well when x - @@ -272,18 +267,16 @@ DISCLAIMER: Power series fits are full of pitfalls for the unwary once the degree of the fit becomes large or the interval of sample points is badly - centered. The problem is that the powers x**n are generally a poor - basis for the polynomial functions on the sample interval, resulting in a - Vandermonde matrix is ill conditioned and coefficients sensitive to rounding - erros. The computation of the polynomial - values will also sensitive to rounding errors. Consequently, the quality of - the polynomial fit - should be checked against the data whenever the condition number is large. - The quality of polynomial fits *can not* be taken for granted. If all - you want to do is draw a smooth curve through the y values and polyfit is - not doing the job, try centering the sample range or look into - scipy.interpolate, which includes some nice spline fitting functions that - may be of use. + centered. The problem is that the powers x**n are generally a poor basis for + the polynomial functions on the sample interval, resulting in a Vandermonde + matrix is ill conditioned and coefficients sensitive to rounding erros. The + computation of the polynomial values will also sensitive to rounding errors. + Consequently, the quality of the polynomial fit should be checked against + the data whenever the condition number is large. The quality of polynomial + fits *can not* be taken for granted. If all you want to do is draw a smooth + curve through the y values and polyfit is not doing the job, try centering + the sample range or look into scipy.interpolate, which includes some nice + spline fitting functions that may be of use. For more info, see http://mathworld.wolfram.com/LeastSquaresFittingPolynomial.html, @@ -344,19 +337,37 @@ def polyval(p, x): - """Evaluate the polynomial p at x. If x is a polynomial then composition. + """Evaluate the polynomial p at x. - Description: + If p is of length N, this function returns the value: - If p is of length N, this function returns the value: - p[0]*(x**N-1) + p[1]*(x**N-2) + ... + p[N-2]*x + p[N-1] + p[0]*(x**N-1) + p[1]*(x**N-2) + ... + p[N-2]*x + p[N-1] - x can be a sequence and p(x) will be returned for all elements of x. - or x can be another polynomial and the composite polynomial p(x) will be - returned. + If x is a sequence then p(x) will be returned for all elements of x. If x is + another polynomial then the composite polynomial p(x) will be returned. - Notice: This can produce inaccurate results for polynomials with - significant variability. Use carefully. + Parameters + ---------- + p : {array_like, poly1d} + 1D array of polynomial coefficients from highest degree to zero or an + instance of poly1d. + x : {array_like, poly1d} + A number, a 1D array of numbers, or an instance of poly1d. + + Returns + ------- + values : {array, poly1d} + If either p or x is an instance of poly1d, then an instance of poly1d is + returned, otherwise a 1D array is returned. In the case where x is a + poly1d, the result is the composition of the two polynomials, i.e., + substitution is used. + + Notes + ----- + Horners method is used to evaluate the polynomial. Even so, for polynomial + if high degree the values may be inaccurate due to rounding errors. Use + carefully. + """ p = NX.asarray(p) if isinstance(x, poly1d): From numpy-svn at scipy.org Sat Mar 15 22:41:03 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 15 Mar 2008 21:41:03 -0500 (CDT) Subject: [Numpy-svn] r4874 - in trunk/numpy/lib: . tests Message-ID: <20080316024103.3DD2439C147@new.scipy.org> Author: charris Date: 2008-03-15 21:40:57 -0500 (Sat, 15 Mar 2008) New Revision: 4874 Modified: trunk/numpy/lib/function_base.py trunk/numpy/lib/tests/test_function_base.py Log: Rewrite average and document it. Remove inappropriate test of average. This should close ticket 700, but someone else should check the documentation to see if the new function does what it is supposed to, whatever the heck that was. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2008-03-15 18:54:01 UTC (rev 4873) +++ trunk/numpy/lib/function_base.py 2008-03-16 02:40:57 UTC (rev 4874) @@ -27,6 +27,7 @@ from _compiled_base import _insert, add_docstring from _compiled_base import digitize, bincount, interp from arraysetops import setdiff1d +import numpy as np #end Fernando's utilities @@ -326,71 +327,96 @@ def average(a, axis=None, weights=None, returned=False): - """Average the array over the given axis. If the axis is None, - average over all dimensions of the array. Equivalent to - a.mean(axis) and to + """Average the array over the given axis. + + Average over the specified axis using the given weights. The average is + taken over all array elements by default. The default values of the + weights is one. When the weights are given, then they must be + broadcastable to the shape of a when the average is taken over all + elements, otherwise they must fill a 1D array of the same length as the + axis. - a.sum(axis) / size(a, axis) + Parameters + ---------- + a : array_like + Array containing data to be averaged. + axis : {None, integer}, optional + Axis to be averaged over. If axis is None, the the average is taken + over all elements in the array. + weights : {None, array_like}, optional + A weighted average is formed using the given weights. If weights=None + then all weights are taken to be one. If axis=None, the the shape of + the weights must be broadcastable to the shape of a, other wise + weights must be 1D and of the same length as the specified axis. + returned :{False, boolean}, optional + When true, then a tuple (average, sum_of_weights) is returned, + otherwise just the average. If the weights are all one the sum of the + weights will also be the number of elements averaged over. - If weights are given, result is: - sum(a * weights,axis) / sum(weights,axis), - where the weights must have a's shape or be 1D with length the - size of a in the given axis. Integer weights are converted to - Float. Not specifying weights is equivalent to specifying - weights that are all 1. + Returns + ------- + average, [sum_of_weights] : {array_type, double} + Returns the average along the specified axis by default. When returned + is True, the returns a tuple with the average as the first element and + the sum of the weights as the second element. The return type is + double if a is of integer type, otherwise it is of the same type as a. + When returned, sum_of_weights is a scalar with the same type as the + average. - If 'returned' is True, return a tuple: the result and the sum of - the weights or count of values. The shape of these two results - will be the same. + Exceptions + ---------- + ZeroDivisionError + Results when all weights are zero.if appropriate. The version in MA + does not, it returns masked values. - Raises ZeroDivisionError if appropriate. (The version in MA does - not -- it returns masked values). + Notes + ----- + The default behavior is equivalent to + + a.sum(axis) / size(a, axis) . + + If weights are given, and axis=None, then the result is equivalent to + + sum(a * weights) / sum(weights), + + In the case when the axis is not the default, then the result is equivalent + to + + tensordot(weights, a, (0,axis))/weights.sum() + + size of a in the given axis. Integer weights are converted to Float. Not + specifying weights is equivalent to specifying weights that are all 1. + + If 'returned' is True, return a tuple: the result and the sum of the weights + or count of values. These are both scalars. + """ - if axis is None: - a = array(a).ravel() + # convert a to array and compatible floating type. + a = np.asarray(a) + 0.0 + if axis is None : if weights is None: - n = add.reduce(a) - d = len(a) * 1.0 - else: - w = array(weights).ravel() * 1.0 - n = add.reduce(multiply(a, w)) - d = add.reduce(w) + scl = a.dtype.type(a.size) + tot = a.sum() + else : + wgt = np.asarray(weights, dtype=a.dtype) + scl = wgt.sum() + tot = np.multiply(a,wgt).sum() else: - a = array(a) - ash = a.shape - if ash == (): - a.shape = (1,) if weights is None: - n = add.reduce(a, axis) - d = ash[axis] * 1.0 - if returned: - d = ones(n.shape) * d - else: - w = array(weights, copy=False) * 1.0 - wsh = w.shape - if wsh == (): - wsh = (1,) - if wsh == ash: - n = add.reduce(a*w, axis) - d = add.reduce(w, axis) - elif wsh == (ash[axis],): - ni = len(ash) - r = [newaxis]*ni - r[axis] = slice(None, None, 1) - r = tuple(r) - n = add.reduce(a*w[r], axis) - d = add.reduce(w, axis) - else: - raise ValueError, 'averaging weights have wrong shape' + scl = a.dtype.type(a.shape[axis]) + tot = a.sum(axis) + else : + wgt = np.array(weights, copy=False, dtype=a.dtype, ndmin=1) + scl = wgt.sum() + tot = np.tensordot(wgt, a, (0,axis)) - if not isinstance(d, ndarray): - if d == 0.0: - raise ZeroDivisionError, 'zero denominator in average()' + if scl == 0.0: + raise ZeroDivisionError, 'zero denominator in average()' if returned: - return n/d, d + return tot/scl, scl else: - return n/d + return tot/scl def asarray_chkfinite(a): """Like asarray, but check that no NaNs or Infs are present. Modified: trunk/numpy/lib/tests/test_function_base.py =================================================================== --- trunk/numpy/lib/tests/test_function_base.py 2008-03-15 18:54:01 UTC (rev 4873) +++ trunk/numpy/lib/tests/test_function_base.py 2008-03-16 02:40:57 UTC (rev 4874) @@ -50,31 +50,30 @@ y4 = ones((4,4)) y4[0,1] = 0 y4[1,0] = 2 - assert_array_equal(y4.mean(0), average(y4, 0)) - assert_array_equal(y4.mean(1), average(y4, 1)) + assert_almost_equal(y4.mean(0), average(y4, 0)) + assert_almost_equal(y4.mean(1), average(y4, 1)) y5 = rand(5,5) - assert_array_equal(y5.mean(0), average(y5, 0)) - assert_array_equal(y5.mean(1), average(y5, 1)) + assert_almost_equal(y5.mean(0), average(y5, 0)) + assert_almost_equal(y5.mean(1), average(y5, 1)) def check_weighted(self): - y1 = array([[1,2,3], - [4,5,6]]) + y1 = array([[1,2,3],[4,5,6]]) actual = average(y1,weights=[1,2],axis=0) desired = array([3.,4.,5.]) - assert_array_equal(actual, desired) + assert_almost_equal(actual, desired) def check_shape(self): - y = array([[1,2,3], - [4,5,6]]) + y = array([[1,2,3],[4,5,6]]) - w2 = [[0,0,1],[0,0,1]] - desired = array([3., 6.]) - assert_array_equal(average(y, weights=w2, axis=1), desired) + # this is not a valid test as documented in average. Should it be? + #w2 = [[0,0,1],[0,0,1]] + #desired = array([3., 6.]) + #assert_array_equal(average(y, weights=w2, axis=1), desired) w1 = [0,0,1] desired = array([3., 6.]) - assert_array_equal(average(y, weights=w1, axis=1), desired) + assert_almost_equal(average(y, weights=w1, axis=1), desired) From numpy-svn at scipy.org Sat Mar 15 23:57:13 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 15 Mar 2008 22:57:13 -0500 (CDT) Subject: [Numpy-svn] r4875 - trunk/numpy/distutils/command Message-ID: <20080316035713.109EB39C0F1@new.scipy.org> Author: cdavid Date: 2008-03-15 22:57:00 -0500 (Sat, 15 Mar 2008) New Revision: 4875 Modified: trunk/numpy/distutils/command/scons.py Log: Add pkg name at the beginning of logging scons call. Modified: trunk/numpy/distutils/command/scons.py =================================================================== --- trunk/numpy/distutils/command/scons.py 2008-03-16 02:40:57 UTC (rev 4874) +++ trunk/numpy/distutils/command/scons.py 2008-03-16 03:57:00 UTC (rev 4875) @@ -325,7 +325,7 @@ elif int(self.silent) == 2: cmd.append('-s') cmdstr = ' '.join(cmd) - log.info("Executing scons command: %s ", cmdstr) + log.info("Executing scons command (pkg is %s): %s ", pkg_name, cmdstr) st = os.system(cmdstr) if st: print "status is %d" % st From numpy-svn at scipy.org Sun Mar 16 12:37:25 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 16 Mar 2008 11:37:25 -0500 (CDT) Subject: [Numpy-svn] r4876 - in trunk/numpy: . tests Message-ID: <20080316163725.56DDF39C2F2@new.scipy.org> Author: stefan Date: 2008-03-16 11:37:08 -0500 (Sun, 16 Mar 2008) New Revision: 4876 Modified: trunk/numpy/ctypeslib.py trunk/numpy/tests/test_ctypeslib.py Log: In ctypes.load_library, also attempt to load .so files on failure. Build processes sometimes produce libraries with incorrect suffixes on non-linux platforms. Modified: trunk/numpy/ctypeslib.py =================================================================== --- trunk/numpy/ctypeslib.py 2008-03-16 03:57:00 UTC (rev 4875) +++ trunk/numpy/ctypeslib.py 2008-03-16 16:37:08 UTC (rev 4876) @@ -30,20 +30,30 @@ warnings.warn("All features of ctypes interface may not work " \ "with ctypes < 1.0.1") if '.' not in libname: + # Try to load library with platform-specific name, otherwise + # default to libname.so. Sometimes, .so files are built + # erroneously on non-linux platforms. + libname_ext = ['%s.so' % libname] if sys.platform == 'win32': - libname = '%s.dll' % libname + libname_ext.insert(0, '%s.dll' % libname) elif sys.platform == 'darwin': - libname = '%s.dylib' % libname - else: - libname = '%s.so' % libname + libname_ext.insert(0, '%s.dylib' % libname) + loader_path = os.path.abspath(loader_path) if not os.path.isdir(loader_path): libdir = os.path.dirname(loader_path) else: libdir = loader_path - libpath = os.path.join(libdir, libname) - return ctypes.cdll[libpath] + for ln in libname_ext: + try: + libpath = os.path.join(libdir, ln) + return ctypes.cdll[libpath] + except OSError, e: + pass + + raise e + ctypes_load_library = deprecate(load_library, 'ctypes_load_library', 'load_library') Modified: trunk/numpy/tests/test_ctypeslib.py =================================================================== --- trunk/numpy/tests/test_ctypeslib.py 2008-03-16 03:57:00 UTC (rev 4875) +++ trunk/numpy/tests/test_ctypeslib.py 2008-03-16 16:37:08 UTC (rev 4876) @@ -1,7 +1,12 @@ import numpy as np -from numpy.ctypeslib import ndpointer +from numpy.ctypeslib import ndpointer, load_library from numpy.testing import * +class TestLoadLibrary(NumpyTestCase): + def check_basic(self): + cdll = load_library('multiarray', + np.core.multiarray.__file__) + class TestNdpointer(NumpyTestCase): def check_dtype(self): dt = np.intc From numpy-svn at scipy.org Sun Mar 16 12:59:16 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 16 Mar 2008 11:59:16 -0500 (CDT) Subject: [Numpy-svn] r4877 - trunk/numpy/lib Message-ID: <20080316165916.88CCF39C3A1@new.scipy.org> Author: charris Date: 2008-03-16 11:59:08 -0500 (Sun, 16 Mar 2008) New Revision: 4877 Modified: trunk/numpy/lib/function_base.py Log: Fix average to preserve matrices. Fix average documentation. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2008-03-16 16:37:08 UTC (rev 4876) +++ trunk/numpy/lib/function_base.py 2008-03-16 16:59:08 UTC (rev 4877) @@ -359,7 +359,7 @@ Returns the average along the specified axis by default. When returned is True, the returns a tuple with the average as the first element and the sum of the weights as the second element. The return type is - double if a is of integer type, otherwise it is of the same type as a. + Float if a is of integer type, otherwise it is of the same type as a. When returned, sum_of_weights is a scalar with the same type as the average. @@ -368,55 +368,51 @@ ZeroDivisionError Results when all weights are zero.if appropriate. The version in MA does not, it returns masked values. + ValueError + Results when both an axis and weights are specified and the weights are + not an 1D array. Notes ----- - The default behavior is equivalent to - a.sum(axis) / size(a, axis) . + a.mean(axis). If weights are given, and axis=None, then the result is equivalent to - sum(a * weights) / sum(weights), + sum(a * weights) / (a.size/weights.size)*sum(weights)), In the case when the axis is not the default, then the result is equivalent - to + to weights broadcast over the specified axis, then - tensordot(weights, a, (0,axis))/weights.sum() + sum(a * weights)/sum(weights) - size of a in the given axis. Integer weights are converted to Float. Not - specifying weights is equivalent to specifying weights that are all 1. + """ + if not isinstance(a, np.matrix) : + a = np.asarray(a) - If 'returned' is True, return a tuple: the result and the sum of the weights - or count of values. These are both scalars. + if weights is None : + avg = a.mean(axis) + scl = avg.dtype.type(a.size/avg.size) + else : + a = a + 0.0 + wgt = np.array(weights, dtype=a.dtype, copy=0) + scl = wgt.sum() + if axis is not None and wgt.ndim != 1 : + raise ValueError, 'Weights must be 1D when axis is specified' + if scl == 0.0: + raise ZeroDivisionError, "Weights sum to zero, can't be normalized" - """ - # convert a to array and compatible floating type. - a = np.asarray(a) + 0.0 - if axis is None : - if weights is None: - scl = a.dtype.type(a.size) - tot = a.sum() - else : - wgt = np.asarray(weights, dtype=a.dtype) - scl = wgt.sum() - tot = np.multiply(a,wgt).sum() - else: - if weights is None: - scl = a.dtype.type(a.shape[axis]) - tot = a.sum(axis) - else : - wgt = np.array(weights, copy=False, dtype=a.dtype, ndmin=1) - scl = wgt.sum() - tot = np.tensordot(wgt, a, (0,axis)) + if axis is None : + scl = scl*(a.size/wgt.size) + else: + wgt = np.array(wgt, copy=0, ndmin=a.ndim).swapaxes(-1,axis) + avg = np.multiply(a,wgt).sum(axis)/scl - if scl == 0.0: - raise ZeroDivisionError, 'zero denominator in average()' if returned: - return tot/scl, scl + return avg, scl else: - return tot/scl + return avg def asarray_chkfinite(a): """Like asarray, but check that no NaNs or Infs are present. From numpy-svn at scipy.org Sun Mar 16 13:08:35 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 16 Mar 2008 12:08:35 -0500 (CDT) Subject: [Numpy-svn] r4878 - trunk/numpy/lib Message-ID: <20080316170835.74C7839C3A1@new.scipy.org> Author: charris Date: 2008-03-16 12:08:32 -0500 (Sun, 16 Mar 2008) New Revision: 4878 Modified: trunk/numpy/lib/function_base.py Log: Change ValueError to TypeError in average Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2008-03-16 16:59:08 UTC (rev 4877) +++ trunk/numpy/lib/function_base.py 2008-03-16 17:08:32 UTC (rev 4878) @@ -368,7 +368,7 @@ ZeroDivisionError Results when all weights are zero.if appropriate. The version in MA does not, it returns masked values. - ValueError + TypeError Results when both an axis and weights are specified and the weights are not an 1D array. @@ -399,7 +399,7 @@ wgt = np.array(weights, dtype=a.dtype, copy=0) scl = wgt.sum() if axis is not None and wgt.ndim != 1 : - raise ValueError, 'Weights must be 1D when axis is specified' + raise TypeError, 'Weights must be 1D when axis is specified' if scl == 0.0: raise ZeroDivisionError, "Weights sum to zero, can't be normalized" From numpy-svn at scipy.org Sun Mar 16 23:49:04 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 16 Mar 2008 22:49:04 -0500 (CDT) Subject: [Numpy-svn] r4879 - trunk/numpy/core/src Message-ID: <20080317034904.832C839C036@new.scipy.org> Author: charris Date: 2008-03-16 22:48:57 -0500 (Sun, 16 Mar 2008) New Revision: 4879 Modified: trunk/numpy/core/src/ufuncobject.c Log: ticket 641 Fix unary ufuncs for clongdouble. Still needs test functions. Needs verification that it fixes the segfault. Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2008-03-16 17:08:32 UTC (rev 4878) +++ trunk/numpy/core/src/ufuncobject.c 2008-03-17 03:48:57 UTC (rev 4879) @@ -338,8 +338,8 @@ x.real = ((longdouble *)ip1)[0]; x.imag = ((longdouble *)ip1)[1]; ((ClongdoubleUnaryFunc *)func)(&x, &res); - ((double *)op)[0] = res.real; - ((double *)op)[1] = res.imag; + ((longdouble *)op)[0] = res.real; + ((longdouble *)op)[1] = res.imag; } } From numpy-svn at scipy.org Mon Mar 17 04:36:35 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 17 Mar 2008 03:36:35 -0500 (CDT) Subject: [Numpy-svn] r4880 - trunk/numpy/core/tests Message-ID: <20080317083635.361F039C01A@new.scipy.org> Author: charris Date: 2008-03-17 03:36:25 -0500 (Mon, 17 Mar 2008) New Revision: 4880 Modified: trunk/numpy/core/tests/test_umath.py Log: Add tests for consistency of complex ufuncs of different precisions. Rename some tests so they actually run. We've been missing errors. Arccosh currently fails. IMHO, we use the wrong branch of the complex function and I won't change anything until we decide on the proper usage. Modified: trunk/numpy/core/tests/test_umath.py =================================================================== --- trunk/numpy/core/tests/test_umath.py 2008-03-17 03:48:57 UTC (rev 4879) +++ trunk/numpy/core/tests/test_umath.py 2008-03-17 08:36:25 UTC (rev 4880) @@ -3,6 +3,7 @@ from numpy.core.umath import minimum, maximum, exp import numpy.core.umath as ncu from numpy import zeros, ndarray, array, choose, pi +import numpy as np restore_path() class TestDivision(NumpyTestCase): @@ -72,7 +73,7 @@ assert_almost_equal(ncu.degrees(-90.0), -0.5*pi) class TestSpecialMethods(NumpyTestCase): - def test_wrap(self): + def check_wrap(self): class with_wrap(object): def __array__(self): return zeros(1) @@ -91,7 +92,7 @@ assert_equal(args[1], a) self.failUnlessEqual(i, 0) - def test_old_wrap(self): + def check_old_wrap(self): class with_wrap(object): def __array__(self): return zeros(1) @@ -103,7 +104,7 @@ x = minimum(a, a) assert_equal(x.arr, zeros(1)) - def test_priority(self): + def check_priority(self): class A(object): def __array__(self): return zeros(1) @@ -141,7 +142,7 @@ self.failUnless(type(exp(b) is B)) self.failUnless(type(exp(c) is C)) - def test_failing_wrap(self): + def check_failing_wrap(self): class A(object): def __array__(self): return zeros(1) @@ -150,7 +151,7 @@ a = A() self.failUnlessRaises(RuntimeError, maximum, a, a) - def test_array_with_context(self): + def check_array_with_context(self): class A(object): def __array__(self, dtype=None, context=None): func, args, i = context @@ -174,27 +175,40 @@ assert_equal(maximum(a, C()), 0) class TestChoose(NumpyTestCase): - def test_mixed(self): + def check_mixed(self): c = array([True,True]) a = array([True,True]) assert_equal(choose(c, (a, 1)), array([1,1])) -class _test_complex_real(NumpyTestCase): - def setUp(self): - self.x = 0.52 - self.z = self.x+0j - self.funcs = ['arcsin', 'arccos', 'arctan', 'arcsinh', 'arccosh', - 'arctanh', 'sin', 'cos', 'tan', 'exp', 'log', 'sqrt', - 'log10'] - def test_it(self): - for fun in self.funcs: - cr = fun(self.z) - assert_almost_equal(fun(self.x),cr.real) - assert_almost_equal(0, cr.imag) +class TestComplexFunctions(NumpyTestCase): + funcs = [np.arcsin , np.arccos , np.arctan, np.arcsinh, np.arccosh, + np.arctanh, np.sin , np.cos , np.tan , np.exp, + np.log , np.sqrt , np.log10] + def check_it(self): + for f in self.funcs: + if f is np.arccosh : + x = 1.5 + else : + x = .5 + fr = f(x) + fz = f(np.complex(x)) + assert_almost_equal(fr, fz.real, err_msg='real part %s'%f) + assert_almost_equal(0., fz.imag, err_msg='imag part %s'%f) + + def check_precisions_consistent(self) : + z = 1 + 1j + for f in self.funcs : + fcf = f(np.csingle(z)) + fcd = f(np.cdouble(z)) + fcl = f(np.clongdouble(z)) + assert_almost_equal(fcf, fcd, decimal=6, err_msg='fch-fcd %s'%f) + assert_almost_equal(fcf, fcl, decimal=6, err_msg='fch-fcl %s'%f) + + class TestChoose(NumpyTestCase): - def test_attributes(self): + def check_attributes(self): add = ncu.add assert_equal(add.__name__, 'add') assert_equal(add.__doc__, 'y = add(x1,x2) adds the arguments elementwise.') From numpy-svn at scipy.org Mon Mar 17 10:52:23 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 17 Mar 2008 09:52:23 -0500 (CDT) Subject: [Numpy-svn] r4881 - trunk/numpy/core/src Message-ID: <20080317145223.24D8839C06A@new.scipy.org> Author: charris Date: 2008-03-17 09:52:17 -0500 (Mon, 17 Mar 2008) New Revision: 4881 Modified: trunk/numpy/core/src/umathmodule.c.src Log: Fix arccosh for complex. The previous implementation could take the sqrt of a number on the branch cut of sqrt, leading to roundoff problems. This seems to have come about because the formula was derived using the non principal branch of the sqrt, i.e., it used 1=(-1)*(-1). Modified: trunk/numpy/core/src/umathmodule.c.src =================================================================== --- trunk/numpy/core/src/umathmodule.c.src 2008-03-17 08:36:25 UTC (rev 4880) +++ trunk/numpy/core/src/umathmodule.c.src 2008-03-17 14:52:17 UTC (rev 4881) @@ -805,15 +805,14 @@ nc_acosh at c@(c at typ@ *x, c at typ@ *r) { nc_prod at c@(x, x, r); - nc_diff at c@(&nc_1 at c@, r, r); + nc_diff at c@(r, &nc_1 at c@, r); nc_sqrt at c@(r, r); - nc_prodi at c@(r, r); nc_sum at c@(x, r, r); nc_log at c@(r, r); return; /* - return nc_log(nc_sum(x,nc_prod(nc_i, - nc_sqrt(nc_diff(nc_1,nc_prod(x,x)))))); + return nc_log(nc_sum(x, + nc_sqrt(nc_diff(nc_prod(x,x),nc_1)))); */ } From numpy-svn at scipy.org Mon Mar 17 11:20:24 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 17 Mar 2008 10:20:24 -0500 (CDT) Subject: [Numpy-svn] r4882 - trunk/numpy/core/src Message-ID: <20080317152024.A123F39C02A@new.scipy.org> Author: charris Date: 2008-03-17 10:20:18 -0500 (Mon, 17 Mar 2008) New Revision: 4882 Modified: trunk/numpy/core/src/umathmodule.c.src Log: Use a more accurate expression for arccosh of complex numbers. The implementations of the other special functions should be examined to see if similar improvements can be made. Modified: trunk/numpy/core/src/umathmodule.c.src =================================================================== --- trunk/numpy/core/src/umathmodule.c.src 2008-03-17 14:52:17 UTC (rev 4881) +++ trunk/numpy/core/src/umathmodule.c.src 2008-03-17 15:20:18 UTC (rev 4882) @@ -804,15 +804,18 @@ static void nc_acosh at c@(c at typ@ *x, c at typ@ *r) { - nc_prod at c@(x, x, r); - nc_diff at c@(r, &nc_1 at c@, r); + c at typ@ t; + + nc_sum at c@(x, &nc_1 at c@, &t); + nc_diff at c@(x, &nc_1 at c@, r); + nc_prod at c@(&t, r, r); nc_sqrt at c@(r, r); nc_sum at c@(x, r, r); nc_log at c@(r, r); return; /* return nc_log(nc_sum(x, - nc_sqrt(nc_diff(nc_prod(x,x),nc_1)))); + nc_sqrt(nc_prod(nc_sum(x,nc_1), nc_diff(x,nc_1))))); */ } From numpy-svn at scipy.org Tue Mar 18 07:17:26 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 06:17:26 -0500 (CDT) Subject: [Numpy-svn] r4883 - trunk/numpy/core/tests Message-ID: <20080318111726.1B23A39C39A@new.scipy.org> Author: stefan Date: 2008-03-18 06:17:21 -0500 (Tue, 18 Mar 2008) New Revision: 4883 Modified: trunk/numpy/core/tests/test_multiarray.py Log: Fix multiarray from/to-file test under Windows. Modified: trunk/numpy/core/tests/test_multiarray.py =================================================================== --- trunk/numpy/core/tests/test_multiarray.py 2008-03-17 15:20:18 UTC (rev 4882) +++ trunk/numpy/core/tests/test_multiarray.py 2008-03-18 11:17:21 UTC (rev 4883) @@ -662,23 +662,21 @@ rand = np.random.random self.x = rand(shape) + rand(shape).astype(np.complex)*1j - self.dtype = np.complex + self.dtype = self.x.dtype def test_file(self): - # Python under Windows does not believe that TemporaryFile - # is an open file - if sys.platform.startswith('win'): - filename = tempfile.mktemp() - f = open(filename,'wb') - else: - f = tempfile.TemporaryFile() + # Test disabled on Windows, since the tempfile does not flush + # properly. The test ensures that both filenames and file + # objects are accepted in tofile and fromfile, so as long as + # it runs on at least one platform, we should be ok. + if not sys.platform.startswith('win'): + tmp_file = tempfile.NamedTemporaryFile('wb', + prefix='numpy_tofromfile') + self.x.tofile(tmp_file.file) + tmp_file.flush() + y = np.fromfile(tmp_file.name,dtype=self.dtype) + assert_array_equal(y,self.x.flat) - self.x.tofile(f) - f.flush() - f.seek(0) - y = np.fromfile(f,dtype=self.dtype) - assert_array_equal(y,self.x.flat) - def test_filename(self): filename = tempfile.mktemp() f = open(filename,'wb') From numpy-svn at scipy.org Tue Mar 18 07:56:29 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 06:56:29 -0500 (CDT) Subject: [Numpy-svn] r4884 - trunk/numpy Message-ID: <20080318115629.F211F39C133@new.scipy.org> Author: stefan Date: 2008-03-18 06:56:24 -0500 (Tue, 18 Mar 2008) New Revision: 4884 Modified: trunk/numpy/ctypeslib.py Log: Ctypes loads .so/.pyd if library is not found. Modified: trunk/numpy/ctypeslib.py =================================================================== --- trunk/numpy/ctypeslib.py 2008-03-18 11:17:21 UTC (rev 4883) +++ trunk/numpy/ctypeslib.py 2008-03-18 11:56:24 UTC (rev 4884) @@ -31,9 +31,9 @@ "with ctypes < 1.0.1") if '.' not in libname: # Try to load library with platform-specific name, otherwise - # default to libname.so. Sometimes, .so files are built + # default to libname.[so|pyd]. Sometimes, these files are built # erroneously on non-linux platforms. - libname_ext = ['%s.so' % libname] + libname_ext = ['%s.so' % libname, '%s.pyd' % libname] if sys.platform == 'win32': libname_ext.insert(0, '%s.dll' % libname) elif sys.platform == 'darwin': From numpy-svn at scipy.org Tue Mar 18 14:02:33 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 13:02:33 -0500 (CDT) Subject: [Numpy-svn] r4885 - trunk/numpy/core/tests Message-ID: <20080318180233.BB41E39C2DA@new.scipy.org> Author: charris Date: 2008-03-18 13:02:31 -0500 (Tue, 18 Mar 2008) New Revision: 4885 Modified: trunk/numpy/core/tests/test_umath.py Log: Get actual and desired in right order in tests. Modified: trunk/numpy/core/tests/test_umath.py =================================================================== --- trunk/numpy/core/tests/test_umath.py 2008-03-18 11:56:24 UTC (rev 4884) +++ trunk/numpy/core/tests/test_umath.py 2008-03-18 18:02:31 UTC (rev 4885) @@ -194,8 +194,8 @@ x = .5 fr = f(x) fz = f(np.complex(x)) - assert_almost_equal(fr, fz.real, err_msg='real part %s'%f) - assert_almost_equal(0., fz.imag, err_msg='imag part %s'%f) + assert_almost_equal(fz.real, fr, err_msg='real part %s'%f) + assert_almost_equal(fz.imag, 0., err_msg='imag part %s'%f) def check_precisions_consistent(self) : z = 1 + 1j @@ -204,7 +204,7 @@ fcd = f(np.cdouble(z)) fcl = f(np.clongdouble(z)) assert_almost_equal(fcf, fcd, decimal=6, err_msg='fch-fcd %s'%f) - assert_almost_equal(fcf, fcl, decimal=6, err_msg='fch-fcl %s'%f) + assert_almost_equal(fcl, fcd, decimal=15, err_msg='fch-fcl %s'%f) class TestChoose(NumpyTestCase): From numpy-svn at scipy.org Tue Mar 18 18:03:37 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 17:03:37 -0500 (CDT) Subject: [Numpy-svn] r4886 - in trunk/numpy/ma: . tests Message-ID: <20080318220337.46F8139C306@new.scipy.org> Author: pierregm Date: 2008-03-18 17:03:34 -0500 (Tue, 18 Mar 2008) New Revision: 4886 Modified: trunk/numpy/ma/core.py trunk/numpy/ma/tests/test_core.py Log: - fixed masked_where (bug #703) - simplified 'masked_invalid' and added it to __all__ - added the 'out' optional parameter to .mean Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-18 18:02:31 UTC (rev 4885) +++ trunk/numpy/ma/core.py 2008-03-18 22:03:34 UTC (rev 4886) @@ -39,11 +39,11 @@ 'logical_and', 'logical_not', 'logical_or', 'logical_xor', 'make_mask', 'make_mask_none', 'mask_or', 'masked', 'masked_array', 'masked_equal', 'masked_greater', - 'masked_greater_equal', 'masked_inside', 'masked_less', - 'masked_less_equal', 'masked_not_equal', 'masked_object', - 'masked_outside', 'masked_print_option', 'masked_singleton', - 'masked_values', 'masked_where', 'max', 'maximum', 'mean', 'min', - 'minimum', 'multiply', + 'masked_greater_equal', 'masked_inside', 'masked_invalid', + 'masked_less','masked_less_equal', 'masked_not_equal', + 'masked_object','masked_outside', 'masked_print_option', + 'masked_singleton','masked_values', 'masked_where', 'max', 'maximum', + 'mean', 'min', 'minimum', 'multiply', 'negative', 'nomask', 'nonzero', 'not_equal', 'ones', 'outer', 'outerproduct', 'power', 'product', 'ptp', 'put', 'putmask', @@ -830,7 +830,7 @@ Whether to return a copy of a (True) or modify a in place. """ - cond = filled(condition,1) + cond = make_mask(condition) a = narray(a, copy=copy, subok=True) if hasattr(a, '_mask'): cond = mask_or(cond, a._mask) @@ -967,7 +967,7 @@ """ a = narray(a, copy=copy, subok=True) - condition = (numpy.isnan(a) | numpy.isinf(a)) + condition = ~(numpy.isfinite(a)) if hasattr(a, '_mask'): condition = mask_or(condition, a._mask) cls = type(a) @@ -1306,7 +1306,7 @@ m = self._mask if not getattr(dout,'ndim', False): # Just a scalar............ - if m is not nomask and m[indx]: + if (not m.ndim and not m) or m[indx]: return masked else: # Force dout to MA ........ @@ -2103,7 +2103,7 @@ result.__setmask__(self.mask) return result - def mean(self, axis=None, dtype=None): + def mean(self, axis=None, dtype=None, out=None): """Average the array over the given axis. Equivalent to a.sum(axis, dtype) / a.size(axis). @@ -2119,11 +2119,14 @@ """ if self._mask is nomask: - return super(MaskedArray, self).mean(axis=axis, dtype=dtype) + result = super(MaskedArray, self).mean(axis=axis, dtype=dtype) else: dsum = self.sum(axis=axis, dtype=dtype) cnt = self.count(axis=axis) - return dsum*1./cnt + result = dsum*1./cnt + if out is not None: + out.flat = result.ravel() + return result def anom(self, axis=None, dtype=None): """Return the anomalies (deviations from the average) along @@ -3307,14 +3310,3 @@ ################################################################################ -if 1: - from testutils import assert_equal - if 1: - mtype = [('f',float_),('s','|S3')] - x = array([(1,'a'),(2,'b'),(numpy.pi,'pi')], dtype=mtype) - x[0] = (10,'A') - (xf, xs) = (x['f'], x['s']) - assert_equal(xf.data, [10,2,numpy.pi]) - assert_equal(xf.dtype, float_) - assert_equal(xs.data, ['A', 'b', 'pi']) - assert_equal(xs.dtype, '|S3') Modified: trunk/numpy/ma/tests/test_core.py =================================================================== --- trunk/numpy/ma/tests/test_core.py 2008-03-18 18:02:31 UTC (rev 4885) +++ trunk/numpy/ma/tests/test_core.py 2008-03-18 22:03:34 UTC (rev 4886) @@ -1451,9 +1451,18 @@ assert_equal(b.shape, a.shape) assert_equal(b.fill_value, a.fill_value) - #.............................................................................. +class TestMiscFunctions(NumpyTestCase): + "Test class for miscellaneous functions." + # + def test_masked_where(self): + x = [1,2] + y = masked_where(False,x) + assert_equal(y,[1,2]) + assert_equal(y[1],2) + + ############################################################################### #------------------------------------------------------------------------------ if __name__ == "__main__": From numpy-svn at scipy.org Tue Mar 18 19:17:53 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 18:17:53 -0500 (CDT) Subject: [Numpy-svn] r4887 - trunk/numpy/ma Message-ID: <20080318231753.765DF39C105@new.scipy.org> Author: pierregm Date: 2008-03-18 18:17:50 -0500 (Tue, 18 Mar 2008) New Revision: 4887 Modified: trunk/numpy/ma/core.py Log: reverted to a proper version of __getitem__ Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-18 22:03:34 UTC (rev 4886) +++ trunk/numpy/ma/core.py 2008-03-18 23:17:50 UTC (rev 4887) @@ -1306,7 +1306,7 @@ m = self._mask if not getattr(dout,'ndim', False): # Just a scalar............ - if (not m.ndim and not m) or m[indx]: + if m is not nomask and m[indx]: return masked else: # Force dout to MA ........ From numpy-svn at scipy.org Tue Mar 18 21:33:15 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Tue, 18 Mar 2008 20:33:15 -0500 (CDT) Subject: [Numpy-svn] r4888 - in trunk/numpy/lib: . tests Message-ID: <20080319013315.3507D39C0E6@new.scipy.org> Author: dhuard Date: 2008-03-18 20:33:11 -0500 (Tue, 18 Mar 2008) New Revision: 4888 Modified: trunk/numpy/lib/function_base.py trunk/numpy/lib/tests/test_function_base.py Log: Clean up of average function. weights now should have the same shape as a, or be 1D with length equal to the shape of a along axis. A number of tests are added. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2008-03-18 23:17:50 UTC (rev 4887) +++ trunk/numpy/lib/function_base.py 2008-03-19 01:33:11 UTC (rev 4888) @@ -327,66 +327,50 @@ def average(a, axis=None, weights=None, returned=False): - """Average the array over the given axis. + """Return the weighted average of array a over the given axis. + - Average over the specified axis using the given weights. The average is - taken over all array elements by default. The default values of the - weights is one. When the weights are given, then they must be - broadcastable to the shape of a when the average is taken over all - elements, otherwise they must fill a 1D array of the same length as the - axis. - Parameters ---------- a : array_like - Array containing data to be averaged. + Data to be averaged. axis : {None, integer}, optional - Axis to be averaged over. If axis is None, the the average is taken - over all elements in the array. + Axis along which to average a. If None, averaging is done over the + entire array irrespective of its shape. weights : {None, array_like}, optional - A weighted average is formed using the given weights. If weights=None - then all weights are taken to be one. If axis=None, the the shape of - the weights must be broadcastable to the shape of a, other wise - weights must be 1D and of the same length as the specified axis. + The importance each datum has in the computation of the + average. The weights array can either be 1D, in which case its length + must be the size of a along the given axis, or of the same shape as a. + If weights=None, all data are assumed to have weight equal to one. returned :{False, boolean}, optional - When true, then a tuple (average, sum_of_weights) is returned, - otherwise just the average. If the weights are all one the sum of the - weights will also be the number of elements averaged over. + If True, the tuple (average, sum_of_weights) is returned, + otherwise only the average is returmed. Note that if weights=None, then + the sum of the weights is also the number of elements averaged over. Returns ------- average, [sum_of_weights] : {array_type, double} - Returns the average along the specified axis by default. When returned - is True, the returns a tuple with the average as the first element and - the sum of the weights as the second element. The return type is - Float if a is of integer type, otherwise it is of the same type as a. - When returned, sum_of_weights is a scalar with the same type as the - average. + Return the average along the specified axis. When returned is True, + return a tuple with the average as the first element and the sum + of the weights as the second element. The return type is Float if a is + of integer type, otherwise it is of the same type as a. + sum_of_weights is has the same type as the average. + + Example + ------- + >>> average(range(1,11), weights=range(10,0,-1)) + 4.0 + Exceptions ---------- ZeroDivisionError - Results when all weights are zero.if appropriate. The version in MA - does not, it returns masked values. + Raised when all weights along axis are zero. See numpy.ma.average for a + version robust to this type of error. TypeError - Results when both an axis and weights are specified and the weights are - not an 1D array. - - Notes - ----- - The default behavior is equivalent to - - a.mean(axis). - - If weights are given, and axis=None, then the result is equivalent to - - sum(a * weights) / (a.size/weights.size)*sum(weights)), - - In the case when the axis is not the default, then the result is equivalent - to weights broadcast over the specified axis, then - - sum(a * weights)/sum(weights) - + Raised when the length of 1D weights is not the same as the shape of a + along axis. + """ if not isinstance(a, np.matrix) : a = np.asarray(a) @@ -397,19 +381,27 @@ else : a = a + 0.0 wgt = np.array(weights, dtype=a.dtype, copy=0) - scl = wgt.sum() - if axis is not None and wgt.ndim != 1 : - raise TypeError, 'Weights must be 1D when axis is specified' - if scl == 0.0: - raise ZeroDivisionError, "Weights sum to zero, can't be normalized" - if axis is None : - scl = scl*(a.size/wgt.size) - else: + # Sanity checks + if a.shape != wgt.shape : + if axis is None : + raise TypeError, "Axis must be specified when shapes of a and weights differ." + if wgt.ndim != 1 : + raise TypeError, "1D weights expected when shapes of a and weights differ." + if wgt.shape[0] != a.shape[axis] : + raise ValueError, "Length of weights not compatible with specified axis." + + # setup wgt to broadcast along axis wgt = np.array(wgt, copy=0, ndmin=a.ndim).swapaxes(-1,axis) + + scl = wgt.sum(axis=axis) + if (scl == 0.0).any(): + raise ZeroDivisionError, "Weights sum to zero, can't be normalized" + avg = np.multiply(a,wgt).sum(axis)/scl if returned: + scl = np.multiply(avg,0) + scl return avg, scl else: return avg Modified: trunk/numpy/lib/tests/test_function_base.py =================================================================== --- trunk/numpy/lib/tests/test_function_base.py 2008-03-18 23:17:50 UTC (rev 4887) +++ trunk/numpy/lib/tests/test_function_base.py 2008-03-19 01:33:11 UTC (rev 4888) @@ -57,26 +57,64 @@ assert_almost_equal(y5.mean(0), average(y5, 0)) assert_almost_equal(y5.mean(1), average(y5, 1)) - def check_weighted(self): + y6 = matrix(rand(5,5)) + assert_array_equal(y6.mean(0), average(y6,0)) + + def check_weights(self): + y = arange(10) + w = arange(10) + assert_almost_equal(average(y, weights=w), (arange(10)**2).sum()*1./arange(10).sum()) + y1 = array([[1,2,3],[4,5,6]]) - actual = average(y1,weights=[1,2],axis=0) + w0 = [1,2] + actual = average(y1,weights=w0,axis=0) desired = array([3.,4.,5.]) assert_almost_equal(actual, desired) - def check_shape(self): - y = array([[1,2,3],[4,5,6]]) - - # this is not a valid test as documented in average. Should it be? - #w2 = [[0,0,1],[0,0,1]] - #desired = array([3., 6.]) - #assert_array_equal(average(y, weights=w2, axis=1), desired) w1 = [0,0,1] desired = array([3., 6.]) - assert_almost_equal(average(y, weights=w1, axis=1), desired) + assert_almost_equal(average(y1, weights=w1, axis=1), desired) + + # This should raise an error. Can we test for that ? + # assert_equal(average(y1, weights=w1), 9./2.) + + # 2D Case + w2 = [[0,0,1],[0,0,2]] + desired = array([3., 6.]) + assert_array_equal(average(y1, weights=w2, axis=1), desired) + + assert_equal(average(y1, weights=w2), 5.) + + + def check_returned(self): + y = array([[1,2,3],[4,5,6]]) + # No weights + avg, scl = average(y, returned=True) + assert_equal(scl, 6.) + avg, scl = average(y, 0, returned=True) + assert_array_equal(scl, array([2.,2.,2.])) + + avg, scl = average(y, 1, returned=True) + assert_array_equal(scl, array([3.,3.])) + + # With weights + w0 = [1,2] + avg, scl = average(y, weights=w0, axis=0, returned=True) + assert_array_equal(scl, array([3., 3., 3.])) + + w1 = [1,2,3] + avg, scl = average(y, weights=w1, axis=1, returned=True) + assert_array_equal(scl, array([6., 6.])) + + w2 = [[0,0,1],[1,2,3]] + avg, scl = average(y, weights=w2, axis=1, returned=True) + assert_array_equal(scl, array([1.,6.])) + + class TestSelect(NumpyTestCase): def _select(self,cond,values,default=0): output = [] From numpy-svn at scipy.org Wed Mar 19 01:59:15 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 00:59:15 -0500 (CDT) Subject: [Numpy-svn] r4889 - trunk/numpy/lib/src Message-ID: <20080319055915.9B9E239C04C@new.scipy.org> Author: charris Date: 2008-03-19 00:59:13 -0500 (Wed, 19 Mar 2008) New Revision: 4889 Modified: trunk/numpy/lib/src/_compiled_base.c Log: Fix histogram references in arr_bincount. Modified: trunk/numpy/lib/src/_compiled_base.c =================================================================== --- trunk/numpy/lib/src/_compiled_base.c 2008-03-19 01:33:11 UTC (rev 4888) +++ trunk/numpy/lib/src/_compiled_base.c 2008-03-19 05:59:13 UTC (rev 4889) @@ -82,17 +82,18 @@ static PyObject * arr_bincount(PyObject *self, PyObject *args, PyObject *kwds) { - /* histogram accepts one or two arguments. The first is an array - * of non-negative integers and the second, if present, is an - * array of weights, which must be promotable to double. - * Call these arguments list and weight. Both must be one- - * dimensional. len (weight) == len(list) + /* arr_bincount is registered as bincount. + * arr_bincount accepts one or two arguments. The first is an array of + * non-negative integers and the second, if present, is an array of + * weights, which must be promotable to double. Call these arguments list + * and weight. Both must be one- dimensional. len (weight) == len(list) * If weight is not present: - * histogram (list) [i] is the number of occurrences of i in list. + * arr_bincount(self,list)[i] is the number of occurrences of i in list. * If weight is present: - * histogram (list, weight) [i] is the sum of all weight [j] - * where list [j] == i. */ - /* self is not used */ + * arr_bincount(self,list, weight)[i] is the sum of all weight[j] + * where list [j] == i. + * Self is not used. + */ PyArray_Descr *type; PyObject *list = NULL, *weight=Py_None ; PyObject *lst=NULL, *ans=NULL, *wts=NULL; @@ -149,11 +150,11 @@ arr_digitize(PyObject *self, PyObject *args, PyObject *kwds) { /* digitize (x, bins) returns an array of python integers the same - length of x. The values i returned are such that - bins [i - 1] <= x < bins [i] if bins is monotonically increasing, - or bins [i - 1] > x >= bins [i] if bins is monotonically decreasing. - Beyond the bounds of bins, returns either i = 0 or i = len (bins) - as appropriate. */ + length of x. The values i returned are such that bins [i - 1] <= x < + bins [i] if bins is monotonically increasing, or bins [i - 1] > x >= + bins [i] if bins is monotonically decreasing. Beyond the bounds of + bins, returns either i = 0 or i = len (bins) as appropriate. + */ /* self is not used */ PyObject *ox, *obins ; PyObject *ax=NULL, *abins=NULL, *aret=NULL; From numpy-svn at scipy.org Wed Mar 19 02:16:10 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 01:16:10 -0500 (CDT) Subject: [Numpy-svn] r4890 - trunk/numpy/lib/src Message-ID: <20080319061610.A37B939C09A@new.scipy.org> Author: charris Date: 2008-03-19 01:16:07 -0500 (Wed, 19 Mar 2008) New Revision: 4890 Modified: trunk/numpy/lib/src/_compiled_base.c Log: More typo fixing. Modified: trunk/numpy/lib/src/_compiled_base.c =================================================================== --- trunk/numpy/lib/src/_compiled_base.c 2008-03-19 05:59:13 UTC (rev 4889) +++ trunk/numpy/lib/src/_compiled_base.c 2008-03-19 06:16:07 UTC (rev 4890) @@ -83,14 +83,14 @@ arr_bincount(PyObject *self, PyObject *args, PyObject *kwds) { /* arr_bincount is registered as bincount. - * arr_bincount accepts one or two arguments. The first is an array of + * bincount accepts one or two arguments. The first is an array of * non-negative integers and the second, if present, is an array of * weights, which must be promotable to double. Call these arguments list - * and weight. Both must be one- dimensional. len (weight) == len(list) + * and weight. Both must be one-dimensional with len(weight) == len(list) * If weight is not present: - * arr_bincount(self,list)[i] is the number of occurrences of i in list. + * bincount(list)[i] is the number of occurrences of i in list. * If weight is present: - * arr_bincount(self,list, weight)[i] is the sum of all weight[j] + * bincount(self,list, weight)[i] is the sum of all weight[j] * where list [j] == i. * Self is not used. */ @@ -111,7 +111,7 @@ mxi = mxx (numbers, len) ; mni = mnx (numbers, len) ; Py_Assert(numbers[mni] >= 0, - "irst argument of bincount must be non-negative"); + "The first argument of bincount must be non-negative"); ans_size = numbers [mxi] + 1 ; type = PyArray_DescrFromType(PyArray_INTP); if (weight == Py_None) { @@ -125,8 +125,8 @@ Py_Try(wts = PyArray_ContiguousFromAny(weight, PyArray_DOUBLE, 1, 1)); weights = (double *)PyArray_DATA (wts); - Py_Assert(PyArray_SIZE(wts) == len, "bincount: length of weights " \ - "does not match that of list"); + Py_Assert(PyArray_SIZE(wts) == len, + "bincount: length of weights does not match that of list"); type = PyArray_DescrFromType(PyArray_DOUBLE); Py_Try(ans = PyArray_Zeros(1, &ans_size, type, 0)); dans = (double *)PyArray_DATA (ans); From numpy-svn at scipy.org Wed Mar 19 02:17:52 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 01:17:52 -0500 (CDT) Subject: [Numpy-svn] r4891 - trunk/numpy/lib/src Message-ID: <20080319061752.5EF5D39C0B4@new.scipy.org> Author: charris Date: 2008-03-19 01:17:50 -0500 (Wed, 19 Mar 2008) New Revision: 4891 Modified: trunk/numpy/lib/src/_compiled_base.c Log: And add bincount to error message. Modified: trunk/numpy/lib/src/_compiled_base.c =================================================================== --- trunk/numpy/lib/src/_compiled_base.c 2008-03-19 06:16:07 UTC (rev 4890) +++ trunk/numpy/lib/src/_compiled_base.c 2008-03-19 06:17:50 UTC (rev 4891) @@ -111,7 +111,7 @@ mxi = mxx (numbers, len) ; mni = mnx (numbers, len) ; Py_Assert(numbers[mni] >= 0, - "The first argument of bincount must be non-negative"); + "bincount: first argument of bincount must be non-negative"); ans_size = numbers [mxi] + 1 ; type = PyArray_DescrFromType(PyArray_INTP); if (weight == Py_None) { From numpy-svn at scipy.org Wed Mar 19 05:29:57 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 04:29:57 -0500 (CDT) Subject: [Numpy-svn] r4892 - in trunk: . numpy/distutils Message-ID: <20080319092957.0049339C04C@new.scipy.org> Author: stefan Date: 2008-03-19 04:29:52 -0500 (Wed, 19 Mar 2008) New Revision: 4892 Modified: trunk/numpy/distutils/environment.py trunk/numpy/distutils/system_info.py trunk/site.cfg.example Log: In site.cfg, change DEFAULT section to ALL to accommodate building on Python 2.6. Modified: trunk/numpy/distutils/environment.py =================================================================== --- trunk/numpy/distutils/environment.py 2008-03-19 06:17:50 UTC (rev 4891) +++ trunk/numpy/distutils/environment.py 2008-03-19 09:29:52 UTC (rev 4892) @@ -4,7 +4,7 @@ __metaclass__ = type class EnvironmentConfig: - def __init__(self, distutils_section='DEFAULT', **kw): + def __init__(self, distutils_section='ALL', **kw): self._distutils_section = distutils_section self._conf_keys = kw self._conf = None Modified: trunk/numpy/distutils/system_info.py =================================================================== --- trunk/numpy/distutils/system_info.py 2008-03-19 06:17:50 UTC (rev 4891) +++ trunk/numpy/distutils/system_info.py 2008-03-19 09:29:52 UTC (rev 4892) @@ -63,19 +63,19 @@ The first one found is used to get system configuration options The format is that used by ConfigParser (i.e., Windows .INI style). The -section DEFAULT has options that are the default for each section. The +section ALL has options that are the default for each section. The available sections are fftw, atlas, and x11. Appropiate defaults are used if nothing is specified. The order of finding the locations of resources is the following: 1. environment variable 2. section in site.cfg - 3. DEFAULT section in site.cfg + 3. ALL section in site.cfg Only the first complete match is returned. Example: ---------- -[DEFAULT] +[ALL] library_dirs = /usr/lib:/usr/local/lib:/opt/lib include_dirs = /usr/include:/usr/local/include:/opt/include src_dirs = /usr/local/src:/opt/src @@ -337,7 +337,7 @@ """ get_info() is the only public method. Don't use others. """ - section = 'DEFAULT' + section = 'ALL' dir_env_var = None search_static_first = 0 # XXX: disabled by default, may disappear in # future unless it is proved to be useful. @@ -474,7 +474,7 @@ if os.path.isdir(d1): ds2.append(d1) dirs = ds2 + dirs - default_dirs = self.cp.get('DEFAULT', key).split(os.pathsep) + default_dirs = self.cp.get(self.section, key).split(os.pathsep) dirs.extend(default_dirs) ret = [] for d in dirs: Modified: trunk/site.cfg.example =================================================================== --- trunk/site.cfg.example 2008-03-19 06:17:50 UTC (rev 4891) +++ trunk/site.cfg.example 2008-03-19 09:29:52 UTC (rev 4892) @@ -55,7 +55,7 @@ # This is a good place to add general library and include directories like # /usr/local/{lib,include} # -#[DEFAULT] +#[ALL] #library_dirs = /usr/local/lib #include_dirs = /usr/local/include From numpy-svn at scipy.org Wed Mar 19 07:20:14 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 06:20:14 -0500 (CDT) Subject: [Numpy-svn] r4893 - trunk/numpy/core/tests Message-ID: <20080319112014.B155E39C263@new.scipy.org> Author: stefan Date: 2008-03-19 06:20:10 -0500 (Wed, 19 Mar 2008) New Revision: 4893 Modified: trunk/numpy/core/tests/test_regression.py Log: Fix test for intp conversion on win32 running 64-bit hardware. Intp is a numpy type, and does not allow two parameters in the constructor, unlike the Python integer type. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-19 09:29:52 UTC (rev 4892) +++ trunk/numpy/core/tests/test_regression.py 2008-03-19 11:20:10 UTC (rev 4893) @@ -197,8 +197,8 @@ np.intp('0x' + 'f'*i_width,16) self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) self.failUnlessRaises(ValueError,np.intp,'0x1',32) - assert_equal(255,np.intp('0xFF',16)) - assert_equal(1024,np.intp(1024)) + assert_equal(255,np.long('0xFF',16)) + assert_equal(1024,np.long(1024)) def check_endian_bool_indexing(self,level=rlevel): """Ticket #105""" From numpy-svn at scipy.org Wed Mar 19 10:45:29 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 09:45:29 -0500 (CDT) Subject: [Numpy-svn] r4894 - trunk/numpy/core/tests Message-ID: <20080319144529.3B37439C0F3@new.scipy.org> Author: stefan Date: 2008-03-19 09:45:16 -0500 (Wed, 19 Mar 2008) New Revision: 4894 Modified: trunk/numpy/core/tests/test_regression.py Log: Fix another occurrence of intp in the regression tests. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-19 11:20:10 UTC (rev 4893) +++ trunk/numpy/core/tests/test_regression.py 2008-03-19 14:45:16 UTC (rev 4894) @@ -194,7 +194,7 @@ def check_intp(self,level=rlevel): """Ticket #99""" i_width = np.int_(0).nbytes*2 - 1 - np.intp('0x' + 'f'*i_width,16) + np.long('0x' + 'f'*i_width,16) self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) self.failUnlessRaises(ValueError,np.intp,'0x1',32) assert_equal(255,np.long('0xFF',16)) From numpy-svn at scipy.org Wed Mar 19 11:08:53 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 10:08:53 -0500 (CDT) Subject: [Numpy-svn] r4895 - trunk/numpy/core/tests Message-ID: <20080319150853.E472739C307@new.scipy.org> Author: stefan Date: 2008-03-19 10:08:50 -0500 (Wed, 19 Mar 2008) New Revision: 4895 Modified: trunk/numpy/core/tests/test_regression.py Log: Fix typo. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-19 14:45:16 UTC (rev 4894) +++ trunk/numpy/core/tests/test_regression.py 2008-03-19 15:08:50 UTC (rev 4895) @@ -194,7 +194,7 @@ def check_intp(self,level=rlevel): """Ticket #99""" i_width = np.int_(0).nbytes*2 - 1 - np.long('0x' + 'f'*i_width,16) + long('0x' + 'f'*i_width,16) self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) self.failUnlessRaises(ValueError,np.intp,'0x1',32) assert_equal(255,np.long('0xFF',16)) From numpy-svn at scipy.org Wed Mar 19 11:10:17 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 10:10:17 -0500 (CDT) Subject: [Numpy-svn] r4896 - trunk/numpy/core/tests Message-ID: <20080319151017.3808839C358@new.scipy.org> Author: stefan Date: 2008-03-19 10:10:11 -0500 (Wed, 19 Mar 2008) New Revision: 4896 Modified: trunk/numpy/core/tests/test_regression.py Log: Remove check for OverflowError in intp test. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-19 15:08:50 UTC (rev 4895) +++ trunk/numpy/core/tests/test_regression.py 2008-03-19 15:10:11 UTC (rev 4896) @@ -195,7 +195,7 @@ """Ticket #99""" i_width = np.int_(0).nbytes*2 - 1 long('0x' + 'f'*i_width,16) - self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) + #self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) self.failUnlessRaises(ValueError,np.intp,'0x1',32) assert_equal(255,np.long('0xFF',16)) assert_equal(1024,np.long(1024)) From numpy-svn at scipy.org Wed Mar 19 20:12:20 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 19 Mar 2008 19:12:20 -0500 (CDT) Subject: [Numpy-svn] r4897 - in trunk/numpy/core: src tests Message-ID: <20080320001220.C30AA39C130@new.scipy.org> Author: stefan Date: 2008-03-19 19:12:12 -0500 (Wed, 19 Mar 2008) New Revision: 4897 Modified: trunk/numpy/core/src/multiarraymodule.c trunk/numpy/core/tests/test_regression.py Log: Fix memory leaks as reported in #562. Patch by Matthieu Brucher. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-19 15:10:11 UTC (rev 4896) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-20 00:12:12 UTC (rev 4897) @@ -5663,7 +5663,6 @@ ret = PyArray_NewCopy((PyArrayObject*)op, order); if (oldtype == type) goto finish; - Py_INCREF(oldtype); Py_DECREF(PyArray_DESCR(ret)); PyArray_DESCR(ret) = oldtype; goto finish; @@ -5691,6 +5690,7 @@ ret = PyArray_CheckFromAny(op, type, 0, 0, flags, NULL); finish: + Py_XDECREF(oldtype); if (!ret || (nd=PyArray_NDIM(ret)) >= ndmin) return ret; /* create a new array from the same data with ones in the shape */ /* steals a reference to ret */ Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-19 15:10:11 UTC (rev 4896) +++ trunk/numpy/core/tests/test_regression.py 2008-03-20 00:12:12 UTC (rev 4897) @@ -818,5 +818,11 @@ """Ticket #658""" np.indices((0,3,4)).T.reshape(-1,3) + def check_mem_deallocation_leak(self, level=rlevel): + """Ticket #562""" + a = np.zeros(5,dtype=float) + b = np.array(a,dtype=float) + del a, b + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Thu Mar 20 09:41:22 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 20 Mar 2008 08:41:22 -0500 (CDT) Subject: [Numpy-svn] r4898 - trunk/numpy/lib Message-ID: <20080320134122.EEDD339C3F6@new.scipy.org> Author: dhuard Date: 2008-03-20 08:41:19 -0500 (Thu, 20 Mar 2008) New Revision: 4898 Modified: trunk/numpy/lib/twodim_base.py Log: added docstring to diagflat. Modified: trunk/numpy/lib/twodim_base.py =================================================================== --- trunk/numpy/lib/twodim_base.py 2008-03-20 00:12:12 UTC (rev 4897) +++ trunk/numpy/lib/twodim_base.py 2008-03-20 13:41:19 UTC (rev 4898) @@ -83,6 +83,22 @@ raise ValueError, "Input must be 1- or 2-d." def diagflat(v,k=0): + """Return a 2D array whose k'th diagonal is a flattened v and all other + elements are zero. + + Examples + -------- + >>> diagflat([[1,2],[3,4]]]) + array([[1, 0, 0, 0], + [0, 2, 0, 0], + [0, 0, 3, 0], + [0, 0, 0, 4]]) + + >>> diagflat([1,2], 1) + array([[0, 1, 0], + [0, 0, 2], + [0, 0, 0]]) + """ try: wrap = v.__array_wrap__ except AttributeError: From numpy-svn at scipy.org Fri Mar 21 05:16:09 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 04:16:09 -0500 (CDT) Subject: [Numpy-svn] r4899 - in trunk/numpy/core: src tests Message-ID: <20080321091609.B37A039C13E@new.scipy.org> Author: stefan Date: 2008-03-21 04:15:56 -0500 (Fri, 21 Mar 2008) New Revision: 4899 Modified: trunk/numpy/core/src/arrayobject.c trunk/numpy/core/tests/test_regression.py Log: Fix memory leak in _copy_from0d. Investigated by Matthieu, patched by pv. Closes #633. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-20 13:41:19 UTC (rev 4898) +++ trunk/numpy/core/src/arrayobject.c 2008-03-21 09:15:56 UTC (rev 4899) @@ -760,9 +760,9 @@ else sptr = src->data; /* FIXME: This should check for a flag on the data-type that states whether or not it is variable length. - Because the ISFLEXIBLE check is hard-coded to the + Because the ISFLEXIBLE check is hard-coded to the built-in data-types. - */ + */ if (PyArray_ISALIGNED(dest) && !PyArray_ISFLEXIBLE(dest)) { myfunc = _strided_byte_copy; } @@ -783,24 +783,28 @@ else dstride = nbytes; + /* Refcount note: src and dest may have different sizes */ PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS - myfunc(dptr, dstride, sptr, 0, numcopies, (int) nbytes); + myfunc(dptr, dstride, sptr, 0, numcopies, (int) nbytes); if (swap) _strided_byte_swap(dptr, dstride, numcopies, (int) nbytes); NPY_END_THREADS - } + PyArray_INCREF(dest); + PyArray_XDECREF(src); + } else { PyArrayIterObject *dit; int axis=-1; dit = (PyArrayIterObject *)\ PyArray_IterAllButAxis((PyObject *)dest, &axis); if (dit == NULL) goto finish; + /* Refcount note: src and dest may have different sizes */ PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -815,7 +819,9 @@ PyArray_ITER_NEXT(dit); } NPY_END_THREADS - Py_DECREF(dit); + PyArray_INCREF(dest); + PyArray_XDECREF(src); + Py_DECREF(dit); } retval = 0; finish: @@ -839,13 +845,14 @@ if (PyArray_NDIM(src) == 0) { + /* Refcount note: src and dst have the same size */ PyArray_INCREF((PyArrayObject *)src); PyArray_XDECREF((PyArrayObject *)dst); NPY_BEGIN_THREADS memcpy(PyArray_BYTES(dst), PyArray_BYTES(src), PyArray_ITEMSIZE(src)); NPY_END_THREADS - return 0; + return 0; } if (order == PyArray_FORTRANORDER) { @@ -868,6 +875,8 @@ dptr = PyArray_BYTES(dst); elsize = PyArray_ITEMSIZE(dst); nbytes = elsize * PyArray_DIM(src, axis); + + /* Refcount note: src and dst have the same size */ PyArray_INCREF((PyArrayObject *)src); PyArray_XDECREF((PyArrayObject *)dst); NPY_BEGIN_THREADS @@ -880,7 +889,7 @@ } NPY_END_THREADS - Py_DECREF(it); + Py_DECREF(it); return 0; } @@ -909,6 +918,7 @@ } elsize = PyArray_ITEMSIZE(dest); + /* Refcount note: src and dst have the same size */ PyArray_INCREF(src); PyArray_XDECREF(dest); @@ -929,7 +939,7 @@ } NPY_END_THREADS - Py_DECREF(sit); + Py_DECREF(sit); Py_DECREF(dit); return 0; } @@ -958,6 +968,7 @@ maxaxis = PyArray_RemoveSmallest(multi); if (maxaxis < 0) { /* copy 1 0-d array to another */ + /* Refcount note: src and dst have the same size */ PyArray_INCREF(src); PyArray_XDECREF(dest); memcpy(dest->data, src->data, elsize); @@ -969,6 +980,7 @@ /* Increment the source and decrement the destination reference counts */ + /* Refcount note: src and dest may have different sizes */ PyArray_INCREF(src); PyArray_XDECREF(dest); @@ -988,7 +1000,10 @@ } NPY_END_THREADS - Py_DECREF(multi); + PyArray_INCREF(dest); + PyArray_XDECREF(src); + + Py_DECREF(multi); return 0; } @@ -1028,6 +1043,7 @@ (PyArray_ISFARRAY_RO(src) && PyArray_ISFARRAY(dest))); if (simple) { + /* Refcount note: src and dest have the same size */ PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -1100,6 +1116,7 @@ (PyArray_ISFARRAY_RO(src) && PyArray_ISFARRAY(dest))); if (simple) { + /* Refcount note: src and dest have the same size */ PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -1126,6 +1143,7 @@ isrc = (PyArrayIterObject *)PyArray_IterNew((PyObject *)src); if (isrc == NULL) {Py_DECREF(idest); return -1;} elsize = dest->descr->elsize; + /* Refcount note: src and dest have the same size */ PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-20 13:41:19 UTC (rev 4898) +++ trunk/numpy/core/tests/test_regression.py 2008-03-21 09:15:56 UTC (rev 4899) @@ -824,5 +824,106 @@ b = np.array(a,dtype=float) del a, b + def check_object_array_refcounting(self): + """Ticket #633""" + if not hasattr(sys, 'getrefcount'): + return + + # NB. this is probably CPython-specific + + cnt = sys.getrefcount + + a = object() + b = object() + c = object() + + cnt0_a = cnt(a) + cnt0_b = cnt(b) + cnt0_c = cnt(c) + + # -- 0d -> 1d broadcasted slice assignment + + arr = np.zeros(5, dtype=np.object_) + + arr[:] = a + assert cnt(a) == cnt0_a + 5 + + arr[:] = b + assert cnt(a) == cnt0_a + assert cnt(b) == cnt0_b + 5 + + arr[:2] = c + assert cnt(b) == cnt0_b + 3 + assert cnt(c) == cnt0_c + 2 + + del arr + + # -- 1d -> 2d broadcasted slice assignment + + arr = np.zeros((5, 2), dtype=np.object_) + arr0 = np.zeros(2, dtype=np.object_) + + arr0[0] = a + assert cnt(a) == cnt0_a + 1 + arr0[1] = b + assert cnt(b) == cnt0_b + 1 + + arr[:,:] = arr0 + assert cnt(a) == cnt0_a + 6 + assert cnt(b) == cnt0_b + 6 + + arr[:,0] = None + assert cnt(a) == cnt0_a + 1 + + del arr, arr0 + + # -- 2d copying + flattening + + arr = np.zeros((5, 2), dtype=np.object_) + + arr[:,0] = a + arr[:,1] = b + assert cnt(a) == cnt0_a + 5 + assert cnt(b) == cnt0_b + 5 + + arr2 = arr.copy() + assert cnt(a) == cnt0_a + 10 + assert cnt(b) == cnt0_b + 10 + + arr2 = arr[:,0].copy() + assert cnt(a) == cnt0_a + 10 + assert cnt(b) == cnt0_b + 5 + + arr2 = arr.flatten() + assert cnt(a) == cnt0_a + 10 + assert cnt(b) == cnt0_b + 10 + + del arr, arr2 + + # -- concatenate, repeat, take, choose + + arr1 = np.zeros((5, 1), dtype=np.object_) + arr2 = np.zeros((5, 1), dtype=np.object_) + + arr1[...] = a + arr2[...] = b + assert cnt(a) == cnt0_a + 5 + assert cnt(b) == cnt0_b + 5 + + arr3 = np.concatenate((arr1, arr2)) + assert cnt(a) == cnt0_a + 5 + 5 + assert cnt(b) == cnt0_b + 5 + 5 + + arr3 = arr1.repeat(3, axis=0) + assert cnt(a) == cnt0_a + 5 + 3*5 + + arr3 = arr1.take([1,2,3], axis=0) + assert cnt(a) == cnt0_a + 5 + 3 + + x = np.array([[0],[1],[0],[1],[1]], int) + arr3 = x.choose(arr1, arr2) + assert cnt(a) == cnt0_a + 5 + 2 + assert cnt(b) == cnt0_b + 5 + 3 + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 08:49:47 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 07:49:47 -0500 (CDT) Subject: [Numpy-svn] r4900 - trunk/numpy/distutils/command Message-ID: <20080321124947.71579C7C088@new.scipy.org> Author: cdavid Date: 2008-03-21 07:49:41 -0500 (Fri, 21 Mar 2008) New Revision: 4900 Modified: trunk/numpy/distutils/command/build_clib.py Log: Fix typo (bug #704). Modified: trunk/numpy/distutils/command/build_clib.py =================================================================== --- trunk/numpy/distutils/command/build_clib.py 2008-03-21 09:15:56 UTC (rev 4899) +++ trunk/numpy/distutils/command/build_clib.py 2008-03-21 12:49:41 UTC (rev 4900) @@ -79,7 +79,7 @@ force=self.force, requiref90='f90' in languages, c_compiler=self.compiler) - if self.compiler is not None: + if self.fcompiler is not None: self.fcompiler.customize(self.distribution) libraries = self.libraries From numpy-svn at scipy.org Fri Mar 21 09:08:41 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 08:08:41 -0500 (CDT) Subject: [Numpy-svn] r4901 - trunk/numpy/lib/tests Message-ID: <20080321130841.A016C39C2B3@new.scipy.org> Author: cdavid Date: 2008-03-21 08:08:21 -0500 (Fri, 21 Mar 2008) New Revision: 4901 Added: trunk/numpy/lib/tests/test_regression.py Log: Add regression test for #628. Added: trunk/numpy/lib/tests/test_regression.py =================================================================== --- trunk/numpy/lib/tests/test_regression.py 2008-03-21 12:49:41 UTC (rev 4900) +++ trunk/numpy/lib/tests/test_regression.py 2008-03-21 13:08:21 UTC (rev 4901) @@ -0,0 +1,33 @@ +from numpy.testing import * + +set_local_path() +import numpy as np +restore_path() + +rlevel = 1 + +class TestRegression(NumpyTestCase): + def test_polyfit_build(self,level=rlevel): + """Ticket #628""" + ref = [-1.06123820e-06, 5.70886914e-04, -1.13822012e-01, + 9.95368241e+00, -3.14526520e+02] + x = [90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, + 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, + 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 129, + 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, + 146, 147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, + 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, + 170, 171, 172, 173, 174, 175, 176] + y = [9.0, 3.0, 7.0, 4.0, 4.0, 8.0, 6.0, 11.0, 9.0, 8.0, 11.0, 5.0, + 6.0, 5.0, 9.0, 8.0, 6.0, 10.0, 6.0, 10.0, 7.0, 6.0, 6.0, 6.0, + 13.0, 4.0, 9.0, 11.0, 4.0, 5.0, 8.0, 5.0, 7.0, 7.0, 6.0, 12.0, + 7.0, 7.0, 9.0, 4.0, 12.0, 6.0, 6.0, 4.0, 3.0, 9.0, 8.0, 8.0, + 6.0, 7.0, 9.0, 10.0, 6.0, 8.0, 4.0, 7.0, 7.0, 10.0, 8.0, 8.0, + 6.0, 3.0, 8.0, 4.0, 5.0, 7.0, 8.0, 6.0, 6.0, 4.0, 12.0, 9.0, + 8.0, 8.0, 8.0, 6.0, 7.0, 4.0, 4.0, 5.0, 7.0] + tested = np.polyfit(x, y, 4) + assert_array_almost_equal(ref, tested) + + +if __name__ == "__main__": + NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 09:24:36 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 08:24:36 -0500 (CDT) Subject: [Numpy-svn] r4902 - trunk/numpy/linalg/tests Message-ID: <20080321132436.91ED739C26B@new.scipy.org> Author: cdavid Date: 2008-03-21 08:24:30 -0500 (Fri, 21 Mar 2008) New Revision: 4902 Added: trunk/numpy/linalg/tests/test_regression.py Log: Add regression test for ticket #652. Added: trunk/numpy/linalg/tests/test_regression.py =================================================================== --- trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:08:21 UTC (rev 4901) +++ trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:24:30 UTC (rev 4902) @@ -0,0 +1,34 @@ +""" Test functions for linalg module +""" + +from numpy.testing import * +set_package_path() +from numpy import linalg, arange, float64 +restore_path() + +rlevel = 1 + +class TestRegression(NumpyTestCase): + def test_eig_build(self, level = rlevel): + """Ticket #652""" + rva = [1.03221168e+02 +0.j, + -1.91843603e+01 +0.j, + -6.04004526e-01+15.84422474j, + -6.04004526e-01-15.84422474j, + -1.13692929e+01 +0.j, + -6.57612485e-01+10.41755503j, + -6.57612485e-01-10.41755503j, + 1.82126812e+01 +0.j, + 1.06011014e+01 +0.j , + 7.80732773e+00 +0.j , + -7.65390898e-01 +0.j, + 1.51971555e-15 +0.j , + -1.51308713e-15 +0.j] + a = arange(13*13, dtype = float64) + a.shape = (13,13) + a = a%17 + va, ve = linalg.eig(a) + assert_array_almost_equal(va, rva) + +if __name__ == '__main__': + NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 09:28:34 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 08:28:34 -0500 (CDT) Subject: [Numpy-svn] r4903 - trunk/numpy/linalg/tests Message-ID: <20080321132834.0C11F39C1C4@new.scipy.org> Author: cdavid Date: 2008-03-21 08:28:29 -0500 (Fri, 21 Mar 2008) New Revision: 4903 Modified: trunk/numpy/linalg/tests/test_regression.py Log: Add regression test for #662. Modified: trunk/numpy/linalg/tests/test_regression.py =================================================================== --- trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:24:30 UTC (rev 4902) +++ trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:28:29 UTC (rev 4903) @@ -3,7 +3,7 @@ from numpy.testing import * set_package_path() -from numpy import linalg, arange, float64 +from numpy import linalg, arange, float64, array restore_path() rlevel = 1 @@ -30,5 +30,16 @@ va, ve = linalg.eig(a) assert_array_almost_equal(va, rva) + def test_eigh_build(self, level = rlevel): + """Ticket 662.""" + rvals = [68.60568999, 89.57756725, 106.67185574] + + cov = array([[ 77.70273908, 3.51489954, 15.64602427], + [3.51489954, 88.97013878, -1.07431931], + [15.64602427, -1.07431931, 98.18223512]]) + + vals, vecs = linalg.eigh(cov) + assert_array_almost_equal(vals, rvals) + if __name__ == '__main__': NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 09:35:54 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 08:35:54 -0500 (CDT) Subject: [Numpy-svn] r4904 - trunk/numpy/linalg/tests Message-ID: <20080321133554.C396039C26B@new.scipy.org> Author: cdavid Date: 2008-03-21 08:35:50 -0500 (Fri, 21 Mar 2008) New Revision: 4904 Modified: trunk/numpy/linalg/tests/test_regression.py Log: Add regression for #627. Modified: trunk/numpy/linalg/tests/test_regression.py =================================================================== --- trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:28:29 UTC (rev 4903) +++ trunk/numpy/linalg/tests/test_regression.py 2008-03-21 13:35:50 UTC (rev 4904) @@ -3,7 +3,8 @@ from numpy.testing import * set_package_path() -from numpy import linalg, arange, float64, array +import numpy as np +from numpy import linalg, arange, float64, array, dot, transpose restore_path() rlevel = 1 @@ -41,5 +42,15 @@ vals, vecs = linalg.eigh(cov) assert_array_almost_equal(vals, rvals) + def test_svd_build(self, level = rlevel): + """Ticket 627.""" + a = array([[ 0., 1.], [ 1., 1.], [ 2., 1.], [ 3., 1.]]) + m, n = a.shape + u, s, vh = linalg.svd(a) + + b = dot(transpose(u[:, n:]), a) + + assert_array_almost_equal(b, np.zeros((2, 2))) + if __name__ == '__main__': NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 10:54:39 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 09:54:39 -0500 (CDT) Subject: [Numpy-svn] r4905 - trunk/numpy/core/src Message-ID: <20080321145439.E1674C7C087@new.scipy.org> Author: stefan Date: 2008-03-21 09:54:34 -0500 (Fri, 21 Mar 2008) New Revision: 4905 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Revert r4897, which fixed one memory error in exchange for another. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-21 13:35:50 UTC (rev 4904) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-21 14:54:34 UTC (rev 4905) @@ -5663,6 +5663,7 @@ ret = PyArray_NewCopy((PyArrayObject*)op, order); if (oldtype == type) goto finish; + Py_INCREF(oldtype); Py_DECREF(PyArray_DESCR(ret)); PyArray_DESCR(ret) = oldtype; goto finish; @@ -5690,7 +5691,6 @@ ret = PyArray_CheckFromAny(op, type, 0, 0, flags, NULL); finish: - Py_XDECREF(oldtype); if (!ret || (nd=PyArray_NDIM(ret)) >= ndmin) return ret; /* create a new array from the same data with ones in the shape */ /* steals a reference to ret */ From numpy-svn at scipy.org Fri Mar 21 15:34:21 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 14:34:21 -0500 (CDT) Subject: [Numpy-svn] r4906 - trunk/numpy/core/src Message-ID: <20080321193421.9316FC7C0EF@new.scipy.org> Author: oliphant Date: 2008-03-21 14:34:19 -0500 (Fri, 21 Mar 2008) New Revision: 4906 Modified: trunk/numpy/core/src/arrayobject.c Log: Fix reference count pattern for object arrays so that a decref is followed by an incref on the *same* array. This should fix reference count issues on object arrays. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-21 14:54:34 UTC (rev 4905) +++ trunk/numpy/core/src/arrayobject.c 2008-03-21 19:34:19 UTC (rev 4906) @@ -743,7 +743,7 @@ NPY_BEGIN_THREADS_DEF - numcopies = PyArray_SIZE(dest); + numcopies = PyArray_SIZE(dest); if (numcopies < 1) return 0; nbytes = PyArray_ITEMSIZE(src); @@ -784,7 +784,6 @@ dstride = nbytes; /* Refcount note: src and dest may have different sizes */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -795,8 +794,7 @@ NPY_END_THREADS - PyArray_INCREF(dest); - PyArray_XDECREF(src); + PyArray_INCREF(dest); } else { PyArrayIterObject *dit; @@ -805,8 +803,8 @@ PyArray_IterAllButAxis((PyObject *)dest, &axis); if (dit == NULL) goto finish; /* Refcount note: src and dest may have different sizes */ - PyArray_INCREF(src); PyArray_XDECREF(dest); + NPY_BEGIN_THREADS while(dit->index < dit->size) { myfunc(dit->dataptr, PyArray_STRIDE(dest, axis), @@ -819,9 +817,9 @@ PyArray_ITER_NEXT(dit); } NPY_END_THREADS - PyArray_INCREF(dest); - PyArray_XDECREF(src); - Py_DECREF(dit); + + PyArray_INCREF(dest); + Py_DECREF(dit); } retval = 0; finish: @@ -844,16 +842,15 @@ NPY_BEGIN_THREADS_DEF - if (PyArray_NDIM(src) == 0) { - /* Refcount note: src and dst have the same size */ - PyArray_INCREF((PyArrayObject *)src); - PyArray_XDECREF((PyArrayObject *)dst); - NPY_BEGIN_THREADS - memcpy(PyArray_BYTES(dst), PyArray_BYTES(src), - PyArray_ITEMSIZE(src)); - NPY_END_THREADS - return 0; - } + if (PyArray_NDIM(src) == 0) { + PyArray_XDECREF((PyArrayObject *)dst); + NPY_BEGIN_THREADS + memcpy(PyArray_BYTES(dst), PyArray_BYTES(src), + PyArray_ITEMSIZE(src)); + NPY_END_THREADS + PyArray_INCREF((PyArrayObject *)dst); + return 0; + } if (order == PyArray_FORTRANORDER) { axis = 0; @@ -876,8 +873,6 @@ elsize = PyArray_ITEMSIZE(dst); nbytes = elsize * PyArray_DIM(src, axis); - /* Refcount note: src and dst have the same size */ - PyArray_INCREF((PyArrayObject *)src); PyArray_XDECREF((PyArrayObject *)dst); NPY_BEGIN_THREADS while(it->index < it->size) { @@ -889,6 +884,8 @@ } NPY_END_THREADS + PyArray_INCREF((PyArrayObject *)dst); + Py_DECREF(it); return 0; } @@ -918,8 +915,6 @@ } elsize = PyArray_ITEMSIZE(dest); - /* Refcount note: src and dst have the same size */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -939,6 +934,8 @@ } NPY_END_THREADS + PyArray_INCREF(dest); + Py_DECREF(sit); Py_DECREF(dit); return 0; @@ -968,11 +965,10 @@ maxaxis = PyArray_RemoveSmallest(multi); if (maxaxis < 0) { /* copy 1 0-d array to another */ - /* Refcount note: src and dst have the same size */ - PyArray_INCREF(src); PyArray_XDECREF(dest); memcpy(dest->data, src->data, elsize); if (swap) byte_swap_vector(dest->data, 1, elsize); + PyArray_INCREF(dest); return 0; } maxdim = multi->dimensions[maxaxis]; @@ -980,8 +976,6 @@ /* Increment the source and decrement the destination reference counts */ - /* Refcount note: src and dest may have different sizes */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -1001,7 +995,6 @@ NPY_END_THREADS PyArray_INCREF(dest); - PyArray_XDECREF(src); Py_DECREF(multi); return 0; @@ -1043,16 +1036,15 @@ (PyArray_ISFARRAY_RO(src) && PyArray_ISFARRAY(dest))); if (simple) { - /* Refcount note: src and dest have the same size */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS if (usecopy) memcpy(dest->data, src->data, PyArray_NBYTES(dest)); else memmove(dest->data, src->data, PyArray_NBYTES(dest)); - NPY_END_THREADS - return 0; + NPY_END_THREADS + PyArray_INCREF(dest); + return 0; } swap = PyArray_ISNOTSWAPPED(dest) != PyArray_ISNOTSWAPPED(src); @@ -1117,12 +1109,12 @@ if (simple) { /* Refcount note: src and dest have the same size */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS memcpy(dest->data, src->data, PyArray_NBYTES(dest)); NPY_END_THREADS - return 0; + PyArray_INCREF(dest); + return 0; } if (PyArray_SAMESHAPE(dest, src)) { @@ -1143,8 +1135,6 @@ isrc = (PyArrayIterObject *)PyArray_IterNew((PyObject *)src); if (isrc == NULL) {Py_DECREF(idest); return -1;} elsize = dest->descr->elsize; - /* Refcount note: src and dest have the same size */ - PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS while(idest->index < idest->size) { @@ -1153,7 +1143,8 @@ PyArray_ITER_NEXT(isrc); } NPY_END_THREADS - Py_DECREF(idest); + PyArray_INCREF(dest); + Py_DECREF(idest); Py_DECREF(isrc); return 0; } From numpy-svn at scipy.org Fri Mar 21 19:55:09 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 18:55:09 -0500 (CDT) Subject: [Numpy-svn] r4907 - trunk/numpy/core/src Message-ID: <20080321235509.DB0DCC7C031@new.scipy.org> Author: oliphant Date: 2008-03-21 18:54:58 -0500 (Fri, 21 Mar 2008) New Revision: 4907 Modified: trunk/numpy/core/src/arrayobject.c trunk/numpy/core/src/arraytypes.inc.src Log: Fix ticket #711 by more carefully guarding object array reference counting. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-21 19:34:19 UTC (rev 4906) +++ trunk/numpy/core/src/arrayobject.c 2008-03-21 23:54:58 UTC (rev 4907) @@ -784,6 +784,7 @@ dstride = nbytes; /* Refcount note: src and dest may have different sizes */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS @@ -794,7 +795,8 @@ NPY_END_THREADS - PyArray_INCREF(dest); + PyArray_INCREF(dest); + PyArray_XDECREF(src); } else { PyArrayIterObject *dit; @@ -803,8 +805,8 @@ PyArray_IterAllButAxis((PyObject *)dest, &axis); if (dit == NULL) goto finish; /* Refcount note: src and dest may have different sizes */ + PyArray_INCREF(src); PyArray_XDECREF(dest); - NPY_BEGIN_THREADS while(dit->index < dit->size) { myfunc(dit->dataptr, PyArray_STRIDE(dest, axis), @@ -817,9 +819,9 @@ PyArray_ITER_NEXT(dit); } NPY_END_THREADS - - PyArray_INCREF(dest); - Py_DECREF(dit); + PyArray_INCREF(dest); + PyArray_XDECREF(src); + Py_DECREF(dit); } retval = 0; finish: @@ -843,12 +845,13 @@ if (PyArray_NDIM(src) == 0) { - PyArray_XDECREF((PyArrayObject *)dst); - NPY_BEGIN_THREADS - memcpy(PyArray_BYTES(dst), PyArray_BYTES(src), - PyArray_ITEMSIZE(src)); + /* Refcount note: src and dst have the same size */ + PyArray_INCREF((PyArrayObject *)src); + PyArray_XDECREF((PyArrayObject *)dst); + NPY_BEGIN_THREADS + memcpy(PyArray_BYTES(dst), PyArray_BYTES(src), + PyArray_ITEMSIZE(src)); NPY_END_THREADS - PyArray_INCREF((PyArrayObject *)dst); return 0; } @@ -873,19 +876,19 @@ elsize = PyArray_ITEMSIZE(dst); nbytes = elsize * PyArray_DIM(src, axis); + /* Refcount note: src and dst have the same size */ + PyArray_INCREF((PyArrayObject *)src); PyArray_XDECREF((PyArrayObject *)dst); NPY_BEGIN_THREADS - while(it->index < it->size) { - myfunc(dptr, elsize, it->dataptr, - PyArray_STRIDE(src,axis), - PyArray_DIM(src,axis), elsize); - dptr += nbytes; - PyArray_ITER_NEXT(it); - } + while(it->index < it->size) { + myfunc(dptr, elsize, it->dataptr, + PyArray_STRIDE(src,axis), + PyArray_DIM(src,axis), elsize); + dptr += nbytes; + PyArray_ITER_NEXT(it); + } NPY_END_THREADS - PyArray_INCREF((PyArrayObject *)dst); - Py_DECREF(it); return 0; } @@ -915,27 +918,27 @@ } elsize = PyArray_ITEMSIZE(dest); + /* Refcount note: src and dst have the same size */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS - while(dit->index < dit->size) { - /* strided copy of elsize bytes */ - myfunc(dit->dataptr, dest->strides[maxaxis], - sit->dataptr, src->strides[maxaxis], - maxdim, elsize); - if (swap) { - _strided_byte_swap(dit->dataptr, - dest->strides[maxaxis], - dest->dimensions[maxaxis], - elsize); - } - PyArray_ITER_NEXT(dit); - PyArray_ITER_NEXT(sit); + while(dit->index < dit->size) { + /* strided copy of elsize bytes */ + myfunc(dit->dataptr, dest->strides[maxaxis], + sit->dataptr, src->strides[maxaxis], + maxdim, elsize); + if (swap) { + _strided_byte_swap(dit->dataptr, + dest->strides[maxaxis], + dest->dimensions[maxaxis], + elsize); } + PyArray_ITER_NEXT(dit); + PyArray_ITER_NEXT(sit); + } NPY_END_THREADS - PyArray_INCREF(dest); - Py_DECREF(sit); Py_DECREF(dit); return 0; @@ -951,7 +954,7 @@ int maxaxis; intp maxdim; NPY_BEGIN_THREADS_DEF - elsize = PyArray_ITEMSIZE(dest); + elsize = PyArray_ITEMSIZE(dest); multi = (PyArrayMultiIterObject *)PyArray_MultiIterNew(2, dest, src); if (multi == NULL) return -1; @@ -965,10 +968,11 @@ maxaxis = PyArray_RemoveSmallest(multi); if (maxaxis < 0) { /* copy 1 0-d array to another */ + /* Refcount note: src and dst have the same size */ + PyArray_INCREF(src); PyArray_XDECREF(dest); memcpy(dest->data, src->data, elsize); if (swap) byte_swap_vector(dest->data, 1, elsize); - PyArray_INCREF(dest); return 0; } maxdim = multi->dimensions[maxaxis]; @@ -976,25 +980,28 @@ /* Increment the source and decrement the destination reference counts */ + /* Refcount note: src and dest may have different sizes */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS - while(multi->index < multi->size) { - myfunc(multi->iters[0]->dataptr, - multi->iters[0]->strides[maxaxis], - multi->iters[1]->dataptr, - multi->iters[1]->strides[maxaxis], - maxdim, elsize); - if (swap) { - _strided_byte_swap(multi->iters[0]->dataptr, - multi->iters[0]->strides[maxaxis], - maxdim, elsize); - } - PyArray_MultiIter_NEXT(multi); + while(multi->index < multi->size) { + myfunc(multi->iters[0]->dataptr, + multi->iters[0]->strides[maxaxis], + multi->iters[1]->dataptr, + multi->iters[1]->strides[maxaxis], + maxdim, elsize); + if (swap) { + _strided_byte_swap(multi->iters[0]->dataptr, + multi->iters[0]->strides[maxaxis], + maxdim, elsize); } + PyArray_MultiIter_NEXT(multi); + } NPY_END_THREADS PyArray_INCREF(dest); + PyArray_XDECREF(src); Py_DECREF(multi); return 0; @@ -1036,15 +1043,16 @@ (PyArray_ISFARRAY_RO(src) && PyArray_ISFARRAY(dest))); if (simple) { + /* Refcount note: src and dest have the same size */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS - if (usecopy) - memcpy(dest->data, src->data, PyArray_NBYTES(dest)); - else - memmove(dest->data, src->data, PyArray_NBYTES(dest)); - NPY_END_THREADS - PyArray_INCREF(dest); - return 0; + if (usecopy) + memcpy(dest->data, src->data, PyArray_NBYTES(dest)); + else + memmove(dest->data, src->data, PyArray_NBYTES(dest)); + NPY_END_THREADS + return 0; } swap = PyArray_ISNOTSWAPPED(dest) != PyArray_ISNOTSWAPPED(src); @@ -1109,12 +1117,12 @@ if (simple) { /* Refcount note: src and dest have the same size */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS - memcpy(dest->data, src->data, PyArray_NBYTES(dest)); + memcpy(dest->data, src->data, PyArray_NBYTES(dest)); NPY_END_THREADS - PyArray_INCREF(dest); - return 0; + return 0; } if (PyArray_SAMESHAPE(dest, src)) { @@ -1135,6 +1143,8 @@ isrc = (PyArrayIterObject *)PyArray_IterNew((PyObject *)src); if (isrc == NULL) {Py_DECREF(idest); return -1;} elsize = dest->descr->elsize; + /* Refcount note: src and dest have the same size */ + PyArray_INCREF(src); PyArray_XDECREF(dest); NPY_BEGIN_THREADS while(idest->index < idest->size) { @@ -1143,7 +1153,6 @@ PyArray_ITER_NEXT(isrc); } NPY_END_THREADS - PyArray_INCREF(dest); Py_DECREF(idest); Py_DECREF(isrc); return 0; Modified: trunk/numpy/core/src/arraytypes.inc.src =================================================================== --- trunk/numpy/core/src/arraytypes.inc.src 2008-03-21 19:34:19 UTC (rev 4906) +++ trunk/numpy/core/src/arraytypes.inc.src 2008-03-21 23:54:58 UTC (rev 4907) @@ -2086,7 +2086,7 @@ @name at _fastclip(@type@ *in, intp ni, @type@ *min, @type@ *max, @type@ *out) { register npy_intp i; - @type@ max_val = 0, min_val = 0; + @type@ max_val=0, min_val=0; if (max != NULL) max_val = *max; From numpy-svn at scipy.org Fri Mar 21 20:10:15 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 19:10:15 -0500 (CDT) Subject: [Numpy-svn] r4908 - trunk/numpy/core/tests Message-ID: <20080322001015.DDAAEC7C0EE@new.scipy.org> Author: oliphant Date: 2008-03-21 19:10:11 -0500 (Fri, 21 Mar 2008) New Revision: 4908 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test in Ticket #711 which is the fix by pv Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-21 23:54:58 UTC (rev 4907) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 00:10:11 UTC (rev 4908) @@ -924,6 +924,21 @@ arr3 = x.choose(arr1, arr2) assert cnt(a) == cnt0_a + 5 + 2 assert cnt(b) == cnt0_b + 5 + 3 + + def check_object_array_refcount_self_assign(self): + """Ticket #711""" + class VictimObject(object): + deleted = False + def __del__(self): + self.deleted = True + d = VictimObject() + arr = np.zeros(5, dtype=np.object_) + arr[:] = d + del d + arr[:] = arr # refcount of 'd' might hit zero here + assert not arr[0].deleted + arr[:] = arr # trying to induce a segfault by doing it again... + assert not arr[0].deleted if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Fri Mar 21 20:24:24 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 19:24:24 -0500 (CDT) Subject: [Numpy-svn] r4909 - in trunk/numpy/core: include/numpy src Message-ID: <20080322002424.8542D39C382@new.scipy.org> Author: oliphant Date: 2008-03-21 19:24:21 -0500 (Fri, 21 Mar 2008) New Revision: 4909 Modified: trunk/numpy/core/include/numpy/ndarrayobject.h trunk/numpy/core/src/arrayobject.c Log: More complete fix to #647 so that fast copy is not attempted on portions of record arrays. Modified: trunk/numpy/core/include/numpy/ndarrayobject.h =================================================================== --- trunk/numpy/core/include/numpy/ndarrayobject.h 2008-03-22 00:10:11 UTC (rev 4908) +++ trunk/numpy/core/include/numpy/ndarrayobject.h 2008-03-22 00:24:21 UTC (rev 4909) @@ -1748,6 +1748,16 @@ #define PyArray_ISOBJECT(obj) PyTypeNum_ISOBJECT(PyArray_TYPE(obj)) #define PyArray_HASFIELDS(obj) PyDataType_HASFIELDS(PyArray_DESCR(obj)) + /* FIXME: This should check for a flag on the data-type + that states whether or not it is variable length. + Because the ISFLEXIBLE check is hard-coded to the + built-in data-types. + */ +#define PyArray_ISVARIABLE(obj) PyTypeNum_ISFLEXIBLE(PyArray_TYPE(obj)) + +#define PyArray_SAFEALIGNEDCOPY(obj) (PyArray_ISALIGNED(obj) && !PyArray_ISVARIABLE(obj)) + + #define NPY_LITTLE '<' #define NPY_BIG '>' #define NPY_NATIVE '=' Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-22 00:10:11 UTC (rev 4908) +++ trunk/numpy/core/src/arrayobject.c 2008-03-22 00:24:21 UTC (rev 4909) @@ -758,12 +758,7 @@ sptr = aligned; } else sptr = src->data; - /* FIXME: This should check for a flag on the data-type - that states whether or not it is variable length. - Because the ISFLEXIBLE check is hard-coded to the - built-in data-types. - */ - if (PyArray_ISALIGNED(dest) && !PyArray_ISFLEXIBLE(dest)) { + if (PyArray_SAFEALIGNEDCOPY(dest)) { myfunc = _strided_byte_copy; } else if (usecopy) { @@ -865,7 +860,7 @@ it = (PyArrayIterObject *)PyArray_IterAllButAxis(src, &axis); if (it == NULL) return -1; - if (PyArray_ISALIGNED(src)) { + if (PyArray_SAFEALIGNEDCOPY(src)) { myfunc = _strided_byte_copy; } else { @@ -1061,7 +1056,7 @@ return _copy_from0d(dest, src, usecopy, swap); } - if (PyArray_ISALIGNED(dest) && PyArray_ISALIGNED(src)) { + if (PyArray_SAFEALIGNEDCOPY(dest) && PyArray_SAFEALIGNEDCOPY(src)) { myfunc = _strided_byte_copy; } else if (usecopy) { @@ -1127,7 +1122,7 @@ if (PyArray_SAMESHAPE(dest, src)) { int swap; - if (PyArray_ISALIGNED(dest) && PyArray_ISALIGNED(src)) { + if (PyArray_SAFEALIGNEDCOPY(dest) && PyArray_SAFEALIGNEDCOPY(src)) { myfunc = _strided_byte_copy; } else { From numpy-svn at scipy.org Fri Mar 21 21:00:27 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 20:00:27 -0500 (CDT) Subject: [Numpy-svn] r4910 - trunk/numpy/core/src Message-ID: <20080322010027.EB74FC7C0F0@new.scipy.org> Author: oliphant Date: 2008-03-21 20:00:25 -0500 (Fri, 21 Mar 2008) New Revision: 4910 Modified: trunk/numpy/core/src/ufuncobject.c Log: Fix ticket #670. Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2008-03-22 00:24:21 UTC (rev 4909) +++ trunk/numpy/core/src/ufuncobject.c 2008-03-22 01:00:25 UTC (rev 4910) @@ -3440,7 +3440,7 @@ static int cmp_arg_types(int *arg1, int *arg2, int n) { - while (n--) { + for (;n>0; n--, arg1++, arg2++) { if (PyArray_EquivTypenums(*arg1, *arg2)) continue; if (PyArray_CanCastSafely(*arg1, *arg2)) return -1; From numpy-svn at scipy.org Fri Mar 21 21:43:16 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 20:43:16 -0500 (CDT) Subject: [Numpy-svn] r4911 - trunk/numpy/core/src Message-ID: <20080322014316.4F68E39C03B@new.scipy.org> Author: oliphant Date: 2008-03-21 20:43:02 -0500 (Fri, 21 Mar 2008) New Revision: 4911 Modified: trunk/numpy/core/src/arraymethods.c trunk/numpy/core/src/multiarraymodule.c trunk/numpy/core/src/scalartypes.inc.src trunk/numpy/core/src/ufuncobject.c Log: Fix reference count problems due to indiscriminate use of DescrConverter in PyArg_ParseTuple. Tests need to be run to make sure this works. Modified: trunk/numpy/core/src/arraymethods.c =================================================================== --- trunk/numpy/core/src/arraymethods.c 2008-03-22 01:00:25 UTC (rev 4910) +++ trunk/numpy/core/src/arraymethods.c 2008-03-22 01:43:02 UTC (rev 4911) @@ -255,13 +255,16 @@ array_getfield(PyArrayObject *self, PyObject *args, PyObject *kwds) { - PyArray_Descr *dtype; + PyArray_Descr *dtype=NULL; int offset = 0; static char *kwlist[] = {"dtype", "offset", 0}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&|i", kwlist, PyArray_DescrConverter, - &dtype, &offset)) return NULL; + &dtype, &offset)) { + Py_XDECREF(dtype); + return NULL; + } return PyArray_GetField(self, dtype, offset); } @@ -302,14 +305,17 @@ static PyObject * array_setfield(PyArrayObject *self, PyObject *args, PyObject *kwds) { - PyArray_Descr *dtype; + PyArray_Descr *dtype=NULL; int offset = 0; PyObject *value; static char *kwlist[] = {"value", "dtype", "offset", 0}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&|i", kwlist, &value, PyArray_DescrConverter, - &dtype, &offset)) return NULL; + &dtype, &offset)) { + Py_XDECREF(dtype); + return NULL; + } if (PyArray_SetField(self, dtype, offset, value) < 0) return NULL; @@ -649,7 +655,10 @@ PyObject *obj; if (!PyArg_ParseTuple(args, "O&", PyArray_DescrConverter, - &descr)) return NULL; + &descr)) { + Py_XDECREF(descr); + return NULL; + } if (descr == self->descr) { obj = _ARET(PyArray_NewCopy(self,NPY_ANYORDER)); @@ -709,7 +718,10 @@ PyObject *ret; if (!PyArg_ParseTuple(args, "|O&", PyArray_DescrConverter, - &newtype)) return NULL; + &newtype)) { + Py_XDECREF(newtype); + return NULL; + } /* convert to PyArray_Type */ if (!PyArray_CheckExact(self)) { @@ -1437,9 +1449,13 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(dtype); + return NULL; + } num = _get_type_num_double(self->descr, dtype); + Py_XDECREF(dtype); return PyArray_Mean(self, axis, num, out); } @@ -1449,6 +1465,7 @@ int axis=MAX_DIMS; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; + int rtype; static char *kwlist[] = {"axis", "dtype", "out", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, @@ -1456,9 +1473,14 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(dtype); + return NULL; + } - return PyArray_Sum(self, axis, _CHKTYPENUM(dtype), out); + rtype = _CHKTYPENUM(dtype); + Py_XDECREF(dtype); + return PyArray_Sum(self, axis, rtype, out); } @@ -1468,6 +1490,7 @@ int axis=MAX_DIMS; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; + int rtype; static char *kwlist[] = {"axis", "dtype", "out", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, @@ -1475,9 +1498,14 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(dtype); + return NULL; + } - return PyArray_CumSum(self, axis, _CHKTYPENUM(dtype), out); + rtype = _CHKTYPENUM(dtype); + Py_XDECREF(dtype); + return PyArray_CumSum(self, axis, rtype, out); } static PyObject * @@ -1486,6 +1514,7 @@ int axis=MAX_DIMS; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; + int rtype; static char *kwlist[] = {"axis", "dtype", "out", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, @@ -1493,9 +1522,14 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(dtype); + return NULL; + } - return PyArray_Prod(self, axis, _CHKTYPENUM(dtype), out); + rtype = _CHKTYPENUM(dtype); + Py_XDECREF(dtype); + return PyArray_Prod(self, axis, rtype, out); } static PyObject * @@ -1504,6 +1538,7 @@ int axis=MAX_DIMS; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; + int rtype; static char *kwlist[] = {"axis", "dtype", "out", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O&O&O&", kwlist, @@ -1511,9 +1546,14 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(dtype); + return NULL; + } - return PyArray_CumProd(self, axis, _CHKTYPENUM(dtype), out); + rtype = _CHKTYPENUM(dtype); + Py_XDECREF(dtype); + return PyArray_CumProd(self, axis, rtype, out); } @@ -1571,9 +1611,13 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out, &ddof)) return NULL; + &out, &ddof)) { + Py_XDECREF(dtype); + return NULL; + } num = _get_type_num_double(self->descr, dtype); + Py_XDECREF(dtype); return __New_PyArray_Std(self, axis, num, out, 0, ddof); } @@ -1593,9 +1637,13 @@ &axis, PyArray_DescrConverter2, &dtype, PyArray_OutputConverter, - &out, &ddof)) return NULL; + &out, &ddof)) { + Py_XDECREF(dtype); + return NULL; + } num = _get_type_num_double(self->descr, dtype); + Py_XDECREF(dtype); return __New_PyArray_Std(self, axis, num, out, 1, ddof); } @@ -1633,16 +1681,22 @@ int axis1=0, axis2=1, offset=0; PyArray_Descr *dtype=NULL; PyArrayObject *out=NULL; + int rtype; static char *kwlist[] = {"offset", "axis1", "axis2", "dtype", "out", NULL}; if (!PyArg_ParseTupleAndKeywords(args, kwds, "|iiiO&O&", kwlist, &offset, &axis1, &axis2, PyArray_DescrConverter2, &dtype, - PyArray_OutputConverter, &out)) + PyArray_OutputConverter, &out)) { + Py_XDECREF(dtype); return NULL; + } + rtype = _CHKTYPENUM(dtype); + Py_XDECREF(dtype); + return _ARET(PyArray_Trace(self, offset, axis1, axis2, - _CHKTYPENUM(dtype), out)); + rtype, out)); } #undef _CHKTYPENUM Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-22 01:00:25 UTC (rev 4910) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-22 01:43:02 UTC (rev 4911) @@ -5633,8 +5633,11 @@ PyArray_BoolConverter, ©, PyArray_OrderConverter, &order, PyArray_BoolConverter, &subok, - &ndmin)) - return NULL; + &ndmin)) { + Py_XDECREF(type); + return NULL; + } + /* fast exit if simple call */ if ((subok && PyArray_Check(op)) || @@ -5688,9 +5691,11 @@ flags |= NPY_FORCECAST; + Py_XINCREF(type); ret = PyArray_CheckFromAny(op, type, 0, 0, flags, NULL); finish: + Py_XDECREF(type); if (!ret || (nd=PyArray_NDIM(ret)) >= ndmin) return ret; /* create a new array from the same data with ones in the shape */ /* steals a reference to ret */ @@ -5748,8 +5753,9 @@ return ret; fail: + Py_XDECREF(typecode); PyDimMem_FREE(shape.ptr); - return ret; + return NULL; } /* This function is needed for supporting Pickles of @@ -5876,6 +5882,7 @@ return ret; fail: + Py_XDECREF(typecode); PyDimMem_FREE(shape.ptr); return ret; } @@ -6217,6 +6224,7 @@ &data, &s, PyArray_DescrConverter, &descr, &nin, &sep)) { + Py_XDECREF(descr); return NULL; } @@ -6350,11 +6358,10 @@ &file, PyArray_DescrConverter, &type, &nin, &sep)) { + Py_XDECREF(type); return NULL; } - if (type == NULL) type = PyArray_DescrFromType(PyArray_DEFAULT); - if (PyString_Check(file) || PyUnicode_Check(file)) { file = PyObject_CallFunction((PyObject *)&PyFile_Type, "Os", file, "rb"); @@ -6363,6 +6370,7 @@ else { Py_INCREF(file); } + fp = PyFile_AsFile(file); if (fp == NULL) { PyErr_SetString(PyExc_IOError, @@ -6370,6 +6378,9 @@ Py_DECREF(file); return NULL; } + + if (type == NULL) type = PyArray_DescrFromType(PyArray_DEFAULT); + ret = PyArray_FromFile(fp, type, (intp) nin, sep); Py_DECREF(file); return ret; @@ -6480,6 +6491,7 @@ &iter, PyArray_DescrConverter, &descr, &nin)) { + Py_XDECREF(descr); return NULL; } @@ -6598,6 +6610,7 @@ &obj, PyArray_DescrConverter, &type, &nin, &offset)) { + Py_XDECREF(type); return NULL; } if (type==NULL) @@ -6882,8 +6895,10 @@ if(!PyArg_ParseTupleAndKeywords(args, kws, "O|OOO&", kwd, &o_start, &o_stop, &o_step, PyArray_DescrConverter2, - &typecode)) + &typecode)) { + Py_XDECREF(typecode); return NULL; + } return PyArray_ArangeObj(o_start, o_stop, o_step, typecode); } @@ -7059,23 +7074,28 @@ PyArray_Descr *d1=NULL; PyArray_Descr *d2=NULL; Bool ret; - PyObject *retobj; + PyObject *retobj=NULL; static char *kwlist[] = {"from", "to", NULL}; if(!PyArg_ParseTupleAndKeywords(args, kwds, "O&O&", kwlist, PyArray_DescrConverter, &d1, - PyArray_DescrConverter, &d2)) - return NULL; + PyArray_DescrConverter, &d2)) { + goto finish; + } if (d1 == NULL || d2 == NULL) { PyErr_SetString(PyExc_TypeError, "did not understand one of the types; " \ "'None' not accepted"); - return NULL; + goto finish; } ret = PyArray_CanCastTo(d1, d2); retobj = (ret ? Py_True : Py_False); Py_INCREF(retobj); + + finish: + Py_XDECREF(d1); + Py_XDECREF(d2); return retobj; } Modified: trunk/numpy/core/src/scalartypes.inc.src =================================================================== --- trunk/numpy/core/src/scalartypes.inc.src 2008-03-22 01:00:25 UTC (rev 4910) +++ trunk/numpy/core/src/scalartypes.inc.src 2008-03-22 01:43:02 UTC (rev 4911) @@ -1075,7 +1075,10 @@ PyObject *ret; if (!PyArg_ParseTuple(args, "|O&", &PyArray_DescrConverter, - &outcode)) return NULL; + &outcode)) { + Py_XDECREF(outcode); + return NULL; + } ret = PyArray_FromScalar(scalar, outcode); return ret; } @@ -1214,7 +1217,7 @@ static PyObject * voidtype_setfield(PyVoidScalarObject *self, PyObject *args, PyObject *kwds) { - PyArray_Descr *typecode; + PyArray_Descr *typecode=NULL; int offset = 0; PyObject *value, *src; int mysize; @@ -1229,7 +1232,10 @@ if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO&|i", kwlist, &value, PyArray_DescrConverter, - &typecode, &offset)) return NULL; + &typecode, &offset)) { + Py_XDECREF(typecode); + return NULL; + } mysize = self->ob_size; @@ -1250,6 +1256,7 @@ temp = (PyObject **)dptr; Py_XDECREF(*temp); memcpy(temp, &value, sizeof(PyObject *)); + Py_DECREF(typecode); } else { /* Copy data from value to correct place in dptr */ Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2008-03-22 01:00:25 UTC (rev 4910) +++ trunk/numpy/core/src/ufuncobject.c 2008-03-22 01:43:02 UTC (rev 4911) @@ -2832,10 +2832,13 @@ PyArray_DescrConverter2, &otype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(otype); + return NULL; + } indices = (PyArrayObject *)PyArray_FromAny(obj_ind, indtype, 1, 1, CARRAY, NULL); - if (indices == NULL) return NULL; + if (indices == NULL) {Py_XDECREF(otype); return NULL;} } else { if(!PyArg_ParseTupleAndKeywords(args, kwds, "O|iO&O&", kwlist1, @@ -2843,7 +2846,10 @@ PyArray_DescrConverter2, &otype, PyArray_OutputConverter, - &out)) return NULL; + &out)) { + Py_XDECREF(otype); + return NULL; + } } /* Ensure input is an array */ @@ -2861,6 +2867,7 @@ if (mp->nd == 0) { PyErr_Format(PyExc_TypeError, "cannot %s on a scalar", _reduce_type[operation]); + Py_XDECREF(otype); Py_DECREF(mp); return NULL; } @@ -2871,6 +2878,7 @@ PyErr_Format(PyExc_TypeError, "cannot perform %s with flexible type", _reduce_type[operation]); + Py_XDECREF(otype); Py_DECREF(mp); return NULL; } @@ -2878,6 +2886,7 @@ if (axis < 0) axis += mp->nd; if (axis < 0 || axis >= mp->nd) { PyErr_SetString(PyExc_ValueError, "axis not in array"); + Py_XDECREF(otype); Py_DECREF(mp); return NULL; } From numpy-svn at scipy.org Fri Mar 21 23:06:30 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 22:06:30 -0500 (CDT) Subject: [Numpy-svn] r4912 - trunk/numpy/core/src Message-ID: <20080322030630.DC4C8C7C0C0@new.scipy.org> Author: oliphant Date: 2008-03-21 22:06:28 -0500 (Fri, 21 Mar 2008) New Revision: 4912 Modified: trunk/numpy/core/src/arrayobject.c Log: Fix ticket #702 (as well as other speed ups). Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-22 01:43:02 UTC (rev 4911) +++ trunk/numpy/core/src/arrayobject.c 2008-03-22 03:06:28 UTC (rev 4912) @@ -7773,7 +7773,7 @@ NPY_BEGIN_THREADS_DEF - if (mpsize == 0) return 0; + if (mpsize == 0) return 0; if (!PyArray_ISWRITEABLE(out)) { PyErr_SetString(PyExc_ValueError, "output array is not writeable"); @@ -7800,7 +7800,8 @@ if (PyArray_ISNUMBER(mp) && PyArray_ISNUMBER(out)) { NPY_END_THREADS } #endif - if (!PyArray_ISNUMBER(mp) && PyErr_Occurred()) return -1; + if (PyErr_Occurred()) return -1; + return 0; } /* If the input or output is OBJECT, STRING, UNICODE, or VOID */ From numpy-svn at scipy.org Sat Mar 22 00:15:37 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 23:15:37 -0500 (CDT) Subject: [Numpy-svn] r4913 - trunk/numpy/distutils Message-ID: <20080322041537.8ABE939C0F6@new.scipy.org> Author: oliphant Date: 2008-03-21 23:15:24 -0500 (Fri, 21 Mar 2008) New Revision: 4913 Modified: trunk/numpy/distutils/core.py Log: Comment out NotImplemented error when using setup tools. Modified: trunk/numpy/distutils/core.py =================================================================== --- trunk/numpy/distutils/core.py 2008-03-22 03:06:28 UTC (rev 4912) +++ trunk/numpy/distutils/core.py 2008-03-22 04:15:24 UTC (rev 4913) @@ -97,7 +97,7 @@ # class is local to a function in setuptools.command.easy_install if dist is not None and \ 'DistributionWithoutHelpCommands' in repr(dist): - raise NotImplementedError("setuptools not supported yet for numpy.scons branch") + #raise NotImplementedError("setuptools not supported yet for numpy.scons branch") dist = None if always and dist is None: dist = NumpyDistribution() From numpy-svn at scipy.org Sat Mar 22 00:23:44 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 23:23:44 -0500 (CDT) Subject: [Numpy-svn] r4914 - trunk/numpy/linalg Message-ID: <20080322042344.922B039C12B@new.scipy.org> Author: oliphant Date: 2008-03-21 23:23:42 -0500 (Fri, 21 Mar 2008) New Revision: 4914 Modified: trunk/numpy/linalg/dlapack_lite.c Log: Change iteration loop number to a defined value and increment it. Should fix ticket #706. Modified: trunk/numpy/linalg/dlapack_lite.c =================================================================== --- trunk/numpy/linalg/dlapack_lite.c 2008-03-22 04:15:24 UTC (rev 4913) +++ trunk/numpy/linalg/dlapack_lite.c 2008-03-22 04:23:42 UTC (rev 4914) @@ -1,3 +1,5 @@ +#define MAXITERLOOPS 100 + /* NOTE: This is generated code. Look in Misc/lapack_lite for information on remaking this file. @@ -10560,7 +10562,7 @@ iter = niter + 1; - for (niter = iter; niter <= 30; ++niter) { + for (niter = iter; niter <= MAXITERLOOPS; ++niter) { /* Test for convergence */ @@ -10965,7 +10967,7 @@ iter = niter + 1; - for (niter = iter; niter <= 30; ++niter) { + for (niter = iter; niter <= MAXITERLOOPS; ++niter) { /* Test for convergence */ @@ -11524,7 +11526,7 @@ iter = niter + 1; - for (niter = iter; niter <= 20; ++niter) { + for (niter = iter; niter <= MAXITERLOOPS; ++niter) { if (*orgati) { temp1 = dscale[1] - *tau; @@ -21090,6 +21092,7 @@ } /* dlasd3_ */ + /* Subroutine */ int dlasd4_(integer *n, integer *i__, doublereal *d__, doublereal *z__, doublereal *delta, doublereal *rho, doublereal * sigma, doublereal *work, integer *info) @@ -21460,7 +21463,7 @@ iter = niter + 1; - for (niter = iter; niter <= 20; ++niter) { + for (niter = iter; niter <= MAXITERLOOPS; ++niter) { /* Test for convergence */ @@ -21899,7 +21902,7 @@ iter = niter + 1; - for (niter = iter; niter <= 20; ++niter) { + for (niter = iter; niter <= MAXITERLOOPS; ++niter) { /* Test for convergence */ From numpy-svn at scipy.org Sat Mar 22 00:46:46 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 21 Mar 2008 23:46:46 -0500 (CDT) Subject: [Numpy-svn] r4915 - trunk/numpy/core/src Message-ID: <20080322044646.1573739C284@new.scipy.org> Author: oliphant Date: 2008-03-21 23:46:19 -0500 (Fri, 21 Mar 2008) New Revision: 4915 Modified: trunk/numpy/core/src/multiarraymodule.c Log: Fix ticket #583 : error when using str as data-type for fromiter. Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-22 04:23:42 UTC (rev 4914) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-22 04:46:19 UTC (rev 4915) @@ -6401,7 +6401,11 @@ if (iter == NULL) goto done; elcount = (count < 0) ? 0 : count; - elsize = dtype->elsize; + if ((elsize=dtype->elsize) == 0) { + PyErr_SetString(PyExc_ValueError, "Must specify length "\ + "when using variable-size data-type."); + goto done; + } /* We would need to alter the memory RENEW code to decrement any reference counts before throwing away any memory. From numpy-svn at scipy.org Sat Mar 22 02:25:15 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 01:25:15 -0500 (CDT) Subject: [Numpy-svn] r4916 - trunk/numpy/distutils/fcompiler Message-ID: <20080322062515.4EC19C7C0D7@new.scipy.org> Author: cdavid Date: 2008-03-22 01:25:07 -0500 (Sat, 22 Mar 2008) New Revision: 4916 Modified: trunk/numpy/distutils/fcompiler/compaq.py Log: Add VisualCompaq compiler to the list of fortran compilers if platform is cygwin. Modified: trunk/numpy/distutils/fcompiler/compaq.py =================================================================== --- trunk/numpy/distutils/fcompiler/compaq.py 2008-03-22 04:46:19 UTC (rev 4915) +++ trunk/numpy/distutils/fcompiler/compaq.py 2008-03-22 06:25:07 UTC (rev 4916) @@ -8,7 +8,7 @@ from distutils.errors import DistutilsPlatformError compilers = ['CompaqFCompiler'] -if os.name != 'posix': +if os.name != 'posix' or sys.platform[:6] == 'cygwin' : # Otherwise we'd get a false positive on posix systems with # case-insensitive filesystems (like darwin), because we'll pick # up /bin/df From numpy-svn at scipy.org Sat Mar 22 02:43:23 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 01:43:23 -0500 (CDT) Subject: [Numpy-svn] r4917 - trunk/numpy/distutils Message-ID: <20080322064323.C424039C05A@new.scipy.org> Author: cdavid Date: 2008-03-22 01:43:19 -0500 (Sat, 22 Mar 2008) New Revision: 4917 Modified: trunk/numpy/distutils/cpuinfo.py Log: Handle typo (sse3 vs ssse3) in the cpu arch flags as found in /proc/cpuinfo for some linux kernels (at least 2.6.23). Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2008-03-22 06:25:07 UTC (rev 4916) +++ trunk/numpy/distutils/cpuinfo.py 2008-03-22 06:43:19 UTC (rev 4917) @@ -272,7 +272,7 @@ return re.match(r'.*?\bsse2\b',self.info[0]['flags']) is not None def _has_sse3(self): - return re.match(r'.*?\bsse3\b',self.info[0]['flags']) is not None + return re.match(r'.*?\bsss?e3\b',self.info[0]['flags']) is not None def _has_3dnow(self): return re.match(r'.*?\b3dnow\b',self.info[0]['flags']) is not None From numpy-svn at scipy.org Sat Mar 22 02:45:59 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 01:45:59 -0500 (CDT) Subject: [Numpy-svn] r4918 - trunk/numpy/random/mtrand Message-ID: <20080322064559.8E45239C05A@new.scipy.org> Author: oliphant Date: 2008-03-22 01:45:57 -0500 (Sat, 22 Mar 2008) New Revision: 4918 Modified: trunk/numpy/random/mtrand/mtrand.pyx trunk/numpy/random/mtrand/numpy.pxi Log: Attempt to fix ticket #555 Modified: trunk/numpy/random/mtrand/mtrand.pyx =================================================================== --- trunk/numpy/random/mtrand/mtrand.pyx 2008-03-22 06:43:19 UTC (rev 4917) +++ trunk/numpy/random/mtrand/mtrand.pyx 2008-03-22 06:45:57 UTC (rev 4918) @@ -511,6 +511,9 @@ errcode = rk_randomseed(self.internal_state) elif type(seed) is int: rk_seed(seed, self.internal_state) + elif (PyArray_IsScalar(seed, Integer)): + iseed = int(seed) + rk_seed(iseed, self.internal_state) else: obj = PyArray_ContiguousFromObject(seed, NPY_LONG, 1, 1) init_by_array(self.internal_state, (obj.data), Modified: trunk/numpy/random/mtrand/numpy.pxi =================================================================== --- trunk/numpy/random/mtrand/numpy.pxi 2008-03-22 06:43:19 UTC (rev 4917) +++ trunk/numpy/random/mtrand/numpy.pxi 2008-03-22 06:45:57 UTC (rev 4918) @@ -130,4 +130,6 @@ object PyArray_IterNew(object arr) void PyArray_ITER_NEXT(flatiter it) + int PyArray_IsScalar(object obj, void* cls) + void import_array() From numpy-svn at scipy.org Sat Mar 22 02:55:46 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 01:55:46 -0500 (CDT) Subject: [Numpy-svn] r4919 - trunk/numpy/random/mtrand Message-ID: <20080322065546.0B57E39C1D1@new.scipy.org> Author: oliphant Date: 2008-03-22 01:55:41 -0500 (Sat, 22 Mar 2008) New Revision: 4919 Modified: trunk/numpy/random/mtrand/mtrand.c trunk/numpy/random/mtrand/mtrand.pyx trunk/numpy/random/mtrand/numpy.pxi Log: Re-generated the pyrex mtrand code after fixing seed setting bug: ticket #555 Modified: trunk/numpy/random/mtrand/mtrand.c =================================================================== --- trunk/numpy/random/mtrand/mtrand.c 2008-03-22 06:45:57 UTC (rev 4918) +++ trunk/numpy/random/mtrand/mtrand.c 2008-03-22 06:55:41 UTC (rev 4919) @@ -1,4 +1,4 @@ -/* Generated by Pyrex 0.9.6.4 on Tue Feb 12 15:30:45 2008 */ +/* Generated by Pyrex 0.9.6.4 on Sat Mar 22 02:09:21 2008 */ #define PY_SSIZE_T_CLEAN #include "Python.h" @@ -243,7 +243,7 @@ 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) { __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; goto __pyx_L1;} @@ -254,7 +254,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; @@ -274,18 +274,18 @@ 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) { (__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; @@ -319,7 +319,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":146 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":146 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; goto __pyx_L1;} @@ -330,7 +330,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":149 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":149 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -350,18 +350,18 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":150 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":150 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":151 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":151 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":152 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":152 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":154 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":154 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -408,44 +408,44 @@ __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":165 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":165 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":166 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":166 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 166; 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":167 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":167 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":168 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":168 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":169 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":169 */ __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 169; 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":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,(((double *)__pyx_v_itera->dataptr)[0])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":172 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":172 */ PyArray_ITER_NEXT(__pyx_v_itera); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":174 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":174 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 174; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -465,17 +465,17 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":175 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":175 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":176 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":176 */ __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 176; 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":178 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":178 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; goto __pyx_L1;} @@ -492,23 +492,23 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":180 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":180 */ __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":181 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":181 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":182 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":182 */ (__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":183 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":183 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":184 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":184 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -543,7 +543,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":193 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":193 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; goto __pyx_L1;} @@ -554,7 +554,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":196 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":196 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -574,18 +574,18 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":197 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":197 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":198 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":198 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":199 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":199 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":201 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":201 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -629,48 +629,48 @@ 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":214 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":214 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":215 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":215 */ __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_oa),((void *)__pyx_v_ob)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; 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":216 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":216 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 216; 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":217 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":217 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":218 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":218 */ __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":219 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":219 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":220 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":220 */ __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":221 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":221 */ (__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":222 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":222 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":224 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":224 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -690,17 +690,17 @@ arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":225 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":225 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":226 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":226 */ __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 = 226; 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":227 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":227 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; goto __pyx_L1;} @@ -717,29 +717,29 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":229 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":229 */ __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":230 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":230 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":231 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":231 */ __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":232 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":232 */ (__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":233 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":233 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":234 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":234 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":235 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":235 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -774,7 +774,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":245 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":245 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyFloat_FromDouble(__pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; goto __pyx_L1;} @@ -785,7 +785,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":248 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":248 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -805,18 +805,18 @@ arrayObject = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":249 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":249 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":250 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":250 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":251 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":251 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a,__pyx_v_b,__pyx_v_c); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":253 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":253 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -862,51 +862,51 @@ 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":267 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":267 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":268 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":268 */ __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 = 268; 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":269 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":269 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_DOUBLE); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; 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":270 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":270 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":271 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":271 */ __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":272 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":272 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":273 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":273 */ __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":274 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":274 */ __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":275 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":275 */ (__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":276 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":276 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":278 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":278 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -926,17 +926,17 @@ arrayObject = ((PyArrayObject *)__pyx_5); Py_DECREF(__pyx_5); __pyx_5 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":279 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":279 */ __pyx_v_array_data = ((double *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":280 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":280 */ __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 = 280; 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":282 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":282 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 283; goto __pyx_L1;} @@ -953,29 +953,29 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":284 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":284 */ __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":285 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":285 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":286 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":286 */ __pyx_v_ob_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":287 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":287 */ __pyx_v_oc_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":288 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":288 */ (__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":289 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":289 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":290 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":290 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1013,7 +1013,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":298 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":298 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 299; goto __pyx_L1;} @@ -1024,7 +1024,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":301 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":301 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1042,18 +1042,18 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":302 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":302 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":303 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":303 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":304 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":304 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":306 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":306 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1087,7 +1087,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":314 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":314 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 315; goto __pyx_L1;} @@ -1098,7 +1098,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":317 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":317 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1116,18 +1116,18 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":318 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":318 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":319 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":319 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":320 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":320 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_p); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":322 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":322 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1171,48 +1171,48 @@ 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":333 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":333 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":334 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":334 */ __pyx_2 = PyArray_MultiIterNew(2,((void *)__pyx_v_on),((void *)__pyx_v_op)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 334; 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":335 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":335 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; 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":336 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":336 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":337 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":337 */ __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":338 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":338 */ __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":339 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":339 */ __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":340 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":340 */ (__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":341 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":341 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":343 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":343 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1230,17 +1230,17 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":344 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":344 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":345 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":345 */ __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 = 345; 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":346 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":346 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 347; goto __pyx_L1;} @@ -1257,29 +1257,29 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":348 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":348 */ __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":349 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":349 */ __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":350 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":350 */ __pyx_v_op_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":351 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":351 */ (__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":352 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":352 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":353 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":353 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,2); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":355 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":355 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1314,7 +1314,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":364 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":364 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; goto __pyx_L1;} @@ -1325,7 +1325,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":367 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":367 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 367; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 367; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1343,18 +1343,18 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":368 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":368 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":369 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":369 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":370 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":370 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_n,__pyx_v_m,__pyx_v_N); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":372 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":372 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1400,51 +1400,51 @@ 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":385 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":385 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":386 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":386 */ __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 = 386; 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":387 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":387 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_multi->nd,__pyx_v_multi->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 387; 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":388 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":388 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":389 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":389 */ __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":390 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":390 */ __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,0)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":391 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":391 */ __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":392 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":392 */ __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":393 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":393 */ (__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":394 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":394 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":396 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":396 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; goto __pyx_L1;} __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1462,17 +1462,17 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":397 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":397 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":398 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":398 */ __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 = 398; 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":400 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":400 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 401; goto __pyx_L1;} @@ -1489,29 +1489,29 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":402 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":402 */ __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":403 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":403 */ __pyx_v_on_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":404 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":404 */ __pyx_v_om_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,2)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":405 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":405 */ __pyx_v_oN_data = ((long *)PyArray_MultiIter_DATA(__pyx_v_multi,3)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":406 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":406 */ (__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":407 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":407 */ PyArray_MultiIter_NEXT(__pyx_v_multi); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":409 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":409 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1547,7 +1547,7 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":417 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":417 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { __pyx_2 = PyInt_FromLong(__pyx_v_func(__pyx_v_state,__pyx_v_a)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 418; goto __pyx_L1;} @@ -1558,7 +1558,7 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":420 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":420 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1576,18 +1576,18 @@ 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 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__pyx_v_array_data[__pyx_v_i]) = __pyx_v_func(__pyx_v_state,__pyx_v_a); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":425 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":425 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1632,44 +1632,44 @@ __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":436 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":436 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":437 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":437 */ __pyx_2 = PyArray_SimpleNew(__pyx_v_oa->nd,__pyx_v_oa->dimensions,NPY_LONG); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; 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":438 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":438 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":439 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":439 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":440 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":440 */ __pyx_2 = PyArray_IterNew(((PyObject *)__pyx_v_oa)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; 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":441 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":441 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":442 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":442 */ (__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":443 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":443 */ PyArray_ITER_NEXT(__pyx_v_itera); } goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":445 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":445 */ __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 445; goto __pyx_L1;} __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_empty); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 445; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; @@ -1687,17 +1687,17 @@ arrayObject = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":446 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":446 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":447 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":447 */ __pyx_3 = PyArray_MultiIterNew(2,((void *)arrayObject),((void *)__pyx_v_oa)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; 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":448 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":448 */ __pyx_1 = (__pyx_v_multi->size != PyArray_SIZE(arrayObject)); if (__pyx_1) { __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 449; goto __pyx_L1;} @@ -1714,23 +1714,23 @@ } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":450 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":450 */ __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":451 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":451 */ __pyx_v_oa_data = ((double *)PyArray_MultiIter_DATA(__pyx_v_multi,1)); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":452 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":452 */ (__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":453 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":453 */ PyArray_MultiIter_NEXTi(__pyx_v_multi,1); } } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":454 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":454 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -1760,29 +1760,29 @@ long __pyx_v_i; double __pyx_r; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":459 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":459 */ __pyx_v_sum = (__pyx_v_darr[0]); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":460 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":460 */ __pyx_v_c = 0.0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":461 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":461 */ for (__pyx_v_i = 1; __pyx_v_i < __pyx_v_n; ++__pyx_v_i) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":462 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":462 */ __pyx_v_y = ((__pyx_v_darr[__pyx_v_i]) - __pyx_v_c); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":463 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":463 */ __pyx_v_t = (__pyx_v_sum + __pyx_v_y); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":464 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":464 */ __pyx_v_c = ((__pyx_v_t - __pyx_v_sum) - __pyx_v_y); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":465 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":465 */ __pyx_v_sum = __pyx_v_t; } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":466 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":466 */ __pyx_r = __pyx_v_sum; goto __pyx_L0; @@ -1804,10 +1804,10 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":489 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":489 */ ((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":491 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":491 */ __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_seed); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; goto __pyx_L1;} __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 491; goto __pyx_L1;} Py_INCREF(__pyx_v_seed); @@ -1838,10 +1838,10 @@ __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":495 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":495 */ PyMem_Free(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":496 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":496 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state = NULL; goto __pyx_L2; } @@ -1851,6 +1851,7 @@ } static PyObject *__pyx_n_type; +static PyObject *__pyx_n_integer; static PyObject *__pyx_f_6mtrand_11RandomState_seed(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ static char __pyx_doc_6mtrand_11RandomState_seed[] = "Seed the generator.\n\n seed(seed=None)\n\n seed can be an integer, an array (or other sequence) of integers of any\n length, or None. If seed is None, then RandomState will try to read data\n from /dev/urandom (or the Windows analogue) if available or seed from\n the clock otherwise.\n "; @@ -1858,6 +1859,7 @@ PyObject *__pyx_v_seed = 0; rk_error __pyx_v_errcode; PyArrayObject *arrayObject_obj; + PyObject *__pyx_v_iseed; PyObject *__pyx_r; int __pyx_1; PyObject *__pyx_2 = 0; @@ -1870,8 +1872,9 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_seed); arrayObject_obj = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); + __pyx_v_iseed = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":510 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":510 */ __pyx_1 = __pyx_v_seed == Py_None; if (__pyx_1) { __pyx_v_errcode = rk_randomseed(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); @@ -1893,16 +1896,40 @@ rk_seed(__pyx_5,((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state); goto __pyx_L2; } + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_integer); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; goto __pyx_L1;} + Py_DECREF(__pyx_3); __pyx_3 = 0; + __pyx_1 = PyObject_IsInstance(__pyx_v_seed,__pyx_4); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; goto __pyx_L1;} + Py_DECREF(__pyx_4); __pyx_4 = 0; + if (__pyx_1) { + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":515 */ + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} + Py_INCREF(__pyx_v_seed); + PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_seed); + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} + Py_DECREF(__pyx_2); __pyx_2 = 0; + Py_DECREF(__pyx_3); __pyx_3 = 0; + Py_DECREF(__pyx_v_iseed); + __pyx_v_iseed = __pyx_4; + __pyx_4 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":516 */ + __pyx_5 = PyInt_AsUnsignedLongMask(__pyx_v_iseed); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 516; 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":515 */ - __pyx_3 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 515; goto __pyx_L1;} - Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":518 */ + __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_seed,NPY_LONG,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 518; goto __pyx_L1;} + Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject_obj)); - arrayObject_obj = ((PyArrayObject *)__pyx_3); - Py_DECREF(__pyx_3); __pyx_3 = 0; + arrayObject_obj = ((PyArrayObject *)__pyx_2); + Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":516 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":519 */ init_by_array(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,((unsigned long *)arrayObject_obj->data),(arrayObject_obj->dimensions[0])); } __pyx_L2:; @@ -1917,6 +1944,7 @@ __pyx_r = 0; __pyx_L0:; Py_DECREF(arrayObject_obj); + Py_DECREF(__pyx_v_iseed); Py_DECREF(__pyx_v_self); Py_DECREF(__pyx_v_seed); return __pyx_r; @@ -1942,20 +1970,20 @@ Py_INCREF(__pyx_v_self); arrayObject_state = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":525 */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":528 */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_empty); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_1 = PyInt_FromLong(624); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_uint); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(624); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_uint); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; 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 = 525; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4); __pyx_1 = 0; __pyx_4 = 0; - __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 525; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_1))); @@ -1963,22 +1991,22 @@ arrayObject_state = ((PyArrayObject *)__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":526 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":529 */ 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":527 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_asarray); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":530 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_asarray); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} - __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_uint32); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_3, __pyx_n_uint32); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_INCREF(((PyObject *)arrayObject_state)); PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)arrayObject_state)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_1); __pyx_1 = 0; - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 530; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); @@ -1986,9 +2014,9 @@ arrayObject_state = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":528 */ - __pyx_1 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} - __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 528; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":531 */ + __pyx_1 = PyInt_FromLong(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;} + __pyx_2 = PyTuple_New(3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 531; goto __pyx_L1;} Py_INCREF(__pyx_n_MT19937); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_n_MT19937); Py_INCREF(((PyObject *)arrayObject_state)); @@ -2044,50 +2072,50 @@ __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":539 */ - __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 539; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":542 */ + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_state, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_algorithm_name); __pyx_v_algorithm_name = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":540 */ - if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 540; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":543 */ + if (PyObject_Cmp(__pyx_v_algorithm_name, __pyx_n_MT19937, &__pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 543; goto __pyx_L1;} __pyx_3 = __pyx_3 != 0; if (__pyx_3) { - __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); 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;} + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} 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 = 541; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 541; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":542 */ - __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} - __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":545 */ + __pyx_1 = PySequence_GetSlice(__pyx_v_state, 1, PY_SSIZE_T_MAX); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} + __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_4 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} + __pyx_4 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} Py_DECREF(__pyx_v_key); __pyx_v_key = __pyx_4; __pyx_4 = 0; - __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} - __pyx_3 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} + __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} + __pyx_3 = PyInt_AsLong(__pyx_1); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_v_pos = __pyx_3; - if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 542; goto __pyx_L1;} + if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":543 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":546 */ /*try:*/ { - __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_ULONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 544; goto __pyx_L3;} + __pyx_4 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_ULONG,1,1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; goto __pyx_L3;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_4); @@ -2099,14 +2127,14 @@ Py_XDECREF(__pyx_2); __pyx_2 = 0; Py_XDECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":545 */ - __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_TypeError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":548 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_TypeError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; goto __pyx_L1;} __pyx_3 = PyErr_ExceptionMatches(__pyx_1); Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_3) { __Pyx_AddTraceback("mtrand.set_state"); - if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 545; goto __pyx_L1;} - __pyx_5 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 547; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_2, &__pyx_4, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; goto __pyx_L1;} + __pyx_5 = PyArray_ContiguousFromObject(__pyx_v_key,NPY_LONG,1,1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_5))); Py_DECREF(((PyObject *)arrayObject_obj)); arrayObject_obj = ((PyArrayObject *)__pyx_5); @@ -2119,27 +2147,27 @@ goto __pyx_L1; __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":548 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":551 */ __pyx_3 = ((arrayObject_obj->dimensions[0]) != 624); if (__pyx_3) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;} Py_INCREF(__pyx_k70p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k70p); - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":550 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":553 */ 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":551 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":554 */ ((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state->pos = __pyx_v_pos; __pyx_r = Py_None; Py_INCREF(Py_None); @@ -2168,8 +2196,8 @@ static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 555; goto __pyx_L1;} - __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 555; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; __pyx_r = __pyx_2; __pyx_2 = 0; @@ -2198,11 +2226,11 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "O", __pyx_argnames, &__pyx_v_state)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_state); - __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_v_self, __pyx_n_set_state); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} Py_INCREF(__pyx_v_state); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_state); - __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 558; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_1, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -2234,16 +2262,16 @@ static char *__pyx_argnames[] = {0}; if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "", __pyx_argnames)) return 0; Py_INCREF(__pyx_v_self); - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_random); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n___RandomState_ctor); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n___RandomState_ctor); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} - __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} + __pyx_2 = PyTuple_New(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_get_state); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; goto __pyx_L1;} + __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_1); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_2); PyTuple_SET_ITEM(__pyx_3, 2, __pyx_4); @@ -2279,7 +2307,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - __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 = 569; goto __pyx_L1;} + __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 = 572; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -2307,7 +2335,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - __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 = 576; goto __pyx_L1;} + __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 = 579; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -2357,54 +2385,54 @@ Py_INCREF(__pyx_v_size); arrayObject = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":591 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":594 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":592 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":595 */ __pyx_v_lo = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":593 */ - __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 593; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":596 */ + __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; goto __pyx_L1;} __pyx_v_hi = __pyx_2; goto __pyx_L2; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":595 */ - __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 595; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":598 */ + __pyx_2 = PyInt_AsLong(__pyx_v_low); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; goto __pyx_L1;} __pyx_v_lo = __pyx_2; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":596 */ - __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":599 */ + __pyx_2 = PyInt_AsLong(__pyx_v_high); if (PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 599; goto __pyx_L1;} __pyx_v_hi = __pyx_2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":598 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":601 */ __pyx_v_diff = ((__pyx_v_hi - __pyx_v_lo) - 1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":599 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":602 */ __pyx_1 = (__pyx_v_diff < 0); if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;} 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 = 600; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_5, 0, 0); Py_DECREF(__pyx_5); __pyx_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 600; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 603; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":602 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":605 */ __pyx_1 = __pyx_v_size == Py_None; if (__pyx_1) { - __pyx_3 = PyInt_FromLong((((long)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 = 603; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong((((long)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 = 606; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -2412,17 +2440,17 @@ } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":605 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":608 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_empty); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 605; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 608; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); @@ -2430,18 +2458,18 @@ arrayObject = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":606 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":609 */ __pyx_v_length = PyArray_SIZE(arrayObject); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":607 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":610 */ __pyx_v_array_data = ((long *)arrayObject->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":608 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":611 */ for (__pyx_v_i = 0; __pyx_v_i < __pyx_v_length; ++__pyx_v_i) { (__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":610 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":613 */ Py_INCREF(((PyObject *)arrayObject)); __pyx_r = ((PyObject *)arrayObject); goto __pyx_L0; @@ -2478,19 +2506,19 @@ Py_INCREF(__pyx_v_self); __pyx_v_bytestring = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":618 */ - __pyx_1 = PyString_FromStringAndSize(NULL,__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":621 */ + __pyx_1 = PyString_FromStringAndSize(NULL,__pyx_v_length); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 621; 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":619 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":622 */ __pyx_v_bytes = PyString_AS_STRING(__pyx_v_bytestring); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":620 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":623 */ 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":621 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":624 */ Py_INCREF(__pyx_v_bytestring); __pyx_r = __pyx_v_bytestring; goto __pyx_L0; @@ -2540,16 +2568,16 @@ __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":632 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":635 */ __pyx_v_flow = PyFloat_AsDouble(__pyx_v_low); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":633 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":636 */ __pyx_v_fhigh = PyFloat_AsDouble(__pyx_v_high); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":634 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":637 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_flow,(__pyx_v_fhigh - __pyx_v_flow)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_uniform,__pyx_v_size,__pyx_v_flow,(__pyx_v_fhigh - __pyx_v_flow)); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -2557,51 +2585,51 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":636 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":639 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":637 */ - __pyx_2 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 637; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":640 */ + __pyx_2 = PyArray_FROM_OTF(__pyx_v_low,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 640; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_olow)); __pyx_v_olow = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":638 */ - __pyx_2 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":641 */ + __pyx_2 = PyArray_FROM_OTF(__pyx_v_high,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 641; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_ohigh)); __pyx_v_ohigh = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":639 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_subtract); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":642 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_subtract); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ohigh)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ohigh)); Py_INCREF(((PyObject *)__pyx_v_olow)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_olow)); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 639; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_temp); __pyx_v_temp = __pyx_4; __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":640 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":643 */ Py_INCREF(__pyx_v_temp); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":642 */ - __pyx_3 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 642; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":645 */ + __pyx_3 = PyArray_EnsureArray(__pyx_v_temp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odiff)); __pyx_v_odiff = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":643 */ - __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 643; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":646 */ + __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 646; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -2649,11 +2677,11 @@ return 0; } Py_INCREF(__pyx_v_self); - __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 656; goto __pyx_L1;} + __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} __pyx_2 = (__pyx_1 == 0); if (__pyx_2) { - __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;} - __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_r = __pyx_4; __pyx_4 = 0; @@ -2661,11 +2689,11 @@ goto __pyx_L2; } /*else*/ { - __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} - __pyx_4 = PyTuple_New(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} - __pyx_5 = PyDict_New(); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} - if (PyDict_SetItem(__pyx_5, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} - __pyx_6 = PyEval_CallObjectWithKeywords(__pyx_3, __pyx_4, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_random_sample); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 662; goto __pyx_L1;} + __pyx_4 = PyTuple_New(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 662; goto __pyx_L1;} + __pyx_5 = PyDict_New(); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 662; goto __pyx_L1;} + if (PyDict_SetItem(__pyx_5, __pyx_n_size, __pyx_v_args) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 662; goto __pyx_L1;} + __pyx_6 = PyEval_CallObjectWithKeywords(__pyx_3, __pyx_4, __pyx_5); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 662; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; @@ -2711,11 +2739,11 @@ return 0; } Py_INCREF(__pyx_v_self); - __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 671; goto __pyx_L1;} + __pyx_1 = PyObject_Length(__pyx_v_args); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;} __pyx_2 = (__pyx_1 == 0); if (__pyx_2) { - __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;} - __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 672; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 675; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, 0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 675; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_r = __pyx_4; __pyx_4 = 0; @@ -2723,11 +2751,11 @@ goto __pyx_L2; } /*else*/ { - __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;} Py_INCREF(__pyx_v_args); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_args); - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 674; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __pyx_r = __pyx_5; @@ -2772,17 +2800,17 @@ Py_INCREF(__pyx_v_high); Py_INCREF(__pyx_v_size); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":683 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":686 */ __pyx_1 = __pyx_v_high == Py_None; if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":684 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":687 */ 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":685 */ - __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 685; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":688 */ + __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 688; goto __pyx_L1;} Py_DECREF(__pyx_v_low); __pyx_v_low = __pyx_2; __pyx_2 = 0; @@ -2790,19 +2818,19 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":686 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} - __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} - __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":689 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_randint); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} + __pyx_4 = PyNumber_Add(__pyx_v_high, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} + __pyx_3 = PyTuple_New(3); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} Py_INCREF(__pyx_v_low); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_low); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_4); Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_3, 2, __pyx_v_size); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 689; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_r = __pyx_4; @@ -2836,7 +2864,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - __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 = 694; goto __pyx_L1;} + __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 = 697; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -2890,35 +2918,35 @@ __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":704 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":707 */ __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":705 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":708 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":706 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":709 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":707 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":710 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_INCREF(__pyx_k73p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k73p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 708; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 711; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":709 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 709; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":712 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_normal,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 712; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -2926,64 +2954,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":711 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":714 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":713 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 713; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":716 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":714 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 714; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":717 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":715 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":718 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 715; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} Py_INCREF(__pyx_k74p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k74p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 716; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":717 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":720 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 720; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -3043,52 +3071,52 @@ __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":727 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":730 */ __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":728 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":731 */ __pyx_v_fb = PyFloat_AsDouble(__pyx_v_b); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":729 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":732 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":730 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":733 */ __pyx_1 = (__pyx_v_fa <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;} Py_INCREF(__pyx_k75p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k75p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 731; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":732 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":735 */ __pyx_1 = (__pyx_v_fb <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; goto __pyx_L1;} Py_INCREF(__pyx_k76p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k76p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 733; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":734 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_fa,__pyx_v_fb); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":737 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_beta,__pyx_v_size,__pyx_v_fa,__pyx_v_fb); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 737; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -3096,103 +3124,103 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":736 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":739 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":738 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 738; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":741 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":739 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":742 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_b,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_ob)); __pyx_v_ob = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":740 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":743 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_INCREF(__pyx_k77p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k77p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 741; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":742 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":745 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ob)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_ob)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 742; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} Py_INCREF(__pyx_k78p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k78p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":744 */ - __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":747 */ + __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -3244,32 +3272,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":754 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":757 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":755 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":758 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":756 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":759 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} Py_INCREF(__pyx_k79p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k79p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 757; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 760; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":758 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 758; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":761 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_exponential,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 761; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -3277,57 +3305,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":760 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":763 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":762 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 762; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":765 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 765; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":763 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":766 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 763; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; goto __pyx_L1;} Py_INCREF(__pyx_k80p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k80p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 764; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":765 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 765; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":768 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -3360,7 +3388,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - __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 = 772; goto __pyx_L1;} + __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 = 775; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -3404,32 +3432,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oshape = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":782 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":785 */ __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":783 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":786 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":784 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":787 */ __pyx_1 = (__pyx_v_fshape <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; goto __pyx_L1;} Py_INCREF(__pyx_k81p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k81p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":786 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_fshape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 786; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":789 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_gamma,__pyx_v_size,__pyx_v_fshape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -3437,57 +3465,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":788 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":791 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":789 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":792 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oshape)); __pyx_v_oshape = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":790 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":793 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 790; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 793; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;} Py_INCREF(__pyx_k82p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k82p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 791; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":792 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":795 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 795; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -3546,52 +3574,52 @@ __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":802 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":805 */ __pyx_v_fshape = PyFloat_AsDouble(__pyx_v_shape); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":803 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":806 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":804 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":807 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":805 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":808 */ __pyx_1 = (__pyx_v_fshape <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} Py_INCREF(__pyx_k83p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k83p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 806; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":807 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":810 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; goto __pyx_L1;} Py_INCREF(__pyx_k84p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k84p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":809 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_fshape,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":812 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gamma,__pyx_v_size,__pyx_v_fshape,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -3599,103 +3627,103 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":811 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":814 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":812 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 812; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":815 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_shape,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oshape)); __pyx_v_oshape = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":813 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 813; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":816 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":814 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":817 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oshape)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;} Py_INCREF(__pyx_k85p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k85p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":816 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":819 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 816; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 819; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;} Py_INCREF(__pyx_k86p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k86p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":818 */ - __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":821 */ + __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 821; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -3755,52 +3783,52 @@ __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":828 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":831 */ __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":829 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":832 */ __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":830 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":833 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":831 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":834 */ __pyx_1 = (__pyx_v_fdfnum <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;} Py_INCREF(__pyx_k87p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k87p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 832; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":833 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":836 */ __pyx_1 = (__pyx_v_fdfden <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;} Py_INCREF(__pyx_k88p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k88p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":835 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":838 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 838; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -3808,103 +3836,103 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":837 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":840 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":839 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 839; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":842 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odfnum)); __pyx_v_odfnum = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":840 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 840; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":843 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_odfden)); __pyx_v_odfden = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":841 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":844 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 841; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;} Py_INCREF(__pyx_k89p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k89p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":843 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":846 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 843; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 846; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; goto __pyx_L1;} Py_INCREF(__pyx_k90p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k90p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 844; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":845 */ - __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":848 */ + __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 848; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -3975,72 +4003,72 @@ __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":855 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":858 */ __pyx_v_fdfnum = PyFloat_AsDouble(__pyx_v_dfnum); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":856 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":859 */ __pyx_v_fdfden = PyFloat_AsDouble(__pyx_v_dfden); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":857 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":860 */ __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":858 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":861 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":859 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":862 */ __pyx_1 = (__pyx_v_fdfnum <= 1); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} Py_INCREF(__pyx_k91p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k91p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 860; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 863; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":861 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":864 */ __pyx_1 = (__pyx_v_fdfden <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;} Py_INCREF(__pyx_k92p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k92p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 862; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":863 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":866 */ __pyx_1 = (__pyx_v_fnonc < 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} Py_INCREF(__pyx_k93p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k93p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 864; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":865 */ - __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 865; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":868 */ + __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_f,__pyx_v_size,__pyx_v_fdfnum,__pyx_v_fdfden,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 868; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4048,149 +4076,149 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":868 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":871 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":870 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 870; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":873 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_dfnum,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 873; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odfnum)); __pyx_v_odfnum = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":871 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 871; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":874 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_dfden,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_odfden)); __pyx_v_odfden = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":872 */ - __pyx_2 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 872; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":875 */ + __pyx_2 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_ononc)); __pyx_v_ononc = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":874 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":877 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_odfnum)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} Py_INCREF(__pyx_k94p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k94p); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 875; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":876 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":879 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_odfden)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_5); __pyx_5 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 876; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;} Py_INCREF(__pyx_k95p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k95p); - __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;} goto __pyx_L7; } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":878 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":881 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 878; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 881; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;} + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;} Py_INCREF(__pyx_k96p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k96p); - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; goto __pyx_L1;} goto __pyx_L8; } __pyx_L8:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":880 */ - __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 880; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":883 */ + __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 883; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4243,32 +4271,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":891 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":894 */ __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":892 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":895 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":893 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":896 */ __pyx_1 = (__pyx_v_fdf <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} Py_INCREF(__pyx_k97p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k97p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 894; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":895 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 895; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":898 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_chisquare,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4276,57 +4304,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":897 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":900 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":899 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":902 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":900 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":903 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 903; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;} Py_INCREF(__pyx_k98p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k98p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 904; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":902 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":905 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 905; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -4384,52 +4412,52 @@ __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":911 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":914 */ __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":912 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":915 */ __pyx_v_fnonc = PyFloat_AsDouble(__pyx_v_nonc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":913 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":916 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":914 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":917 */ __pyx_1 = (__pyx_v_fdf <= 1); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} Py_INCREF(__pyx_k99p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k99p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":916 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":919 */ __pyx_1 = (__pyx_v_fnonc <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} Py_INCREF(__pyx_k100p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k100p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 917; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 920; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":918 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_fdf,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 918; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":921 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_noncentral_chisquare,__pyx_v_size,__pyx_v_fdf,__pyx_v_fnonc); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 921; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4437,103 +4465,103 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":921 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":924 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":923 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":926 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":924 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 924; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":927 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_nonc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_ononc)); __pyx_v_ononc = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":925 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":928 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_INCREF(__pyx_k101p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k101p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":927 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":930 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_ononc)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 927; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} Py_INCREF(__pyx_k102p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k102p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 931; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":929 */ - __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":932 */ + __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 932; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -4568,7 +4596,7 @@ if (!PyArg_ParseTupleAndKeywords(__pyx_args, __pyx_kwds, "|O", __pyx_argnames, &__pyx_v_size)) return 0; Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_size); - __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 = 937; goto __pyx_L1;} + __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 = 940; goto __pyx_L1;} __pyx_r = __pyx_1; __pyx_1 = 0; goto __pyx_L0; @@ -4612,32 +4640,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_odf = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":947 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":950 */ __pyx_v_fdf = PyFloat_AsDouble(__pyx_v_df); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":948 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":951 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":949 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":952 */ __pyx_1 = (__pyx_v_fdf <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_INCREF(__pyx_k103p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k103p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 953; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":951 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 951; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":954 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_standard_t,__pyx_v_size,__pyx_v_fdf); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4645,57 +4673,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":953 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":956 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":955 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 955; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":958 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_df,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_odf)); __pyx_v_odf = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":956 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":959 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_odf)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 956; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} Py_INCREF(__pyx_k104p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k104p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 960; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":958 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 958; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":961 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 961; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -4749,35 +4777,35 @@ __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":969 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":972 */ __pyx_v_fmu = PyFloat_AsDouble(__pyx_v_mu); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":970 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":973 */ __pyx_v_fkappa = PyFloat_AsDouble(__pyx_v_kappa); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":971 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":974 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":972 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":975 */ __pyx_1 = (__pyx_v_fkappa < 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_INCREF(__pyx_k105p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k105p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":974 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_fmu,__pyx_v_fkappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 974; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":977 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_vonmises,__pyx_v_size,__pyx_v_fmu,__pyx_v_fkappa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 977; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4785,64 +4813,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":976 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":979 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":978 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":981 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_mu,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_omu)); __pyx_v_omu = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":979 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 979; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":982 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_kappa,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 982; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_okappa)); __pyx_v_okappa = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":980 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":983 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_okappa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_okappa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; goto __pyx_L1;} Py_INCREF(__pyx_k106p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k106p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":982 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 982; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":985 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 985; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -4893,32 +4921,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":992 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":995 */ __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":993 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":996 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":994 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":997 */ __pyx_1 = (__pyx_v_fa <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;} Py_INCREF(__pyx_k107p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k107p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 998; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":996 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 996; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":999 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_pareto,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 999; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -4926,57 +4954,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":998 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1001 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1000 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1000; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1003 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1003; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1001 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1004 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; goto __pyx_L1;} Py_INCREF(__pyx_k108p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k108p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1003 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1003; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1006 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1006; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5025,32 +5053,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1013 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1016 */ __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1014 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1017 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1015 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1018 */ __pyx_1 = (__pyx_v_fa <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;} Py_INCREF(__pyx_k109p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k109p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1016; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1017 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1017; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1020 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_weibull,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1020; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5058,57 +5086,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1019 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1022 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1021 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1021; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1024 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1022 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1025 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;} Py_INCREF(__pyx_k110p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k110p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1023; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1026; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1024 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1027 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5157,32 +5185,32 @@ 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":1037 */ __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1035 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1038 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1036 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1039 */ __pyx_1 = (__pyx_v_fa <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;} Py_INCREF(__pyx_k111p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k111p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1037; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1038 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1038; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1041 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_power,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1041; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5190,57 +5218,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1040 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1043 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1042 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1045 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1045; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1043 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1046 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1046; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_INCREF(__pyx_k112p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k112p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1045 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1045; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1048 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1048; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5296,35 +5324,35 @@ __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":1055 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1058 */ __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1056 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1059 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1057 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1060 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1058 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1061 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1062; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1062; goto __pyx_L1;} Py_INCREF(__pyx_k113p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k113p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1062; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1059; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1062; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1060 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1060; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1063 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_laplace,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5332,64 +5360,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1062 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1065 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1063 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1066 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1064 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1064; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1067 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1065 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1068 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1065; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} Py_INCREF(__pyx_k114p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k114p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1066; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1067 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1067; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1070 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5447,35 +5475,35 @@ __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":1077 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1080 */ __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1078 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1081 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1079 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1082 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1080 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1083 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1084; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1084; goto __pyx_L1;} Py_INCREF(__pyx_k115p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k115p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1084; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1081; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1084; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1082 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1082; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1085 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_gumbel,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5483,64 +5511,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1084 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1087 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1085 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1085; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1088 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1086 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1086; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1089 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1087 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1090 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1087; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1090; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} Py_INCREF(__pyx_k116p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k116p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1088; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1089 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1089; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1092 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1092; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5598,35 +5626,35 @@ __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":1099 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1102 */ __pyx_v_floc = PyFloat_AsDouble(__pyx_v_loc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1100 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1103 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1101 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1104 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1102 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1105 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; goto __pyx_L1;} Py_INCREF(__pyx_k117p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k117p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1106; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1104 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1104; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1107 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logistic,__pyx_v_size,__pyx_v_floc,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5634,64 +5662,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1106 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1109 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1107 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1107; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1110 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_loc,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oloc)); __pyx_v_oloc = ((PyArrayObject *)__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1108 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1108; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1111 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1109 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1112 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} Py_INCREF(__pyx_k118p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k118p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1111 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1114 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1114; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5749,35 +5777,35 @@ __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":1126 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1129 */ __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1127 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1130 */ __pyx_v_fsigma = PyFloat_AsDouble(__pyx_v_sigma); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1129 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1132 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1130 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1133 */ __pyx_1 = (__pyx_v_fsigma <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_INCREF(__pyx_k119p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k119p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1132 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_fmean,__pyx_v_fsigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1135 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_lognormal,__pyx_v_size,__pyx_v_fmean,__pyx_v_fsigma); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5785,64 +5813,64 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1134 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1137 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1136 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1136; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1136; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1139 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_omean)); __pyx_v_omean = ((PyArrayObject *)__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1137 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1140 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_sigma,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_osigma)); __pyx_v_osigma = ((PyArrayObject *)__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1138 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1141 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_osigma)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_osigma)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1141; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;} Py_INCREF(__pyx_k120p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k120p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1139; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1140 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1140; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1143 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1143; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -5894,32 +5922,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oscale = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1150 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1152 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1155 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1153 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1156 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; goto __pyx_L1;} Py_INCREF(__pyx_k121p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k121p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1155 */ - __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1158 */ + __pyx_2 = __pyx_f_6mtrand_cont1_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_rayleigh,__pyx_v_size,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1158; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -5927,57 +5955,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1157 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1160 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1159 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1159; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1162 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1160 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1163 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1160; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1163; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; goto __pyx_L1;} Py_INCREF(__pyx_k122p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k122p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1164; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1162 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1165 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1165; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -6035,52 +6063,52 @@ __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":1172 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1175 */ __pyx_v_fmean = PyFloat_AsDouble(__pyx_v_mean); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1173 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1176 */ __pyx_v_fscale = PyFloat_AsDouble(__pyx_v_scale); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1174 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1177 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1175 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1178 */ __pyx_1 = (__pyx_v_fmean <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} Py_INCREF(__pyx_k123p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k123p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1177 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1180 */ __pyx_1 = (__pyx_v_fscale <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} Py_INCREF(__pyx_k124p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k124p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1178; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1181; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1179 */ - __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_fmean,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1179; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1182 */ + __pyx_2 = __pyx_f_6mtrand_cont2_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_wald,__pyx_v_size,__pyx_v_fmean,__pyx_v_fscale); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -6088,100 +6116,100 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1181 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1184 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1182 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1182; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1185 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_mean,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_omean)); __pyx_v_omean = ((PyArrayObject *)__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1183 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} - if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1186 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_scale,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + if (!__Pyx_TypeTest(__pyx_4, __pyx_ptype_6mtrand_ndarray)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} Py_DECREF(((PyObject *)__pyx_v_oscale)); __pyx_v_oscale = ((PyArrayObject *)__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1184 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1187 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(0.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_omean)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_omean)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1184; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;} Py_INCREF(__pyx_k125p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k125p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1185; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;} goto __pyx_L5; } - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(0.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_3, 0, ((PyObject *)__pyx_v_oscale)); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1186; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1189; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1190; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1190; goto __pyx_L1;} Py_INCREF(__pyx_k126p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k126p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1190; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1187; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1190; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1188 */ - __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1188; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1191 */ + __pyx_3 = __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_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1191; goto __pyx_L1;} __pyx_r = __pyx_3; __pyx_3 = 0; goto __pyx_L0; @@ -6253,72 +6281,72 @@ __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":1201 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1204 */ __pyx_v_fleft = PyFloat_AsDouble(__pyx_v_left); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1202 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1205 */ __pyx_v_fright = PyFloat_AsDouble(__pyx_v_right); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1203 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1206 */ __pyx_v_fmode = PyFloat_AsDouble(__pyx_v_mode); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1204 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1207 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1205 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1208 */ __pyx_1 = (__pyx_v_fleft > __pyx_v_fmode); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; goto __pyx_L1;} Py_INCREF(__pyx_k127p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k127p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1206; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1209; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1207 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1210 */ __pyx_1 = (__pyx_v_fmode > __pyx_v_fright); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;} Py_INCREF(__pyx_k128p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k128p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1208; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1209 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1212 */ __pyx_1 = (__pyx_v_fleft == __pyx_v_fright); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; goto __pyx_L1;} Py_INCREF(__pyx_k129p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k129p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1213; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1211 */ - __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_fleft,__pyx_v_fmode,__pyx_v_fright); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1214 */ + __pyx_2 = __pyx_f_6mtrand_cont3_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_triangular,__pyx_v_size,__pyx_v_fleft,__pyx_v_fmode,__pyx_v_fright); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1214; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -6326,146 +6354,146 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1214 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1217 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1215 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1215; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1218 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_left,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1218; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oleft)); __pyx_v_oleft = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1216 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1216; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1219 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_mode,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_omode)); __pyx_v_omode = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1217 */ - __pyx_2 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1217; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1220 */ + __pyx_2 = PyArray_FROM_OTF(__pyx_v_right,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_oright)); __pyx_v_oright = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1219 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1222 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oleft)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oleft)); Py_INCREF(((PyObject *)__pyx_v_omode)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_omode)); - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_5); __pyx_5 = 0; - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} Py_INCREF(__pyx_k130p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k130p); - __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1220; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1221 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1224 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_omode)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_omode)); Py_INCREF(((PyObject *)__pyx_v_oright)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_oright)); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1221; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;} + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;} Py_INCREF(__pyx_k131p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k131p); - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1222; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;} goto __pyx_L7; } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1223 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1226 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_equal); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oleft)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_oleft)); Py_INCREF(((PyObject *)__pyx_v_oright)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_oright)); - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_5); __pyx_5 = 0; - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1223; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1226; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;} Py_INCREF(__pyx_k132p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k132p); - __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1224; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; goto __pyx_L1;} goto __pyx_L8; } __pyx_L8:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1225 */ - __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1225; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1228 */ + __pyx_2 = __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_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1228; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -6531,66 +6559,66 @@ __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":1238 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1241 */ __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1239 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1242 */ __pyx_v_ln = PyInt_AsLong(__pyx_v_n); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1240 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1243 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1241 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1244 */ __pyx_1 = (__pyx_v_ln <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} Py_INCREF(__pyx_k133p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k133p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1242; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1243 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1246 */ __pyx_1 = (__pyx_v_fp < 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} Py_INCREF(__pyx_k134p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k134p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1244; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} goto __pyx_L4; } __pyx_1 = (__pyx_v_fp > 1); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;} Py_INCREF(__pyx_k135p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k135p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1247 */ - __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1247; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1250 */ + __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1250; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -6598,142 +6626,142 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1249 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1252 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1251 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1251; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1254 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_on)); __pyx_v_on = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1252 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1255 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1253 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1256 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_INCREF(__pyx_v_n); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_n); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} Py_INCREF(__pyx_k136p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k136p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1254; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1255 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1258 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_INCREF(__pyx_v_p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1255; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} Py_INCREF(__pyx_k137p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k137p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1257 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1260 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_INCREF(__pyx_v_p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); __pyx_3 = 0; - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1260; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} Py_INCREF(__pyx_k138p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k138p); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1258; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1261; goto __pyx_L1;} goto __pyx_L7; } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1259 */ - __pyx_4 = __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_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1259; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1262 */ + __pyx_4 = __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_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1262; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; goto __pyx_L0; @@ -6797,66 +6825,66 @@ __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":1271 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1274 */ __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1272 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1275 */ __pyx_v_ln = PyInt_AsLong(__pyx_v_n); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1273 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1276 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1274 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1277 */ __pyx_1 = (__pyx_v_ln <= 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} Py_INCREF(__pyx_k139p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k139p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1275; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1278; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1276 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1279 */ __pyx_1 = (__pyx_v_fp < 0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} Py_INCREF(__pyx_k140p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k140p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1277; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} goto __pyx_L4; } __pyx_1 = (__pyx_v_fp > 1); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} Py_INCREF(__pyx_k141p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k141p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1279; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1282; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1280 */ - __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1280; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1283 */ + __pyx_2 = __pyx_f_6mtrand_discnp_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_negative_binomial,__pyx_v_size,__pyx_v_ln,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1283; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -6864,142 +6892,142 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1283 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1286 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1285 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1288 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_n,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_on)); __pyx_v_on = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1286 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1286; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1289 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1287 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1290 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_less_equal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_INCREF(__pyx_v_n); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_n); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} Py_INCREF(__pyx_k142p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k142p); - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1289 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1292 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_5 = PyInt_FromLong(0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_INCREF(__pyx_v_p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1289; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} Py_INCREF(__pyx_k143p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k143p); - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1291 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1294 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_greater); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_INCREF(__pyx_v_p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_p); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_3); __pyx_3 = 0; - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1294; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} Py_INCREF(__pyx_k144p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k144p); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1292; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; goto __pyx_L1;} goto __pyx_L7; } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1293 */ - __pyx_4 = __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_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1293; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1296 */ + __pyx_4 = __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_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} __pyx_r = __pyx_4; __pyx_4 = 0; goto __pyx_L0; @@ -7051,35 +7079,35 @@ Py_INCREF(__pyx_v_size); __pyx_v_olam = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1303 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1306 */ __pyx_v_flam = PyFloat_AsDouble(__pyx_v_lam); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1304 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1307 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1305 */ - __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;} - if (PyObject_Cmp(__pyx_v_lam, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1305; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1308 */ + __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_v_lam, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1308; goto __pyx_L1;} __pyx_1 = __pyx_1 < 0; Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;} Py_INCREF(__pyx_k145p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k145p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1306; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1307 */ - __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_flam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1307; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1310 */ + __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_poisson,__pyx_v_size,__pyx_v_flam); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1310; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7087,57 +7115,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1309 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1312 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1311 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1311; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1314 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_lam,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_olam)); __pyx_v_olam = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1312 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1315 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_olam)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_olam)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1312; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1315; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1316; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1316; goto __pyx_L1;} Py_INCREF(__pyx_k146p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k146p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1316; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1313; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1316; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1314 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1314; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1317 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1317; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -7186,32 +7214,32 @@ Py_INCREF(__pyx_v_size); __pyx_v_oa = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1324 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1327 */ __pyx_v_fa = PyFloat_AsDouble(__pyx_v_a); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1325 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1328 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1326 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1329 */ __pyx_1 = (__pyx_v_fa <= 1.0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;} Py_INCREF(__pyx_k147p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k147p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1327; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1330; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1328 */ - __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1328; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1331 */ + __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_zipf,__pyx_v_size,__pyx_v_fa); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1331; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7219,57 +7247,57 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1330 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1333 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1332 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1332; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1335 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_a,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1335; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_oa)); __pyx_v_oa = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1333 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1336 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less_equal); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(1.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(1.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_oa)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1333; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1336; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} Py_INCREF(__pyx_k148p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k148p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1334; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1337; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1335 */ - __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1335; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1338 */ + __pyx_5 = __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_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1338; goto __pyx_L1;} __pyx_r = __pyx_5; __pyx_5 = 0; goto __pyx_L0; @@ -7322,49 +7350,49 @@ Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1346 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1349 */ __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1347 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1350 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1348 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1351 */ __pyx_1 = (__pyx_v_fp < 0.0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} Py_INCREF(__pyx_k149p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k149p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1349; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1350 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1353 */ __pyx_1 = (__pyx_v_fp > 1.0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} Py_INCREF(__pyx_k150p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k150p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1351; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1354; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1352 */ - __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1352; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1355 */ + __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_geometric,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1355; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7372,96 +7400,96 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1354 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1357 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1357 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1357; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1360 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1358 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1361 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1358; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} Py_INCREF(__pyx_k151p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k151p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1359; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1362; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1360 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1363 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_5); __pyx_5 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1360; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1363; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} Py_INCREF(__pyx_k152p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k152p); - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1361; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1364; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1362 */ - __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 = 1362; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1365 */ + __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 = 1365; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7535,101 +7563,101 @@ __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":1377 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1380 */ __pyx_v_lngood = PyInt_AsLong(__pyx_v_ngood); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1378 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1381 */ __pyx_v_lnbad = PyInt_AsLong(__pyx_v_nbad); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1379 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1382 */ __pyx_v_lnsample = PyInt_AsLong(__pyx_v_nsample); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1380 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1383 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1381 */ - __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;} - if (PyObject_Cmp(__pyx_v_ngood, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1381; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1384 */ + __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_v_ngood, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} __pyx_1 = __pyx_1 < 0; Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} Py_INCREF(__pyx_k153p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k153p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1382; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1383 */ - __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;} - if (PyObject_Cmp(__pyx_v_nbad, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1383; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1386 */ + __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_v_nbad, __pyx_2, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} __pyx_1 = __pyx_1 < 0; Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} Py_INCREF(__pyx_k154p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k154p); - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1384; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1385 */ - __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} - if (PyObject_Cmp(__pyx_v_nsample, __pyx_3, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1385; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1388 */ + __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_v_nsample, __pyx_3, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} __pyx_1 = __pyx_1 < 0; Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;} Py_INCREF(__pyx_k155p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k155p); - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1386; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1387 */ - __pyx_4 = PyNumber_Add(__pyx_v_ngood, __pyx_v_nbad); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} - if (PyObject_Cmp(__pyx_4, __pyx_v_nsample, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1387; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1390 */ + __pyx_4 = PyNumber_Add(__pyx_v_ngood, __pyx_v_nbad); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1390; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_4, __pyx_v_nsample, &__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1390; goto __pyx_L1;} __pyx_1 = __pyx_1 < 0; Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1391; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1391; goto __pyx_L1;} Py_INCREF(__pyx_k156p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k156p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1391; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1388; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1391; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1389 */ - __pyx_2 = __pyx_f_6mtrand_discnmN_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_lngood,__pyx_v_lnbad,__pyx_v_lnsample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1389; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1392 */ + __pyx_2 = __pyx_f_6mtrand_discnmN_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_hypergeometric,__pyx_v_size,__pyx_v_lngood,__pyx_v_lnbad,__pyx_v_lnsample); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1392; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7637,198 +7665,198 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1393 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1396 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1395 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1395; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1398 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_ngood,NPY_LONG,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_ongood)); __pyx_v_ongood = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1396 */ - __pyx_4 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1396; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1399 */ + __pyx_4 = PyArray_FROM_OTF(__pyx_v_nbad,NPY_LONG,NPY_ALIGNED); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_4))); Py_DECREF(((PyObject *)__pyx_v_onbad)); __pyx_v_onbad = ((PyArrayObject *)__pyx_4); Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1397 */ - __pyx_2 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1397; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1400 */ + __pyx_2 = PyArray_FROM_OTF(__pyx_v_nsample,NPY_LONG,NPY_ALIGNED); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_onsample)); __pyx_v_onsample = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1398 */ - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1401 */ + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ongood)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_ongood)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); __pyx_2 = 0; - __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_3); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1398; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} Py_INCREF(__pyx_k157p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k157p); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1399; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} goto __pyx_L7; } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1400 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1403 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_4, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_5 = PyInt_FromLong(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_5 = PyInt_FromLong(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_onbad)); PyTuple_SET_ITEM(__pyx_4, 0, ((PyObject *)__pyx_v_onbad)); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_5); __pyx_5 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1400; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_4); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} Py_INCREF(__pyx_k158p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k158p); - __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1401; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} goto __pyx_L8; } __pyx_L8:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1402 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1405 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_onsample)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_onsample)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_4); __pyx_4 = 0; - __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1402; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} - __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;} + __pyx_5 = PyTuple_New(1); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;} Py_INCREF(__pyx_k159p); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_k159p); - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1403; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;} goto __pyx_L9; } __pyx_L9:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1404 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1407 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_any); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_less); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} - __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} + __pyx_5 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_ongood)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_ongood)); Py_INCREF(((PyObject *)__pyx_v_onbad)); PyTuple_SET_ITEM(__pyx_2, 1, ((PyObject *)__pyx_v_onbad)); - __pyx_6 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_6 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_5, 0, __pyx_6); Py_INCREF(((PyObject *)__pyx_v_onsample)); PyTuple_SET_ITEM(__pyx_5, 1, ((PyObject *)__pyx_v_onsample)); __pyx_6 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2); __pyx_2 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1404; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_3); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1407; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1408; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1408; goto __pyx_L1;} Py_INCREF(__pyx_k160p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k160p); - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1408; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1405; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1408; goto __pyx_L1;} goto __pyx_L10; } __pyx_L10:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1406 */ - __pyx_6 = __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_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1406; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1409 */ + __pyx_6 = __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_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1409; goto __pyx_L1;} __pyx_r = __pyx_6; __pyx_6 = 0; goto __pyx_L0; @@ -7886,49 +7914,49 @@ Py_INCREF(__pyx_v_size); __pyx_v_op = ((PyArrayObject *)Py_None); Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1417 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1420 */ __pyx_v_fp = PyFloat_AsDouble(__pyx_v_p); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1418 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1421 */ __pyx_1 = (!PyErr_Occurred()); if (__pyx_1) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1419 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1422 */ __pyx_1 = (__pyx_v_fp < 0.0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;} Py_INCREF(__pyx_k161p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k161p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1420; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1421 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1424 */ __pyx_1 = (__pyx_v_fp > 1.0); if (__pyx_1) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1425; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1425; goto __pyx_L1;} Py_INCREF(__pyx_k162p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k162p); - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1425; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1422; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1425; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1423 */ - __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1423; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1426 */ + __pyx_2 = __pyx_f_6mtrand_discd_array_sc(((struct __pyx_obj_6mtrand_RandomState *)__pyx_v_self)->internal_state,rk_logseries,__pyx_v_size,__pyx_v_fp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1426; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -7936,96 +7964,96 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1425 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1428 */ PyErr_Clear(); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1427 */ - __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1427; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1430 */ + __pyx_3 = PyArray_FROM_OTF(__pyx_v_p,NPY_DOUBLE,NPY_ALIGNED); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_3))); Py_DECREF(((PyObject *)__pyx_v_op)); __pyx_v_op = ((PyArrayObject *)__pyx_3); Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1428 */ - __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1431 */ + __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_any); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_3, __pyx_n_less); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_5, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_3); __pyx_3 = 0; - __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_3); __pyx_3 = 0; - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1428; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_5); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_1) { - __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1432; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1432; goto __pyx_L1;} Py_INCREF(__pyx_k163p); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_k163p); - __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1432; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1429; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1432; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1430 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1433 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_5, __pyx_n_any); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_greater); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_INCREF(((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 0, ((PyObject *)__pyx_v_op)); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_5); __pyx_5 = 0; - __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_4, __pyx_2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_5); __pyx_5 = 0; - __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_3, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1430; goto __pyx_L1;} + __pyx_1 = PyObject_IsTrue(__pyx_2); if (__pyx_1 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1433; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_1) { - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1434; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1434; goto __pyx_L1;} Py_INCREF(__pyx_k164p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k164p); - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1434; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_4, 0, 0); Py_DECREF(__pyx_4); __pyx_4 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1431; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1434; goto __pyx_L1;} goto __pyx_L6; } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1432 */ - __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 = 1432; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1435 */ + __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 = 1435; goto __pyx_L1;} __pyx_r = __pyx_2; __pyx_2 = 0; goto __pyx_L0; @@ -8103,38 +8131,38 @@ __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":1453 */ - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1456 */ + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;} Py_INCREF(__pyx_v_mean); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_mean); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1453; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_mean); __pyx_v_mean = __pyx_3; __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1454 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;} - __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1457 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1457; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_array); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1457; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1457; goto __pyx_L1;} Py_INCREF(__pyx_v_cov); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_cov); - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1454; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1457; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_v_cov); __pyx_v_cov = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1455 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1458 */ __pyx_4 = __pyx_v_size == Py_None; if (__pyx_4) { - __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1456; goto __pyx_L1;} + __pyx_1 = PyList_New(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;} Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_1; __pyx_1 = 0; @@ -8147,98 +8175,98 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1459 */ - __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;} - __pyx_5 = PyObject_Length(__pyx_3); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1459; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1462 */ + __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} + __pyx_5 = PyObject_Length(__pyx_3); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_4 = (__pyx_5 != 1); if (__pyx_4) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;} - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} Py_INCREF(__pyx_k165p); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_k165p); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1460; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} goto __pyx_L3; } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1461 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} - __pyx_5 = PyObject_Length(__pyx_2); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1464 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_5 = PyObject_Length(__pyx_2); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_4 = (__pyx_5 != 2); if (!__pyx_4) { - __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} - __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} - __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} - __pyx_6 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_6 = PyObject_GetItem(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - if (PyObject_Cmp(__pyx_2, __pyx_6, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1461; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_2, __pyx_6, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} __pyx_4 = __pyx_4 != 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; } if (__pyx_4) { - __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1465; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1465; goto __pyx_L1;} Py_INCREF(__pyx_k166p); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_k166p); - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1465; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; __Pyx_Raise(__pyx_2, 0, 0); Py_DECREF(__pyx_2); __pyx_2 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1462; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1465; goto __pyx_L1;} goto __pyx_L4; } __pyx_L4:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1463 */ - __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} - __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} - __pyx_3 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1466 */ + __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} + __pyx_3 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} - __pyx_6 = PyInt_FromLong(0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} - __pyx_1 = PyObject_GetItem(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_v_cov, __pyx_n_shape); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} + __pyx_6 = PyInt_FromLong(0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} + __pyx_1 = PyObject_GetItem(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; - if (PyObject_Cmp(__pyx_3, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1463; goto __pyx_L1;} + if (PyObject_Cmp(__pyx_3, __pyx_1, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} __pyx_4 = __pyx_4 != 0; Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} - __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;} Py_INCREF(__pyx_k167p); PyTuple_SET_ITEM(__pyx_6, 0, __pyx_k167p); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; __Pyx_Raise(__pyx_3, 0, 0); Py_DECREF(__pyx_3); __pyx_3 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1464; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;} goto __pyx_L5; } __pyx_L5:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1466 */ - __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} - __pyx_4 = PyObject_IsInstance(__pyx_v_shape,__pyx_1); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1466; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1469 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} + __pyx_4 = PyObject_IsInstance(__pyx_v_shape,__pyx_1); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; if (__pyx_4) { - __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1467; goto __pyx_L1;} + __pyx_2 = PyList_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1470; goto __pyx_L1;} Py_INCREF(__pyx_v_shape); PyList_SET_ITEM(__pyx_2, 0, __pyx_v_shape); Py_DECREF(__pyx_v_shape); @@ -8248,174 +8276,174 @@ } __pyx_L6:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1468 */ - __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;} - __pyx_3 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;} - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1471 */ + __pyx_6 = __Pyx_GetName(__pyx_b, __pyx_n_list); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;} + __pyx_3 = PySequence_GetSlice(__pyx_v_shape, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_3); __pyx_3 = 0; - __pyx_2 = PyObject_CallObject(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1468; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1471; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_final_shape); __pyx_v_final_shape = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1469 */ - __pyx_3 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} - __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} - __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1472 */ + __pyx_3 = PyObject_GetAttr(__pyx_v_final_shape, __pyx_n_append); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} + __pyx_6 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_6, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1469; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1472; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1473 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} - __pyx_6 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1476 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_standard_normal); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} + __pyx_6 = PyObject_GetAttr(__pyx_3, __pyx_n_multiply); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyObject_GetAttr(__pyx_6, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_6, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape); - __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + __pyx_6 = PyObject_CallObject(__pyx_1, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_1, 0, __pyx_6); __pyx_6 = 0; - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1473; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1476; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_x); __pyx_v_x = __pyx_3; __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1474 */ - __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_6, __pyx_n_multiply); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1477 */ + __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_6, __pyx_n_multiply); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + __pyx_1 = PyObject_GetAttr(__pyx_2, __pyx_n_reduce); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = PyObject_Length(__pyx_v_final_shape); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} - __pyx_3 = PySequence_GetSlice(__pyx_v_final_shape, 0, (__pyx_5 - 1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} - __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + __pyx_5 = PyObject_Length(__pyx_v_final_shape); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} + __pyx_3 = PySequence_GetSlice(__pyx_v_final_shape, 0, (__pyx_5 - 1)); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_6, 0, __pyx_3); __pyx_3 = 0; - __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_6); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_1, __pyx_6); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;} - __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;} - __pyx_6 = PyObject_GetItem(__pyx_3, __pyx_1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1475; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_v_mean, __pyx_n_shape); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1478; goto __pyx_L1;} + __pyx_1 = PyInt_FromLong(0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1478; goto __pyx_L1;} + __pyx_6 = PyObject_GetItem(__pyx_3, __pyx_1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1478; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + __pyx_3 = PyTuple_New(2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_3, 0, __pyx_2); PyTuple_SET_ITEM(__pyx_3, 1, __pyx_6); __pyx_2 = 0; __pyx_6 = 0; - if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1474; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1477; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1483 */ - __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1486 */ + __pyx_1 = PyList_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} Py_INCREF(__pyx_n_svd); PyList_SET_ITEM(__pyx_1, 0, __pyx_n_svd); - __pyx_2 = __Pyx_Import(__pyx_k168p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;} + __pyx_2 = __Pyx_Import(__pyx_k168p, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = PyObject_GetAttr(__pyx_2, __pyx_n_svd); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1483; goto __pyx_L1;} + __pyx_6 = PyObject_GetAttr(__pyx_2, __pyx_n_svd); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} Py_DECREF(__pyx_v_svd); __pyx_v_svd = __pyx_6; __pyx_6 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1485 */ - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1488 */ + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_INCREF(__pyx_v_cov); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_cov); - __pyx_1 = PyObject_CallObject(__pyx_v_svd, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_v_svd, __pyx_3); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + __pyx_2 = PyObject_GetIter(__pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + __pyx_6 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_v_u); __pyx_v_u = __pyx_6; __pyx_6 = 0; - __pyx_3 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + __pyx_3 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_v_s); __pyx_v_s = __pyx_3; __pyx_3 = 0; - __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + __pyx_1 = __Pyx_UnpackItem(__pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_v_v); __pyx_v_v = __pyx_1; __pyx_1 = 0; - if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1485; goto __pyx_L1;} + if (__Pyx_EndUnpack(__pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1488; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1486 */ - __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_dot); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1489 */ + __pyx_6 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_6, __pyx_n_dot); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_sqrt); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_n_sqrt); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_6 = PyTuple_New(1); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_INCREF(__pyx_v_s); PyTuple_SET_ITEM(__pyx_6, 0, __pyx_v_s); - __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_2, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; - __pyx_2 = PyNumber_Multiply(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_2 = PyNumber_Multiply(__pyx_v_x, __pyx_1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_6 = PyTuple_New(2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_6 = PyTuple_New(2); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_6, 0, __pyx_2); Py_INCREF(__pyx_v_v); PyTuple_SET_ITEM(__pyx_6, 1, __pyx_v_v); __pyx_2 = 0; - __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1486; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_v_x); __pyx_v_x = __pyx_1; __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1489 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1492 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1492; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_add); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1492; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_6 = PyTuple_New(3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} + __pyx_6 = PyTuple_New(3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1492; goto __pyx_L1;} Py_INCREF(__pyx_v_mean); PyTuple_SET_ITEM(__pyx_6, 0, __pyx_v_mean); Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_6, 1, __pyx_v_x); Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_6, 2, __pyx_v_x); - __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1489; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_6); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1492; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_6); __pyx_6 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1490 */ - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;} - __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1493 */ + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_tuple); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1493; goto __pyx_L1;} + __pyx_3 = PyTuple_New(1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1493; goto __pyx_L1;} Py_INCREF(__pyx_v_final_shape); PyTuple_SET_ITEM(__pyx_3, 0, __pyx_v_final_shape); - __pyx_6 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;} + __pyx_6 = PyObject_CallObject(__pyx_2, __pyx_3); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1493; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1490; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_v_x, __pyx_n_shape, __pyx_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1493; goto __pyx_L1;} Py_DECREF(__pyx_6); __pyx_6 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1491 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1494 */ Py_INCREF(__pyx_v_x); __pyx_r = __pyx_v_x; goto __pyx_L0; @@ -8485,42 +8513,42 @@ __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":1509 */ - __pyx_1 = PyObject_Length(__pyx_v_pvals); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1509; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1512 */ + __pyx_1 = PyObject_Length(__pyx_v_pvals); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1512; goto __pyx_L1;} __pyx_v_d = __pyx_1; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1510 */ - __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1510; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1513 */ + __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_pvals,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1513; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)arrayObject_parr)); arrayObject_parr = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1511 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1514 */ __pyx_v_pix = ((double *)arrayObject_parr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1513 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1516 */ __pyx_3 = (__pyx_f_6mtrand_kahan_sum(__pyx_v_pix,(__pyx_v_d - 1)) > (1.0 + 1e-12)); if (__pyx_3) { - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_ValueError); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} Py_INCREF(__pyx_k170p); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_k170p); - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; __Pyx_Raise(__pyx_5, 0, 0); Py_DECREF(__pyx_5); __pyx_5 = 0; - {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1514; goto __pyx_L1;} + {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} goto __pyx_L2; } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1516 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1519 */ __pyx_3 = __pyx_v_size == Py_None; if (__pyx_3) { - __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1517; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1520; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1520; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_shape); @@ -8528,20 +8556,20 @@ __pyx_4 = 0; goto __pyx_L3; } - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_size); - __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_5, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1518; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} __pyx_3 = __pyx_4 == __pyx_5; Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; if (__pyx_3) { - __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1519; goto __pyx_L1;} - __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1519; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_d); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1522; goto __pyx_L1;} + __pyx_4 = PyTuple_New(2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1522; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 1, __pyx_2); @@ -8552,11 +8580,11 @@ goto __pyx_L3; } /*else*/ { - __pyx_5 = PyInt_FromLong(__pyx_v_d); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} + __pyx_5 = PyInt_FromLong(__pyx_v_d); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1524; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1524; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_5); __pyx_5 = 0; - __pyx_4 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1521; goto __pyx_L1;} + __pyx_4 = PyNumber_Add(__pyx_v_size, __pyx_2); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1524; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_4; @@ -8564,56 +8592,56 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1523 */ - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1526 */ + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_zeros); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;} + __pyx_4 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;} Py_INCREF(__pyx_v_shape); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1523; goto __pyx_L1;} + __pyx_4 = PyObject_CallObject(__pyx_2, __pyx_5); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1526; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_v_multin); __pyx_v_multin = __pyx_4; __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1524 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1527 */ 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":1525 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1528 */ __pyx_v_mnix = ((long *)arrayObject_mnarr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1526 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1529 */ __pyx_v_i = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1527 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1530 */ while (1) { __pyx_3 = (__pyx_v_i < PyArray_SIZE(arrayObject_mnarr)); if (!__pyx_3) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1528 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1531 */ __pyx_v_Sum = 1.0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1529 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1532 */ __pyx_v_dn = __pyx_v_n; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1530 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1533 */ __pyx_6 = (__pyx_v_d - 1); for (__pyx_v_j = 0; __pyx_v_j < __pyx_6; ++__pyx_v_j) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1531 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1534 */ (__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":1532 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1535 */ __pyx_v_dn = (__pyx_v_dn - (__pyx_v_mnix[(__pyx_v_i + __pyx_v_j)])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1533 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1536 */ __pyx_3 = (__pyx_v_dn <= 0); if (__pyx_3) { goto __pyx_L7; @@ -8621,12 +8649,12 @@ } __pyx_L8:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1535 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1538 */ __pyx_v_Sum = (__pyx_v_Sum - (__pyx_v_pix[__pyx_v_j])); } __pyx_L7:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1536 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1539 */ __pyx_3 = (__pyx_v_dn > 0); if (__pyx_3) { (__pyx_v_mnix[((__pyx_v_i + __pyx_v_d) - 1)]) = __pyx_v_dn; @@ -8634,11 +8662,11 @@ } __pyx_L9:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1539 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1542 */ __pyx_v_i = (__pyx_v_i + __pyx_v_d); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1541 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1544 */ Py_INCREF(__pyx_v_multin); __pyx_r = __pyx_v_multin; goto __pyx_L0; @@ -8696,25 +8724,25 @@ __pyx_v_shape = Py_None; Py_INCREF(Py_None); __pyx_v_diric = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1598 */ - __pyx_1 = PyObject_Length(__pyx_v_alpha); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1598; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1601 */ + __pyx_1 = PyObject_Length(__pyx_v_alpha); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1601; goto __pyx_L1;} __pyx_v_k = __pyx_1; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1599 */ - __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1599; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1602 */ + __pyx_2 = PyArray_ContiguousFromObject(__pyx_v_alpha,NPY_DOUBLE,1,1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1602; goto __pyx_L1;} Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_2))); Py_DECREF(((PyObject *)__pyx_v_alpha_arr)); __pyx_v_alpha_arr = ((PyArrayObject *)__pyx_2); Py_DECREF(__pyx_2); __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1600 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1603 */ __pyx_v_alpha_data = ((double *)__pyx_v_alpha_arr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1602 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1605 */ __pyx_3 = __pyx_v_size == Py_None; if (__pyx_3) { - __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1603; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1603; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1606; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1606; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_shape); @@ -8722,20 +8750,20 @@ __pyx_4 = 0; goto __pyx_L2; } - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_type); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_4, 0, __pyx_v_size); - __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;} + __pyx_5 = PyObject_CallObject(__pyx_2, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1604; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} __pyx_3 = __pyx_5 == __pyx_2; Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_3) { - __pyx_4 = PyInt_FromLong(__pyx_v_k); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;} - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1605; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_k); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1608; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1608; goto __pyx_L1;} Py_INCREF(__pyx_v_size); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_size); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_4); @@ -8746,11 +8774,11 @@ goto __pyx_L2; } /*else*/ { - __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} - __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_k); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1610; goto __pyx_L1;} + __pyx_4 = PyTuple_New(1); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1610; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_4, 0, __pyx_2); __pyx_2 = 0; - __pyx_5 = PyNumber_Add(__pyx_v_size, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1607; goto __pyx_L1;} + __pyx_5 = PyNumber_Add(__pyx_v_size, __pyx_4); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1610; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_v_shape); __pyx_v_shape = __pyx_5; @@ -8758,70 +8786,70 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1609 */ - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_zeros); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1612 */ + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_zeros); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_float64); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} + __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_5, __pyx_n_float64); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} Py_DECREF(__pyx_5); __pyx_5 = 0; - __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} + __pyx_5 = PyTuple_New(2); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} Py_INCREF(__pyx_v_shape); PyTuple_SET_ITEM(__pyx_5, 0, __pyx_v_shape); PyTuple_SET_ITEM(__pyx_5, 1, __pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1609; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, __pyx_5); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1612; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; Py_DECREF(__pyx_5); __pyx_5 = 0; Py_DECREF(__pyx_v_diric); __pyx_v_diric = __pyx_2; __pyx_2 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1610 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1613 */ Py_INCREF(((PyObject *)((PyArrayObject *)__pyx_v_diric))); Py_DECREF(((PyObject *)__pyx_v_val_arr)); __pyx_v_val_arr = ((PyArrayObject *)__pyx_v_diric); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1611 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1614 */ __pyx_v_val_data = ((double *)__pyx_v_val_arr->data); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1613 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1616 */ __pyx_v_i = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1614 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1617 */ __pyx_v_totsize = PyArray_SIZE(__pyx_v_val_arr); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1615 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1618 */ while (1) { __pyx_3 = (__pyx_v_i < __pyx_v_totsize); if (!__pyx_3) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1616 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1619 */ __pyx_v_acc = 0.0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1617 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1620 */ for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1618 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1621 */ (__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])); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1619 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1622 */ __pyx_v_acc = (__pyx_v_acc + (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)])); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1620 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1623 */ __pyx_v_invacc = (1 / __pyx_v_acc); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1621 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1624 */ for (__pyx_v_j = 0; __pyx_v_j < __pyx_v_k; ++__pyx_v_j) { (__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) = ((__pyx_v_val_data[(__pyx_v_i + __pyx_v_j)]) * __pyx_v_invacc); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1623 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1626 */ __pyx_v_i = (__pyx_v_i + __pyx_v_k); } - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1625 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1628 */ Py_INCREF(__pyx_v_diric); __pyx_r = __pyx_v_diric; goto __pyx_L0; @@ -8866,16 +8894,16 @@ Py_INCREF(__pyx_v_self); Py_INCREF(__pyx_v_x); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1636 */ - __pyx_1 = PyObject_Length(__pyx_v_x); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1636; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1639 */ + __pyx_1 = PyObject_Length(__pyx_v_x); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1639; goto __pyx_L1;} __pyx_v_i = (__pyx_1 - 1); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1637 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1640 */ /*try:*/ { - __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;} - __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;} + __pyx_2 = PyInt_FromLong(0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1641; goto __pyx_L2;} + __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1641; goto __pyx_L2;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_1 = PyObject_Length(__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1638; goto __pyx_L2;} + __pyx_1 = PyObject_Length(__pyx_3); if (__pyx_1 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1641; goto __pyx_L2;} Py_DECREF(__pyx_3); __pyx_3 = 0; __pyx_v_j = __pyx_1; } @@ -8884,10 +8912,10 @@ Py_XDECREF(__pyx_2); __pyx_2 = 0; Py_XDECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1639 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1642 */ /*except:*/ { __Pyx_AddTraceback("mtrand.shuffle"); - if (__Pyx_GetException(&__pyx_2, &__pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1639; goto __pyx_L1;} + if (__Pyx_GetException(&__pyx_2, &__pyx_3, &__pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1642; goto __pyx_L1;} __pyx_v_j = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; @@ -8896,82 +8924,82 @@ } __pyx_L3:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1642 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1645 */ __pyx_5 = (__pyx_v_j == 0); if (__pyx_5) { while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1645 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1648 */ __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":1646 */ - __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} - __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1649 */ + __pyx_2 = PyInt_FromLong(__pyx_v_j); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} + __pyx_3 = PyObject_GetItem(__pyx_v_x, __pyx_2); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 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 = 1646; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1646; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1649; 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":1647 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1650 */ __pyx_v_i = (__pyx_v_i - 1); } goto __pyx_L4; } /*else*/ { - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1650 */ - __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1653 */ + __pyx_4 = PyInt_FromLong(0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1653; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1653; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_5 = PyObject_HasAttr(__pyx_2,__pyx_n_copy); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1650; goto __pyx_L1;} + __pyx_5 = PyObject_HasAttr(__pyx_2,__pyx_n_copy); if (__pyx_5 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1653; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; __pyx_v_copy = __pyx_5; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1651 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1654 */ __pyx_5 = __pyx_v_copy; if (__pyx_5) { while (1) { __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1653 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1656 */ __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":1654 */ - __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} - __pyx_4 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1657 */ + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} + __pyx_4 = PyObject_GetItem(__pyx_v_x, __pyx_3); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_copy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_4, __pyx_n_copy); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, 0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_4 = PyObject_GetAttr(__pyx_2, __pyx_n_copy); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyObject_CallObject(__pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_2 = PyObject_CallObject(__pyx_4, 0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_4, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 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 = 1654; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1654; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1657; 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":1655 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1658 */ __pyx_v_i = (__pyx_v_i - 1); } goto __pyx_L7; @@ -8981,30 +9009,30 @@ __pyx_5 = (__pyx_v_i > 0); if (!__pyx_5) break; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1658 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1661 */ __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":1659 */ - __pyx_4 = PyInt_FromLong(__pyx_v_j); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1662 */ + __pyx_4 = PyInt_FromLong(__pyx_v_j); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_3 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + __pyx_3 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} - __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + __pyx_4 = PyInt_FromLong(__pyx_v_i); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} + __pyx_2 = PyObject_GetItem(__pyx_v_x, __pyx_4); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} Py_DECREF(__pyx_4); __pyx_4 = 0; - __pyx_4 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + __pyx_4 = PySequence_GetSlice(__pyx_2, 0, PY_SSIZE_T_MAX); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; 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 = 1659; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + __pyx_2 = PyInt_FromLong(__pyx_v_i); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_2, __pyx_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; 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 = 1659; goto __pyx_L1;} - if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1659; goto __pyx_L1;} + __pyx_3 = PyInt_FromLong(__pyx_v_j); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} + if (PyObject_SetItem(__pyx_v_x, __pyx_3, __pyx_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1662; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_4); __pyx_4 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1660 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1663 */ __pyx_v_i = (__pyx_v_i - 1); } } @@ -9026,7 +9054,6 @@ return __pyx_r; } -static PyObject *__pyx_n_integer; static PyObject *__pyx_n_arange; static PyObject *__pyx_f_6mtrand_11RandomState_permutation(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ @@ -9045,26 +9072,26 @@ Py_INCREF(__pyx_v_x); __pyx_v_arr = Py_None; Py_INCREF(Py_None); - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1668 */ - __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;} - __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_integer); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1671 */ + __pyx_1 = __Pyx_GetName(__pyx_b, __pyx_n_int); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} + __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_2, __pyx_n_integer); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; - __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;} + __pyx_2 = PyTuple_New(2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} PyTuple_SET_ITEM(__pyx_2, 0, __pyx_1); PyTuple_SET_ITEM(__pyx_2, 1, __pyx_3); __pyx_1 = 0; __pyx_3 = 0; - __pyx_4 = PyObject_IsInstance(__pyx_v_x,__pyx_2); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1668; goto __pyx_L1;} + __pyx_4 = PyObject_IsInstance(__pyx_v_x,__pyx_2); if (__pyx_4 == -1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; if (__pyx_4) { - __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;} - __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;} + __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} + __pyx_3 = PyObject_GetAttr(__pyx_1, __pyx_n_arange); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} Py_DECREF(__pyx_1); __pyx_1 = 0; - __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;} + __pyx_2 = PyTuple_New(1); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_2, 0, __pyx_v_x); - __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1669; goto __pyx_L1;} + __pyx_1 = PyObject_CallObject(__pyx_3, __pyx_2); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_v_arr); @@ -9073,13 +9100,13 @@ goto __pyx_L2; } /*else*/ { - __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} - __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} + __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_n__sp); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1674; goto __pyx_L1;} + __pyx_2 = PyObject_GetAttr(__pyx_3, __pyx_n_array); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1674; goto __pyx_L1;} Py_DECREF(__pyx_3); __pyx_3 = 0; - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1674; goto __pyx_L1;} Py_INCREF(__pyx_v_x); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_x); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1671; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1674; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_v_arr); @@ -9088,17 +9115,17 @@ } __pyx_L2:; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1672 */ - __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} - __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1675 */ + __pyx_2 = PyObject_GetAttr(__pyx_v_self, __pyx_n_shuffle); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;} + __pyx_1 = PyTuple_New(1); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;} Py_INCREF(__pyx_v_arr); PyTuple_SET_ITEM(__pyx_1, 0, __pyx_v_arr); - __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1672; goto __pyx_L1;} + __pyx_3 = PyObject_CallObject(__pyx_2, __pyx_1); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;} Py_DECREF(__pyx_2); __pyx_2 = 0; Py_DECREF(__pyx_1); __pyx_1 = 0; Py_DECREF(__pyx_3); __pyx_3 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1673 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1676 */ Py_INCREF(__pyx_v_arr); __pyx_r = __pyx_v_arr; goto __pyx_L0; @@ -9558,556 +9585,556 @@ if (PyObject_SetAttrString(__pyx_m, "RandomState", (PyObject *)&__pyx_type_6mtrand_RandomState) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 468; 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":488 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":488 */ Py_INCREF(Py_None); __pyx_k2 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":498 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":498 */ Py_INCREF(Py_None); __pyx_k3 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":564 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":567 */ Py_INCREF(Py_None); __pyx_k4 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":571 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":574 */ Py_INCREF(Py_None); __pyx_k5 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":578 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":581 */ 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":623 */ - __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 623; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":626 */ + __pyx_1 = PyFloat_FromDouble(0.0); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; goto __pyx_L1;} __pyx_k8 = __pyx_1; __pyx_1 = 0; - __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 623; goto __pyx_L1;} + __pyx_2 = PyFloat_FromDouble(1.0); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 626; goto __pyx_L1;} __pyx_k9 = __pyx_2; __pyx_2 = 0; Py_INCREF(Py_None); __pyx_k10 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":676 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":679 */ 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":689 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":692 */ Py_INCREF(Py_None); __pyx_k13 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":696 */ - __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":699 */ + __pyx_3 = PyFloat_FromDouble(0.0); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} __pyx_k14 = __pyx_3; __pyx_3 = 0; - __pyx_4 = PyFloat_FromDouble(1.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; goto __pyx_L1;} + __pyx_4 = PyFloat_FromDouble(1.0); if (!__pyx_4) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; goto __pyx_L1;} __pyx_k15 = __pyx_4; __pyx_4 = 0; Py_INCREF(Py_None); __pyx_k16 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":719 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":722 */ Py_INCREF(Py_None); __pyx_k17 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":746 */ - __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 746; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":749 */ + __pyx_5 = PyFloat_FromDouble(1.0); if (!__pyx_5) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 749; 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":767 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":770 */ Py_INCREF(Py_None); __pyx_k20 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":774 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":777 */ Py_INCREF(Py_None); __pyx_k21 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":794 */ - __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 794; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":797 */ + __pyx_6 = PyFloat_FromDouble(1.0); if (!__pyx_6) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; 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":820 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":823 */ Py_INCREF(Py_None); __pyx_k24 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":847 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":850 */ Py_INCREF(Py_None); __pyx_k25 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":883 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":886 */ Py_INCREF(Py_None); __pyx_k26 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":904 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":907 */ Py_INCREF(Py_None); __pyx_k27 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":932 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":935 */ Py_INCREF(Py_None); __pyx_k28 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":939 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":942 */ Py_INCREF(Py_None); __pyx_k29 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":960 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":963 */ Py_INCREF(Py_None); __pyx_k30 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":984 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":987 */ Py_INCREF(Py_None); __pyx_k31 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1005 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1008 */ Py_INCREF(Py_None); __pyx_k32 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1026 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1029 */ Py_INCREF(Py_None); __pyx_k33 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1047 */ - __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1050 */ + __pyx_7 = PyFloat_FromDouble(0.0); if (!__pyx_7) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} __pyx_k34 = __pyx_7; __pyx_7 = 0; - __pyx_8 = PyFloat_FromDouble(1.0); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; goto __pyx_L1;} + __pyx_8 = PyFloat_FromDouble(1.0); if (!__pyx_8) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1050; goto __pyx_L1;} __pyx_k35 = __pyx_8; __pyx_8 = 0; Py_INCREF(Py_None); __pyx_k36 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1069 */ - __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1072 */ + __pyx_9 = PyFloat_FromDouble(0.0); if (!__pyx_9) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} __pyx_k37 = __pyx_9; __pyx_9 = 0; - __pyx_10 = PyFloat_FromDouble(1.0); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1069; goto __pyx_L1;} + __pyx_10 = PyFloat_FromDouble(1.0); if (!__pyx_10) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1072; goto __pyx_L1;} __pyx_k38 = __pyx_10; __pyx_10 = 0; Py_INCREF(Py_None); __pyx_k39 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1091 */ - __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1094 */ + __pyx_11 = PyFloat_FromDouble(0.0); if (!__pyx_11) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; goto __pyx_L1;} __pyx_k40 = __pyx_11; __pyx_11 = 0; - __pyx_12 = PyFloat_FromDouble(1.0); if (!__pyx_12) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1091; goto __pyx_L1;} + __pyx_12 = PyFloat_FromDouble(1.0); if (!__pyx_12) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; goto __pyx_L1;} __pyx_k41 = __pyx_12; __pyx_12 = 0; Py_INCREF(Py_None); __pyx_k42 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1113 */ - __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1116 */ + __pyx_13 = PyFloat_FromDouble(0.0); if (!__pyx_13) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; goto __pyx_L1;} __pyx_k43 = __pyx_13; __pyx_13 = 0; - __pyx_14 = PyFloat_FromDouble(1.0); if (!__pyx_14) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1113; goto __pyx_L1;} + __pyx_14 = PyFloat_FromDouble(1.0); if (!__pyx_14) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1116; goto __pyx_L1;} __pyx_k44 = __pyx_14; __pyx_14 = 0; Py_INCREF(Py_None); __pyx_k45 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1142 */ - __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1142; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1145 */ + __pyx_15 = PyFloat_FromDouble(1.0); if (!__pyx_15) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1145; 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":1164 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1167 */ Py_INCREF(Py_None); __pyx_k48 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1192 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1195 */ Py_INCREF(Py_None); __pyx_k49 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1229 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1232 */ Py_INCREF(Py_None); __pyx_k50 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1261 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1264 */ Py_INCREF(Py_None); __pyx_k51 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1296 */ - __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1299 */ + __pyx_16 = PyFloat_FromDouble(1.0); if (!__pyx_16) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1299; 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":1316 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1319 */ Py_INCREF(Py_None); __pyx_k54 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1337 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1340 */ Py_INCREF(Py_None); __pyx_k55 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1364 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1367 */ Py_INCREF(Py_None); __pyx_k56 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1409 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1412 */ Py_INCREF(Py_None); __pyx_k57 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1435 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1438 */ Py_INCREF(Py_None); __pyx_k58 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1493 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1496 */ Py_INCREF(Py_None); __pyx_k59 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1543 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1546 */ Py_INCREF(Py_None); __pyx_k60 = Py_None; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1675 */ - __pyx_17 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;} - if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1675; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1678 */ + __pyx_17 = PyObject_CallObject(((PyObject*)__pyx_ptype_6mtrand_RandomState), 0); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n__rand, __pyx_17) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1676 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1676; 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 = 1676; goto __pyx_L1;} - Py_DECREF(__pyx_18); __pyx_18 = 0; - - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1677 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1677; 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 = 1677; goto __pyx_L1;} - Py_DECREF(__pyx_18); __pyx_18 = 0; - - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1678 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1678; 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 = 1678; goto __pyx_L1;} - Py_DECREF(__pyx_18); __pyx_18 = 0; - - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1679 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1679 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_seed); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; 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 = 1679; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_seed, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1679; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1680 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1680 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_get_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; 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 = 1680; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_get_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1680; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1681 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1681 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_set_state); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; 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 = 1681; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_set_state, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1681; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1682 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1682 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_sample); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; 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 = 1682; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_random_sample, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1682; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1683 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1683 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randint); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; 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 = 1683; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_randint, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1683; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1684 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1684 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_bytes); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; 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 = 1684; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_bytes, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1684; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1685 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1685 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_uniform); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; 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 = 1685; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_uniform, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1685; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1686 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1686 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rand); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; 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 = 1686; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_rand, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1686; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1687 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1687 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_randn); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; 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 = 1687; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_randn, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1687; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1688 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1688 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_random_integers); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; 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 = 1688; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_random_integers, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1688; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1689 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1689 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; 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 = 1689; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1689; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1690 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1690 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; 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 = 1690; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1690; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1691 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1691 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_beta); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; 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 = 1691; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_beta, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1691; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1692 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1692 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; 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 = 1692; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1692; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1693 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1693 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_exponential); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; 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 = 1693; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_exponential, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1693; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1694 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1694 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; 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 = 1694; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1694; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1695 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1695 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gamma); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; 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 = 1695; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_gamma, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1695; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1696 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1696 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; 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 = 1696; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1696; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1697 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1697 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_f); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; 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 = 1697; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_f, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1697; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1698 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1698 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; 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 = 1698; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1698; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1699 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1699 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_noncentral_chisquare); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; 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 = 1699; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_noncentral_chisquare, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1699; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1700 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1700 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_cauchy); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; 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 = 1700; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_cauchy, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1700; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1701 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1701 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_standard_t); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; 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 = 1701; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_standard_t, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1701; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1702 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1702 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_vonmises); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; 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 = 1702; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_vonmises, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1702; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1703 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1703 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_pareto); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; 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 = 1703; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_pareto, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1703; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1704 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1704 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_weibull); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; 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 = 1704; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_weibull, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1704; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1705 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1705 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_power); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; 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 = 1705; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_power, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1705; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1706 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1706 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_laplace); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; 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 = 1706; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_laplace, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1706; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1707 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1707 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_gumbel); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; 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 = 1707; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_gumbel, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1707; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1708 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1708 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logistic); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; 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 = 1708; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_logistic, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1708; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1709 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1709 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_lognormal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; 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 = 1709; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_lognormal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1709; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1711 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1710 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1710; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_rayleigh); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1710; 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 = 1711; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_rayleigh, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1710; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1712 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1711 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_wald); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; 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 = 1712; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_wald, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1711; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1713 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1713; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1712 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_triangular); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; 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 = 1713; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_triangular, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1712; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1714 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1714 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; 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 = 1714; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1714; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1715 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1715 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_negative_binomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; 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 = 1715; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_negative_binomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1715; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1716 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1716 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_poisson); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; 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 = 1716; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_poisson, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1716; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1717 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1717 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_zipf); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; 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 = 1717; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_zipf, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1717; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1719 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1718 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1718; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_geometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1718; 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 = 1718; goto __pyx_L1;} + Py_DECREF(__pyx_18); __pyx_18 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1719 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_hypergeometric); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; 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 = 1719; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_hypergeometric, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1719; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1720 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1720 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_logseries); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; 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 = 1720; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_logseries, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1720; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1721 */ - __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_dirichlet); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;} + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1722 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1722; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multivariate_normal); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1722; goto __pyx_L1;} Py_DECREF(__pyx_17); __pyx_17 = 0; - if (PyObject_SetAttr(__pyx_m, __pyx_n_dirichlet, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1721; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_multivariate_normal, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1722; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1723 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1723 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_multinomial); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; 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 = 1723; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_multinomial, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1723; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; - /* "/Users/rkern/svn/numpy/numpy/random/mtrand/mtrand.pyx":1724 */ + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1724 */ __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;} - __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_dirichlet); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; 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 = 1724; goto __pyx_L1;} + if (PyObject_SetAttr(__pyx_m, __pyx_n_dirichlet, __pyx_18) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1724; goto __pyx_L1;} Py_DECREF(__pyx_18); __pyx_18 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1726 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1726; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_shuffle); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1726; 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 = 1726; goto __pyx_L1;} + Py_DECREF(__pyx_18); __pyx_18 = 0; + + /* "/home/oliphant/numpy/numpy/random/mtrand/mtrand.pyx":1727 */ + __pyx_17 = __Pyx_GetName(__pyx_m, __pyx_n__rand); if (!__pyx_17) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1727; goto __pyx_L1;} + __pyx_18 = PyObject_GetAttr(__pyx_17, __pyx_n_permutation); if (!__pyx_18) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1727; 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 = 1727; 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 2008-03-22 06:45:57 UTC (rev 4918) +++ trunk/numpy/random/mtrand/mtrand.pyx 2008-03-22 06:55:41 UTC (rev 4919) @@ -511,7 +511,7 @@ errcode = rk_randomseed(self.internal_state) elif type(seed) is int: rk_seed(seed, self.internal_state) - elif (PyArray_IsScalar(seed, Integer)): + elif isinstance(seed, _sp.integer): iseed = int(seed) rk_seed(iseed, self.internal_state) else: Modified: trunk/numpy/random/mtrand/numpy.pxi =================================================================== --- trunk/numpy/random/mtrand/numpy.pxi 2008-03-22 06:45:57 UTC (rev 4918) +++ trunk/numpy/random/mtrand/numpy.pxi 2008-03-22 06:55:41 UTC (rev 4919) @@ -130,6 +130,4 @@ object PyArray_IterNew(object arr) void PyArray_ITER_NEXT(flatiter it) - int PyArray_IsScalar(object obj, void* cls) - void import_array() From numpy-svn at scipy.org Sat Mar 22 03:04:47 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 02:04:47 -0500 (CDT) Subject: [Numpy-svn] r4920 - trunk/numpy/distutils Message-ID: <20080322070447.89D2939C01B@new.scipy.org> Author: cdavid Date: 2008-03-22 02:04:43 -0500 (Sat, 22 Mar 2008) New Revision: 4920 Modified: trunk/numpy/distutils/cpuinfo.py Log: Include patch from jsbronder to fix ticket #644 related to nocona cpu detection. Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2008-03-22 06:55:41 UTC (rev 4919) +++ trunk/numpy/distutils/cpuinfo.py 2008-03-22 07:04:43 UTC (rev 4920) @@ -231,7 +231,11 @@ return self.is_PentiumIV() and self.has_sse3() def _is_Nocona(self): - return self.is_64bit() and self.is_PentiumIV() + return self.is_Intel() \ + and (self.info[0]['cpu family'] == '6' \ + or self.info[0]['cpu family'] == '15' ) \ + and self.has_sse3() \ + and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None def _is_Core2(self): return self.is_64bit() and self.is_Intel() and \ From numpy-svn at scipy.org Sat Mar 22 10:31:23 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 09:31:23 -0500 (CDT) Subject: [Numpy-svn] r4921 - trunk/numpy/core/tests Message-ID: <20080322143123.49454C7C039@new.scipy.org> Author: stefan Date: 2008-03-22 09:31:17 -0500 (Sat, 22 Mar 2008) New Revision: 4921 Modified: trunk/numpy/core/tests/test_regression.py Log: Add test for #583. Fix invalid test for #99. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 07:04:43 UTC (rev 4920) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 14:31:17 UTC (rev 4921) @@ -196,7 +196,7 @@ i_width = np.int_(0).nbytes*2 - 1 long('0x' + 'f'*i_width,16) #self.failUnlessRaises(OverflowError,np.intp,'0x' + 'f'*(i_width+1),16) - self.failUnlessRaises(ValueError,np.intp,'0x1',32) + #self.failUnlessRaises(ValueError,np.intp,'0x1',32) assert_equal(255,np.long('0xFF',16)) assert_equal(1024,np.long(1024)) @@ -725,6 +725,10 @@ """Ticket #572""" np.lib.place(1,1,1) + def check_mem_on_invalid_dtype(self): + "Ticket #583" + self.failUnlessRaises(ValueError, np.fromiter, [['12',''],['13','']], str) + def check_dot_negative_stride(self, level=rlevel): """Ticket #588""" x = np.array([[1,5,25,125.,625]]) @@ -828,11 +832,11 @@ """Ticket #633""" if not hasattr(sys, 'getrefcount'): return - + # NB. this is probably CPython-specific - + cnt = sys.getrefcount - + a = object() b = object() c = object() @@ -840,26 +844,26 @@ cnt0_a = cnt(a) cnt0_b = cnt(b) cnt0_c = cnt(c) - + # -- 0d -> 1d broadcasted slice assignment - + arr = np.zeros(5, dtype=np.object_) - + arr[:] = a assert cnt(a) == cnt0_a + 5 - + arr[:] = b assert cnt(a) == cnt0_a assert cnt(b) == cnt0_b + 5 - + arr[:2] = c assert cnt(b) == cnt0_b + 3 assert cnt(c) == cnt0_c + 2 del arr - + # -- 1d -> 2d broadcasted slice assignment - + arr = np.zeros((5, 2), dtype=np.object_) arr0 = np.zeros(2, dtype=np.object_) @@ -878,7 +882,7 @@ del arr, arr0 # -- 2d copying + flattening - + arr = np.zeros((5, 2), dtype=np.object_) arr[:,0] = a @@ -939,6 +943,7 @@ assert not arr[0].deleted arr[:] = arr # trying to induce a segfault by doing it again... assert not arr[0].deleted - + + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Sat Mar 22 10:38:39 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 09:38:39 -0500 (CDT) Subject: [Numpy-svn] r4922 - trunk/numpy/core/tests Message-ID: <20080322143839.6D5E239C12D@new.scipy.org> Author: stefan Date: 2008-03-22 09:38:22 -0500 (Sat, 22 Mar 2008) New Revision: 4922 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test for #555. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 14:31:17 UTC (rev 4921) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 14:38:22 UTC (rev 4922) @@ -721,6 +721,12 @@ assert x != y assert x == x + def check_rand_seed(self, level=rlevel): + """Ticket #555""" + for l in np.arange(4): + np.random.seed(l) + + def check_mem_insert(self, level=rlevel): """Ticket #572""" np.lib.place(1,1,1) @@ -828,7 +834,7 @@ b = np.array(a,dtype=float) del a, b - def check_object_array_refcounting(self): + def check_object_array_refcounting(self, level=rlevel): """Ticket #633""" if not hasattr(sys, 'getrefcount'): return @@ -929,7 +935,7 @@ assert cnt(a) == cnt0_a + 5 + 2 assert cnt(b) == cnt0_b + 5 + 3 - def check_object_array_refcount_self_assign(self): + def check_object_array_refcount_self_assign(self, level=rlevel): """Ticket #711""" class VictimObject(object): deleted = False From numpy-svn at scipy.org Sat Mar 22 10:47:16 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 09:47:16 -0500 (CDT) Subject: [Numpy-svn] r4923 - trunk/numpy/core/tests Message-ID: <20080322144716.B572739C13B@new.scipy.org> Author: stefan Date: 2008-03-22 09:47:02 -0500 (Sat, 22 Mar 2008) New Revision: 4923 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test for ticket #702. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 14:38:22 UTC (rev 4922) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 14:47:02 UTC (rev 4923) @@ -935,6 +935,15 @@ assert cnt(a) == cnt0_a + 5 + 2 assert cnt(b) == cnt0_b + 5 + 3 + def check_mem_custom_float_to_array(self, level=rlevel): + """Ticket 702""" + class MyFloat: + def __float__(self): + return 1 + + tmp = np.atleast_1d([MyFloat()]) + tmp2 = tmp.astype(float) + def check_object_array_refcount_self_assign(self, level=rlevel): """Ticket #711""" class VictimObject(object): From numpy-svn at scipy.org Sat Mar 22 12:20:56 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 11:20:56 -0500 (CDT) Subject: [Numpy-svn] r4924 - trunk/numpy/core/tests Message-ID: <20080322162056.E743439C309@new.scipy.org> Author: stefan Date: 2008-03-22 11:20:41 -0500 (Sat, 22 Mar 2008) New Revision: 4924 Modified: trunk/numpy/core/tests/test_regression.py Log: Move test for #562 to the right place. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 14:47:02 UTC (rev 4923) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 16:20:41 UTC (rev 4924) @@ -726,6 +726,11 @@ for l in np.arange(4): np.random.seed(l) + def check_mem_deallocation_leak(self, level=rlevel): + """Ticket #562""" + a = np.zeros(5,dtype=float) + b = np.array(a,dtype=float) + del a, b def check_mem_insert(self, level=rlevel): """Ticket #572""" @@ -828,12 +833,6 @@ """Ticket #658""" np.indices((0,3,4)).T.reshape(-1,3) - def check_mem_deallocation_leak(self, level=rlevel): - """Ticket #562""" - a = np.zeros(5,dtype=float) - b = np.array(a,dtype=float) - del a, b - def check_object_array_refcounting(self, level=rlevel): """Ticket #633""" if not hasattr(sys, 'getrefcount'): From numpy-svn at scipy.org Sat Mar 22 12:25:26 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 11:25:26 -0500 (CDT) Subject: [Numpy-svn] r4925 - trunk/numpy/core/tests Message-ID: <20080322162526.071B1C7C0CF@new.scipy.org> Author: stefan Date: 2008-03-22 11:25:21 -0500 (Sat, 22 Mar 2008) New Revision: 4925 Modified: trunk/numpy/core/tests/test_regression.py Log: Fix typo. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 16:20:41 UTC (rev 4924) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 16:25:21 UTC (rev 4925) @@ -726,7 +726,7 @@ for l in np.arange(4): np.random.seed(l) - def check_mem_deallocation_leak(self, level=rlevel): + def check_mem_deallocation_leak(self, level=rlevel): """Ticket #562""" a = np.zeros(5,dtype=float) b = np.array(a,dtype=float) From numpy-svn at scipy.org Sat Mar 22 12:26:02 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 11:26:02 -0500 (CDT) Subject: [Numpy-svn] r4926 - trunk/numpy/core/tests Message-ID: <20080322162602.8A8E7C7C0CF@new.scipy.org> Author: stefan Date: 2008-03-22 11:25:58 -0500 (Sat, 22 Mar 2008) New Revision: 4926 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Add test for #629. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 16:25:21 UTC (rev 4925) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 16:25:58 UTC (rev 4926) @@ -76,5 +76,36 @@ assert_array_equal(x[...],value) assert_array_equal(x[()],value) +class TestRepr(NumpyTestCase): + def check_float_repr(self): + from numpy import nan, inf + for t in [np.float32, np.float64, np.longdouble]: + finfo=np.finfo(t) + last_fraction_bit_idx = finfo.nexp + finfo.nmant + last_exponent_bit_idx = finfo.nexp + storage_bytes = np.dtype(t).itemsize*8 + for which in ['small denorm','small norm']: # could add some more types here + # Values from http://en.wikipedia.org/wiki/IEEE_754 + constr = array([0x00]*storage_bytes,dtype=np.uint8) + if which == 'small denorm': + byte = last_fraction_bit_idx // 8 + bytebit = 7-(last_fraction_bit_idx % 8) + constr[byte] = 1< Author: stefan Date: 2008-03-22 11:31:25 -0500 (Sat, 22 Mar 2008) New Revision: 4927 Modified: trunk/numpy/core/tests/test_regression.py Log: Add test for ticket #632. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-22 16:25:58 UTC (rev 4926) +++ trunk/numpy/core/tests/test_regression.py 2008-03-22 16:31:25 UTC (rev 4927) @@ -807,6 +807,12 @@ y = np.fromstring("\x00\x01\x00\x02", dtype="|S2") assert_array_equal(np.sort(x, kind="q"), y) + def check_hist_bins_as_list(self, level=rlevel): + """Ticket #632""" + hist,edges = np.histogram([1,2,3,4],[1,2]) + assert_array_equal(hist,[1,3]) + assert_array_equal(edges,[1,2]) + def check_copy_detection_zero_dim(self, level=rlevel): """Ticket #658""" np.indices((0,3,4)).T.reshape(-1,3) From numpy-svn at scipy.org Sat Mar 22 13:45:14 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 12:45:14 -0500 (CDT) Subject: [Numpy-svn] r4928 - trunk/numpy/core/tests Message-ID: <20080322174514.BC8CC39C0B9@new.scipy.org> Author: stefan Date: 2008-03-22 12:45:01 -0500 (Sat, 22 Mar 2008) New Revision: 4928 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Fix comparison to 0 in scalarmath test. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 16:31:25 UTC (rev 4927) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 17:45:01 UTC (rev 4928) @@ -105,7 +105,8 @@ # through a Python float, which will lose # precision continue - assert_equal( val, val2 ) + if not (val == 0 and val2 < 1e-100): + assert_equal(val, val2) if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Sat Mar 22 14:20:51 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 13:20:51 -0500 (CDT) Subject: [Numpy-svn] r4929 - trunk/numpy/core/tests Message-ID: <20080322182051.500E839C067@new.scipy.org> Author: stefan Date: 2008-03-22 13:20:44 -0500 (Sat, 22 Mar 2008) New Revision: 4929 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Fix order of arguments to test. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 17:45:01 UTC (rev 4928) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-22 18:20:44 UTC (rev 4929) @@ -105,7 +105,7 @@ # through a Python float, which will lose # precision continue - if not (val == 0 and val2 < 1e-100): + if not (val2 == 0 and val < 1e-100): assert_equal(val, val2) if __name__ == "__main__": From numpy-svn at scipy.org Sat Mar 22 16:03:26 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 22 Mar 2008 15:03:26 -0500 (CDT) Subject: [Numpy-svn] r4930 - in trunk/numpy/ma: . tests Message-ID: <20080322200326.EA31C39C121@new.scipy.org> Author: pierregm Date: 2008-03-22 15:03:03 -0500 (Sat, 22 Mar 2008) New Revision: 4930 Modified: trunk/numpy/ma/core.py trunk/numpy/ma/extras.py trunk/numpy/ma/morestats.py trunk/numpy/ma/mrecords.py trunk/numpy/ma/mstats.py trunk/numpy/ma/tests/test_extras.py trunk/numpy/ma/tests/test_mstats.py Log: core : fixed sort when axis is None mstats : fixed mmedian, renamed to median and moved to numpy.ma.extras for compatibility extras : introduced median from mstats mrecords: * fixed __array_finalize__ to keep the mask of a masked array when viewing it as a mrecarray * simplified _getdata Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/core.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -2856,7 +2856,10 @@ def sort(a, axis=-1, kind='quicksort', order=None, endwith=True, fill_value=None): "Function version of the eponymous method." - a = narray(a, copy=False, subok=True) + a = narray(a, copy=True, subok=True) + if axis is None: + a = a.flatten() + axis = 0 if fill_value is None: if endwith: filler = minimum_fill_value(a) Modified: trunk/numpy/ma/extras.py =================================================================== --- trunk/numpy/ma/extras.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/extras.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -11,15 +11,12 @@ __revision__ = "$Revision: 3473 $" __date__ = '$Date: 2007-10-29 17:18:13 +0200 (Mon, 29 Oct 2007) $' -__all__ = [ -'apply_along_axis', 'atleast_1d', 'atleast_2d', 'atleast_3d', 'average', -'vstack', 'hstack', 'dstack', 'row_stack', 'column_stack', -'compress_rowcols', 'compress_rows', 'compress_cols', 'count_masked', -'dot', 'hsplit', -'mask_rowcols','mask_rows','mask_cols','masked_all','masked_all_like', -'mediff1d', 'mr_', -'notmasked_edges','notmasked_contiguous', -'stdu', 'varu', +__all__ = ['apply_along_axis', 'atleast_1d', 'atleast_2d', 'atleast_3d', + 'average', 'vstack', 'hstack', 'dstack', 'row_stack', 'column_stack', + 'compress_rowcols', 'compress_rows', 'compress_cols', 'count_masked', + 'dot', 'hsplit', 'mask_rowcols','mask_rows','mask_cols','masked_all', + 'masked_all_like', 'mediff1d', 'median', 'mr_', 'notmasked_edges', + 'notmasked_contiguous', 'stdu', 'varu', ] from itertools import groupby @@ -412,6 +409,84 @@ else: return result + + +def median(a, axis=0, out=None, overwrite_input=False): + """Compute the median along the specified axis. + + Returns the median of the array elements. The median is taken + over the first axis of the array by default, otherwise over + the specified axis. + + Parameters + ---------- + a : array-like + Input array or object that can be converted to an array + axis : {int, None}, optional + Axis along which the medians are computed. The default is to + compute the median along the first dimension. axis=None + returns the median of the flattened array + + out : ndarray, optional + Alternative output array in which to place the result. It must + have the same shape and buffer length as the expected output + but the type will be cast if necessary. + + overwrite_input : {False, True}, optional + If True, then allow use of memory of input array (a) for + calculations. The input array will be modified by the call to + median. This will save memory when you do not need to preserve + the contents of the input array. Treat the input as undefined, + but it will probably be fully or partially sorted. Default is + False. Note that, if overwrite_input is true, and the input + is not already an ndarray, an error will be raised. + + Returns + ------- + median : ndarray. + A new array holding the result is returned unless out is + specified, in which case a reference to out is returned. + Return datatype is float64 for ints and floats smaller than + float64, or the input datatype otherwise. + + See Also + ------- + mean + + Notes + ----- + Given a vector V length N, the median of V is the middle value of + a sorted copy of V (Vs) - i.e. Vs[(N-1)/2], when N is odd. It is + the mean of the two middle values of Vs, when N is even. + + """ + def _median1D(data): + counts = filled(count(data,axis),0) + (idx,rmd) = divmod(counts, 2) + if rmd: + choice = slice(idx,idx+1) + else: + choice = slice(idx-1,idx+1) + return data[choice].mean(0) + # + if overwrite_input: + if axis is None: + sorted = a.ravel() + sorted.sort() + else: + a.sort(axis=axis) + sorted = a + else: + sorted = sort(a, axis=axis) + if axis is None: + result = _median1D(sorted) + else: + result = apply_along_axis(_median1D, axis, sorted) + return result + + + + #.............................................................................. def compress_rowcols(x, axis=None): """Suppress the rows and/or columns of a 2D array that contains Modified: trunk/numpy/ma/morestats.py =================================================================== --- trunk/numpy/ma/morestats.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/morestats.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -23,8 +23,8 @@ import numpy.ma as MA from numpy.ma.core import masked, nomask, MaskedArray, masked_array -from numpy.ma.extras import apply_along_axis, dot -from numpy.ma.mstats import trim_both, trimmed_stde, mquantiles, mmedian, stde_median +from numpy.ma.extras import apply_along_axis, dot, median +from numpy.ma.mstats import trim_both, trimmed_stde, mquantiles, stde_median from scipy.stats.distributions import norm, beta, t, binom from scipy.stats.morestats import find_repeats @@ -328,7 +328,7 @@ A (p,) array of comparison values. """ - (med_1, med_2) = (mmedian(group_1, axis=axis), mmedian(group_2, axis=axis)) + (med_1, med_2) = (median(group_1, axis=axis), median(group_2, axis=axis)) (std_1, std_2) = (stde_median(group_1, axis=axis), stde_median(group_2, axis=axis)) W = abs(med_1 - med_2) / sqrt(std_1**2 + std_2**2) Modified: trunk/numpy/ma/mrecords.py =================================================================== --- trunk/numpy/ma/mrecords.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/mrecords.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -163,8 +163,13 @@ _fieldmask = getattr(obj, '_fieldmask', None) if _fieldmask is None: mdescr = [(n,'|b1') for (n,_) in self.dtype.descr] - _fieldmask = numpy.empty(self.shape, dtype=mdescr).view(recarray) - _fieldmask.flat = tuple([False]*len(mdescr)) + _mask = getattr(obj, '_mask', nomask) + if _mask is nomask: + _fieldmask = numpy.empty(self.shape, dtype=mdescr).view(recarray) + _fieldmask.flat = tuple([False]*len(mdescr)) + else: + _fieldmask = narray([tuple([m]*len(mdescr)) for m in _mask], + dtype=mdescr).view(recarray) # Update some of the attributes attrdict = dict(_fieldmask=_fieldmask, _hardmask=getattr(obj,'_hardmask',False), @@ -181,7 +186,7 @@ #...................................................... def _getdata(self): "Returns the data as a recarray." - return self.view(recarray) + return ndarray.view(self,recarray) _data = property(fget=_getdata) #...................................................... def __setmask__(self, mask): @@ -469,7 +474,7 @@ result = narray(self.filled().tolist(), dtype=object) mask = narray(self._fieldmask.tolist()) result[mask] = None - return [tuple(r) for r in result] + return result.tolist() #-------------------------------------------- # Pickling def __getstate__(self): @@ -787,5 +792,30 @@ return newdata ############################################################################### - - +# +#if 1: +# from numpy.ma.testutils import assert_equal +# if 1: +# ilist = [1,2,3,4,5] +# flist = [1.1,2.2,3.3,4.4,5.5] +# slist = ['one','two','three','four','five'] +# ddtype = [('a',int_),('b',float_),('c','|S8')] +# mask = [0,1,0,0,1] +# self_base = masked_array(zip(ilist,flist,slist), mask=mask, dtype=ddtype) +# if 1: +# base = self_base.copy() +# mbase = base.view(mrecarray) +# mbase = mbase.copy() +# mbase.fill_value = (999999,1e20,'N/A') +# +# print mbase.a +# +# # Change the data, the mask should be conserved +# mbase.a._data[:] = 5 +# assert_equal(mbase['a']._data, [5,5,5,5,5]) +# assert_equal(mbase['a']._mask, [0,1,0,0,1]) +# # +# z = mbase.a +# print z.tolist() +# z = base[:2] +# print z.view(mrecarray) \ No newline at end of file Modified: trunk/numpy/ma/mstats.py =================================================================== --- trunk/numpy/ma/mstats.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/mstats.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -13,7 +13,7 @@ import numpy -from numpy import bool_, float_, int_, \ +from numpy import bool_, float_, int_, ndarray, \ sqrt from numpy import array as narray import numpy.core.numeric as numeric @@ -21,9 +21,9 @@ import numpy.ma from numpy.ma.core import masked, nomask, MaskedArray, masked_array -from numpy.ma.extras import apply_along_axis, dot +from numpy.ma.extras import apply_along_axis, dot, median as mmedian -__all__ = ['cov','meppf','plotting_positions','meppf','mmedian','mquantiles', +__all__ = ['cov','meppf','plotting_positions','meppf','mquantiles', 'stde_median','trim_tail','trim_both','trimmed_mean','trimmed_stde', 'winsorize'] @@ -352,24 +352,6 @@ meppf = plotting_positions -def mmedian(data, axis=None): - """Returns the median of data along the given axis. - - Missing data are discarded. - - """ - def _median1D(data): - x = numpy.sort(data.compressed()) - if x.size == 0: - return masked - return numpy.median(x) - data = masked_array(data, subok=True, copy=True) - if axis is None: - return _median1D(data) - else: - return apply_along_axis(_median1D, axis, data) - - def cov(x, y=None, rowvar=True, bias=False, strict=False): """Estimates the covariance matrix. Modified: trunk/numpy/ma/tests/test_extras.py =================================================================== --- trunk/numpy/ma/tests/test_extras.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/tests/test_extras.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -324,6 +324,36 @@ return b[1] xa = apply_along_axis(myfunc,2,a) assert_equal(xa,[[1,4],[7,10]]) + +class TestMedian(NumpyTestCase): + def __init__(self, *args, **kwds): + NumpyTestCase.__init__(self, *args, **kwds) + # + def test_2d(self): + "Tests median w/ 2D" + (n,p) = (101,30) + x = masked_array(numpy.linspace(-1.,1.,n),) + x[:10] = x[-10:] = masked + z = masked_array(numpy.empty((n,p), dtype=numpy.float_)) + z[:,0] = x[:] + idx = numpy.arange(len(x)) + for i in range(1,p): + numpy.random.shuffle(idx) + z[:,i] = x[idx] + assert_equal(median(z[:,0]), 0) + assert_equal(median(z), numpy.zeros((p,))) + # + def test_3d(self): + "Tests median w/ 3D" + x = numpy.ma.arange(24).reshape(3,4,2) + x[x%3==0] = masked + assert_equal(median(x,0), [[12,9],[6,15],[12,9],[18,15]]) + x.shape = (4,3,2) + assert_equal(median(x,0),[[99,10],[11,99],[13,14]]) + x = numpy.ma.arange(24).reshape(4,3,2) + x[x%5==0] = masked + assert_equal(median(x,0), [[12,10],[8,9],[16,17]]) + ############################################################################### #------------------------------------------------------------------------------ Modified: trunk/numpy/ma/tests/test_mstats.py =================================================================== --- trunk/numpy/ma/tests/test_mstats.py 2008-03-22 18:20:44 UTC (rev 4929) +++ trunk/numpy/ma/tests/test_mstats.py 2008-03-22 20:03:03 UTC (rev 4930) @@ -19,6 +19,7 @@ from numpy.ma.testutils import * from numpy.ma.mstats import * +from numpy.ma import median #.............................................................................. class TestQuantiles(NumpyTestCase): @@ -96,19 +97,19 @@ for i in range(1,p): numpy.random.shuffle(idx) z[:,i] = x[idx] - assert_equal(mmedian(z[:,0]), 0) - assert_equal(mmedian(z), numpy.zeros((p,))) + assert_equal(median(z[:,0]), 0) + assert_equal(median(z), numpy.zeros((p,))) def test_3d(self): "Tests median w/ 3D" x = numpy.ma.arange(24).reshape(3,4,2) x[x%3==0] = masked - assert_equal(mmedian(x,0), [[12,9],[6,15],[12,9],[18,15]]) + assert_equal(median(x,0), [[12,9],[6,15],[12,9],[18,15]]) x.shape = (4,3,2) - assert_equal(mmedian(x,0),[[99,10],[11,99],[13,14]]) + assert_equal(median(x,0),[[99,10],[11,99],[13,14]]) x = numpy.ma.arange(24).reshape(4,3,2) x[x%5==0] = masked - assert_equal(mmedian(x,0), [[12,10],[8,9],[16,17]]) + assert_equal(median(x,0), [[12,10],[8,9],[16,17]]) #.............................................................................. class TestTrimming(NumpyTestCase): From numpy-svn at scipy.org Sun Mar 23 02:13:30 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 01:13:30 -0500 (CDT) Subject: [Numpy-svn] r4931 - in trunk/numpy: distutils tests Message-ID: <20080323061330.A632839C07C@new.scipy.org> Author: cdavid Date: 2008-03-23 01:13:17 -0500 (Sun, 23 Mar 2008) New Revision: 4931 Modified: trunk/numpy/distutils/cpuinfo.py trunk/numpy/tests/test_ctypeslib.py Log: Fix has_sse3 and add has_ssse3 function for cpuinfo on linux. Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2008-03-22 20:03:03 UTC (rev 4930) +++ trunk/numpy/distutils/cpuinfo.py 2008-03-23 06:13:17 UTC (rev 4931) @@ -276,8 +276,11 @@ return re.match(r'.*?\bsse2\b',self.info[0]['flags']) is not None def _has_sse3(self): - return re.match(r'.*?\bsss?e3\b',self.info[0]['flags']) is not None + return re.match(r'.*?\bpni\b',self.info[0]['flags']) is not None + def _has_ssse3(self): + return re.match(r'.*?\bssse3\b',self.info[0]['flags']) is not None + def _has_3dnow(self): return re.match(r'.*?\b3dnow\b',self.info[0]['flags']) is not None Modified: trunk/numpy/tests/test_ctypeslib.py =================================================================== --- trunk/numpy/tests/test_ctypeslib.py 2008-03-22 20:03:03 UTC (rev 4930) +++ trunk/numpy/tests/test_ctypeslib.py 2008-03-23 06:13:17 UTC (rev 4931) @@ -4,8 +4,13 @@ class TestLoadLibrary(NumpyTestCase): def check_basic(self): - cdll = load_library('multiarray', - np.core.multiarray.__file__) + try: + cdll = load_library('multiarray', + np.core.multiarray.__file__) + except ImportError, e: + msg = "ctypes is not available on this python: skipping the test" \ + " (import error was: %s)" % str(e) + print msg class TestNdpointer(NumpyTestCase): def check_dtype(self): From numpy-svn at scipy.org Sun Mar 23 02:16:36 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 01:16:36 -0500 (CDT) Subject: [Numpy-svn] r4932 - trunk/numpy/tests Message-ID: <20080323061636.3D7B739C214@new.scipy.org> Author: cdavid Date: 2008-03-23 01:16:32 -0500 (Sun, 23 Mar 2008) New Revision: 4932 Modified: trunk/numpy/tests/test_ctypeslib.py Log: Revert accidentally commited changes to TestLoadLibrary unittest for ctypes. Modified: trunk/numpy/tests/test_ctypeslib.py =================================================================== --- trunk/numpy/tests/test_ctypeslib.py 2008-03-23 06:13:17 UTC (rev 4931) +++ trunk/numpy/tests/test_ctypeslib.py 2008-03-23 06:16:32 UTC (rev 4932) @@ -4,13 +4,8 @@ class TestLoadLibrary(NumpyTestCase): def check_basic(self): - try: - cdll = load_library('multiarray', - np.core.multiarray.__file__) - except ImportError, e: - msg = "ctypes is not available on this python: skipping the test" \ - " (import error was: %s)" % str(e) - print msg + cdll = load_library('multiarray', + np.core.multiarray.__file__) class TestNdpointer(NumpyTestCase): def check_dtype(self): From numpy-svn at scipy.org Sun Mar 23 02:17:56 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 01:17:56 -0500 (CDT) Subject: [Numpy-svn] r4933 - trunk/numpy/distutils Message-ID: <20080323061756.67E7839C214@new.scipy.org> Author: cdavid Date: 2008-03-23 01:17:53 -0500 (Sun, 23 Mar 2008) New Revision: 4933 Modified: trunk/numpy/distutils/cpuinfo.py Log: mimic gcc driver detection for nocona cpu detection. Modified: trunk/numpy/distutils/cpuinfo.py =================================================================== --- trunk/numpy/distutils/cpuinfo.py 2008-03-23 06:16:32 UTC (rev 4932) +++ trunk/numpy/distutils/cpuinfo.py 2008-03-23 06:17:53 UTC (rev 4933) @@ -234,7 +234,7 @@ return self.is_Intel() \ and (self.info[0]['cpu family'] == '6' \ or self.info[0]['cpu family'] == '15' ) \ - and self.has_sse3() \ + and (self.has_sse3() and not self.has_ssse3())\ and re.match(r'.*?\blm\b',self.info[0]['flags']) is not None def _is_Core2(self): From numpy-svn at scipy.org Sun Mar 23 07:15:19 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 06:15:19 -0500 (CDT) Subject: [Numpy-svn] r4934 - trunk/numpy/ma/tests Message-ID: <20080323111519.8901039C04D@new.scipy.org> Author: stefan Date: 2008-03-23 06:15:12 -0500 (Sun, 23 Mar 2008) New Revision: 4934 Modified: trunk/numpy/ma/tests/test_old_ma.py Log: Remove broken ma test. Modified: trunk/numpy/ma/tests/test_old_ma.py =================================================================== --- trunk/numpy/ma/tests/test_old_ma.py 2008-03-23 06:17:53 UTC (rev 4933) +++ trunk/numpy/ma/tests/test_old_ma.py 2008-03-23 11:15:12 UTC (rev 4934) @@ -475,9 +475,7 @@ x = arange(10).astype(float32) xm = arange(10) xm[2] = masked - id1 = id(x.data) x += 1. - assert id1 == id(x.data) assert eq(x, y+1.) def check_testPickle(self): From numpy-svn at scipy.org Sun Mar 23 09:53:38 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 08:53:38 -0500 (CDT) Subject: [Numpy-svn] r4935 - trunk/numpy/core Message-ID: <20080323135338.3D7FB39C06C@new.scipy.org> Author: stefan Date: 2008-03-23 08:53:33 -0500 (Sun, 23 Mar 2008) New Revision: 4935 Modified: trunk/numpy/core/numeric.py Log: Add numeric doctests (patch by Gael). Modified: trunk/numpy/core/numeric.py =================================================================== --- trunk/numpy/core/numeric.py 2008-03-23 11:15:12 UTC (rev 4934) +++ trunk/numpy/core/numeric.py 2008-03-23 13:53:33 UTC (rev 4935) @@ -12,7 +12,7 @@ 'array_repr', 'array_str', 'set_string_function', 'little_endian', 'require', 'fromiter', 'array_equal', 'array_equiv', - 'indices', 'fromfunction', + 'indices', 'fromfunction', 'load', 'loads', 'isscalar', 'binary_repr', 'base_repr', 'ones', 'identity', 'allclose', 'compare_chararrays', 'putmask', 'seterr', 'geterr', 'setbufsize', 'getbufsize', @@ -211,6 +211,13 @@ """Return a 2-d array of shape N x a.ndim where each row is a sequence of indices into a. This sequence must be converted to a tuple in order to be used to index into a. + + >>> from numpy import ones, argwhere + >>> argwhere(ones((2, 2))) + array([[0, 0], + [0, 1], + [1, 0], + [1, 1]]) """ return asarray(a.nonzero()).T @@ -218,6 +225,12 @@ """Return indicies that are not-zero in flattened version of a Equivalent to a.ravel().nonzero()[0] + + >>> from numpy import arange, flatnonzero + >>> arange(-2, 3) + array([-2, -1, 0, 1, 2]) + >>> flatnonzero(arange(-2, 3)) + array([0, 1, 3, 4]) """ return a.ravel().nonzero()[0] @@ -369,6 +382,12 @@ def roll(a, shift, axis=None): """Roll the elements in the array by 'shift' positions along the given axis. + + >>> from numpy import roll + >>> arange(10) + array([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]) + >>> roll(arange(10), 2) + array([8, 9, 0, 1, 2, 3, 4, 5, 6, 7]) """ a = asanyarray(a) if axis is None: @@ -388,11 +407,14 @@ def rollaxis(a, axis, start=0): """Return transposed array so that axis is rolled before start. - if a.shape is (3,4,5,6) - rollaxis(a, 3, 1).shape is (3,6,4,5) - rollaxis(a, 2, 0).shape is (5,3,4,6) - rollaxis(a, 1, 3).shape is (3,5,4,6) - rollaxis(a, 1, 4).shape is (3,5,6,4) + >>> from numpy import ones, rollaxis + >>> a = ones((3,4,5,6)) + >>> rollaxis(a, 3, 1).shape + (3, 6, 4, 5) + >>> rollaxis(a, 2, 0).shape + (5, 3, 4, 6) + >>> rollaxis(a, 1, 4).shape + (3, 5, 6, 4) """ n = a.ndim if axis < 0: From numpy-svn at scipy.org Sun Mar 23 10:21:36 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 09:21:36 -0500 (CDT) Subject: [Numpy-svn] r4936 - trunk/numpy/doc Message-ID: <20080323142136.8C0CD39C458@new.scipy.org> Author: stefan Date: 2008-03-23 09:21:31 -0500 (Sun, 23 Mar 2008) New Revision: 4936 Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt Log: Fix ReST syntax in HOWTO_DOCUMENT. Modified: trunk/numpy/doc/HOWTO_DOCUMENT.txt =================================================================== --- trunk/numpy/doc/HOWTO_DOCUMENT.txt 2008-03-23 13:53:33 UTC (rev 4935) +++ trunk/numpy/doc/HOWTO_DOCUMENT.txt 2008-03-23 14:21:31 UTC (rev 4936) @@ -4,18 +4,21 @@ .. Contents:: -.. Attention:: This document is slightly out of date. During the December -2007 sprint, Travis Oliphant made some changes to the NumPy/SciPy docstring -standard. The changes are relatively minor, but the standard no longer -follows the epydoc/restructured text standards. The changes brings our -docstring standard more in line with the ETS standard; in addition, it also -conserves horizontal real-estate and arguably looks better when printed as -plain text. Unfortunately, these changes mean that currently it isn't -possible to render the docstrings as desired. Travis has committed to writing -something to render the docstrings. At that point, we will update this -document to correspond with the new standard. For now, just refer to: -`example.py `__ +.. Attention:: + This document is slightly out of date. During the December 2007 sprint, + Travis Oliphant made some changes to the NumPy/SciPy docstring standard. + The changes are relatively minor, but the standard no longer follows the + epydoc/restructured text standards. The changes brings our docstring + standard more in line with the ETS standard; in addition, it also + conserves horizontal real-estate and arguably looks better when printed as + plain text. Unfortunately, these changes mean that currently it isn't + possible to render the docstrings as desired. Travis has committed to + writing something to render the docstrings. At that point, we will update + this document to correspond with the new standard. For now, just refer + to: `example.py + `__ + Overview -------- In general, we follow the standard Python style conventions as described here: From numpy-svn at scipy.org Sun Mar 23 13:16:14 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sun, 23 Mar 2008 12:16:14 -0500 (CDT) Subject: [Numpy-svn] r4937 - trunk/numpy/tests Message-ID: <20080323171614.E5E7F39C020@new.scipy.org> Author: cdavid Date: 2008-03-23 12:16:06 -0500 (Sun, 23 Mar 2008) New Revision: 4937 Modified: trunk/numpy/tests/test_ctypeslib.py Log: Do not fail test when ctypes is not available; print a message about skipping the test instead. Modified: trunk/numpy/tests/test_ctypeslib.py =================================================================== --- trunk/numpy/tests/test_ctypeslib.py 2008-03-23 14:21:31 UTC (rev 4936) +++ trunk/numpy/tests/test_ctypeslib.py 2008-03-23 17:16:06 UTC (rev 4937) @@ -4,8 +4,13 @@ class TestLoadLibrary(NumpyTestCase): def check_basic(self): - cdll = load_library('multiarray', - np.core.multiarray.__file__) + try: + cdll = load_library('multiarray', + np.core.multiarray.__file__) + except ImportError, e: + msg = "ctypes is not available on this python: skipping the test" \ + " (import error was: %s)" % str(e) + print msg class TestNdpointer(NumpyTestCase): def check_dtype(self): From numpy-svn at scipy.org Mon Mar 24 18:05:55 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 24 Mar 2008 17:05:55 -0500 (CDT) Subject: [Numpy-svn] r4938 - trunk/numpy/oldnumeric Message-ID: <20080324220555.44ED639C424@new.scipy.org> Author: rkern Date: 2008-03-24 17:05:53 -0500 (Mon, 24 Mar 2008) New Revision: 4938 Modified: trunk/numpy/oldnumeric/misc.py Log: NotImplementedError is the exception, not NotImplemented Modified: trunk/numpy/oldnumeric/misc.py =================================================================== --- trunk/numpy/oldnumeric/misc.py 2008-03-23 17:16:06 UTC (rev 4937) +++ trunk/numpy/oldnumeric/misc.py 2008-03-24 22:05:53 UTC (rev 4938) @@ -31,12 +31,12 @@ class Unpickler(pickle.Unpickler): def __init__(self, *args, **kwds): - raise NotImplemented + raise NotImplementedError def load_array(self): - raise NotImplemented + raise NotImplementedError class Pickler(pickle.Pickler): def __init__(self, *args, **kwds): - raise NotImplemented + raise NotImplementedError def save_array(self, object): - raise NotImplemented + raise NotImplementedError From numpy-svn at scipy.org Mon Mar 24 21:24:41 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 24 Mar 2008 20:24:41 -0500 (CDT) Subject: [Numpy-svn] r4939 - trunk/numpy/core/tests Message-ID: <20080325012441.94D4B39C017@new.scipy.org> Author: stefan Date: 2008-03-24 20:24:36 -0500 (Mon, 24 Mar 2008) New Revision: 4939 Modified: trunk/numpy/core/tests/test_regression.py Log: Add regression test for PyArray_FromIter issue mentioned on list. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-24 22:05:53 UTC (rev 4938) +++ trunk/numpy/core/tests/test_regression.py 2008-03-25 01:24:36 UTC (rev 4939) @@ -964,6 +964,11 @@ arr[:] = arr # trying to induce a segfault by doing it again... assert not arr[0].deleted + def check_mem_fromiter_invalid_dtype_string(self, level=rlevel): + x = [1,2,3] + self.failUnlessRaises(ValueError, + np.fromiter, [xi for xi in x], dtype='S') + if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Tue Mar 25 00:28:52 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 24 Mar 2008 23:28:52 -0500 (CDT) Subject: [Numpy-svn] r4940 - trunk/numpy/oldnumeric Message-ID: <20080325042852.7882F39C01C@new.scipy.org> Author: oliphant Date: 2008-03-24 23:28:49 -0500 (Mon, 24 Mar 2008) New Revision: 4940 Modified: trunk/numpy/oldnumeric/compat.py trunk/numpy/oldnumeric/misc.py Log: Improve support for old pickles. Modified: trunk/numpy/oldnumeric/compat.py =================================================================== --- trunk/numpy/oldnumeric/compat.py 2008-03-25 01:24:36 UTC (rev 4939) +++ trunk/numpy/oldnumeric/compat.py 2008-03-25 04:28:49 UTC (rev 4940) @@ -6,7 +6,8 @@ 'array_constructor', 'pickle_array', 'DumpArray', 'LoadArray', 'multiarray', # from cPickle - 'dump', 'dumps' + 'dump', 'dumps', 'load', 'loads', + 'Unpickler', 'Pickler' ] import numpy.core.multiarray as multiarray @@ -64,3 +65,45 @@ else: return (array_constructor, (a.shape, a.dtype.char, a.tostring(), LittleEndian)) + +def loads(astr): + import cPickle + arr = cPickle.loads(astr.replace('Numeric', 'numpy.oldnumeric')) + return arr + +def load(fp): + return loads(fp.read()) + +def _LoadArray(fp): + import typeconv + ln = fp.readline().split() + if ln[0][0] == 'A': ln[0] = ln[0][1:] + typecode = ln[0][0] + endian = ln[0][1] + itemsize = int(ln[0][2:]) + shape = [int(x) for x in ln[1:]) + sz = itemsize + for val in shape: + sz *= val + dstr = fp.read(sz) + m = mu.fromstring(dstr, typeconv.convtypecode(typecode)) + m.shape = shape + + if (LittleEndian and endian == 'B') or (not LittleEndian and endian == 'L'): + return m.byteswap(True) + else: + return m + +import pickle, copy +class Unpickler(pickle.Unpickler): + def load_array(self): + self.stack.append(_LoadArray(self)) + + dispatch = copy.copy(pickle.Unpickler.dispatch) + dispatch['A'] = load_array + +class Pickler(pickle.Pickler): + def __init__(self, *args, **kwds): + raise NotImplementedError, "Don't pickle new arrays with this" + def save_array(self, object): + raise NotImplementedError, "Don't pickle new arrays with this" Modified: trunk/numpy/oldnumeric/misc.py =================================================================== --- trunk/numpy/oldnumeric/misc.py 2008-03-25 01:24:36 UTC (rev 4939) +++ trunk/numpy/oldnumeric/misc.py 2008-03-25 04:28:49 UTC (rev 4940) @@ -1,15 +1,15 @@ # Functions that already have the correct syntax or miscellaneous functions -__all__ = ['load', 'sort', 'copy_reg', 'clip', 'Unpickler', 'rank', +__all__ = ['sort', 'copy_reg', 'clip', 'rank', 'sign', 'shape', 'types', 'allclose', 'size', 'choose', 'swapaxes', 'array_str', 'pi', 'math', 'concatenate', 'putmask', 'put', 'around', 'vdot', 'transpose', 'array2string', 'diagonal', 'searchsorted', 'copy', 'resize', 'array_repr', 'e', 'StringIO', 'pickle', - 'argsort', 'convolve', 'loads', 'cross_correlate', - 'Pickler', 'dot', 'outerproduct', 'innerproduct', 'insert'] + 'argsort', 'convolve', 'cross_correlate', + 'dot', 'outerproduct', 'innerproduct', 'insert'] import types import StringIO @@ -17,26 +17,13 @@ import math import copy import copy_reg -from pickle import load, loads from numpy import sort, clip, rank, sign, shape, putmask, allclose, size,\ choose, swapaxes, array_str, array_repr, e, pi, put, \ resize, around, concatenate, vdot, transpose, \ diagonal, searchsorted, argsort, convolve, dot, \ - outer as outerproduct, inner as innerproduct, correlate as cross_correlate, \ + outer as outerproduct, inner as innerproduct, \ + correlate as cross_correlate, \ place as insert from array_printer import array2string - - -class Unpickler(pickle.Unpickler): - def __init__(self, *args, **kwds): - raise NotImplementedError - def load_array(self): - raise NotImplementedError - -class Pickler(pickle.Pickler): - def __init__(self, *args, **kwds): - raise NotImplementedError - def save_array(self, object): - raise NotImplementedError From numpy-svn at scipy.org Tue Mar 25 00:49:52 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Mon, 24 Mar 2008 23:49:52 -0500 (CDT) Subject: [Numpy-svn] r4941 - trunk/numpy/oldnumeric Message-ID: <20080325044952.56C1739C01C@new.scipy.org> Author: oliphant Date: 2008-03-24 23:49:47 -0500 (Mon, 24 Mar 2008) New Revision: 4941 Modified: trunk/numpy/oldnumeric/compat.py Log: Fix typo from last checkin. Modified: trunk/numpy/oldnumeric/compat.py =================================================================== --- trunk/numpy/oldnumeric/compat.py 2008-03-25 04:28:49 UTC (rev 4940) +++ trunk/numpy/oldnumeric/compat.py 2008-03-25 04:49:47 UTC (rev 4941) @@ -81,7 +81,7 @@ typecode = ln[0][0] endian = ln[0][1] itemsize = int(ln[0][2:]) - shape = [int(x) for x in ln[1:]) + shape = [int(x) for x in ln[1:]] sz = itemsize for val in shape: sz *= val From numpy-svn at scipy.org Wed Mar 26 23:38:19 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 26 Mar 2008 22:38:19 -0500 (CDT) Subject: [Numpy-svn] r4942 - trunk/numpy/lib Message-ID: <20080327033819.B3C5E39C03A@new.scipy.org> Author: oliphant Date: 2008-03-26 22:38:14 -0500 (Wed, 26 Mar 2008) New Revision: 4942 Modified: trunk/numpy/lib/function_base.py Log: Added patch from ticket #610 to allow floats in interp. Modified: trunk/numpy/lib/function_base.py =================================================================== --- trunk/numpy/lib/function_base.py 2008-03-25 04:49:47 UTC (rev 4941) +++ trunk/numpy/lib/function_base.py 2008-03-27 03:38:14 UTC (rev 4942) @@ -21,11 +21,11 @@ from numpy.core.umath import pi, multiply, add, arctan2, \ frompyfunc, isnan, cos, less_equal, sqrt, sin, mod, exp, log10 from numpy.core.fromnumeric import ravel, nonzero, choose, sort, mean -from numpy.core.numerictypes import typecodes +from numpy.core.numerictypes import typecodes, number from numpy.lib.shape_base import atleast_1d, atleast_2d from numpy.lib.twodim_base import diag from _compiled_base import _insert, add_docstring -from _compiled_base import digitize, bincount, interp +from _compiled_base import digitize, bincount, interp as compiled_interp from arraysetops import setdiff1d import numpy as np @@ -677,25 +677,25 @@ except RuntimeError: pass -try: - add_docstring(interp, -r"""interp(x, xp, fp, left=None, right=None) -Return the value of a piecewise-linear function at each value in x. +def interp(x, xp, fp, left=None, right=None): + """Return the value of a piecewise-linear function at each value in x. -The piecewise-linear function, f, is defined by the known data-points fp=f(xp). -The xp points must be sorted in increasing order but this is not checked. + The piecewise-linear function, f, is defined by the known data-points + fp=f(xp). The xp points must be sorted in increasing order but this is + not checked. + + For values of x < xp[0] return the value given by left. If left is None, + then return fp[0]. + For values of x > xp[-1] return the value given by right. If right is + None, then return fp[-1]. + """ + if isinstance(x, (float, int, number)): + return compiled_interp([x], xp, fp, left, right).item() + else: + return compiled_interp(x, xp, fp, left, right) + -For values of x < xp[0] return the value given by left. If left is None, then -return fp[0]. -For values of x > xp[-1] return the value given by right. If right is None, then -return fp[-1]. -""" - ) -except RuntimeError: - pass - - def angle(z, deg=0): """Return the angle of the complex argument z. """ From numpy-svn at scipy.org Wed Mar 26 23:54:06 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 26 Mar 2008 22:54:06 -0500 (CDT) Subject: [Numpy-svn] r4943 - trunk/numpy/core/tests Message-ID: <20080327035406.001D539C03B@new.scipy.org> Author: oliphant Date: 2008-03-26 22:54:00 -0500 (Wed, 26 Mar 2008) New Revision: 4943 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Add better test for inexact numbers. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-27 03:38:14 UTC (rev 4942) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-27 03:54:00 UTC (rev 4943) @@ -47,7 +47,11 @@ for t in [np.int32, np.int64, np.float32, np.float64, np.longdouble]: a = t(51) b = a ** 4 - assert b == 6765201, "error with %r: got %r" % (t,b) + msg = "error with %r: got %r" % (t,b) + if issubdtype(t, np.integer): + assert b == 6765201, msg + else: + assert_almost_equal(b, 6765201, err_msg=msg) class TestConversion(NumpyTestCase): def test_int_from_long(self): From numpy-svn at scipy.org Thu Mar 27 00:27:42 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Wed, 26 Mar 2008 23:27:42 -0500 (CDT) Subject: [Numpy-svn] r4944 - in trunk/numpy/core: src tests Message-ID: <20080327042742.8BA0539C03A@new.scipy.org> Author: oliphant Date: 2008-03-26 23:27:35 -0500 (Wed, 26 Mar 2008) New Revision: 4944 Modified: trunk/numpy/core/src/arrayobject.c trunk/numpy/core/tests/test_multiarray.py trunk/numpy/core/tests/test_scalarmath.py Log: Fix ticket #676: flattening in Fortran order for ndim > 2 Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-27 03:54:00 UTC (rev 4943) +++ trunk/numpy/core/src/arrayobject.c 2008-03-27 04:27:35 UTC (rev 4944) @@ -831,6 +831,7 @@ */ int _flat_copyinto(PyObject *dst, PyObject *src, NPY_ORDER order) { PyArrayIterObject *it; + PyObject *orig_src; void (*myfunc)(char *, intp, char *, intp, intp, int); char *dptr; int axis; @@ -839,6 +840,7 @@ NPY_BEGIN_THREADS_DEF + orig_src = src; if (PyArray_NDIM(src) == 0) { /* Refcount note: src and dst have the same size */ PyArray_INCREF((PyArrayObject *)src); @@ -850,15 +852,19 @@ return 0; } + axis = PyArray_NDIM(src)-1; + if (order == PyArray_FORTRANORDER) { - axis = 0; + if (PyArray_NDIM(src) <= 2) axis = 0; + /* fall back to a more general method */ + else src = PyArray_Transpose((PyArrayObject *)orig_src, NULL); } - else { - axis = PyArray_NDIM(src)-1; - } it = (PyArrayIterObject *)PyArray_IterAllButAxis(src, &axis); - if (it == NULL) return -1; + if (it == NULL) { + if (src != orig_src) Py_DECREF(src); + return -1; + } if (PyArray_SAFEALIGNEDCOPY(src)) { myfunc = _strided_byte_copy; @@ -884,6 +890,7 @@ } NPY_END_THREADS + if (src != orig_src) Py_DECREF(src); Py_DECREF(it); return 0; } Modified: trunk/numpy/core/tests/test_multiarray.py =================================================================== --- trunk/numpy/core/tests/test_multiarray.py 2008-03-27 03:54:00 UTC (rev 4943) +++ trunk/numpy/core/tests/test_multiarray.py 2008-03-27 04:27:35 UTC (rev 4944) @@ -415,6 +415,19 @@ a = np.array(['aaaaaaaaa' for i in range(100)], dtype=np.unicode) assert_equal(a.argsort(kind='m'), r) + def check_flatten(self): + x0 = np.array([[1,2,3],[4,5,6]], np.int32) + x1 = np.array([[[1,2],[3,4]],[[5,6],[7,8]]], np.int32) + y0 = np.array([1,2,3,4,5,6], np.int32) + y0f = np.array([1,4,2,5,3,6], np.int32) + y1 = np.array([1,2,3,4,5,6,7,8], np.int32) + y1f = np.array([1,5,3,7,2,6,4,8], np.int32) + assert_equal(x0.flatten(), y0) + assert_equal(x0.flatten('F'), y0f) + assert_equal(x0.flatten('F'), x0.T.flatten()) + assert_equal(x1.flatten(), y1) + assert_equal(x1.flatten('F'), y1f) + assert_equal(x1.flatten('F'), x1.T.flatten()) class TestSubscripting(NumpyTestCase): def check_test_zero_rank(self): Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-27 03:54:00 UTC (rev 4943) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-27 04:27:35 UTC (rev 4944) @@ -48,7 +48,7 @@ a = t(51) b = a ** 4 msg = "error with %r: got %r" % (t,b) - if issubdtype(t, np.integer): + if np.issubdtype(t, np.integer): assert b == 6765201, msg else: assert_almost_equal(b, 6765201, err_msg=msg) From numpy-svn at scipy.org Thu Mar 27 01:26:08 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 27 Mar 2008 00:26:08 -0500 (CDT) Subject: [Numpy-svn] r4945 - in trunk/numpy/core: include/numpy src Message-ID: <20080327052608.124F639C03A@new.scipy.org> Author: oliphant Date: 2008-03-27 00:26:04 -0500 (Thu, 27 Mar 2008) New Revision: 4945 Modified: trunk/numpy/core/include/numpy/ndarrayobject.h trunk/numpy/core/src/multiarraymodule.c Log: Change var and std for complex valued arrays to compute z*conj(z) to match signal processing convention. Modified: trunk/numpy/core/include/numpy/ndarrayobject.h =================================================================== --- trunk/numpy/core/include/numpy/ndarrayobject.h 2008-03-27 04:27:35 UTC (rev 4944) +++ trunk/numpy/core/include/numpy/ndarrayobject.h 2008-03-27 05:26:04 UTC (rev 4945) @@ -1151,6 +1151,7 @@ #define NPY_USE_SETITEM 0x40 /* Use f.setitem when setting creating 0-d array from this data-type. */ +/* define NPY_IS_COMPLEX */ /* These are inherited for global data-type if any data-types in the field have them */ Modified: trunk/numpy/core/src/multiarraymodule.c =================================================================== --- trunk/numpy/core/src/multiarraymodule.c 2008-03-27 04:27:35 UTC (rev 4944) +++ trunk/numpy/core/src/multiarraymodule.c 2008-03-27 05:26:04 UTC (rev 4945) @@ -841,7 +841,7 @@ __New_PyArray_Std(PyArrayObject *self, int axis, int rtype, PyArrayObject *out, int variance, int num) { - PyObject *obj1=NULL, *obj2=NULL, *new=NULL; + PyObject *obj1=NULL, *obj2=NULL, *obj3=NULL, *new=NULL; PyObject *ret=NULL, *newshape=NULL; int i, n; intp val; @@ -870,14 +870,43 @@ if (obj1 == NULL) {Py_DECREF(new); return NULL;} /* Compute x * x */ + if (PyArray_ISCOMPLEX(obj1)) { + obj3 = PyArray_Conjugate((PyAO *)obj1, NULL); + } + else { + obj3 = obj1; + Py_INCREF(obj1); + } + if (obj3 == NULL) {Py_DECREF(new); return NULL;} obj2 = PyArray_EnsureArray \ - (PyArray_GenericBinaryFunction((PyAO *)obj1, obj1, n_ops.multiply)); + (PyArray_GenericBinaryFunction((PyAO *)obj1, obj3, n_ops.multiply)); Py_DECREF(obj1); + Py_DECREF(obj3); if (obj2 == NULL) {Py_DECREF(new); return NULL;} + if (PyArray_ISCOMPLEX(obj2)) { + obj3 = PyObject_GetAttrString(obj2, "real"); + switch(rtype) { + case NPY_CDOUBLE: + rtype = NPY_DOUBLE; + break; + case NPY_CFLOAT: + rtype = NPY_FLOAT; + break; + case NPY_CLONGDOUBLE: + rtype = NPY_LONGDOUBLE; + break; + } + } + else { + obj3 = obj2; + Py_INCREF(obj2); + } + if (obj3 == NULL) {Py_DECREF(new); return NULL;} /* Compute add.reduce(x*x,axis) */ - obj1 = PyArray_GenericReduceFunction((PyAO *)obj2, n_ops.add, + obj1 = PyArray_GenericReduceFunction((PyAO *)obj3, n_ops.add, axis, rtype, NULL); + Py_DECREF(obj3); Py_DECREF(obj2); if (obj1 == NULL) {Py_DECREF(new); return NULL;} From numpy-svn at scipy.org Thu Mar 27 17:56:49 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 27 Mar 2008 16:56:49 -0500 (CDT) Subject: [Numpy-svn] r4946 - in trunk/numpy/ma: . tests Message-ID: <20080327215649.405B839C26D@new.scipy.org> Author: pierregm Date: 2008-03-27 16:56:44 -0500 (Thu, 27 Mar 2008) New Revision: 4946 Modified: trunk/numpy/ma/core.py trunk/numpy/ma/tests/test_core.py Log: new methods : round new functions : frombuffer, fromfunction, identity, indices, trace to fix : fromfile/tofile raise a NotImplementedError. For now. Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-27 05:26:04 UTC (rev 4945) +++ trunk/numpy/ma/core.py 2008-03-27 21:56:44 UTC (rev 4946) @@ -31,9 +31,10 @@ 'default_fill_value', 'diagonal', 'divide', 'dump', 'dumps', 'empty', 'empty_like', 'equal', 'exp', 'fabs', 'fmod', 'filled', 'floor', 'floor_divide','fix_invalid', + 'frombuffer', 'fromfunction', 'getdata','getmask', 'getmaskarray', 'greater', 'greater_equal', 'hypot', - 'ids', 'inner', 'innerproduct', + 'identity', 'ids', 'indices', 'inner', 'innerproduct', 'isMA', 'isMaskedArray', 'is_mask', 'is_masked', 'isarray', 'left_shift', 'less', 'less_equal', 'load', 'loads', 'log', 'log10', 'logical_and', 'logical_not', 'logical_or', 'logical_xor', @@ -2212,6 +2213,16 @@ if axis is not None or dvar is not masked: dvar = sqrt(dvar) return dvar + + #............................................ + def round(self, decimals=0, out=None): + result = self._data.round(decimals).view(type(self)) + result._mask = self._mask + if out is None: + return result + out[:] = result + return + round.__doc__ = ndarray.round.__doc__ #............................................ def argsort(self, axis=None, fill_value=None, kind='quicksort', @@ -2540,6 +2551,10 @@ """ return self.filled(fill_value).tostring(order=order) + #........................ + def tofile(self, fid, sep="", format="%s"): + raise NotImplementedError("Not implemented yet, sorry...") + #-------------------------------------------- # Pickling def __getstate__(self): @@ -2791,10 +2806,12 @@ ptp = _frommethod('ptp') ravel = _frommethod('ravel') repeat = _frommethod('repeat') +round = _frommethod('round') std = _frommethod('std') sum = _frommethod('sum') swapaxes = _frommethod('swapaxes') take = _frommethod('take') +trace = _frommethod('trace') var = _frommethod('var') compress = _frommethod('compress') @@ -3147,7 +3164,7 @@ """ if out is None: - result = fromnumeric.round_(getdata(a), decimals, out) + result = numpy.round_(getdata(a), decimals, out) if isinstance(a,MaskedArray): result = result.view(type(a)) result._mask = a._mask @@ -3155,7 +3172,7 @@ result = result.view(MaskedArray) return result else: - fromnumeric.round_(getdata(a), decimals, out) + numpy.round_(getdata(a), decimals, out) if hasattr(out, '_mask'): out._mask = getmask(a) return out @@ -3312,4 +3329,43 @@ return cPickle.loads(strg) ################################################################################ +def fromfile(file, dtype=float, count=-1, sep=''): + raise NotImplementedError("Not yet implemented. Sorry") + +class _convert2ma: + """Convert functions from numpy to numpy.ma. + + Parameters + ---------- + _methodname : string + Name of the method to transform. + + """ + __doc__ = None + def __init__(self, funcname): + self._func = getattr(numpy, funcname) + self.__doc__ = self.getdoc() + def getdoc(self): + "Return the doc of the function (from the doc of the method)." + return self._func.__doc__ + def __call__(self, a, *args, **params): + return self._func.__call__(a, *args, **params).view(MaskedArray) + +frombuffer = _convert2ma('frombuffer') +fromfunction = _convert2ma('fromfunction') +identity = _convert2ma('identity') +indices = numpy.indices + +############################################################################### +if 1: + if 1: + a = array([1.23456, 2.34567, 3.45678, 4.56789, 5.67890], + mask=[0,1,0,0,0]) + assert(all(a.round() == array([1., 2., 3., 5., 6.]))) + assert(all(a.round(1) == array([1.2, 2.3, 3.5, 4.6, 5.7]))) + assert(all(a.round(3) == array([1.235, 2.346, 3.457, 4.568, 5.679]))) + b = empty_like(a) + a.round(out=b) + assert(all(b == array([1., 2., 3., 5., 6.]))) + print "OK" Modified: trunk/numpy/ma/tests/test_core.py =================================================================== --- trunk/numpy/ma/tests/test_core.py 2008-03-27 05:26:04 UTC (rev 4945) +++ trunk/numpy/ma/tests/test_core.py 2008-03-27 21:56:44 UTC (rev 4946) @@ -1461,6 +1461,21 @@ y = masked_where(False,x) assert_equal(y,[1,2]) assert_equal(y[1],2) + # + def test_round(self): + a = array([1.23456, 2.34567, 3.45678, 4.56789, 5.67890], + mask=[0,1,0,0,0]) + assert_equal(a.round(), [1., 2., 3., 5., 6.]) + assert_equal(a.round(1), [1.2, 2.3, 3.5, 4.6, 5.7]) + assert_equal(a.round(3), [1.235, 2.346, 3.457, 4.568, 5.679]) + b = empty_like(a) + a.round(out=b) + assert_equal(b, [1., 2., 3., 5., 6.]) + # + def test_identity(self): + a = identity(5) + assert(isinstance(a, MaskedArray)) + assert_equal(a, numpy.identity(5)) ############################################################################### From numpy-svn at scipy.org Thu Mar 27 18:04:56 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Thu, 27 Mar 2008 17:04:56 -0500 (CDT) Subject: [Numpy-svn] r4947 - trunk/numpy/ma Message-ID: <20080327220456.D701A39C0C1@new.scipy.org> Author: pierregm Date: 2008-03-27 17:04:54 -0500 (Thu, 27 Mar 2008) New Revision: 4947 Modified: trunk/numpy/ma/core.py Log: (forgot to get rid of my personal tests... sorry about that) Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-27 21:56:44 UTC (rev 4946) +++ trunk/numpy/ma/core.py 2008-03-27 22:04:54 UTC (rev 4947) @@ -3358,14 +3358,3 @@ indices = numpy.indices ############################################################################### -if 1: - if 1: - a = array([1.23456, 2.34567, 3.45678, 4.56789, 5.67890], - mask=[0,1,0,0,0]) - assert(all(a.round() == array([1., 2., 3., 5., 6.]))) - assert(all(a.round(1) == array([1.2, 2.3, 3.5, 4.6, 5.7]))) - assert(all(a.round(3) == array([1.235, 2.346, 3.457, 4.568, 5.679]))) - b = empty_like(a) - a.round(out=b) - assert(all(b == array([1., 2., 3., 5., 6.]))) - print "OK" From numpy-svn at scipy.org Fri Mar 28 01:03:53 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 28 Mar 2008 00:03:53 -0500 (CDT) Subject: [Numpy-svn] r4948 - trunk/numpy/core/src Message-ID: <20080328050353.16E1B39C01F@new.scipy.org> Author: oliphant Date: 2008-03-28 00:03:50 -0500 (Fri, 28 Mar 2008) New Revision: 4948 Modified: trunk/numpy/core/src/arrayobject.c trunk/numpy/core/src/ufuncobject.c Log: Fix some Py_INCREF's to Py_XINCREF to avoid segfault when NULL is stored. Modified: trunk/numpy/core/src/arrayobject.c =================================================================== --- trunk/numpy/core/src/arrayobject.c 2008-03-27 22:04:54 UTC (rev 4947) +++ trunk/numpy/core/src/arrayobject.c 2008-03-28 05:03:50 UTC (rev 4948) @@ -862,7 +862,7 @@ it = (PyArrayIterObject *)PyArray_IterAllButAxis(src, &axis); if (it == NULL) { - if (src != orig_src) Py_DECREF(src); + if (src != orig_src) {Py_DECREF(src);} return -1; } @@ -890,7 +890,7 @@ } NPY_END_THREADS - if (src != orig_src) Py_DECREF(src); + if (src != orig_src) {Py_DECREF(src);} Py_DECREF(it); return 0; } Modified: trunk/numpy/core/src/ufuncobject.c =================================================================== --- trunk/numpy/core/src/ufuncobject.c 2008-03-27 22:04:54 UTC (rev 4947) +++ trunk/numpy/core/src/ufuncobject.c 2008-03-28 05:03:50 UTC (rev 4948) @@ -2425,8 +2425,9 @@ NULL); loop->cast(loop->buffer, loop->castbuf, 1, NULL, NULL); - if (loop->obj) - Py_INCREF(*((PyObject **)loop->castbuf)); + if (loop->obj) { + Py_XINCREF(*((PyObject **)loop->castbuf)); + } memcpy(loop->bufptr[0], loop->castbuf, loop->outsize); } @@ -2570,8 +2571,9 @@ NULL); loop->cast(loop->buffer, loop->castbuf, 1, NULL, NULL); - if (loop->obj) - Py_INCREF(*((PyObject **)loop->castbuf)); + if (loop->obj) { + Py_XINCREF(*((PyObject **)loop->castbuf)); + } memcpy(loop->bufptr[0], loop->castbuf, loop->outsize); } @@ -2693,8 +2695,9 @@ for (i=0; ibufptr[1] = loop->it->dataptr + \ (*ptr)*loop->instrides; - if (loop->obj) - Py_INCREF(*((PyObject **)loop->bufptr[1])); + if (loop->obj) { + Py_XINCREF(*((PyObject **)loop->bufptr[1])); + } memcpy(loop->bufptr[0], loop->bufptr[1], loop->outsize); mm = (i==nn-1 ? arr->dimensions[axis]-*ptr : \ @@ -2723,8 +2726,9 @@ while(loop->index < loop->size) { ptr = (intp *)ind->data; for (i=0; iobj) - Py_INCREF(*((PyObject **)loop->idptr)); + if (loop->obj) { + Py_XINCREF(*((PyObject **)loop->idptr)); + } memcpy(loop->bufptr[0], loop->idptr, loop->outsize); n = 0; From numpy-svn at scipy.org Fri Mar 28 01:08:23 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 28 Mar 2008 00:08:23 -0500 (CDT) Subject: [Numpy-svn] r4949 - trunk/numpy/core/tests Message-ID: <20080328050823.27A1F39C01F@new.scipy.org> Author: oliphant Date: 2008-03-28 00:08:21 -0500 (Fri, 28 Mar 2008) New Revision: 4949 Modified: trunk/numpy/core/tests/test_regression.py Log: Add test for fix to #713. Modified: trunk/numpy/core/tests/test_regression.py =================================================================== --- trunk/numpy/core/tests/test_regression.py 2008-03-28 05:03:50 UTC (rev 4948) +++ trunk/numpy/core/tests/test_regression.py 2008-03-28 05:08:21 UTC (rev 4949) @@ -969,6 +969,12 @@ self.failUnlessRaises(ValueError, np.fromiter, [xi for xi in x], dtype='S') + def check_reduce_big_object_array(self, level=rlevel): + """Ticket #713""" + oldsize = np.setbufsize(10*16) + a = np.array([None]*161, object) + assert not np.any(a) + np.setbufsize(oldsize) if __name__ == "__main__": NumpyTest().run() From numpy-svn at scipy.org Fri Mar 28 14:17:59 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Fri, 28 Mar 2008 13:17:59 -0500 (CDT) Subject: [Numpy-svn] r4950 - trunk/numpy/ma Message-ID: <20080328181759.7A32B39C1DA@new.scipy.org> Author: pierregm Date: 2008-03-28 13:17:56 -0500 (Fri, 28 Mar 2008) New Revision: 4950 Modified: trunk/numpy/ma/core.py Log: added common_fill_value and set_fill_value in __all__ Modified: trunk/numpy/ma/core.py =================================================================== --- trunk/numpy/ma/core.py 2008-03-28 05:08:21 UTC (rev 4949) +++ trunk/numpy/ma/core.py 2008-03-28 18:17:56 UTC (rev 4950) @@ -26,8 +26,8 @@ 'arctanh', 'argmax', 'argmin', 'argsort', 'around', 'array', 'asarray','asanyarray', 'bitwise_and', 'bitwise_or', 'bitwise_xor', - 'ceil', 'choose', 'compress', 'compressed', 'concatenate', - 'conjugate', 'cos', 'cosh', 'count', + 'ceil', 'choose', 'common_fill_value', 'compress', 'compressed', + 'concatenate', 'conjugate', 'cos', 'cosh', 'count', 'default_fill_value', 'diagonal', 'divide', 'dump', 'dumps', 'empty', 'empty_like', 'equal', 'exp', 'fabs', 'fmod', 'filled', 'floor', 'floor_divide','fix_invalid', @@ -50,8 +50,8 @@ 'power', 'product', 'ptp', 'put', 'putmask', 'rank', 'ravel', 'remainder', 'repeat', 'reshape', 'resize', 'right_shift', 'round_', - 'shape', 'sin', 'sinh', 'size', 'sometrue', 'sort', 'sqrt', 'std', - 'subtract', 'sum', 'swapaxes', + 'set_fill_value', 'shape', 'sin', 'sinh', 'size', 'sometrue', 'sort', + 'sqrt', 'std', 'subtract', 'sum', 'swapaxes', 'take', 'tan', 'tanh', 'transpose', 'true_divide', 'var', 'where', 'zeros'] From numpy-svn at scipy.org Sat Mar 29 23:04:28 2008 From: numpy-svn at scipy.org (numpy-svn at scipy.org) Date: Sat, 29 Mar 2008 22:04:28 -0500 (CDT) Subject: [Numpy-svn] r4951 - trunk/numpy/core/tests Message-ID: <20080330030428.38EDE39C2BD@new.scipy.org> Author: oliphant Date: 2008-03-29 22:04:26 -0500 (Sat, 29 Mar 2008) New Revision: 4951 Modified: trunk/numpy/core/tests/test_scalarmath.py Log: Longdouble printing of nan's causes problems on some machines. Modified: trunk/numpy/core/tests/test_scalarmath.py =================================================================== --- trunk/numpy/core/tests/test_scalarmath.py 2008-03-28 18:17:56 UTC (rev 4950) +++ trunk/numpy/core/tests/test_scalarmath.py 2008-03-30 03:04:26 UTC (rev 4951) @@ -84,6 +84,8 @@ def check_float_repr(self): from numpy import nan, inf for t in [np.float32, np.float64, np.longdouble]: + if t is np.longdouble: # skip it for now. + continue finfo=np.finfo(t) last_fraction_bit_idx = finfo.nexp + finfo.nmant last_exponent_bit_idx = finfo.nexp